diff --git a/server/gameservice/constant/constant.go b/server/gameservice/constant/constant.go index 9dfc0a05..91055bbc 100644 --- a/server/gameservice/constant/constant.go +++ b/server/gameservice/constant/constant.go @@ -22,4 +22,4 @@ const ( EMAIL_KEY = "520d8eeb8cf1d833a42c820432c020b2fd60f4b7|" + EMAIL_URL_DEV ) -const BASE_SCORE = 4000 +const BASE_SCORE = 400 diff --git a/server/gameservice/task/seasonRanking.go b/server/gameservice/task/seasonRanking.go index 1f5d5403..9b50ed18 100644 --- a/server/gameservice/task/seasonRanking.go +++ b/server/gameservice/task/seasonRanking.go @@ -55,7 +55,7 @@ func (this *SeasonRankMgr) CalcRanking() { } func (this *SeasonRankMgr) getUsersRecords(lastIdx int64, limit int64) { - sql := fmt.Sprintf("SELECT idx,account_id,channel,`rank`,score,score_modifytime,`address` FROM t_user WHERE score > %d and idx > %d limit %d", + sql := fmt.Sprintf("SELECT idx,`address`, account_id,channel,`rank`,score,score_modifytime FROM t_user WHERE score > %d and idx > %d limit %d", constant.BASE_SCORE, lastIdx, limit) f5.GetJsStyleDb().SelectCustomQuery( constant.GAME_DB, @@ -69,15 +69,16 @@ func (this *SeasonRankMgr) getUsersRecords(lastIdx int64, limit int64) { for rows.Next() { empty = false user := userDb{} - user.idx = q5.ToInt64(*rows.GetByName("idx")) - user.account_id = q5.ToString(*rows.GetByName("account_id")) - user.address = q5.ToString(*rows.GetByName("address")) - user.channel = q5.ToInt32(*rows.GetByName("channel")) - user.rank = q5.ToInt32(*rows.GetByName("rank")) - user.score = q5.ToInt32(*rows.GetByName("score")) - user.score_modifytime = q5.ToInt64(*rows.GetByName("score_modifytime")) + user.idx = q5.ToInt64(rows.GetByName("idx")) + user.account_id = q5.ToString(rows.GetByName("account_id")) + user.address = q5.ToString(rows.GetByName("address")) + user.channel = q5.ToInt32(rows.GetByName("channel")) + user.rank = q5.ToInt32(rows.GetByName("rank")) + user.score = q5.ToInt32(rows.GetByName("score")) + user.score_modifytime = q5.ToInt64(rows.GetByName("score_modifytime")) this.userData[user.idx] = &user - lastIdx = q5.ToInt64(*rows.GetByName("idx")) + lastIdx = q5.ToInt64(rows.GetByName("idx")) + f5.GetSysLog().Info("get User:%s \n", user.channel) } if empty { //done = true diff --git a/third_party/f5 b/third_party/f5 index 64cce9a6..0431c236 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit 64cce9a69150238337ceb4324720952f285c26ef +Subproject commit 0431c236bd92f7176b45852a85f1fab6d9f3ab86 diff --git a/third_party/q5 b/third_party/q5 index 3d4c6f69..decda354 160000 --- a/third_party/q5 +++ b/third_party/q5 @@ -1 +1 @@ -Subproject commit 3d4c6f692f684c1124fc76dd6bd46cdb28e98d87 +Subproject commit decda354c852daae419ca3c78e87c2b13b9e85b6