Browse Source

版本更新

zhengtao 8 months ago
parent
commit
3c852f97f8

+ 0 - 2
game/game_cluster/nodes/game/module/player/actor_player.go

@@ -67,8 +67,6 @@ func (p *actorPlayer) OnInit() {
 
 
 	p.Remote().Register("rank", p.rank) // 排行榜
 	p.Remote().Register("rank", p.rank) // 排行榜
 
 
-	p.Remote().Register("inviteRecord", p.inviteRecord) // 邀请累计信息
-	p.Remote().Register("invite", p.invite)                       // 邀请
 	p.Remote().Register("inviteRecord", p.inviteRecord)           // 邀请累计信息
 	p.Remote().Register("inviteRecord", p.inviteRecord)           // 邀请累计信息
 	p.Remote().Register("inviteRewardRatio", p.inviteRewardRatio) // 邀请裂变查询
 	p.Remote().Register("inviteRewardRatio", p.inviteRewardRatio) // 邀请裂变查询
 	p.Remote().Register("inviteClaimRatio", p.inviteClaimRatio)   // 领取邀请裂变奖励
 	p.Remote().Register("inviteClaimRatio", p.inviteClaimRatio)   // 领取邀请裂变奖励

+ 4 - 4
game/game_cluster/nodes/game/module/player/cashout.go

@@ -29,10 +29,10 @@ func (p *actorPlayer) cashOut(req *param.CashOutReq) int32 {
 		return code.TonWallNotExistsError
 		return code.TonWallNotExistsError
 	}
 	}
 
 
-	errCode := p.VerifyPwd(req.PassWord)
-	if errCode > 0 {
-		return errCode
-	}
+	/*	errCode := p.VerifyPwd(req.PassWord)
+		if errCode > 0 {
+			return errCode
+		}*/
 
 
 	num := int(cutils.Float64ByRatioToInt64(req.Amount, constant.MoneyRatio))
 	num := int(cutils.Float64ByRatioToInt64(req.Amount, constant.MoneyRatio))
 	var id int
 	var id int

+ 15 - 92
game/game_cluster/robot_client/main.go

@@ -6,14 +6,11 @@ import (
 	mhayaHttp "github.com/mhaya/extend/http"
 	mhayaHttp "github.com/mhaya/extend/http"
 	mhayaTime "github.com/mhaya/extend/time"
 	mhayaTime "github.com/mhaya/extend/time"
 	"github.com/mhaya/game/game_cluster/internal/code"
 	"github.com/mhaya/game/game_cluster/internal/code"
-	"github.com/mhaya/game/game_cluster/internal/constant"
-	"github.com/mhaya/game/game_cluster/internal/mdb/models"
 	"github.com/mhaya/game/game_cluster/internal/param"
 	"github.com/mhaya/game/game_cluster/internal/param"
 	mhayaLogger "github.com/mhaya/logger"
 	mhayaLogger "github.com/mhaya/logger"
 	pomeloClient "github.com/mhaya/net/parser/pomelo/client"
 	pomeloClient "github.com/mhaya/net/parser/pomelo/client"
 	"math/rand"
 	"math/rand"
 	"strconv"
 	"strconv"
-	"sync"
 	"time"
 	"time"
 )
 )
 
 
@@ -36,7 +33,7 @@ func main() {
 			Pid:      2,
 			Pid:      2,
 			OpenID:   str,
 			OpenID:   str,
 			Platform: "ios",
 			Platform: "ios",
-			Channel:  "tg_sign",
+			Channel:  "tg",
 		}
 		}
 	}
 	}
 	var Url = ""
 	var Url = ""
@@ -50,47 +47,25 @@ func main() {
 		fmt.Println(Url)
 		fmt.Println(Url)
 		time.Sleep(200 * time.Millisecond)
 		time.Sleep(200 * time.Millisecond)
 		go RunRobot(Url, val)
 		go RunRobot(Url, val)
-	var wg sync.WaitGroup
-
-	//accounts := make(map[string]*param.LoginReq)
-	//for i := 1; i <= maxRobotNum; i++ {
-	//	str := strconv.Itoa(i)
-	//	accounts[str] = &param.LoginReq{
-	//		Pid:      2,
-	//		OpenID:   str,
-	//		Platform: "ios",
-	//		Channel:  "tg",
-	//	}
-	//}
-	//var Url = ""
-	//for _, val := range accounts {
-	//	k := rand.Intn(2)
-	//	if k == 1 {
-	//		Url = url2
-	//	} else {
-	//		Url = url
-	//	}
-	//	fmt.Println(Url)
-	//	time.Sleep(200 * time.Millisecond)
-	//	go RunRobot(Url, val)
-	//}
-
-	// 邀请排行榜机器人
-	accounts := BuildAccount(1)
-	for _, account := range accounts {
-		wg.Add(1)
-		InviteRankRobot(account, &wg)
 	}
 	}
