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

model/rank.go

@@ -235,20 +235,6 @@ type FindPlayerLevelReply struct {
 	List *PlayerLevelInfo
 }
 
-func FindPlayerLevel(args *FindPlayerLevelArgs) (*FindPlayerLevelReply, error) {
-	if rpcCli == nil {
-		logger.Logger.Error("model.FindPlayerLevel rpcCli == nil")
-		return nil, nil
-	}
-
-	ret := new(FindPlayerLevelReply)
-	err := rpcCli.CallWithTimeout("GamePlayerListSvc.FindPlayerLevel", args, ret, time.Second*30)
-	if err != nil {
-		logger.Logger.Error("FindPlayerLevel error:", err)
-		return ret, err
-	}
-	return ret, nil
-}
 func FindPlayerLevelList(args *FindPlayerLevelListArgs) (*FindPlayerLevelListReply, error) {
 	if rpcCli == nil {
 		logger.Logger.Error("model.FindPlayerLevelList rpcCli == nil")

ranksrv/action_gatesrv.go

@@ -420,7 +420,7 @@ func CSPlayerLevelRank(s *netlib.Session, d *rankproto.GateTransmit, packetId in
 				Name:  v.Name,
 				Level: v.Level,
 				ModId: v.ModId,
-				Rank:  i,
+				Rank:  i + start,
 			}
 			ranks = append(ranks, r)
 			i++
@@ -443,37 +443,7 @@ func CSPlayerLevelRank(s *netlib.Session, d *rankproto.GateTransmit, packetId in
 				}
 			}
 		}
-
-		if me == nil {
-			var err error
-			var ret *model.FindPlayerLevelReply
-			task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-				startTs, endTs := rank.StartEndTs()
-				ret, err = model.FindPlayerLevel(&model.FindPlayerLevelArgs{
-					Platform: d.Platform,
-					StartTs:  startTs,
-					EndTs:    endTs,
-					SnId:     d.Snid,
-				})
-				if err != nil {
-					logger.Logger.Errorf("FindWinCoinTienlen error: %v", err)
-				}
-				return nil
-			}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
-				if err == nil && ret.List != nil {
-					me = &rankproto.PlayerLevelRankInfo{
-						SnId:  ret.List.SnId,
-						Name:  ret.List.Name,
-						Rank:  -1,
-						Level: ret.List.Level,
-						ModId: ret.List.ModId,
-					}
-				}
-				send()
-			})).Start()
-		} else {
-			send()
-		}
+		send()
 	})
 	return nil
 }