From f4c9972fdfe206a3508395c5583d0c691a954a44 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 4 Dec 2025 18:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E8=A7=A3=E6=9E=90=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerBaseMod.go | 22 +- src/server/game/RegisterNetworkFunc.go | 759 ++++++++++++++++++------- 2 files changed, 580 insertions(+), 201 deletions(-) diff --git a/src/server/game/PlayerBaseMod.go b/src/server/game/PlayerBaseMod.go index 9f2692d7..f1eaf9fd 100644 --- a/src/server/game/PlayerBaseMod.go +++ b/src/server/game/PlayerBaseMod.go @@ -213,7 +213,10 @@ func (p *PlayerBaseData) ResPlayerBaseInfo(player *Player) { func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, buf []byte) { req := &msg.ReqBindFacebookAccount{} res := &msg.ResBindFacebookAccount{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return + } sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} @@ -251,7 +254,10 @@ func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, buf []byte) { func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, buf []byte) { req := &msg.ReqUnBindFacebook{} res := &msg.ResUnBindFacebook{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return + } res.ResultCode = 0 res.BindAccountId = req.BindAccountId @@ -270,12 +276,15 @@ func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, buf []byte) { func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, buf []byte) { req := &msg.ReqOnlyBindFacebook{} res := &msg.ResOnlyBindFacebook{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return + } sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} isHaveOther := false - err := db.SqlDb.Get(&sqlStruck, sqlStr, req.BindAccountId) + err = db.SqlDb.Get(&sqlStruck, sqlStr, req.BindAccountId) if err != nil { isHaveOther = false } else { @@ -334,7 +343,10 @@ func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, buf []byte) { func (p *PlayerBaseData) ReqSynGameData(player *Player, buf []byte) { req := &msg.ReqSynGameData{} res := &msg.ResSynGameData{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return + } sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index d4d0bc51..9908c87b 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -50,14 +50,21 @@ func ReqPlayerAsset(player *Player, buf []byte) error { func ReqPlayerBaseInfofunction(player *Player, buf []byte) error { // 消息的发送者 detail := &msg.ReqPlayerBaseInfo{} - proto.Unmarshal(buf, detail) + err := proto.Unmarshal(buf, detail) + if err != nil { + return err + } + player.PlayerBaseMod.ResPlayerBaseInfo(player) return nil } func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { detail := &msg.ReqPlayerBriefProfileData{} - proto.Unmarshal(buf, detail) + err := proto.Unmarshal(buf, detail) + if err != nil { + return err + } Uid := int(detail.DwUin) PlayerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(Uid) if PlayerSimpleData == nil { @@ -82,7 +89,10 @@ func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { func ReqFriendPlayerSimple(player *Player, buf []byte) error { detail := &msg.ReqFriendPlayerSimple{} - proto.Unmarshal(buf, detail) + err := proto.Unmarshal(buf, detail) + if err != nil { + return err + } Uid := int(detail.Uid) PlayerSimpleData := G_GameLogicPtr.GetResFriendPlayerByUid(Uid) if PlayerSimpleData == nil { @@ -112,7 +122,10 @@ func ReqRemoveAdFunc(player *Player, buf []byte) error { // 更新玩家物品 func UpdateBaseItemInfofunction(player *Player, buf []byte) error { detail := &msg.UpdateBaseItemInfo{} - proto.Unmarshal(buf, detail) + err := proto.Unmarshal(buf, detail) + if err != nil { + return err + } player.PlayerBaseMod.UpdateBaseItemInfo(detail) return nil } @@ -120,7 +133,10 @@ func UpdateBaseItemInfofunction(player *Player, buf []byte) error { // 请求玩家棋盘信息 func ReqPlayerChessDataFunc(player *Player, buf []byte) error { detail := &msg.ReqPlayerChessData{} - proto.Unmarshal(buf, detail) + err := proto.Unmarshal(buf, detail) + if err != nil { + return err + } playerChessData := &PlayerChessData{} playerChessData.ResPlayerChessData(player) return nil @@ -148,7 +164,10 @@ func ReqSynGameData(player *Player, buf []byte) error { func RegSetEneryFunc(player *Player, buf []byte) error { req := &msg.ReqSetEnergyMul{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } MaxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) BaseMod := player.PlayMod.getBaseMod() EnergyMul := BaseMod.GetEnergyMul() @@ -180,8 +199,11 @@ func RegSetEneryFunc(player *Player, buf []byte) error { // 领取图鉴奖励 func ReqGetHandbookReward(player *Player, buf []byte) error { req := &msg.ReqGetHandbookReward{} - proto.Unmarshal(buf, req) - err := player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } + err = player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResGetHandbookReward{ Code: msg.RES_CODE_FAIL, @@ -213,7 +235,10 @@ func ReqGetHandbookReward(player *Player, buf []byte) error { func RegHandbookAllReward(player *Player, buf []byte) error { req := &msg.RegHandbookAllReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } AllChess := mergeDataCfg.GetAllChessBySeries(req.Type) Items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, AllChess) if err != nil { @@ -254,7 +279,10 @@ func RegHandbookAllReward(player *Player, buf []byte) error { // 领取订单奖励 func ReqRewardOrder(player *Player, buf []byte) error { req := &msg.ReqRewardOrder{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } OrderMod := player.PlayMod.getOrderMod() ChessMod := player.PlayMod.getChessMod() LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -443,7 +471,10 @@ func ReqCreatePetOrder(player *Player, buf []byte) error { func ReqDelOrder(player *Player, buf []byte) error { req := &msg.ReqDelOrder{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } OrderMod := player.PlayMod.getOrderMod() DelOrder, err := OrderMod.DelOrder(int(req.OrderId)) if err != nil { @@ -467,14 +498,17 @@ func ReqDelOrder(player *Player, buf []byte) error { // 场景装饰 func ReqDecorate(player *Player, buf []byte) error { req := &msg.ReqDecorate{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } DecorateMod := player.PlayMod.getDecorateMod() DecorateId := int(req.DecorateId) AreaId := int(req.AreaId) LimitEventMod := player.PlayMod.getLimitedTimeEventMod() DecorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) CostItem, PetExp, PartItem := DecorateMod.GetDecorateCostItem(AreaId, DecorateId, DecorateOffIsExist) - err := player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 + err = player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 if err != nil { player.SendErrClienRes(&msg.ResDecorate{ Code: msg.RES_CODE_FAIL, @@ -552,7 +586,10 @@ func ReqDecorate(player *Player, buf []byte) error { // 场景装饰 func ReqDecorateAll(player *Player, buf []byte) error { req := &msg.ReqDecorateAll{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } DecorateMod := player.PlayMod.getDecorateMod() AreaId := DecorateMod.GetAreaId() UnLockLv := decorateCfg.GetOneKeyDecorateUnlockLv() @@ -567,7 +604,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { LimitEventMod := player.PlayMod.getLimitedTimeEventMod() DecorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) CostItem, AddItem, DecorateNum, DecorateList, Log, PetExp := DecorateMod.DecorateAll(PlayerBaseMod.GetStar(), DecorateOffIsExist) - err := player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 + err = player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 if err != nil { player.SendErrClienRes(&msg.ResDecorateAll{ Code: msg.RES_CODE_FAIL, @@ -620,34 +657,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { } func ReqDecorateReward(player *Player, buf []byte) error { - // req := &msg.ReqDecorateReward{} - // proto.Unmarshal(buf, req) - // DecorateMod := player.PlayMod.getDecorateMod() - // Item, err := DecorateMod.GetDecorateReward(int(req.AreaId)) - // if err != nil { - // player.SendErrClienRes(&msg.ResDecorateReward{ - // Code: msg.RES_CODE_FAIL, - // Msg: err.Error(), - // }) - // return err - // } - // err = player.HandleItem(Item, msg.ITEM_POP_LABEL_DecorateReward.String()) - // if err != nil { - // player.SendErrClienRes(&msg.ResDecorateReward{ - // Code: msg.RES_CODE_FAIL, - // Msg: err.Error(), - // }) - // return err - // } - // player.TeLog("scene_reward", map[string]interface{}{ - // "deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress), - // "item_list": Item, - // }) - // player.PushClientRes(&msg.ResDecorateReward{ - // Code: msg.RES_CODE_SUCCESS, - // }) - // player.PushClientRes(DecorateMod.BackData()) - // player.PlayMod.save() + return nil } @@ -664,13 +674,16 @@ func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { // 从缓存中获取棋子 func ReqGetChessFromBuff(player *Player, buf []byte) error { req := &msg.ReqGetChessFromBuff{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() HandbookMod := player.PlayMod.getHandbookMod() OrderMod := player.PlayMod.getOrderMod() BaseMod := player.PlayMod.getBaseMod() ChessId := int(req.ChessId) - err := ChessMod.GetChessFromBuff(ChessId) + err = ChessMod.GetChessFromBuff(ChessId) Update := HandbookMod.SetHandbook(ChessId) AddNewEmit := make([]int, 0) if Update { @@ -715,9 +728,12 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error { // 放置棋子进背包 func ReqPutPartInBag(player *Player, buf []byte) error { req := &msg.ReqPutPartInBag{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() - err := ChessMod.PutPartInBag(int(req.ChessId)) + err = ChessMod.PutPartInBag(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResPutPartInBag{ Code: msg.RES_CODE_FAIL, @@ -749,9 +765,12 @@ func ReqPutPartInBag(player *Player, buf []byte) error { // 放置棋子进背包 func ReqPutChessInBag(player *Player, buf []byte) error { req := &msg.ReqPutChessInBag{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() - err := ChessMod.PutChessInBag(int(req.BagId), int(req.ChessId), int(req.EmitId)) + err = ChessMod.PutChessInBag(int(req.BagId), int(req.ChessId), int(req.EmitId)) if err != nil { player.SendErrClienRes(&msg.ResPutChessInBag{ Code: msg.RES_CODE_FAIL, @@ -784,7 +803,10 @@ func ReqPutChessInBag(player *Player, buf []byte) error { func ReqTakeChessOutBag(player *Player, buf []byte) error { req := &msg.ReqTakeChessOutBag{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() ChessId, err := ChessMod.TakeChessOutBag(int(req.BagId)) if err != nil { @@ -825,10 +847,13 @@ func ReqTakeChessOutBag(player *Player, buf []byte) error { func ReqBuyChessBagGrid(player *Player, buf []byte) error { req := &msg.ReqBuyChessBagGrid{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() CostItem := ChessMod.GetBuyChessBagGridCost() - err := player.HandleItem(CostItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String()) + err = player.HandleItem(CostItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyChessBagGrid{ Code: msg.RES_CODE_FAIL, @@ -861,7 +886,10 @@ func ReqBuyChessBagGrid(player *Player, buf []byte) error { func ReqSeparateChess(player *Player, buf []byte) error { req := &msg.ReqSeparateChess{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() NewChess, err := ChessMod.SeparateChess(int(req.ChessId)) if err != nil { @@ -900,7 +928,10 @@ func ReqSeparateChess(player *Player, buf []byte) error { func ReqUpgradeChess(player *Player, buf []byte) error { req := &msg.ReqUpgradeChess{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() NewChess, err := ChessMod.UpgradeChess(int(req.ChessId)) if err != nil { @@ -939,7 +970,10 @@ func ReqUpgradeChess(player *Player, buf []byte) error { // 棋子转换 func ReqChessEx(player *Player, buf []byte) error { req := &msg.ReqChessEx{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item @@ -956,7 +990,7 @@ func ReqChessEx(player *Player, buf []byte) error { player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_BUBBLE, A: []interface{}{}}) } - err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) + err = ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) if err != nil { player.SendErrClienRes(&msg.ResChessEx{ Code: msg.RES_CODE_FAIL, @@ -1023,7 +1057,10 @@ func ReqChessEx(player *Player, buf []byte) error { func ReqSourceChest(player *Player, buf []byte) error { req := &msg.ReqSourceChest{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() ChestId := int(req.ChestId) Items, err := ChessMod.SourceChest(ChestId) @@ -1074,7 +1111,10 @@ func ReqCardInfo(player *Player, buf []byte) error { func ReqCardSeasonFirstReward(player *Player, buf []byte) error { req := &msg.ReqCardSeasonFirstReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() itemList, err := CardMod.SeasonFirstReward() if err != nil { @@ -1106,7 +1146,10 @@ func ReqCardSeasonFirstReward(player *Player, buf []byte) error { // 领取卡牌系列收集奖励 func ReqCardCollectReward(player *Player, buf []byte) error { req := &msg.ReqCardCollectReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() itemList, chess, err := CardMod.GetCollectReward(int(req.Color)) if err != nil { @@ -1147,7 +1190,10 @@ func ReqCardCollectReward(player *Player, buf []byte) error { // 兑换星星奖励 func ReqExStarReward(player *Player, buf []byte) error { req := &msg.ReqExStarReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() itemList, CostStar, err := CardMod.ExStarReward(int(req.Id)) if err != nil { @@ -1224,7 +1270,10 @@ func ReqAllCollectReward(player *Player, buf []byte) error { // ---------------------GuildApi---------------------- func ReqGuideReward(player *Player, buf []byte) error { req := &msg.ReqGuideReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } GuideMod := player.PlayMod.getGuideMod() itemList, err := GuideMod.GetReward(int(req.Id)) if err != nil { @@ -1258,7 +1307,10 @@ func ReqGuideReward(player *Player, buf []byte) error { // -----------------dailyTaskApi--------------------- func ReqGetDailyTaskReward(player *Player, buf []byte) error { req := &msg.ReqGetDailyTaskReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } DailyTaskMod := player.PlayMod.getDailyTaskMod() itemList, err := DailyTaskMod.GetDailyReward(int(req.Id)) if err != nil { @@ -1293,7 +1345,10 @@ func ReqGetDailyTaskReward(player *Player, buf []byte) error { func ReqGetDailyWeekReward(player *Player, buf []byte) error { req := &msg.ReqGetDailyWeekReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } DailyTaskMod := player.PlayMod.getDailyTaskMod() itemList, err := DailyTaskMod.GetWeekReward(int(req.Id)) if err != nil { @@ -1328,7 +1383,10 @@ func ReqGetDailyWeekReward(player *Player, buf []byte) error { func ReqDailyUnlock(player *Player, buf []byte) error { req := &msg.ReqDailyUnlock{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } DailyTaskMod := player.PlayMod.getDailyTaskMod() DailyTaskMod.Unlock() player.PlayMod.save() @@ -1341,7 +1399,10 @@ func ReqDailyUnlock(player *Player, buf []byte) error { func ReqGetGuideTaskReward(player *Player, buf []byte) error { req := &msg.ReqGetGuideTaskReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } GuideTaskMod := player.PlayMod.getGuideTaskMod() itemList, err := GuideTaskMod.GetTaskReward(int(req.Id)) if err != nil { @@ -1377,7 +1438,10 @@ func ReqGetGuideTaskReward(player *Player, buf []byte) error { func ReqGetGuideActiveReward(player *Player, buf []byte) error { req := &msg.ReqGetGuideActiveReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } GuideTaskMod := player.PlayMod.getGuideTaskMod() itemList, err := GuideTaskMod.GetActiveReward(int(req.Id)) if err != nil { @@ -1412,9 +1476,12 @@ func ReqGetGuideActiveReward(player *Player, buf []byte) error { // 头像框 func ReqSetAvatar(player *Player, buf []byte) error { req := &msg.ReqSetAvatar{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } avatarMod := player.PlayMod.getAvatarMod() - err := avatarMod.SetAvatar(int(req.Avatar)) + err = avatarMod.SetAvatar(int(req.Avatar)) if err != nil { player.SendErrClienRes(&msg.ResSetAvatar{ Code: msg.RES_CODE_FAIL, @@ -1443,9 +1510,12 @@ func ReqSetAvatar(player *Player, buf []byte) error { // 头像 func ReqSetFace(player *Player, buf []byte) error { req := &msg.ReqSetFace{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FaceMod := player.PlayMod.getFaceMod() - err := FaceMod.SetFace(int(req.Face)) + err = FaceMod.SetFace(int(req.Face)) if err != nil { player.SendErrClienRes(&msg.ResSetFace{ Code: msg.RES_CODE_FAIL, @@ -1474,11 +1544,14 @@ func ReqSetFace(player *Player, buf []byte) error { // 购买能量 func ReqBuyEnergy(player *Player, buf []byte) error { req := &msg.ReqBuyEnergy{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } BaseMod := player.PlayMod.getBaseMod() ChargeMod := player.PlayMod.getChargeMod() Item, Energy, Diamond := ChargeMod.BuyEnergy(player.IsWeeklyDiscount()) - err := player.HandleItem(Item, msg.ITEM_POP_LABEL_BuyEnergy.String()) + err = player.HandleItem(Item, msg.ITEM_POP_LABEL_BuyEnergy.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyEnergy{ Code: msg.RES_CODE_FAIL, @@ -1531,7 +1604,10 @@ func ReqGetEnergyByAD(player *Player, buf []byte) error { // 领取七日签到奖励 func ReqGetSevenLoginReward(player *Player, buf []byte) error { req := &msg.ReqGetSevenLoginReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } SevenLoginMod := player.PlayMod.getSevenLoginMod() itemList, err := SevenLoginMod.GetReward(int(req.Id)) if err != nil { @@ -1566,7 +1642,10 @@ func ReqGetSevenLoginReward(player *Player, buf []byte) error { // 领取月进度奖励 func ReqGetMonthLoginReward(player *Player, buf []byte) error { req := &msg.ReqGetMonthLoginReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } SevenLoginMod := player.PlayMod.getSevenLoginMod() itemList, err := SevenLoginMod.GetMonthReward(int(req.Id)) if err != nil { @@ -1611,7 +1690,10 @@ func ReqFastProduceInfo(player *Player, buf []byte) error { // 连击快手奖励 func ReqFastProduceReward(player *Player, buf []byte) error { req := &msg.ReqFastProduceReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() itemList, EndTime, Times, err := LimitedTimeEventMod.GetFastProduceReward(int(req.Energy)) if err != nil { @@ -1696,7 +1778,10 @@ func ReqGetGoldCard(player *Player, buf []byte) error { // 搜索用户 func ReqSearchPlayer(player *Player, buf []byte) error { req := &msg.ReqSearchPlayer{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Uid, err := strconv.Atoi(req.Uid) list := make([]*msg.ResPlayerSimple, 0) if err == nil { @@ -1739,7 +1824,10 @@ func ReqSearchPlayer(player *Player, buf []byte) error { // 申请好友 func ReqApplyFriend(player *Player, buf []byte) error { req := &msg.ReqApplyFriend{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() if Uid == int(player.M_DwUin) { @@ -1812,7 +1900,10 @@ func ReqApplyFriend(player *Player, buf []byte) error { // 同意申请 func ReqAgreeFriend(player *Player, buf []byte) error { req := &msg.ReqAgreeFriend{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() if !FriendMod.CheckApply(Uid) { @@ -1854,7 +1945,10 @@ func ReqAgreeFriend(player *Player, buf []byte) error { // 删除好友 func ReqDelFriend(player *Player, buf []byte) error { req := &msg.ReqDelFriend{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Uid := int(req.Uid) m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_DEL, @@ -1881,7 +1975,10 @@ func ReqDelFriend(player *Player, buf []byte) error { // 拒绝申请 func ReqRefuseFriend(player *Player, buf []byte) error { req := &msg.ReqRefuseFriend{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() FriendMod.RefuseApply(Uid) @@ -1904,13 +2001,16 @@ func ReqRefuseFriend(player *Player, buf []byte) error { // 向好友请求卡牌 func ReqCardGive(player *Player, buf []byte) error { req := &msg.ReqCardGive{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() EndTime := GoUtil.Now() + 86400 FriendMod := player.PlayMod.getFriendMod() - err := CardMod.RequestCard() + err = CardMod.RequestCard() if err != nil { player.SendErrClienRes(&msg.ResCardGive{ Code: msg.RES_CODE_FAIL, @@ -1997,7 +2097,10 @@ func ReqCardGive(player *Player, buf []byte) error { // 同意卡牌请求 func ReqAgreeCardGive(player *Player, buf []byte) error { req := &msg.ReqAgreeCardGive{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() CardInfo := FriendMod.GetCardInfo(req.Id) if CardInfo == nil { @@ -2008,7 +2111,7 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { return fmt.Errorf("card apply not exist") } CardMod := player.PlayMod.getCardMod() - err := player.SubCard(CardInfo.CardId) + err = player.SubCard(CardInfo.CardId) if err != nil { player.SendErrClienRes(&msg.ResAgreeCardGive{ Code: msg.RES_CODE_FAIL, @@ -2044,7 +2147,10 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { // 拒绝卡牌请求 func ReqRefuseCardGive(player *Player, buf []byte) error { req := &msg.ReqRefuseCardGive{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() CardInfo := FriendMod.GetCardInfo(req.Id) if CardInfo == nil { @@ -2077,7 +2183,10 @@ func ReqRefuseCardGive(player *Player, buf []byte) error { // 赠送卡牌 func ReqCardSend(player *Player, buf []byte) error { req := &msg.ReqCardSend{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() CardId := int(req.CardId) CardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), CardId) @@ -2116,7 +2225,10 @@ func ReqCardSend(player *Player, buf []byte) error { // 卡牌交换 func ReqCardExchange(player *Player, buf []byte) error { req := &msg.ReqCardExchange{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() CardId := int(req.CardId) CardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), CardId) @@ -2156,7 +2268,10 @@ func ReqCardExchange(player *Player, buf []byte) error { // 选择卡牌进行交换 func ReqSelectCardExchange(player *Player, buf []byte) error { req := &msg.ReqSelectCardExchange{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardId := int(req.CardId) CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() @@ -2189,7 +2304,7 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { } FriendMod.DelCardInfo(req.Id) player.AddLog(CardInfo.AUid, friend.LOG_TYPE_CARD_SELECT_SEND, fmt.Sprintf("%d", CardInfo.ExId), GoUtil.Now()) - err := player.SubCard(CardId) + err = player.SubCard(CardId) if err != nil { player.SendErrClienRes(&msg.ResSelectCardExchange{ Code: msg.RES_CODE_FAIL, @@ -2223,7 +2338,10 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { // 同意卡牌交换 func ReqAgreeCardExchange(player *Player, buf []byte) error { req := &msg.ReqSelectCardExchange{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() CardInfo := FriendMod.GetCardInfo(req.Id) @@ -2280,7 +2398,10 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error { // 拒绝选择卡牌 func ReqRefuseCardSelect(player *Player, buf []byte) error { req := &msg.ReqRefuseCardSelect{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() CardInfo := FriendMod.GetCardInfo(req.Id) if CardInfo == nil { @@ -2317,7 +2438,10 @@ func ReqRefuseCardSelect(player *Player, buf []byte) error { // 拒绝进行交换 func ReqRefuseCardExchange(player *Player, buf []byte) error { req := &msg.ReqRefuseCardExchange{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() CardInfo := FriendMod.GetCardInfo(req.Id) @@ -2360,7 +2484,10 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error { // 领取好友卡牌 func ReqGetFriendCard(player *Player, buf []byte) error { req := &msg.ReqRefuseCardExchange{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() CardInfo := FriendMod.GetCardInfo(req.Id) @@ -2388,7 +2515,10 @@ func ReqGetFriendCard(player *Player, buf []byte) error { // 请求玩家榜单 func ReqRank(player *Player, buf []byte) error { req := &msg.ReqRank{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } m := &MsqMod.Msg{ From: int(player.M_DwUin), Type: MsqMod.HANDLE_TYPE_RANK_INFO, @@ -2413,7 +2543,10 @@ func ReqRank(player *Player, buf []byte) error { // 请求竞标赛榜单 func ReqChampshipRank(player *Player, buf []byte) error { req := &msg.ReqRank{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } m := G_GameLogicPtr.ChampshipMgr.GetRankMsg(int(player.M_DwUin)) player.PushClientRes(m) return nil @@ -2421,7 +2554,10 @@ func ReqChampshipRank(player *Player, buf []byte) error { func ReqChampshipPreRank(player *Player, buf []byte) error { req := &msg.ReqRank{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } m := G_GameLogicPtr.ChampshipMgr.GetPreRankMsg(int(player.M_DwUin)) player.PushClientRes(m) return nil @@ -2437,9 +2573,12 @@ func ReqMailList(player *Player, buf []byte) error { // 读邮件 func ReqReadMail(player *Player, buf []byte) error { req := &msg.ReqReadMail{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } MailMod := player.PlayMod.getMailMod() - err := MailMod.Read(int(req.Id)) + err = MailMod.Read(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResReadMail{ Code: msg.RES_CODE_FAIL, @@ -2459,7 +2598,10 @@ func ReqReadMail(player *Player, buf []byte) error { // 领取邮件奖励 func ReqGetMailReward(player *Player, buf []byte) error { req := &msg.ReqGetMailReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } MailMod := player.PlayMod.getMailMod() itemList, err := MailMod.Reward(int(req.Id)) if err != nil { @@ -2494,9 +2636,12 @@ func ReqGetMailReward(player *Player, buf []byte) error { // 删除邮件 func ReqDeleteMail(player *Player, buf []byte) error { req := &msg.ReqDeleteMail{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } MailMod := player.PlayMod.getMailMod() - err := MailMod.Del(int(req.Id)) + err = MailMod.Del(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResDeleteMail{ Code: msg.RES_CODE_FAIL, @@ -2548,7 +2693,10 @@ func ReqFreeShop(player *Player, buf []byte) error { // 购买棋子商店物品 func ReqBuyChessShop(player *Player, buf []byte) error { req := &msg.ReqBuyChessShop{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChargeMod := player.PlayMod.getChargeMod() LostItem, Item, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { @@ -2596,7 +2744,10 @@ func ReqBuyChessShop(player *Player, buf []byte) error { // 购买棋子商店物品 func ReqBuyChessShop2(player *Player, buf []byte) error { req := &msg.ReqBuyChessShop2{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChargeMod := player.PlayMod.getChargeMod() LostItem, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { @@ -2676,7 +2827,10 @@ func ReqRefreshChessShop(player *Player, buf []byte) error { // 领取无尽礼包免费奖励 func ReqEndlessReward(player *Player, buf []byte) error { req := &msg.ReqEndlessReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } EndlessMod := player.PlayMod.getEndlessMod() BaseMod := player.PlayMod.getBaseMod() itemList, err := EndlessMod.GetReward(BaseMod.GetLevel()) @@ -2748,7 +2902,10 @@ func ReqPiggyBankReward(player *Player, buf []byte) error { // 生成订单号 func ReqCreateOrderSn(player *Player, buf []byte) error { req := &msg.ReqCreateOrderSn{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } OrderSn, err := CreateOrderSn(player, req) if err != nil { return err @@ -2763,7 +2920,10 @@ func ReqCreateOrderSn(player *Player, buf []byte) error { func ReqShippingOrder(player *Player, buf []byte) error { return nil req := &msg.ReqShippingOrder{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } go TriggerShippingOrder(player, req) player.PushClientRes(&msg.ResShippingOrder{ @@ -2813,7 +2973,10 @@ func ReqLimitEvent(player *Player, buf []byte) error { func ReqKv(player *Player, buf []byte) error { req := &msg.ReqKv{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } KvMod := player.PlayMod.getKvMod() KvMod.SetVar(int(req.Key), req.Value) return nil @@ -2874,7 +3037,10 @@ func ReqFriendTimeLine(player *Player, buf []byte) error { func ReqFriendTLUpvote(player *Player, buf []byte) error { req := &msg.ReqFriendTLUpvote{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() Items, FUid, err := FriendMod.Upvote(int(req.Id)) if err != nil { @@ -2913,7 +3079,10 @@ func ReqFriendTLUpvote(player *Player, buf []byte) error { func ReqFriendTReward(player *Player, buf []byte) error { req := &msg.ReqFriendTReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() Items, err := FriendMod.GetReward(int(req.Id)) if err != nil { @@ -2979,7 +3148,10 @@ func ReqChampshipRankReward(player *Player, buf []byte) error { func ReqSetName(player *Player, buf []byte) error { req := &msg.ReqSetName{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } BaseMod := player.PlayMod.getBaseMod() BaseMod.SetNickName(req.Name) player.PushClientRes(&msg.ResSetName{ @@ -2996,7 +3168,10 @@ func ReqSetName(player *Player, buf []byte) error { func ReqSetPetName(player *Player, buf []byte) error { req := &msg.ReqSetPetName{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } BaseMod := player.PlayMod.getBaseMod() BaseMod.SetPetName(req.Name) player.PushClientRes(&msg.ResSetPetName{ @@ -3021,9 +3196,12 @@ func ReqUserInfo(player *Player, buf []byte) error { func ReqMasterCard(player *Player, buf []byte) error { req := &msg.ReqMasterCard{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() - err := CardMod.MasterCardEx(int(req.Id), int(req.CardId)) + err = CardMod.MasterCardEx(int(req.Id), int(req.CardId)) if err != nil { player.SendErrClienRes(&msg.ResMasterCard{ Code: msg.RES_CODE_FAIL, @@ -3047,7 +3225,10 @@ func ReqMasterCard(player *Player, buf []byte) error { func ReqSetFacebookUrl(player *Player, buf []byte) error { req := &msg.ReqSetFacebookUrl{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } BaseMod := player.PlayMod.getBaseMod() BaseMod.SetFacebookUrl(req.Url) player.PlayMod.save() @@ -3065,7 +3246,10 @@ func ReqInviteFriendData(player *Player, buf []byte) error { func ReqSelfInvited(player *Player, buf []byte) error { req := &msg.ReqSelfInvited{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } G_GameLogicPtr.FriendMgrSend(&MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_INVITE_FRIEND, From: int(player.M_DwUin), @@ -3080,7 +3264,10 @@ func ReqSelfInvited(player *Player, buf []byte) error { func ReqGetInviteReward(player *Player, buf []byte) error { req := &msg.ReqGetInviteReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } InviteMod := player.PlayMod.getInviteMod() Items, err := InviteMod.GetReward(int(req.GetIndex)) if err != nil { @@ -3113,7 +3300,10 @@ func ReqGetInviteReward(player *Player, buf []byte) error { func ReqAutoAddInviteFriend(player *Player, buf []byte) error { req := &msg.ReqAutoAddInviteFriend{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() Uid := int(req.Id) if Uid == 0 && Uid == int(player.M_DwUin) { @@ -3146,7 +3336,10 @@ func ReqAutoAddInviteFriend(player *Player, buf []byte) error { func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { req := &msg.ReqAutoAddInviteFriend2{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() Uid, err := GetUidByFaceBook(req.Id) if Uid == 0 || Uid == int(player.M_DwUin) { @@ -3187,7 +3380,10 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { func ReqSelectLimitEvent(player *Player, buf []byte) error { req := &msg.ReqSelectLimitEvent{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() BaseMod := player.PlayMod.getBaseMod() Items, EventType, OrderNum, RewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy()) @@ -3229,7 +3425,10 @@ func ReqMining(player *Player, buf []byte) error { // 请求挖矿 func ReqMiningTake(player *Player, buf []byte) error { req := &msg.ReqMiningTake{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } MiningMod := player.PlayMod.getMiningMod() ActivityInfo := GetActivityInfo(player, activity.ACT_TYPE_MINING) Status := GetActivityStatus(player, activity.ACT_TYPE_MINING) @@ -3241,7 +3440,7 @@ func ReqMiningTake(player *Player, buf []byte) error { return fmt.Errorf("activity not start") } LoseItem := miningCfg.GetLoseItem(ActivityInfo.Id) - err := player.HandleLoseItem(LoseItem, "MiningLose") + err = player.HandleLoseItem(LoseItem, "MiningLose") if err != nil { player.SendErrClienRes(&msg.ResMiningTake{ Code: msg.RES_CODE_FAIL, @@ -3314,10 +3513,13 @@ func ReqMiningReward(player *Player, buf []byte) error { // 请求猜颜色基础数据 func ReqGuessColor(player *Player, buf []byte) error { req := &msg.ReqGuessColor{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } GuessColorMod := player.PlayMod.getGuessColorMod() Items := GuessColorMod.FirstIn() - err := player.HandleItem(Items, msg.ITEM_POP_LABEL_GuessColor.String()) + err = player.HandleItem(Items, msg.ITEM_POP_LABEL_GuessColor.String()) if err != nil { return err } @@ -3329,7 +3531,10 @@ func ReqGuessColor(player *Player, buf []byte) error { // 请求猜颜色 func ReqGuessColorTake(player *Player, buf []byte) error { req := &msg.ReqGuessColorTake{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Status := GetActivityStatus(player, activity.ACT_TYPE_GUESS_COLOR) if Status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorTake{ @@ -3340,7 +3545,7 @@ func ReqGuessColorTake(player *Player, buf []byte) error { } GuessColorMod := player.PlayMod.getGuessColorMod() LoseItem := GuessColorMod.GetLoseItem() - err := player.HandleLoseItem(LoseItem, "GuessColorLose") + err = player.HandleLoseItem(LoseItem, "GuessColorLose") if err != nil { player.SendErrClienRes(&msg.ResGuessColorTake{ Code: msg.RES_CODE_FAIL, @@ -3362,7 +3567,10 @@ func ReqGuessColorTake(player *Player, buf []byte) error { // 请求猜颜色奖励 func ReqGuessColorReward(player *Player, buf []byte) error { req := &msg.ReqGuessColorReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Status := GetActivityStatus(player, activity.ACT_TYPE_GUESS_COLOR) if Status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorReward{ @@ -3405,9 +3613,12 @@ func ReqRace(player *Player, buf []byte) error { // 请求竞赛开始 func ReqRaceStart(player *Player, buf []byte) error { req := &msg.ReqRaceStart{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } RaceMod := player.PlayMod.getRaceMod() - err := RaceMod.StartGame() + err = RaceMod.StartGame() if err != nil { player.SendErrClienRes(&msg.ResRaceStart{ Code: msg.RES_CODE_FAIL, @@ -3425,7 +3636,10 @@ func ReqRaceStart(player *Player, buf []byte) error { // 领取竞赛奖励 func ReqRaceReward(player *Player, buf []byte) error { req := &msg.ResRaceReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } RaceMod := player.PlayMod.getRaceMod() Items, err := RaceMod.GetReward() if err != nil { @@ -3462,7 +3676,10 @@ func ReqPlayroom(player *Player, buf []byte) error { // 请求playroom拜访信息 func ReqPlayroomInfo(player *Player, buf []byte) error { req := &msg.ReqPlayroomInfo{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Targer := int(req.Uid) if req.Uid == 0 { @@ -3518,7 +3735,10 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { // 请求playroom交互 func ReqPlayroomInteract(player *Player, buf []byte) error { req := &msg.ReqPlayroomInteract{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items, PType, err := PlayroomMod.Interact(int(req.Id), int(req.Type)) if err != nil { @@ -3568,9 +3788,12 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { // 请求playroom设置房间 func ReqPlayroomSetRoom(player *Player, buf []byte) error { req := &msg.ReqPlayroomSetRoom{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() - _, err := PlayroomMod.SetRoom(GoUtil.MapInt32ToInt(req.Playroom)) + _, err = PlayroomMod.SetRoom(GoUtil.MapInt32ToInt(req.Playroom)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomSetRoom{ Code: msg.RES_CODE_FAIL, @@ -3590,7 +3813,10 @@ func ReqPlayroomSetRoom(player *Player, buf []byte) error { // 玩游戏 func ReqPlayroomGame(player *Player, buf []byte) error { req := &msg.ReqPlayroomGame{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Target := PlayroomMod.GetTarget() if Target == 0 { @@ -3601,7 +3827,7 @@ func ReqPlayroomGame(player *Player, buf []byte) error { return fmt.Errorf("no target") } Items := player.GetPlayroomGameReward(int(req.Type), 0) - err := player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomGame{ Code: msg.RES_CODE_FAIL, @@ -3646,10 +3872,13 @@ func ReqPlayroomGame(player *Player, buf []byte) error { // 选择奖励 func ReqPlayroomSelectReward(player *Player, buf []byte) error { req := &msg.ReqPlayroomSelectReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items := player.GetPlayroomGameReward(playroom.GAME_RESULT_HIGH, int(req.Id)) - err := player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomSelectReward{ Code: msg.RES_CODE_FAIL, @@ -3710,7 +3939,10 @@ func ReqPlayroomLose(player *Player, buf []byte) error { // 宠物开始工作 func ReqPlayroomWork(player *Player, buf []byte) error { req := &msg.ReqPlayroomWork{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items, err := PlayroomMod.Work() if err != nil { @@ -3794,7 +4026,10 @@ func ReqPlayroomDraw(player *Player, buf []byte) error { // 清理碎片 func ReqPlayroomChip(player *Player, buf []byte) error { req := &msg.ReqPlayroomChip{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items, ChipNum, err := PlayroomMod.RemoveChip(req.Uid) if err != nil { @@ -3828,7 +4063,10 @@ func ReqPlayroomChip(player *Player, buf []byte) error { // 翻牌游戏 func ReqPlayroomFlip(player *Player, buf []byte) error { req := &msg.ReqPlayroomFlip{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() CardId, err := PlayroomMod.FlipCard(int(req.Id)) @@ -3855,7 +4093,10 @@ func ReqPlayroomFlip(player *Player, buf []byte) error { func ReqPlayroomFlipReward(player *Player, buf []byte) error { req := &msg.ReqPlayroomFlipReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items, Target, Result, err := PlayroomMod.GetFlipReward() if err != nil { @@ -3909,7 +4150,10 @@ func ReqPlayroomFlipReward(player *Player, buf []byte) error { func ReqPlayroomBuyItem(player *Player, buf []byte) error { req := &msg.ReqPlayroomBuyItem{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() AddItems, CostItem := PlayroomMod.BuyItem(int(req.Id)) if CostItem == nil { @@ -3921,7 +4165,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return err } - err := player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) + err = player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -3949,7 +4193,10 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { func ReqPlayroomUpvote(player *Player, buf []byte) error { req := &msg.ReqPlayroomUpvote{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items, err := PlayroomMod.GiveUpvote(int(req.Id)) if err != nil { @@ -3992,9 +4239,12 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { func ReqPlayroomUnlock(player *Player, buf []byte) error { req := &msg.ReqPlayroomUnlock{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() - err := PlayroomMod.Unlock(int(req.Id)) + err = PlayroomMod.Unlock(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomUnlock{ Code: msg.RES_CODE_FAIL, @@ -4016,7 +4266,10 @@ func ReqPlayroomUnlock(player *Player, buf []byte) error { func ReqPlayroomTask(player *Player, buf []byte) error { req := &msg.ReqPlayroomTask{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Items, err := PlayroomMod.GetDailyTaskReward(int(req.Id)) if err != nil { @@ -4050,7 +4303,10 @@ func ReqPlayroomTask(player *Player, buf []byte) error { func ReqPlayroomTaskReward(player *Player, buf []byte) error { req := &msg.ReqPlayroomTaskReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Id, Items, err := PlayroomMod.GetTaskReward(int(req.Type)) if err != nil { @@ -4086,7 +4342,10 @@ func ReqPlayroomTaskReward(player *Player, buf []byte) error { func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error { req := &msg.ReqOfflineReconnect{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } res := &msg.ResOfflineReconnect{} res.DwUin = req.DwUin if v, ok := G_GameLogicPtr.M_Players.Load(req.DwUin); ok { @@ -4109,7 +4368,10 @@ func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error { // playroom 打工离线 func ReqPlayroomOutline(player *Player, buf []byte) error { req := &msg.ReqPlayroomOutline{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item @@ -4125,7 +4387,7 @@ func ReqPlayroomOutline(player *Player, buf []byte) error { } } - err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) + err = ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomOutline{ Code: msg.RES_CODE_FAIL, @@ -4166,7 +4428,10 @@ func ReqPlayroomWrokOutline(player *Player, buf []byte) error { func ReqPlayroomShop(player *Player, buf []byte) error { req := &msg.ReqPlayroomShop{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() AddItems, LoseItem, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount()) if err != nil { @@ -4225,7 +4490,10 @@ func ReqFriendTreasure(player *Player, buf []byte) error { func ReqFriendTreasureStart(player *Player, buf []byte) error { req := &msg.ReqFriendTreasureStart{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } // FriendMod := player.PlayMod.getFriendMod() FriendTreasureMod := player.PlayMod.getFriendTreasureMod() if FriendTreasureMod.Status == 1 { @@ -4255,7 +4523,10 @@ func ReqFriendTreasureStart(player *Player, buf []byte) error { func ReqFriendTreasureFilp(player *Player, buf []byte) error { req := &msg.ReqFriendTreasureFilp{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendTreasureMod := player.PlayMod.getFriendTreasureMod() Items, Uid, err := FriendTreasureMod.Flip(int(req.Pos)) if err != nil { @@ -4352,7 +4623,10 @@ func ReqFriendTreasureEnd(player *Player, buf []byte) error { func ReqKafkaLog(player *Player, buf []byte) error { req := &msg.ReqKafkaLog{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } player.Kafka(req.Event, map[string]interface{}{ "From": "Client", "data": req.Data, @@ -4362,7 +4636,10 @@ func ReqKafkaLog(player *Player, buf []byte) error { func ReqCardHandbookReward(player *Player, buf []byte) error { req := &msg.ReqCardHandbookReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CardMod := player.PlayMod.getCardMod() Items, err := CardMod.GetHandbookReward(int(req.CardId)) if err != nil { @@ -4395,9 +4672,12 @@ func ReqCardHandbookReward(player *Player, buf []byte) error { // 设置表情 func ReqSetEmoji(player *Player, buf []byte) error { req := &msg.ReqSetEmoji{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } EmojiMod := player.PlayMod.getEmojiMod() - err := EmojiMod.SetEmoji(int(req.Id), int(req.Type)) + err = EmojiMod.SetEmoji(int(req.Id), int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResSetEmoji{ Code: msg.RES_CODE_FAIL, @@ -4428,7 +4708,10 @@ func ReqCollectInfo(player *Player, buf []byte) error { // 领取收集奖励 func ReqCollect(player *Player, buf []byte) error { req := &msg.ReqCollect{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CollectMod := player.PlayMod.getCollectMod() Type := collectCfg.GetRewardType(int(req.Id)) Num := 0 @@ -4476,7 +4759,10 @@ func ReqCollect(player *Player, buf []byte) error { // 获取出售棋子获得的星星数量 func ReqSellChessNum(player *Player, buf []byte) error { req := &msg.ReqSellChessNum{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } data, _ := mergeDataCfg.GetOne(int(req.ChessId)) Num := data.SellNum limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -4491,7 +4777,10 @@ func ReqSellChessNum(player *Player, buf []byte) error { func ReqPlayroomDressSet(player *Player, buf []byte) error { req := &msg.ReqPlayroomDressSet{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() Parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet)) if error != nil { @@ -4513,7 +4802,10 @@ func ReqPlayroomDressSet(player *Player, buf []byte) error { func ReqPlayroomPetAirSet(player *Player, buf []byte) error { req := &msg.ReqPlayroomPetAirSet{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() error := PlayroomMod.PlayroomPetAirSet(int(req.PetAirSet)) if error != nil { @@ -4576,7 +4868,10 @@ func ReqLimitEventLuckyCat(player *Player, buf []byte) error { func ReqActivityReward(player *Player, buf []byte) error { req := &msg.ReqActivityReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ActivityInfo := GetActivityInfo(player, int(req.Id)) if ActivityInfo == nil { player.SendErrClienRes(&msg.ResActivityReward{ @@ -4617,7 +4912,10 @@ func ReqActivityReward(player *Player, buf []byte) error { func ReqLang(player *Player, buf []byte) error { req := &msg.ReqLang{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } BaseMod := player.PlayMod.getBaseMod() BaseMod.SetLang(req.Lang) player.PushClientRes(&msg.ResLang{ @@ -4628,7 +4926,10 @@ func ReqLang(player *Player, buf []byte) error { func ReqCatTrickReward(player *Player, buf []byte) error { req := &msg.ReqCatTrickReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK) { player.SendErrClienRes(&msg.ResCatTrickReward{ @@ -4667,7 +4968,10 @@ func ReqCatTrickReward(player *Player, buf []byte) error { func ReqAddNpc(player *Player, buf []byte) error { req := &msg.ReqAddNpc{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() FriendMod.SetNpc(int(req.NpcId)) if len(FriendMod.Npc) == 1 { // 首次添加NPC 视为邀请好友成功 @@ -4696,7 +5000,10 @@ func ReqAddNpc(player *Player, buf []byte) error { func ReqChargeReceive(player *Player, buf []byte) error { req := &msg.ReqChargeReceive{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), To: int(req.Uid), @@ -4712,7 +5019,10 @@ func ReqChargeReceive(player *Player, buf []byte) error { func ReqAddWish(player *Player, buf []byte) error { req := &msg.ReqAddWish{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChargeMod := player.PlayMod.getChargeMod() Items, err := ChargeMod.AddWish(int(req.Id), int(req.Type)) if err != nil { @@ -4746,7 +5056,10 @@ func ReqAddWish(player *Player, buf []byte) error { func ReqGetWish(player *Player, buf []byte) error { req := &msg.ReqGetWish{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChargeMod := player.PlayMod.getChargeMod() Items, err := ChargeMod.GetWish() if err != nil { @@ -4778,9 +5091,12 @@ func ReqGetWish(player *Player, buf []byte) error { func ReqSendWishBeg(player *Player, buf []byte) error { req := &msg.ReqSendWishBeg{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChargeMod := player.PlayMod.getChargeMod() - err := ChargeMod.SendWishBeg(req.Uid) + err = ChargeMod.SendWishBeg(req.Uid) if err != nil { player.SendErrClienRes(&msg.ResSendWishBeg{ Code: msg.RES_CODE_FAIL, @@ -4808,7 +5124,10 @@ func ReqSendWishBeg(player *Player, buf []byte) error { func ReqWishApplyList(player *Player, buf []byte) error { req := &msg.ReqWishApplyList{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() List := FriendMod.GetWishApply() rs := make([]*msg.ResFriendApplyInfo, 0) @@ -4832,9 +5151,12 @@ func ReqWishApplyList(player *Player, buf []byte) error { func ReqWishApply(player *Player, buf []byte) error { req := &msg.ReqWishApply{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() - err := FriendMod.ApplyWish(req.Uid) + err = FriendMod.ApplyWish(req.Uid) if err != nil { player.SendErrClienRes(&msg.ResWishApply{ Code: msg.RES_CODE_FAIL, @@ -4861,7 +5183,10 @@ func ReqWishApply(player *Player, buf []byte) error { func ReqGuidePlayroom(player *Player, buf []byte) error { req := &msg.ReqGuidePlayroom{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } GuideMod := player.PlayMod.getGuideMod() B := GuideMod.GetPlayroomGuide() if B { @@ -4872,7 +5197,7 @@ func ReqGuidePlayroom(player *Player, buf []byte) error { return fmt.Errorf("已领取") } Items := []*item.Item{item.NewItem(int(req.Id), 1)} - err := player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResWishApply{ Code: msg.RES_CODE_FAIL, @@ -4890,7 +5215,10 @@ func ReqGuidePlayroom(player *Player, buf []byte) error { func ReqId2Verify(player *Player, buf []byte) error { req := &msg.ReqId2Verify{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } if req.Id == "" || req.Name == "" { player.SendErrClienRes(&msg.ResId2Verify{ ResultCode: msg.RES_CODE_FAIL, @@ -4898,7 +5226,7 @@ func ReqId2Verify(player *Player, buf []byte) error { }) return fmt.Errorf("id is zero") } - err := GoUtil.IdVerify(req.Name, req.Id) + err = GoUtil.IdVerify(req.Name, req.Id) if err != nil { player.SendErrClienRes(&msg.ResId2Verify{ ResultCode: msg.RES_CODE_FAIL, @@ -4921,7 +5249,10 @@ func ReqId2Verify(player *Player, buf []byte) error { func ReqFriendByCode(player *Player, buf []byte) error { req := &msg.ReqFriendByCode{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } if req.Code == "" { player.SendErrClienRes(&msg.ResFriendByCode{ Code: msg.RES_CODE_FAIL, @@ -4963,7 +5294,10 @@ func ReqFriendByCode(player *Player, buf []byte) error { func ReqPlayroomGameShowReward(player *Player, buf []byte) error { req := &msg.ReqPlayroomGameShowReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } Items := player.GetPlayroomGameReward(int(req.Type), int(req.SelectId)) player.PushClientRes(&msg.ResPlayroomGameShowReward{ Items: item.ItemToMsg(Items), @@ -4973,9 +5307,12 @@ func ReqPlayroomGameShowReward(player *Player, buf []byte) error { func ReqPlayroomGuide(player *Player, buf []byte) error { req := &msg.ReqPlayroomGuide{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } PlayroomMod := player.PlayMod.getPlayroomMod() - err := PlayroomMod.Guide(int(req.Type)) + err = PlayroomMod.Guide(int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomGuide{ Code: msg.RES_CODE_FAIL, @@ -5002,11 +5339,14 @@ func ReqCatnip(player *Player, buf []byte) error { // TODO : 猫草大作战邀请好友 func ReqCatnipInvite(player *Player, buf []byte) error { req := &msg.ReqCatnipInvite{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ActivityId := GetActivityId(player, activity.ACT_TYPE_MINING) ActivityInfo := GetActivityInfo(player, ActivityId) CatnipMod := player.PlayMod.getCatnipMod() - err := CatnipMod.Invite(int(req.Id), int(req.Uid)) + err = CatnipMod.Invite(int(req.Id), int(req.Uid)) if err != nil { player.SendErrClienRes(&msg.ResCatnipInvite{ Code: msg.RES_CODE_FAIL, @@ -5038,7 +5378,10 @@ func ReqCatnipInvite(player *Player, buf []byte) error { func ReqCatnipAgree(player *Player, buf []byte) error { req := &msg.ReqCatnipAgree{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() ActivityId := GetActivityId(player, activity.ACT_TYPE_MINING) UserList, err := CatnipMod.Agree(int(req.Id), int(req.Uid)) @@ -5094,9 +5437,12 @@ func ReqCatnipAgree(player *Player, buf []byte) error { // TODO : 猫草大作战设置倍数 func ReqCatnipMultiply(player *Player, buf []byte) error { req := &msg.ReqCatnipMultiply{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() - err := CatnipMod.Multiply(int(req.Multiply)) + err = CatnipMod.Multiply(int(req.Multiply)) if err != nil { player.SendErrClienRes(&msg.ResCatnipMultiply{ Code: msg.RES_CODE_FAIL, @@ -5118,7 +5464,10 @@ func ReqCatnipMultiply(player *Player, buf []byte) error { // TODO : 猫草大作战开始游戏 func ReqCatnipPlay(player *Player, buf []byte) error { req := &msg.ReqCatnipPlay{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() Id, Growth, PartnerId, Items, ItemCost, err := CatnipMod.Play(int(req.Id)) if err != nil { @@ -5163,7 +5512,10 @@ func ReqCatnipPlay(player *Player, buf []byte) error { // TODO : 猫草大作战领取奖励 func ReqCatnipReward(player *Player, buf []byte) error { req := &msg.ReqCatnipReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() Items, err := CatnipMod.Reward(int(req.Id), int(req.Progress)) if err != nil { @@ -5197,7 +5549,10 @@ func ReqCatnipReward(player *Player, buf []byte) error { // 猫草大作战领取大奖 func ReqCatnipGrandReward(player *Player, buf []byte) error { req := &msg.ReqCatnipGrandReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() Items, err := CatnipMod.GrandReward() if err != nil { @@ -5227,9 +5582,12 @@ func ReqCatnipGrandReward(player *Player, buf []byte) error { func ReqCatnipRefuse(player *Player, buf []byte) error { req := &msg.ReqCatnipRefuse{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() - err := CatnipMod.Refuse(int(req.Id), int(req.Uid)) + err = CatnipMod.Refuse(int(req.Id), int(req.Uid)) if err != nil { player.SendErrClienRes(&msg.ResCatnipRefuse{ Code: msg.RES_CODE_FAIL, @@ -5287,7 +5645,10 @@ func ReqActPassReward(player *Player, buf []byte) error { func ReqFriendReplyHandle(player *Player, buf []byte) error { req := &msg.ReqFriendReplyHandle{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } FriendMod := player.PlayMod.getFriendMod() ReplyInfo := FriendMod.ReplyFriend(int(req.LogId)) if ReplyInfo == nil { @@ -5356,7 +5717,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { } } Items := baseCfg.GetFriendReplyReward() - err := player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendReplyHandle.String()) + err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendReplyHandle.String()) if err != nil { player.SendErrClienRes(&msg.ResFriendReplyHandle{ Code: msg.RES_CODE_FAIL, @@ -5374,7 +5735,10 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { func ReqGetChessRetireReward(player *Player, buf []byte) error { req := &msg.ReqGetChessRetireReward{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } ChessMod := player.PlayMod.getChessMod() Items, err := ChessMod.GetRetireReward(req.Id) if err != nil { @@ -5407,7 +5771,10 @@ func ReqGetChessRetireReward(player *Player, buf []byte) error { func ReqCatnipEmoji(player *Player, buf []byte) error { req := &msg.ReqCatnipEmoji{} - proto.Unmarshal(buf, req) + err := proto.Unmarshal(buf, req) + if err != nil { + return err + } CatnipMod := player.PlayMod.getCatnipMod() CatnipMod.SetEmoji(int(req.Id), int(req.EmojiId)) player.CatnipBackData()