Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

dbproxy/svc/l_invitescore.go

@@ -2,6 +2,7 @@ package svc
 
 import (
 	"errors"
+	"fmt"
 	"net/rpc"
 	"sort"
 	"time"
@@ -150,7 +151,7 @@ func (b *BindScoreSvc) GetInviteRankList(req *model.FindPlayerRankInviteListArgs
 		//机器人库
 		robotPlayer := AccountCollection(mongo.G_P)
 		var robotPlayerList []PInfo
-		err = robotPlayer.Find(selecter).Select(bson.M{"snid": 1, "name": 1, "roles": 1}).All(&robotPlayerList)
+		err = robotPlayer.Find(selecter).Select(bson.M{"snid": 1, "username": 1, "roles": 1}).All(&robotPlayerList)
 		if err != nil {
 			logger.Logger.Error("GetInviteRankList find player is error", err)
 			return err
@@ -159,8 +160,12 @@ func (b *BindScoreSvc) GetInviteRankList(req *model.FindPlayerRankInviteListArgs
 		for _, inviteInfo := range list {
 			for _, playerData := range retPlayerList {
 				if inviteInfo.SnId == playerData.SnId {
+					name := playerData.Name
+					if name == "" {
+						name = "mango" + fmt.Sprintf("%d", playerData.SnId)
+					}
 					var RankInvite model.PlayerRankInvite
-					RankInvite.Name = playerData.Name
+					RankInvite.Name = name
 					RankInvite.Score = inviteInfo.Score
 					RankInvite.SnId = inviteInfo.SnId
 

ranksrv/rank/invitelog.go

@@ -66,11 +66,13 @@ func RobotRandon() {
 		for i := 0; i < robotNum; i++ {
 			//随机机器人
 			snId := accounts[rand.Intn(len(accounts))].SnId
+			num := int64(rand.Intn(8) + 1)
+			score := num*50 + int64(rand.Intn(551)+50)
 			data := model.RankInvite{
 				Platform: "1",
 				SnId:     snId,
-				Num:      int64(rand.Intn(4) + 2),
-				Score:    int64(rand.Intn(901) + 100),
+				Num:      num,
+				Score:    score,
 				Ts:       time.Now().Unix(),
 				Week:     common.GetWeekStartTs(time.Now().Unix()),
 			}