From b000a8b05da055eb20272ffbd210e6eacbbeec71 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Wed, 8 May 2024 17:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E7=AD=89=E7=BA=A7=E6=A6=9Clo?= =?UTF-8?q?g=E8=BE=93=E5=87=BAerror=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/rank.go | 26 ++++++++++++++------------ ranksrv/action_gatesrv.go | 32 +------------------------------- 2 files changed, 15 insertions(+), 43 deletions(-) diff --git a/model/rank.go b/model/rank.go index 69adece..a500c20 100644 --- a/model/rank.go +++ b/model/rank.go @@ -235,20 +235,22 @@ type FindPlayerLevelReply struct { List *PlayerLevelInfo } -func FindPlayerLevel(args *FindPlayerLevelArgs) (*FindPlayerLevelReply, error) { - if rpcCli == nil { - logger.Logger.Error("model.FindPlayerLevel rpcCli == nil") - return nil, nil - } +/* + 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 + ret := new(FindPlayerLevelReply) + err := rpcCli.CallWithTimeout("RankPlayerLevelSvc.FindPlayerLevel", args, ret, time.Second*30) + if err != nil { + logger.Logger.Error("FindPlayerLevel error:", err) + return ret, err + } + return ret, nil } - return ret, nil -} +*/ func FindPlayerLevelList(args *FindPlayerLevelListArgs) (*FindPlayerLevelListReply, error) { if rpcCli == nil { logger.Logger.Error("model.FindPlayerLevelList rpcCli == nil") diff --git a/ranksrv/action_gatesrv.go b/ranksrv/action_gatesrv.go index 995b5ef..69c4846 100644 --- a/ranksrv/action_gatesrv.go +++ b/ranksrv/action_gatesrv.go @@ -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 }