-	wg.Wait()
+
 }
 }
 
 
 var Player = []string{"28q1PjXEh3M", "28q1PjY2LSm", "28q1PjYpgFW", "28q1PjYLLvw", "28qeTc4cwBj", "28q1RgBeGYq", "28q1PjYLLvx", "28qfgUzvh67", "28qeLPTxn79", "28qfBVzrRqm", "28qf5VTadno", "28qfdrK9yVN", "28qg8W7Lbmh"}
 var Player = []string{"28q1PjXEh3M", "28q1PjY2LSm", "28q1PjYpgFW", "28q1PjYLLvw", "28qeTc4cwBj", "28q1RgBeGYq", "28q1PjYLLvx", "28qfgUzvh67", "28qeLPTxn79", "28qfBVzrRqm", "28qf5VTadno", "28qfdrK9yVN", "28qg8W7Lbmh"}
 
 
 func RunRobot(url string, val *param.LoginReq) {
 func RunRobot(url string, val *param.LoginReq) {
-	token, _ := RegisterAndLogin(url, val)
+	token := RegisterDevAccount(url, val)
+	if token == "" {
+		return
+	}
+	params := map[string]interface{}{
+		"nickName": "guest" + val.OpenID,
+	}
+	Login(url, params, token)
 
 
+	time.Sleep(time.Duration(rand.Int31n(2)) * time.Millisecond)
 	num1 := rand.Intn(12)
 	num1 := rand.Intn(12)
-	params := map[string]interface{}{
+	params = map[string]interface{}{
 		"parentName": Player[num1],
 		"parentName": Player[num1],
 	}
 	}
 	time.Sleep(time.Duration(rand.Int31n(10)) * time.Millisecond)
 	time.Sleep(time.Duration(rand.Int31n(10)) * time.Millisecond)
@@ -115,55 +90,7 @@ func RunRobot(url string, val *param.LoginReq) {
 		}
 		}
 
 
 	}(url, token)
 	}(url, token)
-}
-
-// 邀请排行榜机器人
-func InviteRankRobot(account *param.LoginReq, wg *sync.WaitGroup) {
-	defer wg.Done()
-	// 注册邀请人账号
-	_, userName := RegisterAndLogin(url, account)
-	//
-	//params := map[string]interface{}{
-	//	"parentName": userName,
-	//}
-	// 注册被邀请人账号并填写邀请
-	RegisterAndLogin(url, account)
-
-	time.Sleep(time.Duration(rand.Int31n(10)) * time.Millisecond)
-
-	//Invite(url, params, token)
-
-	//设置邀请榜单
-	models.SetRank(constant.RankSourceInvite, 0, userName, 1)
-}
-
-func BuildAccount(total int) []*param.LoginReq {
-	accounts := make([]*param.LoginReq, 0)
-	for i := 1; i <= total; i++ {
-		str := strconv.Itoa(i)
-		accounts = append(accounts, &param.LoginReq{
-			Pid:      2,
-			OpenID:   str,
-			Platform: "ios",
-			Channel:  "tg",
-		})
-	}
-	return accounts
-}
-
-// 注册并登录
-func RegisterAndLogin(url string, val *param.LoginReq) (string, string) {
-	token := RegisterDevAccount(url, val)
-	if token == "" {
-		return "", ""
-	}
-	params := map[string]interface{}{
-		"nickName": "guest" + val.OpenID,
-	}
-	userName := Login(url, params, token)
 
 
-	time.Sleep(time.Duration(rand.Int31n(2)) * time.Millisecond)
-	return token, userName
 }
 }
 
 
 func RegisterDevAccount(url string, val *param.LoginReq) string {
 func RegisterDevAccount(url string, val *param.LoginReq) string {
@@ -175,7 +102,6 @@ func RegisterDevAccount(url string, val *param.LoginReq) string {
 		"platform": val.Platform,
 		"platform": val.Platform,
 		"channel":  val.Channel,
 		"channel":  val.Channel,
 	}
 	}
-
 	jsonBytes, _, err := mhayaHttp.PostJSON(requestURL, params)
 	jsonBytes, _, err := mhayaHttp.PostJSON(requestURL, params)
 	if err != nil {
 	if err != nil {
 		mhayaLogger.Warn(err)
 		mhayaLogger.Warn(err)
@@ -195,26 +121,23 @@ func RegisterDevAccount(url string, val *param.LoginReq) string {
 	return ""
 	return ""
 }
 }
 
 
-func Login(url string, params map[string]interface{}, token string) string {
+func Login(url string, params map[string]interface{}, token string) {
 	requestURL := fmt.Sprintf("%s/login", url)
 	requestURL := fmt.Sprintf("%s/login", url)
 	jsonBytes, err := mhayaHttp.PostJSONWithHeader(requestURL, params, token)
 	jsonBytes, err := mhayaHttp.PostJSONWithHeader(requestURL, params, token)
 	if err != nil {
 	if err != nil {
 		mhayaLogger.Warn(err)
 		mhayaLogger.Warn(err)
-		return ""
+		return
 	}
 	}
 
 
 	rsp := &code.Result{}
 	rsp := &code.Result{}
 	err = jsoniter.Unmarshal(jsonBytes, rsp)
 	err = jsoniter.Unmarshal(jsonBytes, rsp)
 	if err != nil {
 	if err != nil {
 		mhayaLogger.Warn(err)
 		mhayaLogger.Warn(err)
-		return ""
+		return
 	}
 	}
 
 
 	mhayaLogger.Debugf("Login OK")
 	mhayaLogger.Debugf("Login OK")
 
 
-	m := rsp.Data.(map[string]interface{})
-	i := m["userName"]
-	return i.(string)
 }
 }
 
 
 func Roll(url string, params map[string]interface{}, token string) {
 func Roll(url string, params map[string]interface{}, token string) {