diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go index c7eefe66..b5eee34b 100644 --- a/src/server/game/GameLogic.go +++ b/src/server/game/GameLogic.go @@ -49,7 +49,8 @@ func RegisterMsgProcessFunc(key string, value1 interface{}) { func RunNetProcessByKey(key string, param []interface{}) error { fun, ok := RegisterNetWorkFunc[key] if ok { - err := fun.(func([]interface{}) error)(param) + _, player, buf := ParseArgs(param) + err := fun.(func(*Player, []byte) error)(player, buf) return err } return fmt.Errorf("cant find network func %s", key) @@ -822,6 +823,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() { RegisterMsgProcessFunc("ReqKafkaLog", ReqKafkaLog) // 客户端日志 RegisterMsgProcessFunc("ReqCreateOrderSn", ReqCreateOrderSn) // 创建订单号 RegisterMsgProcessFunc("ReqShippingOrder", ReqShippingOrder) // 获取订单号 + } func (ad *GameLogic) CreateHttpManager() { diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 16b17b07..ff624724 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -30,24 +30,21 @@ import ( "google.golang.org/protobuf/proto" ) -func ReqPlayerAsset(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPlayerAsset(player *Player, buf []byte) error { player.PushClientRes(player.PlayerBaseMod.BackAsset()) return nil } // 请求玩家基础信息 -func ReqPlayerBaseInfofunction(args []interface{}) error { +func ReqPlayerBaseInfofunction(player *Player, buf []byte) error { // 消息的发送者 - _, player, buf := ParseArgs(args) detail := &msg.ReqPlayerBaseInfo{} proto.Unmarshal(buf, detail) player.PlayerBaseMod.ResPlayerBaseInfo(player) return nil } -func ReqPlayerBriefProfileDataFunc(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { detail := &msg.ReqPlayerBriefProfileData{} proto.Unmarshal(buf, detail) Uid := int(detail.DwUin) @@ -64,15 +61,13 @@ func ReqPlayerBriefProfileDataFunc(args []interface{}) error { } // 移除广告 -func ReqRemoveAdFunc(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRemoveAdFunc(player *Player, buf []byte) error { player.PlayerBaseMod.ReqRemoveAd(player, buf) return nil } // 更新玩家物品 -func UpdateBaseItemInfofunction(args []interface{}) error { - _, player, buf := ParseArgs(args) +func UpdateBaseItemInfofunction(player *Player, buf []byte) error { detail := &msg.UpdateBaseItemInfo{} proto.Unmarshal(buf, detail) player.PlayerBaseMod.UpdateBaseItemInfo(detail) @@ -80,8 +75,7 @@ func UpdateBaseItemInfofunction(args []interface{}) error { } // 请求玩家棋盘信息 -func ReqPlayerChessDataFunc(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayerChessDataFunc(player *Player, buf []byte) error { detail := &msg.ReqPlayerChessData{} proto.Unmarshal(buf, detail) playerChessData := &PlayerChessData{} @@ -89,33 +83,28 @@ func ReqPlayerChessDataFunc(args []interface{}) error { return nil } -func ReqBindFacebookAccount(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqBindFacebookAccount(player *Player, buf []byte) error { player.PlayerBaseMod.ReqBindFacebookAccount(player, buf) return nil } -func ReqUnBindFacebook(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqUnBindFacebook(player *Player, buf []byte) error { player.PlayerBaseMod.ReqUnBindFacebook(player, buf) return nil } -func ReqOnlyBindFacebook(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqOnlyBindFacebook(player *Player, buf []byte) error { player.PlayerBaseMod.ReqOnlyBindFacebook(player, buf) return nil } -func ReqSynGameData(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSynGameData(player *Player, buf []byte) error { player.PlayerBaseMod.ReqSynGameData(player, buf) return nil } -func RegSetEneryFunc(args []interface{}) error { - _, player, buf := ParseArgs(args) +func RegSetEneryFunc(player *Player, buf []byte) error { req := &msg.ReqSetEnergyMul{} proto.Unmarshal(buf, req) MaxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) @@ -143,8 +132,7 @@ func RegSetEneryFunc(args []interface{}) error { } // 领取图鉴奖励 -func ReqGetHandbookReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetHandbookReward(player *Player, buf []byte) error { req := &msg.ReqGetHandbookReward{} proto.Unmarshal(buf, req) err := player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) @@ -178,8 +166,7 @@ func ReqGetHandbookReward(args []interface{}) error { } // 领取订单奖励 -func ReqRewardOrder(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRewardOrder(player *Player, buf []byte) error { req := &msg.ReqRewardOrder{} proto.Unmarshal(buf, req) OrderMod := player.PlayMod.getOrderMod() @@ -329,8 +316,7 @@ func ReqRewardOrder(args []interface{}) error { return nil } -func ReqDelOrder(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqDelOrder(player *Player, buf []byte) error { req := &msg.ReqDelOrder{} proto.Unmarshal(buf, req) OrderMod := player.PlayMod.getOrderMod() @@ -350,8 +336,7 @@ func ReqDelOrder(args []interface{}) error { } // 场景装饰 -func ReqDecorate(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqDecorate(player *Player, buf []byte) error { req := &msg.ReqDecorate{} proto.Unmarshal(buf, req) DecorateMod := player.PlayMod.getDecorateMod() @@ -419,8 +404,7 @@ func ReqDecorate(args []interface{}) error { } // 场景装饰 -func ReqDecorateAll(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqDecorateAll(player *Player, buf []byte) error { req := &msg.ReqDecorateAll{} proto.Unmarshal(buf, req) DecorateMod := player.PlayMod.getDecorateMod() @@ -478,8 +462,7 @@ func ReqDecorateAll(args []interface{}) error { // -----------------------ChessApi---------------------- // 更新棋盘信息 -func UpdatePlayerChessDataFunc(args []interface{}) error { - _, player, buf := ParseArgs(args) +func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { data := &PlayerChessData{} err := data.UpdatePlayerChessData(player, buf) if err != nil { @@ -493,8 +476,7 @@ func UpdatePlayerChessDataFunc(args []interface{}) error { } // 从缓存中获取棋子 -func ReqGetChessFromBuff(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetChessFromBuff(player *Player, buf []byte) error { req := &msg.ReqGetChessFromBuff{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -543,8 +525,7 @@ func ReqGetChessFromBuff(args []interface{}) error { } // 放置棋子进背包 -func ReqPutChessInBag(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPutChessInBag(player *Player, buf []byte) error { req := &msg.ReqPutChessInBag{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -577,8 +558,7 @@ func ReqPutChessInBag(args []interface{}) error { return nil } -func ReqTakeChessOutBag(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqTakeChessOutBag(player *Player, buf []byte) error { req := &msg.ReqTakeChessOutBag{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -611,8 +591,7 @@ func ReqTakeChessOutBag(args []interface{}) error { return nil } -func ReqBuyChessBagGrid(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqBuyChessBagGrid(player *Player, buf []byte) error { req := &msg.ReqBuyChessBagGrid{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -648,8 +627,7 @@ func ReqBuyChessBagGrid(args []interface{}) error { return nil } -func ReqSeparateChess(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSeparateChess(player *Player, buf []byte) error { req := &msg.ReqSeparateChess{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -686,8 +664,7 @@ func ReqSeparateChess(args []interface{}) error { } // 棋子转换 -func ReqChessEx(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqChessEx(player *Player, buf []byte) error { req := &msg.ReqChessEx{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -735,8 +712,7 @@ func ReqChessEx(args []interface{}) error { return nil } -func ReqSourceChest(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSourceChest(player *Player, buf []byte) error { req := &msg.ReqSourceChest{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -780,15 +756,13 @@ func ReqSourceChest(args []interface{}) error { // ---------------------CardApi---------------------- -func ReqCardInfo(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqCardInfo(player *Player, buf []byte) error { CardMod := player.PlayMod.getCardMod() player.PushClientRes(CardMod.BackData()) return nil } -func ReqCardSeasonFirstReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCardSeasonFirstReward(player *Player, buf []byte) error { req := &msg.ReqCardSeasonFirstReward{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -816,8 +790,7 @@ func ReqCardSeasonFirstReward(args []interface{}) error { } // 领取卡牌系列收集奖励 -func ReqCardCollectReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCardCollectReward(player *Player, buf []byte) error { req := &msg.ReqCardCollectReward{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -857,8 +830,7 @@ func ReqCardCollectReward(args []interface{}) error { } // 兑换星星奖励 -func ReqExStarReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqExStarReward(player *Player, buf []byte) error { req := &msg.ReqExStarReward{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -888,8 +860,7 @@ func ReqExStarReward(args []interface{}) error { } // 领取全收集奖励 -func ReqAllCollectReward(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqAllCollectReward(player *Player, buf []byte) error { CardMod := player.PlayMod.getCardMod() itemList, itemList2, err := CardMod.AllCollectReward() if err != nil { @@ -925,8 +896,7 @@ func ReqAllCollectReward(args []interface{}) error { } // ---------------------GuildApi---------------------- -func ReqGuideReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGuideReward(player *Player, buf []byte) error { req := &msg.ReqGuideReward{} proto.Unmarshal(buf, req) GuildMod := player.PlayMod.getGuildMod() @@ -956,8 +926,7 @@ func ReqGuideReward(args []interface{}) error { } // -----------------dailyTaskApi--------------------- -func ReqGetDailyTaskReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetDailyTaskReward(player *Player, buf []byte) error { req := &msg.ReqGetDailyTaskReward{} proto.Unmarshal(buf, req) DailyTaskMod := player.PlayMod.getDailyTaskMod() @@ -992,8 +961,7 @@ func ReqGetDailyTaskReward(args []interface{}) error { return nil } -func ReqGetDailyWeekReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetDailyWeekReward(player *Player, buf []byte) error { req := &msg.ReqGetDailyWeekReward{} proto.Unmarshal(buf, req) DailyTaskMod := player.PlayMod.getDailyTaskMod() @@ -1022,8 +990,7 @@ func ReqGetDailyWeekReward(args []interface{}) error { return nil } -func ReqDailyUnlock(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqDailyUnlock(player *Player, buf []byte) error { req := &msg.ReqDailyUnlock{} proto.Unmarshal(buf, req) DailyTaskMod := player.PlayMod.getDailyTaskMod() @@ -1037,8 +1004,7 @@ func ReqDailyUnlock(args []interface{}) error { } // 头像框 -func ReqSetAvatar(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSetAvatar(player *Player, buf []byte) error { req := &msg.ReqSetAvatar{} proto.Unmarshal(buf, req) avatarMod := player.PlayMod.getAvatarMod() @@ -1068,8 +1034,7 @@ func ReqSetAvatar(args []interface{}) error { } // 头像 -func ReqSetFace(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSetFace(player *Player, buf []byte) error { req := &msg.ReqSetFace{} proto.Unmarshal(buf, req) FaceMod := player.PlayMod.getFaceMod() @@ -1091,8 +1056,7 @@ func ReqSetFace(args []interface{}) error { } // 购买能量 -func ReqBuyEnergy(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqBuyEnergy(player *Player, buf []byte) error { req := &msg.ReqBuyEnergy{} proto.Unmarshal(buf, req) BaseMod := player.PlayMod.getBaseMod() @@ -1117,8 +1081,7 @@ func ReqBuyEnergy(args []interface{}) error { return nil } -func ReqGetEnergyByAD(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqGetEnergyByAD(player *Player, buf []byte) error { BaseMod := player.PlayMod.getBaseMod() Item, err := BaseMod.GetEnergyByAD() if err != nil { @@ -1145,8 +1108,7 @@ func ReqGetEnergyByAD(args []interface{}) error { } // 领取七日签到奖励 -func ReqGetSevenLoginReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetSevenLoginReward(player *Player, buf []byte) error { req := &msg.ReqGetSevenLoginReward{} proto.Unmarshal(buf, req) SevenLoginMod := player.PlayMod.getSevenLoginMod() @@ -1181,8 +1143,7 @@ func ReqGetSevenLoginReward(args []interface{}) error { } // 领取月进度奖励 -func ReqGetMonthLoginReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetMonthLoginReward(player *Player, buf []byte) error { req := &msg.ReqGetMonthLoginReward{} proto.Unmarshal(buf, req) SevenLoginMod := player.PlayMod.getSevenLoginMod() @@ -1212,8 +1173,7 @@ func ReqGetMonthLoginReward(args []interface{}) error { } // 连击快手奖励 -func ReqFastProduceReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqFastProduceReward(player *Player, buf []byte) error { req := &msg.ReqFastProduceReward{} proto.Unmarshal(buf, req) LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -1242,8 +1202,7 @@ func ReqFastProduceReward(args []interface{}) error { return nil } -func ReqLimitSenceReward(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqLimitSenceReward(player *Player, buf []byte) error { limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if !limitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_SENCE_DASH) { // 场景冲刺奖励 player.SendErrClienRes(&msg.ResLimitSenceReward{ @@ -1270,8 +1229,7 @@ func ReqLimitSenceReward(args []interface{}) error { return nil } -func ReqGetGoldCard(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqGetGoldCard(player *Player, buf []byte) error { data := G_GameLogicPtr.VarMgr.GetVar(VAR_GOLD_CARD) if data == nil { player.SendErrClienRes(&msg.ResGetGoldCard{ @@ -1289,8 +1247,7 @@ func ReqGetGoldCard(args []interface{}) error { } // 搜索用户 -func ReqSearchPlayer(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSearchPlayer(player *Player, buf []byte) error { req := &msg.ReqSearchPlayer{} proto.Unmarshal(buf, req) Uid, err := strconv.Atoi(req.Uid) @@ -1329,8 +1286,7 @@ func ReqSearchPlayer(args []interface{}) error { } // 申请好友 -func ReqApplyFriend(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqApplyFriend(player *Player, buf []byte) error { req := &msg.ReqApplyFriend{} proto.Unmarshal(buf, req) Uid := int(req.Uid) @@ -1367,8 +1323,7 @@ func ReqApplyFriend(args []interface{}) error { } // 同意申请 -func ReqAgreeFriend(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqAgreeFriend(player *Player, buf []byte) error { req := &msg.ReqAgreeFriend{} proto.Unmarshal(buf, req) Uid := int(req.Uid) @@ -1400,8 +1355,7 @@ func ReqAgreeFriend(args []interface{}) error { } // 删除好友 -func ReqDelFriend(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqDelFriend(player *Player, buf []byte) error { req := &msg.ReqDelFriend{} proto.Unmarshal(buf, req) Uid := int(req.Uid) @@ -1428,8 +1382,7 @@ func ReqDelFriend(args []interface{}) error { } // 拒绝申请 -func ReqRefuseFriend(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRefuseFriend(player *Player, buf []byte) error { req := &msg.ReqRefuseFriend{} proto.Unmarshal(buf, req) Uid := int(req.Uid) @@ -1452,8 +1405,7 @@ func ReqRefuseFriend(args []interface{}) error { } // 向好友请求卡牌 -func ReqCardGive(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCardGive(player *Player, buf []byte) error { req := &msg.ReqCardGive{} proto.Unmarshal(buf, req) @@ -1546,8 +1498,7 @@ func ReqCardGive(args []interface{}) error { } // 同意卡牌请求 -func ReqAgreeCardGive(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqAgreeCardGive(player *Player, buf []byte) error { req := &msg.ReqAgreeCardGive{} proto.Unmarshal(buf, req) FriendMod := player.PlayMod.getFriendMod() @@ -1593,8 +1544,7 @@ func ReqAgreeCardGive(args []interface{}) error { } // 拒绝卡牌请求 -func ReqRefuseCardGive(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRefuseCardGive(player *Player, buf []byte) error { req := &msg.ReqRefuseCardGive{} proto.Unmarshal(buf, req) FriendMod := player.PlayMod.getFriendMod() @@ -1624,8 +1574,7 @@ func ReqRefuseCardGive(args []interface{}) error { } // 赠送卡牌 -func ReqCardSend(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCardSend(player *Player, buf []byte) error { req := &msg.ReqCardSend{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -1658,8 +1607,7 @@ func ReqCardSend(args []interface{}) error { } // 卡牌交换 -func ReqCardExchange(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCardExchange(player *Player, buf []byte) error { req := &msg.ReqCardExchange{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -1698,8 +1646,7 @@ func ReqCardExchange(args []interface{}) error { } // 选择卡牌进行交换 -func ReqSelectCardExchange(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSelectCardExchange(player *Player, buf []byte) error { req := &msg.ReqSelectCardExchange{} proto.Unmarshal(buf, req) CardId := int(req.CardId) @@ -1765,8 +1712,7 @@ func ReqSelectCardExchange(args []interface{}) error { } // 同意卡牌交换 -func ReqAgreeCardExchange(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqAgreeCardExchange(player *Player, buf []byte) error { req := &msg.ReqSelectCardExchange{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -1821,8 +1767,7 @@ func ReqAgreeCardExchange(args []interface{}) error { } // 拒绝选择卡牌 -func ReqRefuseCardSelect(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRefuseCardSelect(player *Player, buf []byte) error { req := &msg.ReqRefuseCardSelect{} proto.Unmarshal(buf, req) FriendMod := player.PlayMod.getFriendMod() @@ -1858,8 +1803,7 @@ func ReqRefuseCardSelect(args []interface{}) error { } // 拒绝进行交换 -func ReqRefuseCardExchange(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRefuseCardExchange(player *Player, buf []byte) error { req := &msg.ReqRefuseCardExchange{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -1901,8 +1845,7 @@ func ReqRefuseCardExchange(args []interface{}) error { } // 领取好友卡牌 -func ReqGetFriendCard(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetFriendCard(player *Player, buf []byte) error { req := &msg.ReqRefuseCardExchange{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -1931,8 +1874,7 @@ func ReqGetFriendCard(args []interface{}) error { } // 请求玩家榜单 -func ReqRank(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRank(player *Player, buf []byte) error { req := &msg.ReqRank{} proto.Unmarshal(buf, req) m := &MsqMod.Msg{ @@ -1956,8 +1898,7 @@ func ReqRank(args []interface{}) error { } // 请求竞标赛榜单 -func ReqChampshipRank(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqChampshipRank(player *Player, buf []byte) error { req := &msg.ReqRank{} proto.Unmarshal(buf, req) m := G_GameLogicPtr.ChampshipMgr.GetRankMsg(int(player.M_DwUin)) @@ -1965,8 +1906,7 @@ func ReqChampshipRank(args []interface{}) error { return nil } -func ReqChampshipPreRank(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqChampshipPreRank(player *Player, buf []byte) error { req := &msg.ReqRank{} proto.Unmarshal(buf, req) m := G_GameLogicPtr.ChampshipMgr.GetPreRankMsg(int(player.M_DwUin)) @@ -1975,16 +1915,14 @@ func ReqChampshipPreRank(args []interface{}) error { } // 请求邮件列表 -func ReqMailList(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqMailList(player *Player, buf []byte) error { MailMod := player.PlayMod.getMailMod() player.PushClientRes(MailMod.BackData()) return nil } // 读邮件 -func ReqReadMail(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqReadMail(player *Player, buf []byte) error { req := &msg.ReqReadMail{} proto.Unmarshal(buf, req) MailMod := player.PlayMod.getMailMod() @@ -2006,8 +1944,7 @@ func ReqReadMail(args []interface{}) error { } // 领取邮件奖励 -func ReqGetMailReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetMailReward(player *Player, buf []byte) error { req := &msg.ReqGetMailReward{} proto.Unmarshal(buf, req) MailMod := player.PlayMod.getMailMod() @@ -2037,8 +1974,7 @@ func ReqGetMailReward(args []interface{}) error { } // 删除邮件 -func ReqDeleteMail(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqDeleteMail(player *Player, buf []byte) error { req := &msg.ReqDeleteMail{} proto.Unmarshal(buf, req) MailMod := player.PlayMod.getMailMod() @@ -2060,8 +1996,7 @@ func ReqDeleteMail(args []interface{}) error { } // 领取商店免费奖励 -func ReqFreeShop(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFreeShop(player *Player, buf []byte) error { ChargeMod := player.PlayMod.getChargeMod() Item, err := ChargeMod.FireFreeShop() if err != nil { @@ -2093,8 +2028,7 @@ func ReqFreeShop(args []interface{}) error { } // 购买棋子商店物品 -func ReqBuyChessShop(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqBuyChessShop(player *Player, buf []byte) error { req := &msg.ReqBuyChessShop{} proto.Unmarshal(buf, req) ChargeMod := player.PlayMod.getChargeMod() @@ -2142,8 +2076,7 @@ func ReqBuyChessShop(args []interface{}) error { } // 购买棋子商店物品 -func ReqBuyChessShop2(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqBuyChessShop2(player *Player, buf []byte) error { req := &msg.ReqBuyChessShop2{} proto.Unmarshal(buf, req) ChargeMod := player.PlayMod.getChargeMod() @@ -2201,8 +2134,7 @@ func ReqBuyChessShop2(args []interface{}) error { } // 刷新棋子商店 -func ReqRefreshChessShop(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqRefreshChessShop(player *Player, buf []byte) error { ChargeMod := player.PlayMod.getChargeMod() ChessMod := player.PlayMod.getChessMod() ChargeMod.InitChessShop(ChessMod.GetEmitList()) @@ -2224,8 +2156,7 @@ func ReqRefreshChessShop(args []interface{}) error { } // 领取无尽礼包免费奖励 -func ReqEndlessReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqEndlessReward(player *Player, buf []byte) error { req := &msg.ReqEndlessReward{} proto.Unmarshal(buf, req) EndlessMod := player.PlayMod.getEndlessMod() @@ -2265,16 +2196,14 @@ func ReqEndlessReward(args []interface{}) error { } // 请求无尽礼包数据 -func ReqEndless(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqEndless(player *Player, buf []byte) error { EndlessMod := player.PlayMod.getEndlessMod() player.PushClientRes(EndlessMod.BackData()) return nil } // 请求存钱罐奖励 -func ReqPiggyBankReward(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPiggyBankReward(player *Player, buf []byte) error { PiggyBankMod := player.PlayMod.getPiggyBankMod() itemList := PiggyBankMod.Fire(0) err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_PiggyBankReward.String()) @@ -2298,8 +2227,7 @@ func ReqPiggyBankReward(args []interface{}) error { } // 生成订单号 -func ReqCreateOrderSn(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCreateOrderSn(player *Player, buf []byte) error { req := &msg.ReqCreateOrderSn{} proto.Unmarshal(buf, req) OrderSn, err := CreateOrderSn(player, int(req.ChargeId), req.PlatForm, req.Channel) @@ -2313,8 +2241,7 @@ func ReqCreateOrderSn(args []interface{}) error { } // 订单发货 -func ReqShippingOrder(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqShippingOrder(player *Player, buf []byte) error { req := &msg.ReqShippingOrder{} proto.Unmarshal(buf, req) @@ -2326,8 +2253,7 @@ func ReqShippingOrder(args []interface{}) error { } // 锦标赛 -func ReqChampshipReward(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqChampshipReward(player *Player, buf []byte) error { ChampshipMod := player.PlayMod.getChampshipMod() itemList := ChampshipMod.GetReward() err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String()) @@ -2353,15 +2279,13 @@ func ReqChampshipReward(args []interface{}) error { return nil } -func ReqLimitEvent(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqLimitEvent(player *Player, buf []byte) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() player.PushClientRes(LimitedTimeEventMod.BackData()) return nil } -func ReqKv(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqKv(player *Player, buf []byte) error { req := &msg.ReqKv{} proto.Unmarshal(buf, req) KvMod := player.PlayMod.getKvMod() @@ -2369,8 +2293,7 @@ func ReqKv(args []interface{}) error { return nil } -func ReqFriendRecommend(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendRecommend(player *Player, buf []byte) error { FriendMod := player.PlayMod.getFriendMod() RecommendList := make([]*msg.ResPlayerSimple, 0) FriendNum := FriendMod.GetFriendNum() @@ -2400,32 +2323,27 @@ func ReqFriendRecommend(args []interface{}) error { return nil } -func ReqFriendList(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendList(player *Player, buf []byte) error { FriendListBackData(player) return nil } -func ReqFriendApply(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendApply(player *Player, buf []byte) error { FriendApplyBackData(player) return nil } -func ReqFriendCardMsg(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendCardMsg(player *Player, buf []byte) error { FriendCardBackData(player) return nil } -func ReqFriendTimeLine(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendTimeLine(player *Player, buf []byte) error { FriendLogBackData(player) return nil } -func ReqChampshipRankReward(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqChampshipRankReward(player *Player, buf []byte) error { MyLastRank := G_GameLogicPtr.ChampshipMgr.getLastMyRank(int(player.M_DwUin)) ChampshipMod := player.PlayMod.getChampshipMod() itemList, err := ChampshipMod.GetRankReward(MyLastRank) @@ -2459,8 +2377,7 @@ func ReqChampshipRankReward(args []interface{}) error { return nil } -func ReqSetName(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSetName(player *Player, buf []byte) error { req := &msg.ReqSetName{} proto.Unmarshal(buf, req) BaseMod := player.PlayMod.getBaseMod() @@ -2477,8 +2394,7 @@ func ReqSetName(args []interface{}) error { return nil } -func ReqSetPetName(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSetPetName(player *Player, buf []byte) error { req := &msg.ReqSetPetName{} proto.Unmarshal(buf, req) BaseMod := player.PlayMod.getBaseMod() @@ -2496,14 +2412,12 @@ func ReqSetPetName(args []interface{}) error { return nil } -func ReqUserInfo(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqUserInfo(player *Player, buf []byte) error { BackUserInfo(player) return nil } -func ReqMasterCard(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqMasterCard(player *Player, buf []byte) error { req := &msg.ReqMasterCard{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() @@ -2529,8 +2443,7 @@ func ReqMasterCard(args []interface{}) error { return nil } -func ReqSetFacebookUrl(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSetFacebookUrl(player *Player, buf []byte) error { req := &msg.ReqSetFacebookUrl{} proto.Unmarshal(buf, req) BaseMod := player.PlayMod.getBaseMod() @@ -2542,15 +2455,13 @@ func ReqSetFacebookUrl(args []interface{}) error { return nil } -func ReqInviteFriendData(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqInviteFriendData(player *Player, buf []byte) error { InviteMod := player.PlayMod.getInviteMod() player.PushClientRes(InviteMod.BackData()) return nil } -func ReqSelfInvited(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSelfInvited(player *Player, buf []byte) error { req := &msg.ReqSelfInvited{} proto.Unmarshal(buf, req) G_GameLogicPtr.FriendMgrSend(&MsqMod.Msg{ @@ -2564,8 +2475,7 @@ func ReqSelfInvited(args []interface{}) error { return nil } -func ReqGetInviteReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGetInviteReward(player *Player, buf []byte) error { req := &msg.ReqGetInviteReward{} proto.Unmarshal(buf, req) InviteMod := player.PlayMod.getInviteMod() @@ -2598,8 +2508,7 @@ func ReqGetInviteReward(args []interface{}) error { return nil } -func ReqAutoAddInviteFriend(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqAutoAddInviteFriend(player *Player, buf []byte) error { req := &msg.ReqAutoAddInviteFriend{} proto.Unmarshal(buf, req) FriendMod := player.PlayMod.getFriendMod() @@ -2627,8 +2536,7 @@ func ReqAutoAddInviteFriend(args []interface{}) error { return nil } -func ReqAutoAddInviteFriend2(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { req := &msg.ReqAutoAddInviteFriend2{} proto.Unmarshal(buf, req) FriendMod := player.PlayMod.getFriendMod() @@ -2664,8 +2572,7 @@ func ReqAutoAddInviteFriend2(args []interface{}) error { return nil } -func ReqSelectLimitEvent(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqSelectLimitEvent(player *Player, buf []byte) error { req := &msg.ReqSelectLimitEvent{} proto.Unmarshal(buf, req) LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -2700,15 +2607,13 @@ func ReqSelectLimitEvent(args []interface{}) error { } // 请求挖矿基础数据 -func ReqMining(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqMining(player *Player, buf []byte) error { MiningBackData(player) return nil } // 请求挖矿 -func ReqMiningTake(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqMiningTake(player *Player, buf []byte) error { req := &msg.ReqMiningTake{} proto.Unmarshal(buf, req) MiningMod := player.PlayMod.getMiningMod() @@ -2753,8 +2658,7 @@ func ReqMiningTake(args []interface{}) error { } // 领取关卡奖励 -func ReqMiningReward(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqMiningReward(player *Player, buf []byte) error { MiningMod := player.PlayMod.getMiningMod() Status := GetActivityStatus(player, ACT_TYPE_MINING) if Status != ACT_STATUS_START { @@ -2786,8 +2690,7 @@ func ReqMiningReward(args []interface{}) error { } // 请求猜颜色基础数据 -func ReqGuessColor(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGuessColor(player *Player, buf []byte) error { req := &msg.ReqGuessColor{} proto.Unmarshal(buf, req) GuessColorMod := player.PlayMod.getGuessColorMod() @@ -2802,8 +2705,7 @@ func ReqGuessColor(args []interface{}) error { } // 请求猜颜色 -func ReqGuessColorTake(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGuessColorTake(player *Player, buf []byte) error { req := &msg.ReqGuessColorTake{} proto.Unmarshal(buf, req) Status := GetActivityStatus(player, ACT_TYPE_GUESS_COLOR) @@ -2832,8 +2734,7 @@ func ReqGuessColorTake(args []interface{}) error { } // 请求猜颜色奖励 -func ReqGuessColorReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqGuessColorReward(player *Player, buf []byte) error { req := &msg.ReqGuessColorReward{} proto.Unmarshal(buf, req) Status := GetActivityStatus(player, ACT_TYPE_GUESS_COLOR) @@ -2867,15 +2768,13 @@ func ReqGuessColorReward(args []interface{}) error { } // 请求竞赛基础数据 -func ReqRace(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqRace(player *Player, buf []byte) error { RaceBackData(player) return nil } // 请求竞赛开始 -func ReqRaceStart(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRaceStart(player *Player, buf []byte) error { req := &msg.ReqRaceStart{} proto.Unmarshal(buf, req) RaceMod := player.PlayMod.getRaceMod() @@ -2895,8 +2794,7 @@ func ReqRaceStart(args []interface{}) error { } // 领取竞赛奖励 -func ReqRaceReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqRaceReward(player *Player, buf []byte) error { req := &msg.ResRaceReward{} proto.Unmarshal(buf, req) RaceMod := player.PlayMod.getRaceMod() @@ -2924,15 +2822,13 @@ func ReqRaceReward(args []interface{}) error { } // 请求playroom基础数据 -func ReqPlayroom(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPlayroom(player *Player, buf []byte) error { PlayroomBackData(player) return nil } // 请求playroom拜访信息 -func ReqPlayroomInfo(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomInfo(player *Player, buf []byte) error { req := &msg.ReqPlayroomInfo{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -2985,8 +2881,7 @@ func ReqPlayroomInfo(args []interface{}) error { } // 请求playroom交互 -func ReqPlayroomInteract(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomInteract(player *Player, buf []byte) error { req := &msg.ReqPlayroomInteract{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3016,8 +2911,7 @@ func ReqPlayroomInteract(args []interface{}) error { } // 请求playroom设置房间 -func ReqPlayroomSetRoom(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomSetRoom(player *Player, buf []byte) error { req := &msg.ReqPlayroomSetRoom{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3038,8 +2932,7 @@ func ReqPlayroomSetRoom(args []interface{}) error { } // 玩游戏 -func ReqPlayroomGame(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomGame(player *Player, buf []byte) error { req := &msg.ReqPlayroomGame{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3089,8 +2982,7 @@ func ReqPlayroomGame(args []interface{}) error { } // 选择奖励 -func ReqPlayroomSelectReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomSelectReward(player *Player, buf []byte) error { req := &msg.ReqPlayroomSelectReward{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3122,8 +3014,7 @@ func ReqPlayroomSelectReward(args []interface{}) error { } // 处理偷取物品 -func ReqPlayroomLose(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPlayroomLose(player *Player, buf []byte) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.ResetLose() player.PushClientRes(PlayroomMod.NotifyLose()) @@ -3131,8 +3022,7 @@ func ReqPlayroomLose(args []interface{}) error { } // 宠物开始工作 -func ReqPlayroomWork(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomWork(player *Player, buf []byte) error { req := &msg.ReqPlayroomWork{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3167,8 +3057,7 @@ func ReqPlayroomWork(args []interface{}) error { } // 宠物休息 -func ReqPlayroomRest(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPlayroomRest(player *Player, buf []byte) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.Rest() player.PlayMod.save() @@ -3177,8 +3066,7 @@ func ReqPlayroomRest(args []interface{}) error { } // 抽取转盘 -func ReqPlayroomDraw(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPlayroomDraw(player *Player, buf []byte) error { PlayroomMod := player.PlayMod.getPlayroomMod() Id, Items, err := PlayroomMod.Draw() if err != nil { @@ -3208,8 +3096,7 @@ func ReqPlayroomDraw(args []interface{}) error { } // 清理碎片 -func ReqPlayroomChip(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomChip(player *Player, buf []byte) error { req := &msg.ReqPlayroomChip{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3231,8 +3118,7 @@ func ReqPlayroomChip(args []interface{}) error { } // 翻牌游戏 -func ReqPlayroomFlip(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomFlip(player *Player, buf []byte) error { req := &msg.ReqPlayroomFlip{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3259,8 +3145,7 @@ func ReqPlayroomFlip(args []interface{}) error { return nil } -func ReqPlayroomFlipReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomFlipReward(player *Player, buf []byte) error { req := &msg.ReqPlayroomFlipReward{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3300,8 +3185,7 @@ func ReqPlayroomFlipReward(args []interface{}) error { return nil } -func ReqPlayroomBuyItem(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomBuyItem(player *Player, buf []byte) error { req := &msg.ReqPlayroomBuyItem{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3338,17 +3222,12 @@ func ReqPlayroomBuyItem(args []interface{}) error { return nil } -func ReqOfflineReconnectFunc(args []interface{}) error { - a := args[0].(gate.Agent) - - buf := args[1].([]byte) - +func ReqOfflineReconnectFunc(player *Player, buf []byte) error { req := &msg.ReqOfflineReconnect{} proto.Unmarshal(buf, req) - res := &msg.ResOfflineReconnect{} res.DwUin = req.DwUin - + a := player.args["agent"].(gate.Agent) if v, ok := G_GameLogicPtr.M_Players.Load(req.DwUin); ok { player := v.(*Player) agent := player.GetAgentByPlayer() @@ -3357,20 +3236,17 @@ func ReqOfflineReconnectFunc(args []interface{}) error { internal.AsignPlayerToAgents(a, player) internal.Agents.Delete(agent) } - res.Result = 3 } else { res.Result = 2 } - data, _ := proto.Marshal(res) G_GameLogicPtr.PackResInfo(a, "ResOfflineReconnect", data) return nil } // playroom 打工离线 -func ReqPlayroomOutline(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomOutline(player *Player, buf []byte) error { req := &msg.ReqPlayroomOutline{} proto.Unmarshal(buf, req) ChessMod := player.PlayMod.getChessMod() @@ -3416,8 +3292,7 @@ func ReqPlayroomOutline(args []interface{}) error { return nil } -func ReqPlayroomWrokOutline(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqPlayroomWrokOutline(player *Player, buf []byte) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.SetWorkOutline(0) player.PlayMod.save() @@ -3428,8 +3303,7 @@ func ReqPlayroomWrokOutline(args []interface{}) error { return nil } -func ReqPlayroomShop(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqPlayroomShop(player *Player, buf []byte) error { req := &msg.ReqPlayroomShop{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() @@ -3465,14 +3339,12 @@ func ReqPlayroomShop(args []interface{}) error { return nil } -func ReqFriendTreasure(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendTreasure(player *Player, buf []byte) error { player.PushClientRes(player.PlayMod.getFriendTreasureMod().BackData()) return nil } -func ReqFriendTreasureStart(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqFriendTreasureStart(player *Player, buf []byte) error { req := &msg.ReqFriendTreasureStart{} proto.Unmarshal(buf, req) // FriendMod := player.PlayMod.getFriendMod() @@ -3523,8 +3395,7 @@ func ReqFriendTreasureStart(args []interface{}) error { return nil } -func ReqFriendTreasureFilp(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqFriendTreasureFilp(player *Player, buf []byte) error { req := &msg.ReqFriendTreasureFilp{} proto.Unmarshal(buf, req) FriendTreasureMod := player.PlayMod.getFriendTreasureMod() @@ -3557,8 +3428,7 @@ func ReqFriendTreasureFilp(args []interface{}) error { return nil } -func ReqFriendTreasureEnd(args []interface{}) error { - _, player, _ := ParseArgs(args) +func ReqFriendTreasureEnd(player *Player, buf []byte) error { FriendTreasureMod := player.PlayMod.getFriendTreasureMod() Items, FriendItemNum, err := FriendTreasureMod.EndGame() if err != nil { @@ -3599,8 +3469,7 @@ func ReqFriendTreasureEnd(args []interface{}) error { return nil } -func ReqKafkaLog(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqKafkaLog(player *Player, buf []byte) error { req := &msg.ReqKafkaLog{} proto.Unmarshal(buf, req) player.Kafka(req.Event, map[string]interface{}{ @@ -3609,8 +3478,7 @@ func ReqKafkaLog(args []interface{}) error { return nil } -func ReqCardHandbookReward(args []interface{}) error { - _, player, buf := ParseArgs(args) +func ReqCardHandbookReward(player *Player, buf []byte) error { req := &msg.ReqCardHandbookReward{} proto.Unmarshal(buf, req) CardMod := player.PlayMod.getCardMod() diff --git a/src/server/game/external.go b/src/server/game/external.go index 824143ce..3586fd20 100644 --- a/src/server/game/external.go +++ b/src/server/game/external.go @@ -176,6 +176,7 @@ func HandleClientReq(args []interface{}) { }() p.(*Player).args = make(map[string]interface{}) p.(*Player).args["func"] = m + p.(*Player).args["agent"] = a err := RunNetProcessByKey(m.GetFunc(), []interface{}{a, buf}) if err != nil { log.Debug("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err)