From 623871995849d86d362f3edbb2173cf3dd02e683 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 3 Apr 2026 14:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BD=E6=95=B0=E6=B3=A8?= =?UTF-8?q?=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/GameLogic.go | 440 +++++---- src/server/game/external.go | 20 +- src/server/game/gm_handler.go | 8 +- src/server/game/player_base_mod.go | 36 +- src/server/game/player_chess_mod.go | 5 +- src/server/game/register_network_func.go | 1039 +++++----------------- src/server/game/req_func_friend.go | 86 +- src/server/game/req_func_fur.go | 22 +- 8 files changed, 516 insertions(+), 1140 deletions(-) diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go index 167094ef..79563db3 100644 --- a/src/server/game/GameLogic.go +++ b/src/server/game/GameLogic.go @@ -6,6 +6,7 @@ import ( "encoding/json" "fmt" "os" + "reflect" "server/MergeConst" "server/conf" userCfg "server/conf/user" @@ -37,6 +38,7 @@ var ( var isInitGameLogic = false var RegisterNetWorkFunc = make(map[string]interface{}) +var NewRegisterNetWorkFunc = make(map[string]func(*Player, *proto.Message) error) const ( SERVER_STATUS_OPEN = 1 // 服务器状态 开放 @@ -49,6 +51,82 @@ func RegisterMsgProcessFunc(key string, value1 interface{}) { RegisterNetWorkFunc[key] = value1 } +func RegisterNewMsgProcessFunc(key string, value interface{}) { + handler, err := buildNewMsgHandlerAdapter(value) + if err != nil { + panic(fmt.Sprintf("RegisterNewMsgProcessFunc[%s] invalid handler: %v", key, err)) + } + NewRegisterNetWorkFunc[key] = handler +} + +func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message) error, error) { + if fn, ok := value.(func(*Player, *proto.Message) error); ok { + return fn, nil + } + + if value == nil { + return nil, fmt.Errorf("handler is nil") + } + + rv := reflect.ValueOf(value) + rt := rv.Type() + if rt.Kind() != reflect.Func { + return nil, fmt.Errorf("handler must be function, got %s", rt.Kind()) + } + if rt.NumIn() != 2 || rt.NumOut() != 1 { + return nil, fmt.Errorf("handler signature must be func(*Player, *T) error") + } + if rt.In(0) != reflect.TypeOf(&Player{}) { + return nil, fmt.Errorf("first arg must be *Player") + } + errorType := reflect.TypeOf((*error)(nil)).Elem() + if !rt.Out(0).Implements(errorType) { + return nil, fmt.Errorf("return type must be error") + } + + msgIfaceType := reflect.TypeOf((*proto.Message)(nil)).Elem() + msgArgType := rt.In(1) + if msgArgType == reflect.TypeOf((*proto.Message)(nil)) { + return func(player *Player, msg *proto.Message) error { + results := rv.Call([]reflect.Value{reflect.ValueOf(player), reflect.ValueOf(msg)}) + if results[0].IsNil() { + return nil + } + return results[0].Interface().(error) + }, nil + } + if msgArgType.Kind() != reflect.Ptr || !msgArgType.Implements(msgIfaceType) { + return nil, fmt.Errorf("second arg must be *proto.Message or pointer type implementing proto.Message") + } + + return func(player *Player, msg *proto.Message) error { + if msg == nil || *msg == nil { + return fmt.Errorf("nil proto message") + } + + raw := *msg + rawType := reflect.TypeOf(raw) + if !rawType.AssignableTo(msgArgType) { + return fmt.Errorf("message type mismatch, expect %s got %s", msgArgType, rawType) + } + + results := rv.Call([]reflect.Value{reflect.ValueOf(player), reflect.ValueOf(raw)}) + if results[0].IsNil() { + return nil + } + return results[0].Interface().(error) + }, nil +} + +func RunNewNetProcessByKey(key string, player *Player, msg *proto.Message) error { + fun, ok := NewRegisterNetWorkFunc[key] + if ok { + err := fun(player, msg) + return err + } + return fmt.Errorf("cant find network func %s", key) +} + func RunNetProcessByKey(key string, param []interface{}) error { fun, ok := RegisterNetWorkFunc[key] if ok { @@ -637,239 +715,239 @@ func (ad *GameLogic) RemoveOldLogs(days int) { func (ad *GameLogic) RegisterNetWorkFunc() { - RegisterMsgProcessFunc("ReqRemoveAd", ReqRemoveAdFunc) - RegisterMsgProcessFunc("ReqPlayerBriefProfileData", ReqPlayerBriefProfileDataFunc) - RegisterMsgProcessFunc("ReqFriendPlayerSimple", ReqFriendPlayerSimple) + RegisterNewMsgProcessFunc("ReqRemoveAd", ReqRemoveAd) + RegisterNewMsgProcessFunc("ReqPlayerBriefProfileData", ReqPlayerBriefProfileData) + RegisterNewMsgProcessFunc("ReqFriendPlayerSimple", ReqFriendPlayerSimple) // RegisterMsgProcessFunc("ReqOfflineReconnect", ReqOfflineReconnectFunc) - RegisterMsgProcessFunc("ReqPlayerAsset", ReqPlayerAsset) - RegisterMsgProcessFunc("ReqId2Verify", ReqId2Verify) // 身份证验证 + RegisterNewMsgProcessFunc("ReqPlayerAsset", ReqPlayerAsset) + RegisterNewMsgProcessFunc("ReqId2Verify", ReqId2Verify) // 身份证验证 // 玩家 - RegisterMsgProcessFunc("ReqUserInfo", ReqUserInfo) - RegisterMsgProcessFunc("ReqSetName", ReqSetName) // 设置名字 - RegisterMsgProcessFunc("ReqLang", ReqLang) // 设置语言 - RegisterMsgProcessFunc("ReqSetPetName", ReqSetPetName) // 设置宠物名字 - RegisterMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl) // 设置facebook地址 - RegisterMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfofunction) // 请求玩家基本信息 - RegisterMsgProcessFunc("ReqKv", ReqKv) // 保存客户端数据 - RegisterMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD) // 看广告获取能量 - RegisterMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy) // 购买能量 - RegisterMsgProcessFunc("ReqAdWatch", ReqAdWatch) // 观看广告 + RegisterNewMsgProcessFunc("ReqUserInfo", ReqUserInfo) + RegisterNewMsgProcessFunc("ReqSetName", ReqSetName) // 设置名字 + RegisterNewMsgProcessFunc("ReqLang", ReqLang) // 设置语言 + RegisterNewMsgProcessFunc("ReqSetPetName", ReqSetPetName) // 设置宠物名字 + RegisterNewMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl) // 设置facebook地址 + RegisterNewMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfofunction) // 请求玩家基本信息 + RegisterNewMsgProcessFunc("ReqKv", ReqKv) // 保存客户端数据 + RegisterNewMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD) // 看广告获取能量 + RegisterNewMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy) // 购买能量 + RegisterNewMsgProcessFunc("ReqAdWatch", ReqAdWatch) // 观看广告 // #region 棋盘 - RegisterMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessDataFunc) - RegisterMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessDataFunc) // 更新棋盘数据 - RegisterMsgProcessFunc("ReqSetEnergyMul", RegSetEneryFunc) //设置能量倍数 - RegisterMsgProcessFunc("ReqChessEx", ReqChessEx) // 转换棋子 - RegisterMsgProcessFunc("ReqGetChessFromBuff", ReqGetChessFromBuff) // 从buff中获取棋子 - RegisterMsgProcessFunc("ReqPutPartInBag", ReqPutPartInBag) // 把零件放入背包 - RegisterMsgProcessFunc("ReqPutChessInBag", ReqPutChessInBag) // 把棋子放入背包 - RegisterMsgProcessFunc("ReqTakeChessOutBag", ReqTakeChessOutBag) // 从背包中取出棋子 - RegisterMsgProcessFunc("ReqTakeChessOutBagToHonor", ReqTakeChessOutBagToHonor) // 从背包中取出棋子 - RegisterMsgProcessFunc("ReqBuyChessBagGrid", ReqBuyChessBagGrid) // 解锁背包格子 - RegisterMsgProcessFunc("ReqSourceChest", ReqSourceChest) // 开宝箱 - RegisterMsgProcessFunc("ReqSeparateChess", ReqSeparateChess) // 分解棋子 - RegisterMsgProcessFunc("ReqUpgradeChess", ReqUpgradeChess) // 升级棋子 - RegisterMsgProcessFunc("ReqSellChessNum", ReqSellChessNum) //购买能量 - RegisterMsgProcessFunc("ReqGetChessRetireReward", ReqGetChessRetireReward) //领取棋子退役奖励 + RegisterNewMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessData) + RegisterNewMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessData) // 更新棋盘数据 + RegisterNewMsgProcessFunc("ReqSetEnergyMul", RegSetEneryFunc) //设置能量倍数 + RegisterNewMsgProcessFunc("ReqChessEx", ReqChessEx) // 转换棋子 + RegisterNewMsgProcessFunc("ReqGetChessFromBuff", ReqGetChessFromBuff) // 从buff中获取棋子 + RegisterNewMsgProcessFunc("ReqPutPartInBag", ReqPutPartInBag) // 把零件放入背包 + RegisterNewMsgProcessFunc("ReqPutChessInBag", ReqPutChessInBag) // 把棋子放入背包 + RegisterNewMsgProcessFunc("ReqTakeChessOutBag", ReqTakeChessOutBag) // 从背包中取出棋子 + RegisterNewMsgProcessFunc("ReqTakeChessOutBagToHonor", ReqTakeChessOutBagToHonor) // 从背包中取出棋子 + RegisterNewMsgProcessFunc("ReqBuyChessBagGrid", ReqBuyChessBagGrid) // 解锁背包格子 + RegisterNewMsgProcessFunc("ReqSourceChest", ReqSourceChest) // 开宝箱 + RegisterNewMsgProcessFunc("ReqSeparateChess", ReqSeparateChess) // 分解棋子 + RegisterNewMsgProcessFunc("ReqUpgradeChess", ReqUpgradeChess) // 升级棋子 + RegisterNewMsgProcessFunc("ReqSellChessNum", ReqSellChessNum) //购买能量 + RegisterNewMsgProcessFunc("ReqGetChessRetireReward", ReqGetChessRetireReward) //领取棋子退役奖励 //领取图鉴奖励 - RegisterMsgProcessFunc("ReqGetHandbookReward", ReqGetHandbookReward) //领取图鉴奖励 - RegisterMsgProcessFunc("RegHandbookAllReward", RegHandbookAllReward) //领取图鉴收集奖励 + RegisterNewMsgProcessFunc("ReqGetHandbookReward", ReqGetHandbookReward) //领取图鉴奖励 + RegisterNewMsgProcessFunc("RegHandbookAllReward", RegHandbookAllReward) //领取图鉴收集奖励 //领取订单奖励 - RegisterMsgProcessFunc("ReqRewardOrder", ReqRewardOrder) // 领取订单奖励 - RegisterMsgProcessFunc("ReqDelOrder", ReqDelOrder) // 删除订单 - RegisterMsgProcessFunc("ReqCreatePetOrder", ReqCreatePetOrder) // 生成消耗品订单 + RegisterNewMsgProcessFunc("ReqRewardOrder", ReqRewardOrder) // 领取订单奖励 + RegisterNewMsgProcessFunc("ReqDelOrder", ReqDelOrder) // 删除订单 + RegisterNewMsgProcessFunc("ReqCreatePetOrder", ReqCreatePetOrder) // 生成消耗品订单 //装饰 - RegisterMsgProcessFunc("ReqDecorate", ReqDecorate) // 装饰 - RegisterMsgProcessFunc("ReqDecorateAll", ReqDecorateAll) // 装饰全部 - RegisterMsgProcessFunc("ReqAreaReward", ReqAreaReward) // 章节奖励 + RegisterNewMsgProcessFunc("ReqDecorate", ReqDecorate) // 装饰 + RegisterNewMsgProcessFunc("ReqDecorateAll", ReqDecorateAll) // 装饰全部 + RegisterNewMsgProcessFunc("ReqAreaReward", ReqAreaReward) // 章节奖励 //Gm命令 - RegisterMsgProcessFunc("ReqGmCommand", ReqGmCommand) // Gm命令 + RegisterNewMsgProcessFunc("ReqGmCommand", ReqGmCommand) // Gm命令 // #region 卡牌 - RegisterMsgProcessFunc("ReqCardInfo", ReqCardInfo) // 请求卡牌信息 - RegisterMsgProcessFunc("ReqCardSeasonFirstReward", ReqCardSeasonFirstReward) // 领取赛季首次奖励 - RegisterMsgProcessFunc("ReqCardCollectReward", ReqCardCollectReward) //领取卡牌系列收集奖励 - RegisterMsgProcessFunc("ReqExStarReward", ReqExStarReward) // 兑换收集星星奖励 - RegisterMsgProcessFunc("ReqAllCollectReward", ReqAllCollectReward) // 领取全收集奖励 - RegisterMsgProcessFunc("ReqCardGive", ReqCardGive) // 请求赠送卡牌 - RegisterMsgProcessFunc("ReqAgreeCardGive", ReqAgreeCardGive) // 同意赠送卡牌 - RegisterMsgProcessFunc("ReqRefuseCardGive", ReqRefuseCardGive) // 拒绝赠送卡牌 + RegisterNewMsgProcessFunc("ReqCardInfo", ReqCardInfo) // 请求卡牌信息 + RegisterNewMsgProcessFunc("ReqCardSeasonFirstReward", ReqCardSeasonFirstReward) // 领取赛季首次奖励 + RegisterNewMsgProcessFunc("ReqCardCollectReward", ReqCardCollectReward) //领取卡牌系列收集奖励 + RegisterNewMsgProcessFunc("ReqExStarReward", ReqExStarReward) // 兑换收集星星奖励 + RegisterNewMsgProcessFunc("ReqAllCollectReward", ReqAllCollectReward) // 领取全收集奖励 + RegisterNewMsgProcessFunc("ReqCardGive", ReqCardGive) // 请求赠送卡牌 + RegisterNewMsgProcessFunc("ReqAgreeCardGive", ReqAgreeCardGive) // 同意赠送卡牌 + RegisterNewMsgProcessFunc("ReqRefuseCardGive", ReqRefuseCardGive) // 拒绝赠送卡牌 - RegisterMsgProcessFunc("ReqCardExchange", ReqCardExchange) // 请求交换卡牌 - RegisterMsgProcessFunc("ReqSelectCardExchange", ReqSelectCardExchange) // 选择交换的卡牌 - RegisterMsgProcessFunc("ReqAgreeCardExchange", ReqAgreeCardExchange) // 完成交换卡牌 - RegisterMsgProcessFunc("ReqRefuseCardSelect", ReqRefuseCardSelect) // 拒绝选择卡牌进行交换 - RegisterMsgProcessFunc("ReqRefuseCardExchange", ReqRefuseCardExchange) // 拒绝卡牌交换 - RegisterMsgProcessFunc("ReqCardSend", ReqCardSend) // 直接赠送卡牌 - RegisterMsgProcessFunc("ReqGetFriendCard", ReqGetFriendCard) // 领取好友赠送的卡牌 - RegisterMsgProcessFunc("ReqMasterCard", ReqMasterCard) // 万能卡兑换 - RegisterMsgProcessFunc("ReqCardHandbookReward", ReqCardHandbookReward) // 卡牌图鉴 + RegisterNewMsgProcessFunc("ReqCardExchange", ReqCardExchange) // 请求交换卡牌 + RegisterNewMsgProcessFunc("ReqSelectCardExchange", ReqSelectCardExchange) // 选择交换的卡牌 + RegisterNewMsgProcessFunc("ReqAgreeCardExchange", ReqAgreeCardExchange) // 完成交换卡牌 + RegisterNewMsgProcessFunc("ReqRefuseCardSelect", ReqRefuseCardSelect) // 拒绝选择卡牌进行交换 + RegisterNewMsgProcessFunc("ReqRefuseCardExchange", ReqRefuseCardExchange) // 拒绝卡牌交换 + RegisterNewMsgProcessFunc("ReqCardSend", ReqCardSend) // 直接赠送卡牌 + RegisterNewMsgProcessFunc("ReqGetFriendCard", ReqGetFriendCard) // 领取好友赠送的卡牌 + RegisterNewMsgProcessFunc("ReqMasterCard", ReqMasterCard) // 万能卡兑换 + RegisterNewMsgProcessFunc("ReqCardHandbookReward", ReqCardHandbookReward) // 卡牌图鉴 // 日常任务 - RegisterMsgProcessFunc("ReqGetDailyTaskReward", ReqGetDailyTaskReward) // 领取日常任务奖励 - RegisterMsgProcessFunc("ReqGetDailyWeekReward", ReqGetDailyWeekReward) // 领取周活跃奖励 - RegisterMsgProcessFunc("ReqDailyUnlock", ReqDailyUnlock) // 日常任务解锁 + RegisterNewMsgProcessFunc("ReqGetDailyTaskReward", ReqGetDailyTaskReward) // 领取日常任务奖励 + RegisterNewMsgProcessFunc("ReqGetDailyWeekReward", ReqGetDailyWeekReward) // 领取周活跃奖励 + RegisterNewMsgProcessFunc("ReqDailyUnlock", ReqDailyUnlock) // 日常任务解锁 // 新手任务 - RegisterMsgProcessFunc("ReqGetGuideTaskReward", ReqGetGuideTaskReward) // 领取日新手任务奖励 - RegisterMsgProcessFunc("ReqGetGuideActiveReward", ReqGetGuideActiveReward) // 领取活跃奖励 + RegisterNewMsgProcessFunc("ReqGetGuideTaskReward", ReqGetGuideTaskReward) // 领取日新手任务奖励 + RegisterNewMsgProcessFunc("ReqGetGuideActiveReward", ReqGetGuideActiveReward) // 领取活跃奖励 // 引导奖励 - RegisterMsgProcessFunc("ReqGuideReward", ReqGuideReward) // 领取引导奖励 - RegisterMsgProcessFunc("ReqGuidePlayroom", ReqGuidePlayroom) // 领取playroom引导奖励 + RegisterNewMsgProcessFunc("ReqGuideReward", ReqGuideReward) // 领取引导奖励 + RegisterNewMsgProcessFunc("ReqGuidePlayroom", ReqGuidePlayroom) // 领取playroom引导奖励 // 头像 - RegisterMsgProcessFunc("ReqSetFace", ReqSetFace) // 设置头像 + RegisterNewMsgProcessFunc("ReqSetFace", ReqSetFace) // 设置头像 // 头像框 - RegisterMsgProcessFunc("ReqSetAvatar", ReqSetAvatar) // 设置头像框 + RegisterNewMsgProcessFunc("ReqSetAvatar", ReqSetAvatar) // 设置头像框 // 表情 - RegisterMsgProcessFunc("ReqSetEmoji", ReqSetEmoji) // 设置表情 + RegisterNewMsgProcessFunc("ReqSetEmoji", ReqSetEmoji) // 设置表情 // 收藏室 - RegisterMsgProcessFunc("ReqCollectInfo", ReqCollectInfo) // 请求收藏室数据 - RegisterMsgProcessFunc("ReqCollect", ReqCollect) // 领取收藏室奖励 + RegisterNewMsgProcessFunc("ReqCollectInfo", ReqCollectInfo) // 请求收藏室数据 + RegisterNewMsgProcessFunc("ReqCollect", ReqCollect) // 领取收藏室奖励 // 七日签到 - RegisterMsgProcessFunc("ReqGetSevenLoginReward", ReqGetSevenLoginReward) // 领取七日签到奖励 - RegisterMsgProcessFunc("ReqGetMonthLoginReward", ReqGetMonthLoginReward) // 领取月签到奖励 + RegisterNewMsgProcessFunc("ReqGetSevenLoginReward", ReqGetSevenLoginReward) // 领取七日签到奖励 + RegisterNewMsgProcessFunc("ReqGetMonthLoginReward", ReqGetMonthLoginReward) // 领取月签到奖励 // 限时事件 - RegisterMsgProcessFunc("ReqLimitEvent", ReqLimitEvent) // 请求限时事件数据 - RegisterMsgProcessFunc("ReqFastProduceReward", ReqFastProduceReward) // 连击快手奖励 - RegisterMsgProcessFunc("ReqFastProduceInfo", ReqFastProduceInfo) // 请求连击快手数据 - RegisterMsgProcessFunc("ReqLimitSenceReward", ReqLimitSenceReward) // 获取场景转盘奖励 - RegisterMsgProcessFunc("ReqSelectLimitEvent", ReqSelectLimitEvent) //领取Bouns限时事件进度奖励 - RegisterMsgProcessFunc("ReqGetGoldCard", ReqGetGoldCard) //请求金卡交换信息 - RegisterMsgProcessFunc("ReqLimitEventLuckyCat", ReqLimitEventLuckyCat) //幸运猫获取奖励 - RegisterMsgProcessFunc("ReqCatTrickReward", ReqCatTrickReward) //小猫戏法获取奖励 + RegisterNewMsgProcessFunc("ReqLimitEvent", ReqLimitEvent) // 请求限时事件数据 + RegisterNewMsgProcessFunc("ReqFastProduceReward", ReqFastProduceReward) // 连击快手奖励 + RegisterNewMsgProcessFunc("ReqFastProduceInfo", ReqFastProduceInfo) // 请求连击快手数据 + RegisterNewMsgProcessFunc("ReqLimitSenceReward", ReqLimitSenceReward) // 获取场景转盘奖励 + RegisterNewMsgProcessFunc("ReqSelectLimitEvent", ReqSelectLimitEvent) //领取Bouns限时事件进度奖励 + RegisterNewMsgProcessFunc("ReqGetGoldCard", ReqGetGoldCard) //请求金卡交换信息 + RegisterNewMsgProcessFunc("ReqLimitEventLuckyCat", ReqLimitEventLuckyCat) //幸运猫获取奖励 + RegisterNewMsgProcessFunc("ReqCatTrickReward", ReqCatTrickReward) //小猫戏法获取奖励 // #region 好友 - RegisterMsgProcessFunc("ReqFriendList", ReqFriendList) // 请求好友列表 - RegisterMsgProcessFunc("ReqFriendApply", ReqFriendApply) // 请求申请好友列表 - RegisterMsgProcessFunc("ReqFriendCardMsg", ReqFriendCardMsg) // 请求好友卡牌申请列表 - RegisterMsgProcessFunc("ReqWishApplyList", ReqWishApplyList) // 请求好友心愿单申请列表 - RegisterMsgProcessFunc("ReqFriendTimeLine", ReqFriendTimeLine) // 请求好友时间线 - RegisterMsgProcessFunc("ReqFriendRecommend", ReqFriendRecommend) // 获取推荐好友 - RegisterMsgProcessFunc("ReqFriendTLUpvote", ReqFriendTLUpvote) // 请求时间线点赞 - RegisterMsgProcessFunc("ReqFriendTReward", ReqFriendTReward) // 获取时间线奖励 - RegisterMsgProcessFunc("ReqAddNpc", ReqAddNpc) // 增加npc - RegisterMsgProcessFunc("ReqWishApply", ReqWishApply) // 同意好友心愿单请求 - RegisterMsgProcessFunc("ReqFriendByCode", ReqFriendByCode) // 根据邀请码查询好友 - RegisterMsgProcessFunc("ReqFriendReplyHandle", ReqFriendReplyHandle) // 回复好友信息 + RegisterNewMsgProcessFunc("ReqFriendList", ReqFriendList) // 请求好友列表 + RegisterNewMsgProcessFunc("ReqFriendApply", ReqFriendApply) // 请求申请好友列表 + RegisterNewMsgProcessFunc("ReqFriendCardMsg", ReqFriendCardMsg) // 请求好友卡牌申请列表 + RegisterNewMsgProcessFunc("ReqWishApplyList", ReqWishApplyList) // 请求好友心愿单申请列表 + RegisterNewMsgProcessFunc("ReqFriendTimeLine", ReqFriendTimeLine) // 请求好友时间线 + RegisterNewMsgProcessFunc("ReqFriendRecommend", ReqFriendRecommend) // 获取推荐好友 + RegisterNewMsgProcessFunc("ReqFriendTLUpvote", ReqFriendTLUpvote) // 请求时间线点赞 + RegisterNewMsgProcessFunc("ReqFriendTReward", ReqFriendTReward) // 获取时间线奖励 + RegisterNewMsgProcessFunc("ReqAddNpc", ReqAddNpc) // 增加npc + RegisterNewMsgProcessFunc("ReqWishApply", ReqWishApply) // 同意好友心愿单请求 + RegisterNewMsgProcessFunc("ReqFriendByCode", ReqFriendByCode) // 根据邀请码查询好友 + RegisterNewMsgProcessFunc("ReqFriendReplyHandle", ReqFriendReplyHandle) // 回复好友信息 - RegisterMsgProcessFunc("ReqSearchPlayer", ReqSearchPlayer) // 搜索好友 - RegisterMsgProcessFunc("ReqApplyFriend", ReqApplyFriend) // 申请好友 - RegisterMsgProcessFunc("ReqAgreeFriend", ReqAgreeFriend) // 同意申请 - RegisterMsgProcessFunc("ReqRefuseFriend", ReqRefuseFriend) // 拒绝申请 - RegisterMsgProcessFunc("ReqDelFriend", ReqDelFriend) // 删除好友 + RegisterNewMsgProcessFunc("ReqSearchPlayer", ReqSearchPlayer) // 搜索好友 + RegisterNewMsgProcessFunc("ReqApplyFriend", ReqApplyFriend) // 申请好友 + RegisterNewMsgProcessFunc("ReqAgreeFriend", ReqAgreeFriend) // 同意申请 + RegisterNewMsgProcessFunc("ReqRefuseFriend", ReqRefuseFriend) // 拒绝申请 + RegisterNewMsgProcessFunc("ReqDelFriend", ReqDelFriend) // 删除好友 // Facebook邀请好友 - RegisterMsgProcessFunc("ReqInviteFriendData", ReqInviteFriendData) // 请求邀请好友数据 - RegisterMsgProcessFunc("ReqSelfInvited", ReqSelfInvited) // 请求自己邀请的好友 - RegisterMsgProcessFunc("ReqGetInviteReward", ReqGetInviteReward) // 领取邀请奖励 - RegisterMsgProcessFunc("ReqAutoAddInviteFriend", ReqAutoAddInviteFriend) // 自动添加邀请好友 - RegisterMsgProcessFunc("ReqAutoAddInviteFriend2", ReqAutoAddInviteFriend2) // 自动添加邀请好友 - RegisterMsgProcessFunc("ReqBindFacebookAccount", ReqBindFacebookAccount) // 绑定facebook账号 - RegisterMsgProcessFunc("ReqOnlyBindFacebook", ReqOnlyBindFacebook) // 绑定唯一facebook - RegisterMsgProcessFunc("ReqUnBindFacebook", ReqUnBindFacebook) // 解绑facebook - RegisterMsgProcessFunc("ReqSynGameData", ReqSynGameData) // 同步账号数据 + RegisterNewMsgProcessFunc("ReqInviteFriendData", ReqInviteFriendData) // 请求邀请好友数据 + RegisterNewMsgProcessFunc("ReqSelfInvited", ReqSelfInvited) // 请求自己邀请的好友 + RegisterNewMsgProcessFunc("ReqGetInviteReward", ReqGetInviteReward) // 领取邀请奖励 + RegisterNewMsgProcessFunc("ReqAutoAddInviteFriend", ReqAutoAddInviteFriend) // 自动添加邀请好友 + RegisterNewMsgProcessFunc("ReqAutoAddInviteFriend2", ReqAutoAddInviteFriend2) // 自动添加邀请好友 + RegisterNewMsgProcessFunc("ReqBindFacebookAccount", ReqBindFacebookAccount) // 绑定facebook账号 + RegisterNewMsgProcessFunc("ReqOnlyBindFacebook", ReqOnlyBindFacebook) // 绑定唯一facebook + RegisterNewMsgProcessFunc("ReqUnBindFacebook", ReqUnBindFacebook) // 解绑facebook + RegisterNewMsgProcessFunc("ReqSynGameData", ReqSynGameData) // 同步账号数据 // 榜单 - RegisterMsgProcessFunc("ReqRank", ReqRank) // 请求榜单数据 + RegisterNewMsgProcessFunc("ReqRank", ReqRank) // 请求榜单数据 // 邮件 - RegisterMsgProcessFunc("ReqMailList", ReqMailList) // 请求邮件数据 - RegisterMsgProcessFunc("ReqReadMail", ReqReadMail) // 读取邮件 - RegisterMsgProcessFunc("ReqGetMailReward", ReqGetMailReward) // 领取邮件奖励 - RegisterMsgProcessFunc("ReqDeleteMail", ReqDeleteMail) // 删除邮件 + RegisterNewMsgProcessFunc("ReqMailList", ReqMailList) // 请求邮件数据 + RegisterNewMsgProcessFunc("ReqReadMail", ReqReadMail) // 读取邮件 + RegisterNewMsgProcessFunc("ReqGetMailReward", ReqGetMailReward) // 领取邮件奖励 + RegisterNewMsgProcessFunc("ReqDeleteMail", ReqDeleteMail) // 删除邮件 // 商店 - RegisterMsgProcessFunc("ReqFreeShop", ReqFreeShop) // 领取商店免费奖励 - RegisterMsgProcessFunc("ReqBuyChessShop", ReqBuyChessShop) // 购买商店棋子 - RegisterMsgProcessFunc("ReqBuyChessShop2", ReqBuyChessShop2) // 购买商店棋子直接加入棋盘 - RegisterMsgProcessFunc("ReqRefreshChessShop", ReqRefreshChessShop) // 刷新棋子商店 - RegisterMsgProcessFunc("ReqAddWish", ReqAddWish) // 添加心愿单 - RegisterMsgProcessFunc("ReqGetWish", ReqGetWish) // 领取心愿单奖励 - RegisterMsgProcessFunc("ReqSendWishBeg", ReqSendWishBeg) // 发送心愿单请求 + RegisterNewMsgProcessFunc("ReqFreeShop", ReqFreeShop) // 领取商店免费奖励 + RegisterNewMsgProcessFunc("ReqBuyChessShop", ReqBuyChessShop) // 购买商店棋子 + RegisterNewMsgProcessFunc("ReqBuyChessShop2", ReqBuyChessShop2) // 购买商店棋子直接加入棋盘 + RegisterNewMsgProcessFunc("ReqRefreshChessShop", ReqRefreshChessShop) // 刷新棋子商店 + RegisterNewMsgProcessFunc("ReqAddWish", ReqAddWish) // 添加心愿单 + RegisterNewMsgProcessFunc("ReqGetWish", ReqGetWish) // 领取心愿单奖励 + RegisterNewMsgProcessFunc("ReqSendWishBeg", ReqSendWishBeg) // 发送心愿单请求 // 无尽礼包 - RegisterMsgProcessFunc("ReqEndless", ReqEndless) // 请求无尽礼包数据 - RegisterMsgProcessFunc("ReqEndlessReward", ReqEndlessReward) // 领取无尽礼包免费奖励 + RegisterNewMsgProcessFunc("ReqEndless", ReqEndless) // 请求无尽礼包数据 + RegisterNewMsgProcessFunc("ReqEndlessReward", ReqEndlessReward) // 领取无尽礼包免费奖励 // 小猪存钱罐 - RegisterMsgProcessFunc("ReqPiggyBankReward", ReqPiggyBankReward) // 小猪存钱罐领取奖励 + RegisterNewMsgProcessFunc("ReqPiggyBankReward", ReqPiggyBankReward) // 小猪存钱罐领取奖励 // 锦标赛 - RegisterMsgProcessFunc("ReqChampship", ReqChampship) // 请求锦标赛数据 - RegisterMsgProcessFunc("ReqChampshipReward", ReqChampshipReward) // 领取锦标赛奖励 - RegisterMsgProcessFunc("ReqChampshipRankReward", ReqChampshipRankReward) // 领取锦标赛排行榜奖励 - RegisterMsgProcessFunc("ReqChampshipRank", ReqChampshipRank) // 请求锦标赛排行榜 - RegisterMsgProcessFunc("ReqChampshipPreRank", ReqChampshipPreRank) // 请求锦标赛昨日排行榜 + RegisterNewMsgProcessFunc("ReqChampship", ReqChampship) // 请求锦标赛数据 + RegisterNewMsgProcessFunc("ReqChampshipReward", ReqChampshipReward) // 领取锦标赛奖励 + RegisterNewMsgProcessFunc("ReqChampshipRankReward", ReqChampshipRankReward) // 领取锦标赛排行榜奖励 + RegisterNewMsgProcessFunc("ReqChampshipRank", ReqChampshipRank) // 请求锦标赛排行榜 + RegisterNewMsgProcessFunc("ReqChampshipPreRank", ReqChampshipPreRank) // 请求锦标赛昨日排行榜 // #region 活动 - RegisterMsgProcessFunc("ReqActivityReward", ReqActivityReward) // 领取活动奖励 - RegisterMsgProcessFunc("ReqAddGiftReward", ReqAddGiftReward) // 领取加赠活动奖励 + RegisterNewMsgProcessFunc("ReqActivityReward", ReqActivityReward) // 领取活动奖励 + RegisterNewMsgProcessFunc("ReqAddGiftReward", ReqAddGiftReward) // 领取加赠活动奖励 // 挖矿 - RegisterMsgProcessFunc("ReqMining", ReqMining) // 请求挖矿数据 - RegisterMsgProcessFunc("ReqMiningReward", ReqMiningReward) // 领取挖矿奖励 - RegisterMsgProcessFunc("ReqMiningTake", ReqMiningTake) // 挖矿 + RegisterNewMsgProcessFunc("ReqMining", ReqMining) // 请求挖矿数据 + RegisterNewMsgProcessFunc("ReqMiningReward", ReqMiningReward) // 领取挖矿奖励 + RegisterNewMsgProcessFunc("ReqMiningTake", ReqMiningTake) // 挖矿 // 猜颜色 - RegisterMsgProcessFunc("ReqGuessColor", ReqGuessColor) // 请求猜颜色数据 - RegisterMsgProcessFunc("ReqGuessColorReward", ReqGuessColorReward) // 领取猜颜色奖励 - RegisterMsgProcessFunc("ReqGuessColorTake", ReqGuessColorTake) // 猜颜色 + RegisterNewMsgProcessFunc("ReqGuessColor", ReqGuessColor) // 请求猜颜色数据 + RegisterNewMsgProcessFunc("ReqGuessColorReward", ReqGuessColorReward) // 领取猜颜色奖励 + RegisterNewMsgProcessFunc("ReqGuessColorTake", ReqGuessColorTake) // 猜颜色 // 三段竞赛 - RegisterMsgProcessFunc("ReqRace", ReqRace) - RegisterMsgProcessFunc("ReqRaceReward", ReqRaceReward) - RegisterMsgProcessFunc("ReqRaceStart", ReqRaceStart) + RegisterNewMsgProcessFunc("ReqRace", ReqRace) + RegisterNewMsgProcessFunc("ReqRaceReward", ReqRaceReward) + RegisterNewMsgProcessFunc("ReqRaceStart", ReqRaceStart) // 猫草大作战 - RegisterMsgProcessFunc("ReqCatnip", ReqCatnip) // 请求猫草大作战数据 - RegisterMsgProcessFunc("ReqCatnipInvite", ReqCatnipInvite) // 猫草大作战邀请好友 - RegisterMsgProcessFunc("ReqCatnipAgree", ReqCatnipAgree) // 同意邀请 - RegisterMsgProcessFunc("ReqCatnipRefuse", ReqCatnipRefuse) // 拒绝邀请 - RegisterMsgProcessFunc("ReqCatnipMultiply", ReqCatnipMultiply) // 猫草大作战倍数 - RegisterMsgProcessFunc("ReqCatnipPlay", ReqCatnipPlay) // 猫草大作战游戏转盘 - RegisterMsgProcessFunc("ReqCatnipReward", ReqCatnipReward) // 猫草大作战领取奖励 - RegisterMsgProcessFunc("ReqCatnipGrandReward", ReqCatnipGrandReward) // 猫草大作战领取大奖 - RegisterMsgProcessFunc("ReqCatnipEmoji", ReqCatnipEmoji) + RegisterNewMsgProcessFunc("ReqCatnip", ReqCatnip) // 请求猫草大作战数据 + RegisterNewMsgProcessFunc("ReqCatnipInvite", ReqCatnipInvite) // 猫草大作战邀请好友 + RegisterNewMsgProcessFunc("ReqCatnipAgree", ReqCatnipAgree) // 同意邀请 + RegisterNewMsgProcessFunc("ReqCatnipRefuse", ReqCatnipRefuse) // 拒绝邀请 + RegisterNewMsgProcessFunc("ReqCatnipMultiply", ReqCatnipMultiply) // 猫草大作战倍数 + RegisterNewMsgProcessFunc("ReqCatnipPlay", ReqCatnipPlay) // 猫草大作战游戏转盘 + RegisterNewMsgProcessFunc("ReqCatnipReward", ReqCatnipReward) // 猫草大作战领取奖励 + RegisterNewMsgProcessFunc("ReqCatnipGrandReward", ReqCatnipGrandReward) // 猫草大作战领取大奖 + RegisterNewMsgProcessFunc("ReqCatnipEmoji", ReqCatnipEmoji) // 活动通行证 - RegisterMsgProcessFunc("ReqActPass", ReqActPass) // 请求活动通行证数据 - RegisterMsgProcessFunc("ReqActPassReward", ReqActPassReward) // 领取活动通行证奖励 + RegisterNewMsgProcessFunc("ReqActPass", ReqActPass) // 请求活动通行证数据 + RegisterNewMsgProcessFunc("ReqActPassReward", ReqActPassReward) // 领取活动通行证奖励 // #region playroom - RegisterMsgProcessFunc("ReqPlayroom", ReqPlayroom) // 请求playroom数据 - RegisterMsgProcessFunc("ReqPlayroomInfo", ReqPlayroomInfo) // 请求playroom拜访信息 - RegisterMsgProcessFunc("ReqPlayroomDressSet", ReqPlayroomDressSet) // 设置服装 - RegisterMsgProcessFunc("ReqPlayroomPetAirSet", ReqPlayroomPetAirSet) // 获取宠物空气 - RegisterMsgProcessFunc("ReqPlayroomGame", ReqPlayroomGame) // 游戏结果 - RegisterMsgProcessFunc("ReqPlayroomInteract", ReqPlayroomInteract) // 宠物交互 - RegisterMsgProcessFunc("ReqPlayroomSetRoom", ReqPlayroomSetRoom) // playroom装饰 - RegisterMsgProcessFunc("ReqPlayroomSelectReward", ReqPlayroomSelectReward) // playroom选择奖励 - RegisterMsgProcessFunc("ReqPlayroomLose", ReqPlayroomLose) // 处理偷取的棋子 - RegisterMsgProcessFunc("ReqPlayroomWork", ReqPlayroomWork) // 宠物工作 - RegisterMsgProcessFunc("ReqPlayroomRest", ReqPlayroomRest) // 宠物休息 - RegisterMsgProcessFunc("ReqPlayroomDraw", ReqPlayroomDraw) // 转盘 - RegisterMsgProcessFunc("ReqPlayroomFlip", ReqPlayroomFlip) // 翻牌 - RegisterMsgProcessFunc("ReqPlayroomFlipReward", ReqPlayroomFlipReward) // 翻牌奖励 - RegisterMsgProcessFunc("ReqPlayroomChip", ReqPlayroomChip) // 消除碎片 - RegisterMsgProcessFunc("ReqPlayroomOutline", ReqPlayroomOutline) // 打工离线 - RegisterMsgProcessFunc("ReqPlayroomWrokOutline", ReqPlayroomWrokOutline) // 打工离线完成 - RegisterMsgProcessFunc("ReqPlayroomShop", ReqPlayroomShop) // playroom 商店 - RegisterMsgProcessFunc("ReqPlayroomBuyItem", ReqPlayroomBuyItem) // 购买playroom物品 - RegisterMsgProcessFunc("ReqPlayroomUpvote", ReqPlayroomUpvote) // 点赞别人的playroom - RegisterMsgProcessFunc("ReqPlayroomUnlock", ReqPlayroomUnlock) // 解锁房间 - RegisterMsgProcessFunc("ReqPlayroomTask", ReqPlayroomTask) // playroom任务 - RegisterMsgProcessFunc("ReqPlayroomTaskReward", ReqPlayroomTaskReward) // 领取任务奖励 - RegisterMsgProcessFunc("ReqPlayroomGameShowReward", ReqPlayroomGameShowReward) // 展示游戏结果数据 - RegisterMsgProcessFunc("ReqPlayroomGuide", ReqPlayroomGuide) // 展示游戏结果数据 - RegisterMsgProcessFunc("ReqPetFur", ReqPetFur) // 宠物毛皮信息 - RegisterMsgProcessFunc("ReqPetFurBuy", ReqPetFurBuy) // 宠物毛皮商店购买 - RegisterMsgProcessFunc("ReqFurSet", ReqFurSet) // 宠物毛皮设置 + RegisterNewMsgProcessFunc("ReqPlayroom", ReqPlayroom) // 请求playroom数据 + RegisterNewMsgProcessFunc("ReqPlayroomInfo", ReqPlayroomInfo) // 请求playroom拜访信息 + RegisterNewMsgProcessFunc("ReqPlayroomDressSet", ReqPlayroomDressSet) // 设置服装 + RegisterNewMsgProcessFunc("ReqPlayroomPetAirSet", ReqPlayroomPetAirSet) // 获取宠物空气 + RegisterNewMsgProcessFunc("ReqPlayroomGame", ReqPlayroomGame) // 游戏结果 + RegisterNewMsgProcessFunc("ReqPlayroomInteract", ReqPlayroomInteract) // 宠物交互 + RegisterNewMsgProcessFunc("ReqPlayroomSetRoom", ReqPlayroomSetRoom) // playroom装饰 + RegisterNewMsgProcessFunc("ReqPlayroomSelectReward", ReqPlayroomSelectReward) // playroom选择奖励 + RegisterNewMsgProcessFunc("ReqPlayroomLose", ReqPlayroomLose) // 处理偷取的棋子 + RegisterNewMsgProcessFunc("ReqPlayroomWork", ReqPlayroomWork) // 宠物工作 + RegisterNewMsgProcessFunc("ReqPlayroomRest", ReqPlayroomRest) // 宠物休息 + RegisterNewMsgProcessFunc("ReqPlayroomDraw", ReqPlayroomDraw) // 转盘 + RegisterNewMsgProcessFunc("ReqPlayroomFlip", ReqPlayroomFlip) // 翻牌 + RegisterNewMsgProcessFunc("ReqPlayroomFlipReward", ReqPlayroomFlipReward) // 翻牌奖励 + RegisterNewMsgProcessFunc("ReqPlayroomChip", ReqPlayroomChip) // 消除碎片 + RegisterNewMsgProcessFunc("ReqPlayroomOutline", ReqPlayroomOutline) // 打工离线 + RegisterNewMsgProcessFunc("ReqPlayroomWrokOutline", ReqPlayroomWrokOutline) // 打工离线完成 + RegisterNewMsgProcessFunc("ReqPlayroomShop", ReqPlayroomShop) // playroom 商店 + RegisterNewMsgProcessFunc("ReqPlayroomBuyItem", ReqPlayroomBuyItem) // 购买playroom物品 + RegisterNewMsgProcessFunc("ReqPlayroomUpvote", ReqPlayroomUpvote) // 点赞别人的playroom + RegisterNewMsgProcessFunc("ReqPlayroomUnlock", ReqPlayroomUnlock) // 解锁房间 + RegisterNewMsgProcessFunc("ReqPlayroomTask", ReqPlayroomTask) // playroom任务 + RegisterNewMsgProcessFunc("ReqPlayroomTaskReward", ReqPlayroomTaskReward) // 领取任务奖励 + RegisterNewMsgProcessFunc("ReqPlayroomGameShowReward", ReqPlayroomGameShowReward) // 展示游戏结果数据 + RegisterNewMsgProcessFunc("ReqPlayroomGuide", ReqPlayroomGuide) // 展示游戏结果数据 + RegisterNewMsgProcessFunc("ReqPetFur", ReqPetFur) // 宠物毛皮信息 + RegisterNewMsgProcessFunc("ReqPetFurBuy", ReqPetFurBuy) // 宠物毛皮商店购买 + RegisterNewMsgProcessFunc("ReqFurSet", ReqFurSet) // 宠物毛皮设置 // 宠物宝藏 - RegisterMsgProcessFunc("ReqFriendTreasure", ReqFriendTreasure) // 请求好友宝藏数据 - RegisterMsgProcessFunc("ReqFriendTreasureStart", ReqFriendTreasureStart) // 开始游戏 - RegisterMsgProcessFunc("ReqFriendTreasureFilp", ReqFriendTreasureFilp) // 翻牌 - RegisterMsgProcessFunc("ReqFriendTreasureEnd", ReqFriendTreasureEnd) // 结束游戏 + RegisterNewMsgProcessFunc("ReqFriendTreasure", ReqFriendTreasure) // 请求好友宝藏数据 + RegisterNewMsgProcessFunc("ReqFriendTreasureStart", ReqFriendTreasureStart) // 开始游戏 + RegisterNewMsgProcessFunc("ReqFriendTreasureFilp", ReqFriendTreasureFilp) // 翻牌 + RegisterNewMsgProcessFunc("ReqFriendTreasureEnd", ReqFriendTreasureEnd) // 结束游戏 // #region 充值 - RegisterMsgProcessFunc("ReqCreateOrderSn", ReqCreateOrderSn) // 创建订单号 - RegisterMsgProcessFunc("ReqShippingOrder", ReqShippingOrder) // 获取订单号 - RegisterMsgProcessFunc("ReqChargeReceive", ReqChargeReceive) // 礼包回复邮件 + RegisterNewMsgProcessFunc("ReqCreateOrderSn", ReqCreateOrderSn) // 创建订单号 + RegisterNewMsgProcessFunc("ReqShippingOrder", ReqShippingOrder) // 获取订单号 + RegisterNewMsgProcessFunc("ReqChargeReceive", ReqChargeReceive) // 礼包回复邮件 } func (ad *GameLogic) InitActivity() { diff --git a/src/server/game/external.go b/src/server/game/external.go index a217eb4a..b5bdedcd 100644 --- a/src/server/game/external.go +++ b/src/server/game/external.go @@ -16,7 +16,6 @@ import ( "gitea.bywaystudios.com/pet_home/leaf/log" - "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "server/db" @@ -232,7 +231,16 @@ 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}) + detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf) + if err != nil { + log.Error("uid : %d, func : %s, unmarshal error : %s", p.(*Player).M_DwUin, m.GetFunc(), err) + p.(*Player).TeLog("func_unmarshal_error", map[string]interface{}{ + "method_name": m.GetFunc(), + "error_info": err.Error(), + }) + return + } + err = RunNewNetProcessByKey(m.GetFunc(), p.(*Player), &detailMsg) if err != nil { log.Error("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err) p.(*Player).TeLog("func_exec_error", map[string]interface{}{ @@ -242,17 +250,15 @@ func HandleClientReq(args []interface{}) { p.(*Player).Recover(backup) //还原Player的数据 return } - detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf) - str := "" + var logDetailMsg *proto.Message if conf.Server.GameName == "pet_home" || conf.Server.GameName == "merge_pet_sdk" { - strbuf, _ := protojson.Marshal(detailMsg) - str = string(strbuf) + logDetailMsg = &detailMsg } p.(*Player).ProcessTrigger() p.(*Player).TeLog("func_exec_time", map[string]interface{}{ "method_name": m.GetFunc(), "exec_time": fmt.Sprintf("%v", time.Since(start)), - "proto": str, + "proto": logDetailMsg, }) } } diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index 8d39b5eb..c97fbcbe 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -36,14 +36,10 @@ import ( "time" "gitea.bywaystudios.com/pet_home/leaf/log" - - "google.golang.org/protobuf/proto" ) -func ReqGmCommand(player *Player, buf []byte) error { - detail := &msg.ReqGmCommand{} - proto.Unmarshal(buf, detail) - return ReqGmCommand_(player, detail.Command) +func ReqGmCommand(player *Player, req *msg.ReqGmCommand) error { + return ReqGmCommand_(player, req.Command) } func ReqGmCommand_(player *Player, Command string) error { // defer func() { diff --git a/src/server/game/player_base_mod.go b/src/server/game/player_base_mod.go index a88644f4..cedc8ad1 100644 --- a/src/server/game/player_base_mod.go +++ b/src/server/game/player_base_mod.go @@ -199,11 +199,8 @@ func (p *PlayerBaseData) GetMaxEnergy() int { // 更新游戏道具 -func (p *PlayerBaseData) ReqRemoveAd(player *Player, buf []byte) { - req := &msg.ReqRemoveAd{} +func (p *PlayerBaseData) ReqRemoveAd(player *Player, req *msg.ReqRemoveAd) { res := &msg.ResRemoveAd{} - proto.Unmarshal(buf, req) - p.Data.NoAd = 1 res.ResultCode = 0 @@ -229,14 +226,8 @@ func (p *PlayerBaseData) ResPlayerBaseInfo(player *Player) { }) } -func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, buf []byte) { - req := &msg.ReqBindFacebookAccount{} +func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, req *msg.ReqBindFacebookAccount) { res := &msg.ResBindFacebookAccount{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } - sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} isHaveOther := false @@ -270,13 +261,8 @@ func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, buf []byte) { G_getGameLogic().PackResInfo(agent, "ResBindFacebookAccount", data) } -func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, buf []byte) { - req := &msg.ReqUnBindFacebook{} +func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFacebook) { res := &msg.ResUnBindFacebook{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } res.ResultCode = 0 res.BindAccountId = req.BindAccountId p.Data.FaceBookId = "" @@ -291,17 +277,12 @@ func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, buf []byte) { "platform_id": req.BindAccountId, }) } -func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, buf []byte) { - req := &msg.ReqOnlyBindFacebook{} +func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, req *msg.ReqOnlyBindFacebook) { res := &msg.ResOnlyBindFacebook{} - 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 { @@ -356,13 +337,8 @@ func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, buf []byte) { G_getGameLogic().PackResInfo(agent, "ResOnlyBindFacebook", data) } -func (p *PlayerBaseData) ReqSynGameData(player *Player, buf []byte) { - req := &msg.ReqSynGameData{} +func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData) { res := &msg.ResSynGameData{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} isHaveOther := false diff --git a/src/server/game/player_chess_mod.go b/src/server/game/player_chess_mod.go index 79868fb2..fb34d214 100644 --- a/src/server/game/player_chess_mod.go +++ b/src/server/game/player_chess_mod.go @@ -51,9 +51,8 @@ func (p *PlayerChessData) ResChessColorData(player *Player) { } // 同步棋盘数据 -func (p *PlayerChessData) UpdatePlayerChessData(player *Player, buf []byte) error { - update := &msg.UpdatePlayerChessData{} - proto.Unmarshal(buf, update) +func (p *PlayerChessData) UpdatePlayerChessData(player *Player, req *msg.UpdatePlayerChessData) error { + update := req lastMap := player.PlayMod.getChessMod().ChessMap addChessList, addNewEmit, err := p.HandleChess(player, update.MChessHandle) if err != nil { diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index f80ba36a..ff4ac751 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -41,41 +41,29 @@ import ( "google.golang.org/protobuf/proto" ) -func ReqPlayerAsset(player *Player, buf []byte) error { +func ReqPlayerAsset(player *Player, req *msg.ReqPlayerAsset) error { player.PushClientRes(player.PlayerBaseMod.BackAsset()) return nil } // 请求玩家基础信息 -func ReqPlayerBaseInfofunction(player *Player, buf []byte) error { - // 消息的发送者 - detail := &msg.ReqPlayerBaseInfo{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } - +func ReqPlayerBaseInfofunction(player *Player, req *msg.ReqPlayerBaseInfo) error { player.PlayerBaseMod.ResPlayerBaseInfo(player) return nil } -func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { - detail := &msg.ReqPlayerBriefProfileData{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } - uid := int(detail.DwUin) +func ReqPlayerBriefProfileData(player *Player, req *msg.ReqPlayerBriefProfileData) error { + uid := int(req.DwUin) playerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(uid) if playerSimpleData == nil { log.Debug("玩家不存在, Uid:%d", uid) player.SendErrClienRes(&msg.ResPlayerBriefProfileData{ - DwUin: detail.DwUin, + DwUin: req.DwUin, }) return errors.New("玩家不存在") } player.PushClientRes(&msg.ResPlayerBriefProfileData{ - DwUin: detail.DwUin, + DwUin: req.DwUin, ImageFrame: int32(playerSimpleData.Avatar), ImageIcon: int32(playerSimpleData.Face), DecorateCnt: int32(playerSimpleData.Decorate), @@ -87,13 +75,8 @@ func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { return nil } -func ReqFriendPlayerSimple(player *Player, buf []byte) error { - detail := &msg.ReqFriendPlayerSimple{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } - uid := int(detail.Uid) +func ReqFriendPlayerSimple(player *Player, req *msg.ReqFriendPlayerSimple) error { + uid := int(req.Uid) playerSimpleData := G_GameLogicPtr.GetResFriendPlayerByUid(uid) if playerSimpleData == nil { log.Debug("玩家不存在, Uid:%d", uid) @@ -107,50 +90,40 @@ func ReqFriendPlayerSimple(player *Player, buf []byte) error { } // 移除广告 -func ReqRemoveAdFunc(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqRemoveAd(player, buf) +func ReqRemoveAd(player *Player, req *msg.ReqRemoveAd) error { + player.PlayerBaseMod.ReqRemoveAd(player, req) player.TeLog("remove_ad", map[string]interface{}{}) return nil } // 请求玩家棋盘信息 -func ReqPlayerChessDataFunc(player *Player, buf []byte) error { - detail := &msg.ReqPlayerChessData{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } +func ReqPlayerChessData(player *Player, req *msg.ReqPlayerChessData) error { playerChessData := &PlayerChessData{} playerChessData.ResPlayerChessData(player) return nil } -func ReqBindFacebookAccount(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqBindFacebookAccount(player, buf) +func ReqBindFacebookAccount(player *Player, req *msg.ReqBindFacebookAccount) error { + player.PlayerBaseMod.ReqBindFacebookAccount(player, req) return nil } -func ReqUnBindFacebook(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqUnBindFacebook(player, buf) +func ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFacebook) error { + player.PlayerBaseMod.ReqUnBindFacebook(player, req) return nil } -func ReqOnlyBindFacebook(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqOnlyBindFacebook(player, buf) +func ReqOnlyBindFacebook(player *Player, req *msg.ReqOnlyBindFacebook) error { + player.PlayerBaseMod.ReqOnlyBindFacebook(player, req) return nil } -func ReqSynGameData(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqSynGameData(player, buf) +func ReqSynGameData(player *Player, req *msg.ReqSynGameData) error { + player.PlayerBaseMod.ReqSynGameData(player, req) return nil } -func RegSetEneryFunc(player *Player, buf []byte) error { - req := &msg.ReqSetEnergyMul{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func RegSetEneryFunc(player *Player, req *msg.ReqSetEnergyMul) error { maxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) BaseMod := player.PlayMod.getBaseMod() energyMul := BaseMod.GetEnergyMul() @@ -180,13 +153,8 @@ func RegSetEneryFunc(player *Player, buf []byte) error { } // 领取图鉴奖励 -func ReqGetHandbookReward(player *Player, buf []byte) error { - req := &msg.ReqGetHandbookReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } - err = player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) +func ReqGetHandbookReward(player *Player, req *msg.ReqGetHandbookReward) error { + err := player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResGetHandbookReward{ Code: msg.RES_CODE_FAIL, @@ -216,12 +184,7 @@ func ReqGetHandbookReward(player *Player, buf []byte) error { return nil } -func RegHandbookAllReward(player *Player, buf []byte) error { - req := &msg.RegHandbookAllReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error { allChess := mergeDataCfg.GetAllChessBySeries(req.Type) items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, allChess) if err != nil { @@ -265,12 +228,7 @@ func RegHandbookAllReward(player *Player, buf []byte) error { } // 领取订单奖励 -func ReqRewardOrder(player *Player, buf []byte) error { - req := &msg.ReqRewardOrder{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error { OrderMod := player.PlayMod.getOrderMod() ChessMod := player.PlayMod.getChessMod() LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -451,19 +409,14 @@ func ReqRewardOrder(player *Player, buf []byte) error { return nil } -func ReqCreatePetOrder(player *Player, buf []byte) error { +func ReqCreatePetOrder(player *Player, req *msg.ReqCreatePetOrder) error { player.CreatePetOrder() OrderMod := player.PlayMod.getOrderMod() player.PushClientRes(OrderMod.BackData()) return nil } -func ReqDelOrder(player *Player, buf []byte) error { - req := &msg.ReqDelOrder{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDelOrder(player *Player, req *msg.ReqDelOrder) error { OrderMod := player.PlayMod.getOrderMod() delOrder, err := OrderMod.DelOrder(int(req.OrderId)) if err != nil { @@ -485,19 +438,14 @@ func ReqDelOrder(player *Player, buf []byte) error { } // 场景装饰 -func ReqDecorate(player *Player, buf []byte) error { - req := &msg.ReqDecorate{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDecorate(player *Player, req *msg.ReqDecorate) error { 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, @@ -580,12 +528,7 @@ func ReqDecorate(player *Player, buf []byte) error { } // 场景装饰 -func ReqDecorateAll(player *Player, buf []byte) error { - req := &msg.ReqDecorateAll{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error { DecorateMod := player.PlayMod.getDecorateMod() areaId := DecorateMod.GetAreaId() unLockLv := decorateCfg.GetOneKeyDecorateUnlockLv() @@ -600,7 +543,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, @@ -661,12 +604,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { return nil } -func ReqAreaReward(player *Player, buf []byte) error { - req := &msg.ReqAreaReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAreaReward(player *Player, req *msg.ReqAreaReward) error { DecorateMod := player.PlayMod.getDecorateMod() rewardItem, err := DecorateMod.GetDecorateReward(int(req.AreaId)) if err != nil { @@ -694,9 +632,9 @@ func ReqAreaReward(player *Player, buf []byte) error { // -----------------------ChessApi---------------------- // 更新棋盘信息 -func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { +func UpdatePlayerChessData(player *Player, req *msg.UpdatePlayerChessData) error { data := &PlayerChessData{} - err := data.UpdatePlayerChessData(player, buf) + err := data.UpdatePlayerChessData(player, req) player.AddHighOrder2() player.InitOrderItem() player.PushClientRes(player.PlayMod.getOrderMod().BackData()) @@ -706,18 +644,13 @@ func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { } // 从缓存中获取棋子 -func ReqGetChessFromBuff(player *Player, buf []byte) error { - req := &msg.ReqGetChessFromBuff{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error { 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 { @@ -759,14 +692,9 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error { } // 放置零件棋子进背包 -func ReqPutPartInBag(player *Player, buf []byte) error { - req := &msg.ReqPutPartInBag{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error { 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, @@ -796,14 +724,9 @@ func ReqPutPartInBag(player *Player, buf []byte) error { } // 放置棋子进背包 -func ReqPutChessInBag(player *Player, buf []byte) error { - req := &msg.ReqPutChessInBag{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error { 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, @@ -834,12 +757,7 @@ func ReqPutChessInBag(player *Player, buf []byte) error { return nil } -func ReqTakeChessOutBag(player *Player, buf []byte) error { - req := &msg.ReqTakeChessOutBag{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error { ChessMod := player.PlayMod.getChessMod() chessId, err := ChessMod.TakeChessOutBag(int(req.BagId)) if err != nil { @@ -878,12 +796,7 @@ func ReqTakeChessOutBag(player *Player, buf []byte) error { return nil } -func ReqTakeChessOutBagToHonor(player *Player, buf []byte) error { - req := &msg.ReqTakeChessOutBagToHonor{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqTakeChessOutBagToHonor(player *Player, req *msg.ReqTakeChessOutBagToHonor) error { ChessMod := player.PlayMod.getChessMod() chessId, err := ChessMod.TakeChessOutBagToHonor(int(req.BagId)) if err != nil { @@ -908,15 +821,10 @@ func ReqTakeChessOutBagToHonor(player *Player, buf []byte) error { return nil } -func ReqBuyChessBagGrid(player *Player, buf []byte) error { - req := &msg.ReqBuyChessBagGrid{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error { 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, @@ -947,12 +855,7 @@ func ReqBuyChessBagGrid(player *Player, buf []byte) error { return nil } -func ReqSeparateChess(player *Player, buf []byte) error { - req := &msg.ReqSeparateChess{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error { ChessMod := player.PlayMod.getChessMod() newChess, err := ChessMod.SeparateChess(int(req.ChessId)) if err != nil { @@ -989,12 +892,7 @@ func ReqSeparateChess(player *Player, buf []byte) error { return nil } -func ReqUpgradeChess(player *Player, buf []byte) error { - req := &msg.ReqUpgradeChess{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error { ChessMod := player.PlayMod.getChessMod() newChess, err := ChessMod.UpgradeChess(int(req.ChessId)) if err != nil { @@ -1031,12 +929,7 @@ func ReqUpgradeChess(player *Player, buf []byte) error { } // 棋子转换 -func ReqChessEx(player *Player, buf []byte) error { - req := &msg.ReqChessEx{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChessEx(player *Player, req *msg.ReqChessEx) error { ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item @@ -1053,7 +946,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, @@ -1119,12 +1012,7 @@ func ReqChessEx(player *Player, buf []byte) error { } // 领取资源宝箱 -func ReqSourceChest(player *Player, buf []byte) error { - req := &msg.ReqSourceChest{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error { ChessMod := player.PlayMod.getChessMod() chestId := int(req.ChestId) items, err := ChessMod.SourceChest(chestId) @@ -1167,18 +1055,13 @@ func ReqSourceChest(player *Player, buf []byte) error { // ---------------------CardApi---------------------- -func ReqCardInfo(player *Player, buf []byte) error { +func ReqCardInfo(player *Player, req *msg.ReqCardInfo) error { CardMod := player.PlayMod.getCardMod() player.PushClientRes(CardMod.BackData()) return nil } -func ReqCardSeasonFirstReward(player *Player, buf []byte) error { - req := &msg.ReqCardSeasonFirstReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward) error { CardMod := player.PlayMod.getCardMod() itemList, err := CardMod.SeasonFirstReward() if err != nil { @@ -1208,12 +1091,7 @@ func ReqCardSeasonFirstReward(player *Player, buf []byte) error { } // 领取卡牌系列收集奖励 -func ReqCardCollectReward(player *Player, buf []byte) error { - req := &msg.ReqCardCollectReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error { CardMod := player.PlayMod.getCardMod() itemList, chess, err := CardMod.GetCollectReward(int(req.Color)) if err != nil { @@ -1253,12 +1131,7 @@ func ReqCardCollectReward(player *Player, buf []byte) error { } // 兑换星星奖励 -func ReqExStarReward(player *Player, buf []byte) error { - req := &msg.ReqExStarReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error { CardMod := player.PlayMod.getCardMod() itemList, costStar, err := CardMod.ExStarReward(int(req.Id)) if err != nil { @@ -1291,7 +1164,7 @@ func ReqExStarReward(player *Player, buf []byte) error { } // 领取全收集奖励 -func ReqAllCollectReward(player *Player, buf []byte) error { +func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error { CardMod := player.PlayMod.getCardMod() itemList, itemList2, err := CardMod.AllCollectReward() if err != nil { @@ -1333,13 +1206,8 @@ func ReqAllCollectReward(player *Player, buf []byte) error { return nil } -// ---------------------GuildApi---------------------- -func ReqGuideReward(player *Player, buf []byte) error { - req := &msg.ReqGuideReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +// ---------------------GuideApi---------------------- +func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error { GuideMod := player.PlayMod.getGuideMod() itemList, err := GuideMod.GetReward(int(req.Id)) if err != nil { @@ -1371,12 +1239,7 @@ func ReqGuideReward(player *Player, buf []byte) error { } // -----------------dailyTaskApi--------------------- -func ReqGetDailyTaskReward(player *Player, buf []byte) error { - req := &msg.ReqGetDailyTaskReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error { DailyTaskMod := player.PlayMod.getDailyTaskMod() itemList, err := DailyTaskMod.GetDailyReward(int(req.Id), player.GetDailyTaskActivityId()) if err != nil { @@ -1409,12 +1272,7 @@ func ReqGetDailyTaskReward(player *Player, buf []byte) error { return nil } -func ReqGetDailyWeekReward(player *Player, buf []byte) error { - req := &msg.ReqGetDailyWeekReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error { DailyTaskMod := player.PlayMod.getDailyTaskMod() itemList, err := DailyTaskMod.GetWeekReward(int(req.Id)) if err != nil { @@ -1447,12 +1305,7 @@ func ReqGetDailyWeekReward(player *Player, buf []byte) error { return nil } -func ReqDailyUnlock(player *Player, buf []byte) error { - req := &msg.ReqDailyUnlock{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDailyUnlock(player *Player, req *msg.ReqDailyUnlock) error { DailyTaskMod := player.PlayMod.getDailyTaskMod() DailyTaskMod.Unlock() player.PlayMod.save() @@ -1463,12 +1316,7 @@ func ReqDailyUnlock(player *Player, buf []byte) error { return nil } -func ReqGetGuideTaskReward(player *Player, buf []byte) error { - req := &msg.ReqGetGuideTaskReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error { GuideTaskMod := player.PlayMod.getGuideTaskMod() itemList, err := GuideTaskMod.GetTaskReward(int(req.Id)) if err != nil { @@ -1502,12 +1350,7 @@ func ReqGetGuideTaskReward(player *Player, buf []byte) error { return nil } -func ReqGetGuideActiveReward(player *Player, buf []byte) error { - req := &msg.ReqGetGuideActiveReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) error { GuideTaskMod := player.PlayMod.getGuideTaskMod() itemList, err := GuideTaskMod.GetActiveReward(int(req.Id)) if err != nil { @@ -1540,14 +1383,9 @@ func ReqGetGuideActiveReward(player *Player, buf []byte) error { } // 头像框 -func ReqSetAvatar(player *Player, buf []byte) error { - req := &msg.ReqSetAvatar{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetAvatar(player *Player, req *msg.ReqSetAvatar) error { 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, @@ -1574,14 +1412,9 @@ func ReqSetAvatar(player *Player, buf []byte) error { } // 头像 -func ReqSetFace(player *Player, buf []byte) error { - req := &msg.ReqSetFace{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetFace(player *Player, req *msg.ReqSetFace) error { 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, @@ -1608,16 +1441,11 @@ func ReqSetFace(player *Player, buf []byte) error { } // 购买能量 -func ReqBuyEnergy(player *Player, buf []byte) error { - req := &msg.ReqBuyEnergy{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyEnergy(player *Player, req *msg.ReqBuyEnergy) error { BaseMod := player.PlayMod.getBaseMod() ChargeMod := player.PlayMod.getChargeMod() items, energy, diamond := ChargeMod.BuyEnergy(player.IsWeeklyDiscount()) - err = player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyEnergy{ Code: msg.RES_CODE_FAIL, @@ -1638,7 +1466,7 @@ func ReqBuyEnergy(player *Player, buf []byte) error { return nil } -func ReqGetEnergyByAD(player *Player, buf []byte) error { +func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error { BaseMod := player.PlayMod.getBaseMod() items, err := BaseMod.GetEnergyByAD() if err != nil { @@ -1668,12 +1496,7 @@ func ReqGetEnergyByAD(player *Player, buf []byte) error { } // 领取七日签到奖励 -func ReqGetSevenLoginReward(player *Player, buf []byte) error { - req := &msg.ReqGetSevenLoginReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) error { SevenLoginMod := player.PlayMod.getSevenLoginMod() itemList, err := SevenLoginMod.GetReward(int(req.Id)) if err != nil { @@ -1706,12 +1529,7 @@ func ReqGetSevenLoginReward(player *Player, buf []byte) error { } // 领取月进度奖励 -func ReqGetMonthLoginReward(player *Player, buf []byte) error { - req := &msg.ReqGetMonthLoginReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) error { SevenLoginMod := player.PlayMod.getSevenLoginMod() itemList, err := SevenLoginMod.GetMonthReward(int(req.Id)) if err != nil { @@ -1743,7 +1561,7 @@ func ReqGetMonthLoginReward(player *Player, buf []byte) error { return nil } -func ReqFastProduceInfo(player *Player, buf []byte) error { +func ReqFastProduceInfo(player *Player, req *msg.ReqFastProduceInfo) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() endTime, times := LimitedTimeEventMod.GetFastProduceInfo() player.PushClientRes(&msg.ResFastProduceInfo{ @@ -1754,12 +1572,7 @@ func ReqFastProduceInfo(player *Player, buf []byte) error { } // 连击快手奖励 -func ReqFastProduceReward(player *Player, buf []byte) error { - req := &msg.ReqFastProduceReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() itemList, err := LimitedTimeEventMod.GetFastProduceReward(int(req.Energy)) if err != nil { @@ -1789,7 +1602,7 @@ func ReqFastProduceReward(player *Player, buf []byte) error { return nil } -func ReqLimitSenceReward(player *Player, buf []byte) error { +func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error { limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if !limitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_SENCE_DASH) { // 场景冲刺奖励 player.SendErrClienRes(&msg.ResLimitSenceReward{ @@ -1827,7 +1640,7 @@ func ReqLimitSenceReward(player *Player, buf []byte) error { return nil } -func ReqGetGoldCard(player *Player, buf []byte) error { +func ReqGetGoldCard(player *Player, req *msg.ReqGetGoldCard) error { gold := player.GetGoldCard() if gold == nil { player.SendErrClienRes(&msg.ResGetGoldCard{ @@ -1844,18 +1657,11 @@ func ReqGetGoldCard(player *Player, buf []byte) error { } // 向好友请求卡牌 -func ReqCardGive(player *Player, buf []byte) error { - req := &msg.ReqCardGive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } - +func ReqCardGive(player *Player, req *msg.ReqCardGive) error { 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, @@ -1932,12 +1738,7 @@ func ReqCardGive(player *Player, buf []byte) error { } // 同意卡牌请求 -func ReqAgreeCardGive(player *Player, buf []byte) error { - req := &msg.ReqAgreeCardGive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error { FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) if cardInfo == nil { @@ -1948,7 +1749,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, @@ -1982,12 +1783,7 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { } // 拒绝卡牌请求 -func ReqRefuseCardGive(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardGive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseCardGive(player *Player, req *msg.ReqRefuseCardGive) error { FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) if cardInfo == nil { @@ -2020,12 +1816,7 @@ func ReqRefuseCardGive(player *Player, buf []byte) error { } // 赠送卡牌 -func ReqCardSend(player *Player, buf []byte) error { - req := &msg.ReqCardSend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardSend(player *Player, req *msg.ReqCardSend) error { CardMod := player.PlayMod.getCardMod() cardId := int(req.CardId) cardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), cardId) @@ -2063,12 +1854,7 @@ func ReqCardSend(player *Player, buf []byte) error { } // 卡牌交换 -func ReqCardExchange(player *Player, buf []byte) error { - req := &msg.ReqCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardExchange(player *Player, req *msg.ReqCardExchange) error { CardMod := player.PlayMod.getCardMod() cardId := int(req.CardId) cardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), cardId) @@ -2106,12 +1892,7 @@ func ReqCardExchange(player *Player, buf []byte) error { } // 选择卡牌进行交换 -func ReqSelectCardExchange(player *Player, buf []byte) error { - req := &msg.ReqSelectCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error { cardId := int(req.CardId) CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() @@ -2144,7 +1925,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, @@ -2176,12 +1957,7 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { } // 同意卡牌交换 -func ReqAgreeCardExchange(player *Player, buf []byte) error { - req := &msg.ReqSelectCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAgreeCardExchange(player *Player, req *msg.ReqSelectCardExchange) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2236,12 +2012,7 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error { } // 拒绝选择卡牌 -func ReqRefuseCardSelect(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardSelect{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseCardSelect(player *Player, req *msg.ReqRefuseCardSelect) error { FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) if cardInfo == nil { @@ -2276,12 +2047,7 @@ func ReqRefuseCardSelect(player *Player, buf []byte) error { } // 拒绝进行交换 -func ReqRefuseCardExchange(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseCardExchange(player *Player, req *msg.ReqRefuseCardExchange) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2322,12 +2088,7 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error { } // 领取好友卡牌 -func ReqGetFriendCard(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetFriendCard(player *Player, req *msg.ReqRefuseCardExchange) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2357,12 +2118,7 @@ func ReqGetFriendCard(player *Player, buf []byte) error { } // 请求玩家榜单 -func ReqRank(player *Player, buf []byte) error { - req := &msg.ReqRank{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRank(player *Player, req *msg.ReqRank) error { BaseMod := player.PlayMod.getBaseMod() m := &MsqMod.Msg{ From: int(player.M_DwUin), @@ -2389,12 +2145,7 @@ func ReqRank(player *Player, buf []byte) error { } // 请求竞标赛榜单 -func ReqChampshipRank(player *Player, buf []byte) error { - req := &msg.ReqRank{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChampshipRank(player *Player, req *msg.ReqRank) error { res, err := SendMsgToCenterSync(&MsqMod.Msg{ From: int(player.M_DwUin), HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_RANK_LIST, @@ -2411,12 +2162,7 @@ func ReqChampshipRank(player *Player, buf []byte) error { return nil } -func ReqChampshipPreRank(player *Player, buf []byte) error { - req := &msg.ReqRank{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChampshipPreRank(player *Player, req *msg.ReqRank) error { res, err := SendMsgToCenterSync(&MsqMod.Msg{ From: int(player.M_DwUin), HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_PRE_RANK, @@ -2434,21 +2180,16 @@ func ReqChampshipPreRank(player *Player, buf []byte) error { } // 请求邮件列表 -func ReqMailList(player *Player, buf []byte) error { +func ReqMailList(player *Player, req *msg.ReqMailList) error { MailMod := player.PlayMod.getMailMod() player.PushClientRes(MailMod.BackData()) return nil } // 读邮件 -func ReqReadMail(player *Player, buf []byte) error { - req := &msg.ReqReadMail{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqReadMail(player *Player, req *msg.ReqReadMail) error { 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, @@ -2466,12 +2207,7 @@ func ReqReadMail(player *Player, buf []byte) error { } // 领取邮件奖励 -func ReqGetMailReward(player *Player, buf []byte) error { - req := &msg.ReqGetMailReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error { MailMod := player.PlayMod.getMailMod() itemList, err := MailMod.Reward(int(req.Id)) if err != nil { @@ -2504,14 +2240,9 @@ func ReqGetMailReward(player *Player, buf []byte) error { } // 删除邮件 -func ReqDeleteMail(player *Player, buf []byte) error { - req := &msg.ReqDeleteMail{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDeleteMail(player *Player, req *msg.ReqDeleteMail) error { 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, @@ -2529,7 +2260,7 @@ func ReqDeleteMail(player *Player, buf []byte) error { } // 领取商店免费奖励 -func ReqFreeShop(player *Player, buf []byte) error { +func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error { ChargeMod := player.PlayMod.getChargeMod() items, err := ChargeMod.FireFreeShop() if err != nil { @@ -2568,12 +2299,7 @@ func ReqFreeShop(player *Player, buf []byte) error { } // 购买棋子商店物品 -func ReqBuyChessShop(player *Player, buf []byte) error { - req := &msg.ReqBuyChessShop{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error { ChargeMod := player.PlayMod.getChargeMod() lostItems, items, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { @@ -2623,12 +2349,7 @@ func ReqBuyChessShop(player *Player, buf []byte) error { } // 购买棋子商店物品 -func ReqBuyChessShop2(player *Player, buf []byte) error { - req := &msg.ReqBuyChessShop2{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error { ChargeMod := player.PlayMod.getChargeMod() lostItems, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { @@ -2688,7 +2409,7 @@ func ReqBuyChessShop2(player *Player, buf []byte) error { } // 刷新棋子商店 -func ReqRefreshChessShop(player *Player, buf []byte) error { +func ReqRefreshChessShop(player *Player, req *msg.ReqRefreshChessShop) error { ChargeMod := player.PlayMod.getChargeMod() ChessMod := player.PlayMod.getChessMod() ChargeMod.InitChessShop(ChessMod.GetEmitList()) @@ -2710,12 +2431,7 @@ func ReqRefreshChessShop(player *Player, buf []byte) error { } // 领取无尽礼包免费奖励 -func ReqEndlessReward(player *Player, buf []byte) error { - req := &msg.ReqEndlessReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error { EndlessMod := player.PlayMod.getEndlessMod() BaseMod := player.PlayMod.getBaseMod() itemList, err := EndlessMod.GetReward(BaseMod.GetLevel()) @@ -2754,14 +2470,14 @@ func ReqEndlessReward(player *Player, buf []byte) error { } // 请求无尽礼包数据 -func ReqEndless(player *Player, buf []byte) error { +func ReqEndless(player *Player, req *msg.ReqEndless) error { EndlessMod := player.PlayMod.getEndlessMod() player.PushClientRes(EndlessMod.BackData()) return nil } // 请求存钱罐奖励 -func ReqPiggyBankReward(player *Player, buf []byte) error { +func ReqPiggyBankReward(player *Player, req *msg.ReqPiggyBankReward) error { PiggyBankMod := player.PlayMod.getPiggyBankMod() itemList := PiggyBankMod.Fire(0) err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_PiggyBankReward.String()) @@ -2785,12 +2501,7 @@ func ReqPiggyBankReward(player *Player, buf []byte) error { } // 生成订单号 -func ReqCreateOrderSn(player *Player, buf []byte) error { - req := &msg.ReqCreateOrderSn{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCreateOrderSn(player *Player, req *msg.ReqCreateOrderSn) error { orderSn, err := player.CreateOrderSn(req) if err != nil { return err @@ -2802,16 +2513,16 @@ func ReqCreateOrderSn(player *Player, buf []byte) error { } // 订单发货 -func ReqShippingOrder(player *Player, buf []byte) error { +func ReqShippingOrder(player *Player, req *msg.ReqShippingOrder) error { return nil } // 锦标赛 -func ReqChampship(player *Player, buf []byte) error { +func ReqChampship(player *Player, req *msg.ReqChampship) error { player.BackChampship() return nil } -func ReqChampshipReward(player *Player, buf []byte) error { +func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error { ChampshipMod := player.PlayMod.getChampshipMod() todayActivityId, _ := player.GetChampshipActivityId() DecorateMod := player.PlayMod.getDecorateMod() @@ -2852,25 +2563,20 @@ func ReqChampshipReward(player *Player, buf []byte) error { return nil } -func ReqLimitEvent(player *Player, buf []byte) error { +func ReqLimitEvent(player *Player, req *msg.ReqLimitEvent) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() player.PushClientRes(LimitedTimeEventMod.BackData()) return nil } -func ReqKv(player *Player, buf []byte) error { - req := &msg.ReqKv{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqKv(player *Player, req *msg.ReqKv) error { KvMod := player.PlayMod.getKvMod() KvMod.SetVar(int(req.Key), req.Value) log.Debug("player %d set kv key %d value %s", player.M_DwUin, req.Key, req.Value) return nil } -func ReqChampshipRankReward(player *Player, buf []byte) error { +func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) error { _, myPreRank := player.GetChampshipRank() ChampshipMod := player.PlayMod.getChampshipMod() _, yesterdayActivityId := player.GetChampshipActivityId() @@ -2910,12 +2616,7 @@ func ReqChampshipRankReward(player *Player, buf []byte) error { return nil } -func ReqSetName(player *Player, buf []byte) error { - req := &msg.ReqSetName{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetName(player *Player, req *msg.ReqSetName) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetNickName(req.Name) player.PushClientRes(&msg.ResSetName{ @@ -2930,12 +2631,7 @@ func ReqSetName(player *Player, buf []byte) error { return nil } -func ReqSetPetName(player *Player, buf []byte) error { - req := &msg.ReqSetPetName{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetPetName(player *Player, req *msg.ReqSetPetName) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetPetName(req.Name) player.PushClientRes(&msg.ResSetPetName{ @@ -2951,19 +2647,14 @@ func ReqSetPetName(player *Player, buf []byte) error { return nil } -func ReqUserInfo(player *Player, buf []byte) error { +func ReqUserInfo(player *Player, req *msg.ReqUserInfo) error { player.BackUserInfo() return nil } -func ReqMasterCard(player *Player, buf []byte) error { - req := &msg.ReqMasterCard{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqMasterCard(player *Player, req *msg.ReqMasterCard) error { 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, @@ -2985,12 +2676,7 @@ func ReqMasterCard(player *Player, buf []byte) error { return nil } -func ReqSetFacebookUrl(player *Player, buf []byte) error { - req := &msg.ReqSetFacebookUrl{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetFacebookUrl(player *Player, req *msg.ReqSetFacebookUrl) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetFacebookUrl(req.Url) player.PlayMod.save() @@ -3000,18 +2686,13 @@ func ReqSetFacebookUrl(player *Player, buf []byte) error { return nil } -func ReqInviteFriendData(player *Player, buf []byte) error { +func ReqInviteFriendData(player *Player, req *msg.ReqInviteFriendData) error { InviteMod := player.PlayMod.getInviteMod() player.PushClientRes(InviteMod.BackData()) return nil } -func ReqSelfInvited(player *Player, buf []byte) error { - req := &msg.ReqSelfInvited{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSelfInvited(player *Player, req *msg.ReqSelfInvited) error { now := GoUtil.Now() FriendMgrSend(&MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_INVITE_FRIEND, @@ -3026,12 +2707,7 @@ func ReqSelfInvited(player *Player, buf []byte) error { return nil } -func ReqGetInviteReward(player *Player, buf []byte) error { - req := &msg.ReqGetInviteReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetInviteReward(player *Player, req *msg.ReqGetInviteReward) error { InviteMod := player.PlayMod.getInviteMod() curIndex := InviteMod.GetIndex items, err := InviteMod.GetReward(int(req.GetIndex)) @@ -3067,12 +2743,7 @@ func ReqGetInviteReward(player *Player, buf []byte) error { return nil } -func ReqAutoAddInviteFriend(player *Player, buf []byte) error { - req := &msg.ReqAutoAddInviteFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAutoAddInviteFriend(player *Player, req *msg.ReqAutoAddInviteFriend) error { FriendMod := player.PlayMod.getFriendMod() uid := int(req.Id) if uid == 0 && uid == int(player.M_DwUin) { @@ -3099,12 +2770,7 @@ func ReqAutoAddInviteFriend(player *Player, buf []byte) error { return nil } -func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { - req := &msg.ReqAutoAddInviteFriend2{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAutoAddInviteFriend2(player *Player, req *msg.ReqAutoAddInviteFriend2) error { FriendMod := player.PlayMod.getFriendMod() uid, err := GetUidByFaceBook(req.Id) if uid == 0 || uid == int(player.M_DwUin) { @@ -3139,12 +2805,7 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { return nil } -func ReqSelectLimitEvent(player *Player, buf []byte) error { - req := &msg.ReqSelectLimitEvent{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() BaseMod := player.PlayMod.getBaseMod() items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy()) @@ -3178,18 +2839,13 @@ func ReqSelectLimitEvent(player *Player, buf []byte) error { } // 请求挖矿基础数据 -func ReqMining(player *Player, buf []byte) error { +func ReqMining(player *Player, req *msg.ReqMining) error { player.MiningBackData() return nil } // 请求挖矿 -func ReqMiningTake(player *Player, buf []byte) error { - req := &msg.ReqMiningTake{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error { MiningMod := player.PlayMod.getMiningMod() activityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) status := player.GetActivityStatus(activity.ACT_TYPE_MINING) @@ -3201,7 +2857,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, @@ -3234,7 +2890,7 @@ func ReqMiningTake(player *Player, buf []byte) error { } // 领取关卡奖励 -func ReqMiningReward(player *Player, buf []byte) error { +func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error { MiningMod := player.PlayMod.getMiningMod() status := player.GetActivityStatus(activity.ACT_TYPE_MINING) if status != ACT_STATUS_START { @@ -3281,15 +2937,10 @@ func ReqMiningReward(player *Player, buf []byte) error { } // 请求猜颜色基础数据 -func ReqGuessColor(player *Player, buf []byte) error { - req := &msg.ReqGuessColor{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuessColor(player *Player, req *msg.ReqGuessColor) error { 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 } @@ -3299,12 +2950,7 @@ func ReqGuessColor(player *Player, buf []byte) error { } // 请求猜颜色 -func ReqGuessColorTake(player *Player, buf []byte) error { - req := &msg.ReqGuessColorTake{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuessColorTake(player *Player, req *msg.ReqGuessColorTake) error { status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorTake{ @@ -3315,7 +2961,7 @@ func ReqGuessColorTake(player *Player, buf []byte) error { } GuessColorMod := player.PlayMod.getGuessColorMod() loseItems := GuessColorMod.GetLoseItem() - err = player.HandleLoseItem(loseItems, "GuessColorLose") + err := player.HandleLoseItem(loseItems, "GuessColorLose") if err != nil { player.SendErrClienRes(&msg.ResGuessColorTake{ Code: msg.RES_CODE_FAIL, @@ -3339,12 +2985,7 @@ func ReqGuessColorTake(player *Player, buf []byte) error { } // 请求猜颜色奖励 -func ReqGuessColorReward(player *Player, buf []byte) error { - req := &msg.ReqGuessColorReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error { status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorReward{ @@ -3379,20 +3020,15 @@ func ReqGuessColorReward(player *Player, buf []byte) error { } // 请求竞赛基础数据 -func ReqRace(player *Player, buf []byte) error { +func ReqRace(player *Player, req *msg.ReqRace) error { player.RaceBackData() return nil } // 请求竞赛开始 -func ReqRaceStart(player *Player, buf []byte) error { - req := &msg.ReqRaceStart{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRaceStart(player *Player, req *msg.ReqRaceStart) error { RaceMod := player.PlayMod.getRaceMod() - err = RaceMod.StartGame() + err := RaceMod.StartGame() if err != nil { player.SendErrClienRes(&msg.ResRaceStart{ Code: msg.RES_CODE_FAIL, @@ -3408,12 +3044,7 @@ func ReqRaceStart(player *Player, buf []byte) error { } // 领取竞赛奖励 -func ReqRaceReward(player *Player, buf []byte) error { - req := &msg.ResRaceReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error { RaceMod := player.PlayMod.getRaceMod() items, err := RaceMod.GetReward() if err != nil { @@ -3442,18 +3073,13 @@ func ReqRaceReward(player *Player, buf []byte) error { } // 请求playroom基础数据 -func ReqPlayroom(player *Player, buf []byte) error { +func ReqPlayroom(player *Player, req *msg.ReqPlayroom) error { player.PlayroomBackData() return nil } // 请求playroom拜访信息 -func ReqPlayroomInfo(player *Player, buf []byte) error { - req := &msg.ReqPlayroomInfo{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomInfo(player *Player, req *msg.ReqPlayroomInfo) error { PlayroomMod := player.PlayMod.getPlayroomMod() target := int(req.Uid) if req.Uid == 0 { @@ -3514,12 +3140,7 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { } // 请求playroom交互 -func ReqPlayroomInteract(player *Player, buf []byte) error { - req := &msg.ReqPlayroomInteract{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, pType, err := PlayroomMod.Interact(int(req.Id), int(req.Type)) if err != nil { @@ -3566,14 +3187,9 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { } // 请求playroom设置房间 -func ReqPlayroomSetRoom(player *Player, buf []byte) error { - req := &msg.ReqPlayroomSetRoom{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomSetRoom(player *Player, req *msg.ReqPlayroomSetRoom) error { 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, @@ -3591,12 +3207,7 @@ func ReqPlayroomSetRoom(player *Player, buf []byte) error { } // 玩游戏 -func ReqPlayroomGame(player *Player, buf []byte) error { - req := &msg.ReqPlayroomGame{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error { PlayroomMod := player.PlayMod.getPlayroomMod() target := PlayroomMod.GetTarget() if target == 0 { @@ -3607,7 +3218,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, @@ -3652,15 +3263,10 @@ func ReqPlayroomGame(player *Player, buf []byte) error { } // 选择奖励 -func ReqPlayroomSelectReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomSelectReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) error { 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, @@ -3716,7 +3322,7 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { } // 处理偷取物品 -func ReqPlayroomLose(player *Player, buf []byte) error { +func ReqPlayroomLose(player *Player, req *msg.ReqPlayroomLose) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.ResetLose() player.PushClientRes(PlayroomMod.NotifyLose()) @@ -3724,12 +3330,7 @@ func ReqPlayroomLose(player *Player, buf []byte) error { } // 宠物开始工作 -func ReqPlayroomWork(player *Player, buf []byte) error { - req := &msg.ReqPlayroomWork{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, err := PlayroomMod.Work() if err != nil { @@ -3766,7 +3367,7 @@ func ReqPlayroomWork(player *Player, buf []byte) error { } // 宠物休息 -func ReqPlayroomRest(player *Player, buf []byte) error { +func ReqPlayroomRest(player *Player, req *msg.ReqPlayroomRest) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.Rest() player.PlayMod.save() @@ -3777,7 +3378,7 @@ func ReqPlayroomRest(player *Player, buf []byte) error { } // 抽取转盘 -func ReqPlayroomDraw(player *Player, buf []byte) error { +func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error { PlayroomMod := player.PlayMod.getPlayroomMod() id, items, err := PlayroomMod.Draw() if err != nil { @@ -3811,12 +3412,7 @@ func ReqPlayroomDraw(player *Player, buf []byte) error { } // 清理碎片 -func ReqPlayroomChip(player *Player, buf []byte) error { - req := &msg.ReqPlayroomChip{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, chipNum, err := PlayroomMod.RemoveChip(req.Uid) if err != nil { @@ -3849,14 +3445,8 @@ func ReqPlayroomChip(player *Player, buf []byte) error { } // 翻牌游戏 -func ReqPlayroomFlip(player *Player, buf []byte) error { - req := &msg.ReqPlayroomFlip{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomFlip(player *Player, req *msg.ReqPlayroomFlip) error { PlayroomMod := player.PlayMod.getPlayroomMod() - cardId, err := PlayroomMod.FlipCard(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomFlip{ @@ -3879,12 +3469,7 @@ func ReqPlayroomFlip(player *Player, buf []byte) error { return nil } -func ReqPlayroomFlipReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomFlipReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, target, result, err := PlayroomMod.GetFlipReward() if err != nil { @@ -3950,12 +3535,7 @@ func ReqPlayroomFlipReward(player *Player, buf []byte) error { return nil } -func ReqPlayroomBuyItem(player *Player, buf []byte) error { - req := &msg.ReqPlayroomBuyItem{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error { PlayroomMod := player.PlayMod.getPlayroomMod() addItems, costItems := PlayroomMod.BuyItem(int(req.Id)) if costItems == nil { @@ -3967,7 +3547,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return err } - err = player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) + err := player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -3993,12 +3573,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return nil } -func ReqPlayroomUpvote(player *Player, buf []byte) error { - req := &msg.ReqPlayroomUpvote{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, err := PlayroomMod.GiveUpvote(int(req.Id)) if err != nil { @@ -4043,14 +3618,9 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { return nil } -func ReqPlayroomUnlock(player *Player, buf []byte) error { - req := &msg.ReqPlayroomUnlock{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomUnlock(player *Player, req *msg.ReqPlayroomUnlock) error { 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, @@ -4070,12 +3640,7 @@ func ReqPlayroomUnlock(player *Player, buf []byte) error { return nil } -func ReqPlayroomTask(player *Player, buf []byte) error { - req := &msg.ReqPlayroomTask{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, err := PlayroomMod.GetDailyTaskReward(int(req.Id)) if err != nil { @@ -4107,12 +3672,7 @@ func ReqPlayroomTask(player *Player, buf []byte) error { return nil } -func ReqPlayroomTaskReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomTaskReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error { PlayroomMod := player.PlayMod.getPlayroomMod() id, items, err := PlayroomMod.GetTaskReward(int(req.Type)) if err != nil { @@ -4173,12 +3733,7 @@ func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error { } // playroom 打工离线 -func ReqPlayroomOutline(player *Player, buf []byte) error { - req := &msg.ReqPlayroomOutline{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error { ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item @@ -4194,7 +3749,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, @@ -4222,7 +3777,7 @@ func ReqPlayroomOutline(player *Player, buf []byte) error { return nil } -func ReqPlayroomWrokOutline(player *Player, buf []byte) error { +func ReqPlayroomWrokOutline(player *Player, req *msg.ReqPlayroomWrokOutline) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.SetWorkOutline(0) player.PlayMod.save() @@ -4233,12 +3788,7 @@ func ReqPlayroomWrokOutline(player *Player, buf []byte) error { return nil } -func ReqPlayroomShop(player *Player, buf []byte) error { - req := &msg.ReqPlayroomShop{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error { PlayroomMod := player.PlayMod.getPlayroomMod() addItems, loseItems, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount()) if err != nil { @@ -4290,17 +3840,12 @@ func ReqPlayroomShop(player *Player, buf []byte) error { return nil } -func ReqFriendTreasure(player *Player, buf []byte) error { +func ReqFriendTreasure(player *Player, req *msg.ReqFriendTreasure) error { player.PushClientRes(player.PlayMod.getFriendTreasureMod().BackData()) return nil } -func ReqFriendTreasureStart(player *Player, buf []byte) error { - req := &msg.ReqFriendTreasureStart{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) error { // FriendMod := player.PlayMod.getFriendMod() FriendTreasureMod := player.PlayMod.getFriendTreasureMod() if FriendTreasureMod.Status == 1 { @@ -4328,12 +3873,7 @@ func ReqFriendTreasureStart(player *Player, buf []byte) error { return nil } -func ReqFriendTreasureFilp(player *Player, buf []byte) error { - req := &msg.ReqFriendTreasureFilp{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error { FriendTreasureMod := player.PlayMod.getFriendTreasureMod() items, uid, err := FriendTreasureMod.Flip(int(req.Pos)) if err != nil { @@ -4379,7 +3919,7 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error { return nil } -func ReqFriendTreasureEnd(player *Player, buf []byte) error { +func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error { FriendTreasureMod := player.PlayMod.getFriendTreasureMod() items, friendItemNum, err := FriendTreasureMod.EndGame(player.GetOrderFactor()) if err != nil { @@ -4433,12 +3973,7 @@ func ReqFriendTreasureEnd(player *Player, buf []byte) error { return nil } -func ReqKafkaLog(player *Player, buf []byte) error { - req := &msg.ReqKafkaLog{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqKafkaLog(player *Player, req *msg.ReqKafkaLog) error { player.TeLog(req.Event, map[string]interface{}{ "From": "Client", "data": req.Data, @@ -4446,12 +3981,7 @@ func ReqKafkaLog(player *Player, buf []byte) error { return nil } -func ReqCardHandbookReward(player *Player, buf []byte) error { - req := &msg.ReqCardHandbookReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error { CardMod := player.PlayMod.getCardMod() items, err := CardMod.GetHandbookReward(int(req.CardId)) if err != nil { @@ -4482,14 +4012,9 @@ func ReqCardHandbookReward(player *Player, buf []byte) error { } // 设置表情 -func ReqSetEmoji(player *Player, buf []byte) error { - req := &msg.ReqSetEmoji{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetEmoji(player *Player, req *msg.ReqSetEmoji) error { 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, @@ -4512,19 +4037,14 @@ func ReqSetEmoji(player *Player, buf []byte) error { } // 请求收藏室内 -func ReqCollectInfo(player *Player, buf []byte) error { +func ReqCollectInfo(player *Player, req *msg.ReqCollectInfo) error { CollectMod := player.PlayMod.getCollectMod() player.PushClientRes(CollectMod.BackData(player.GetOrderFactor())) return nil } // 领取收集奖励 -func ReqCollect(player *Player, buf []byte) error { - req := &msg.ReqCollect{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCollect(player *Player, req *msg.ReqCollect) error { CollectMod := player.PlayMod.getCollectMod() rewardType := collectCfg.GetRewardType(int(req.Id)) var num int @@ -4570,12 +4090,7 @@ func ReqCollect(player *Player, buf []byte) error { } // 获取出售棋子获得的星星数量 -func ReqSellChessNum(player *Player, buf []byte) error { - req := &msg.ReqSellChessNum{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSellChessNum(player *Player, req *msg.ReqSellChessNum) error { data, _ := mergeDataCfg.GetOne(int(req.ChessId)) num := data.SellNum limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -4589,12 +4104,7 @@ func ReqSellChessNum(player *Player, buf []byte) error { } // 设置宠物装扮 -func ReqPlayroomDressSet(player *Player, buf []byte) error { - req := &msg.ReqPlayroomDressSet{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomDressSet(player *Player, req *msg.ReqPlayroomDressSet) error { PlayroomMod := player.PlayMod.getPlayroomMod() parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet)) if error != nil { @@ -4615,12 +4125,7 @@ func ReqPlayroomDressSet(player *Player, buf []byte) error { } // 设置宠物挂件 弃用 -func ReqPlayroomPetAirSet(player *Player, buf []byte) error { - req := &msg.ReqPlayroomPetAirSet{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomPetAirSet(player *Player, req *msg.ReqPlayroomPetAirSet) error { PlayroomMod := player.PlayMod.getPlayroomMod() error := PlayroomMod.PlayroomPetAirSet(int(req.PetAirSet)) if error != nil { @@ -4639,8 +4144,7 @@ func ReqPlayroomPetAirSet(player *Player, buf []byte) error { } // 幸运猫活动领取奖励 -func ReqLimitEventLuckyCat(player *Player, buf []byte) error { - req := &msg.ReqLimitEventLuckyCat{} +func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() err := LimitedTimeEventMod.LuckyCat(int(req.ChessId)) if err != nil { @@ -4683,12 +4187,7 @@ func ReqLimitEventLuckyCat(player *Player, buf []byte) error { } // 领取加赠活动奖励 -func ReqAddGiftReward(player *Player, buf []byte) error { - req := &msg.ReqAddGiftReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error { activityInfo := player.GetActivityInfo(activity.ACT_TYPE_ADD_GIFT) if activityInfo == nil { player.SendErrClienRes(&msg.ResActivityReward{ @@ -4724,12 +4223,7 @@ func ReqAddGiftReward(player *Player, buf []byte) error { } // 领取活动奖励 -func ReqActivityReward(player *Player, buf []byte) error { - req := &msg.ReqActivityReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error { activityInfo := player.GetActivityInfo(int(req.Id)) if activityInfo == nil { player.SendErrClienRes(&msg.ResActivityReward{ @@ -4768,12 +4262,7 @@ func ReqActivityReward(player *Player, buf []byte) error { return nil } -func ReqLang(player *Player, buf []byte) error { - req := &msg.ReqLang{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqLang(player *Player, req *msg.ReqLang) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetLang(req.Lang) player.PushClientRes(&msg.ResLang{ @@ -4782,12 +4271,7 @@ func ReqLang(player *Player, buf []byte) error { return nil } -func ReqAdWatch(player *Player, buf []byte) error { - req := &msg.ReqAdWatch{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAdWatch(player *Player, req *msg.ReqAdWatch) error { ChargeMod := player.GetChargeMod() ChargeMod.AddAdWatch() player.TeLog("ad_watch", map[string]interface{}{ @@ -4800,12 +4284,8 @@ func ReqAdWatch(player *Player, buf []byte) error { }) return nil } -func ReqCatTrickReward(player *Player, buf []byte) error { - req := &msg.ReqCatTrickReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } + +func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK) { player.SendErrClienRes(&msg.ResCatTrickReward{ @@ -4842,12 +4322,7 @@ func ReqCatTrickReward(player *Player, buf []byte) error { return nil } -func ReqChargeReceive(player *Player, buf []byte) error { - req := &msg.ReqChargeReceive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChargeReceive(player *Player, req *msg.ReqChargeReceive) error { FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), To: int(req.Uid), @@ -4861,12 +4336,7 @@ func ReqChargeReceive(player *Player, buf []byte) error { return nil } -func ReqAddWish(player *Player, buf []byte) error { - req := &msg.ReqAddWish{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAddWish(player *Player, req *msg.ReqAddWish) error { ChargeMod := player.PlayMod.getChargeMod() items, err := ChargeMod.AddWish(int(req.Id), int(req.Type)) if err != nil { @@ -4898,12 +4368,7 @@ func ReqAddWish(player *Player, buf []byte) error { return nil } -func ReqGetWish(player *Player, buf []byte) error { - req := &msg.ReqGetWish{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetWish(player *Player, req *msg.ReqGetWish) error { ChargeMod := player.PlayMod.getChargeMod() items, err := ChargeMod.GetWish() if err != nil { @@ -4933,14 +4398,9 @@ func ReqGetWish(player *Player, buf []byte) error { return nil } -func ReqSendWishBeg(player *Player, buf []byte) error { - req := &msg.ReqSendWishBeg{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSendWishBeg(player *Player, req *msg.ReqSendWishBeg) error { 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, @@ -4967,12 +4427,7 @@ func ReqSendWishBeg(player *Player, buf []byte) error { } // TODO 心愿单功能 待开发 -func ReqWishApplyList(player *Player, buf []byte) error { - req := &msg.ReqWishApplyList{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqWishApplyList(player *Player, req *msg.ReqWishApplyList) error { FriendMod := player.PlayMod.getFriendMod() list := FriendMod.GetWishApply() rs := make([]*msg.ResFriendApplyInfo, 0) @@ -4994,14 +4449,9 @@ func ReqWishApplyList(player *Player, buf []byte) error { return nil } -func ReqWishApply(player *Player, buf []byte) error { - req := &msg.ReqWishApply{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqWishApply(player *Player, req *msg.ReqWishApply) error { 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, @@ -5026,12 +4476,7 @@ func ReqWishApply(player *Player, buf []byte) error { return nil } -func ReqGuidePlayroom(player *Player, buf []byte) error { - req := &msg.ReqGuidePlayroom{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error { GuideMod := player.PlayMod.getGuideMod() isReward := GuideMod.GetPlayroomGuide() if isReward { @@ -5042,7 +4487,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, @@ -5058,12 +4503,7 @@ func ReqGuidePlayroom(player *Player, buf []byte) error { return nil } -func ReqId2Verify(player *Player, buf []byte) error { - req := &msg.ReqId2Verify{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error { if req.Id == "" || req.Name == "" { player.SendErrClienRes(&msg.ResId2Verify{ ResultCode: msg.RES_CODE_FAIL, @@ -5071,7 +4511,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, @@ -5092,12 +4532,7 @@ func ReqId2Verify(player *Player, buf []byte) error { return nil } -func ReqPlayroomGameShowReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomGameShowReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomGameShowReward(player *Player, req *msg.ReqPlayroomGameShowReward) error { items := player.GetPlayroomGameReward(int(req.Type), int(req.SelectId)) player.PushClientRes(&msg.ResPlayroomGameShowReward{ Items: item.ItemToMsg(items), @@ -5105,14 +4540,9 @@ func ReqPlayroomGameShowReward(player *Player, buf []byte) error { return nil } -func ReqPlayroomGuide(player *Player, buf []byte) error { - req := &msg.ReqPlayroomGuide{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomGuide(player *Player, req *msg.ReqPlayroomGuide) error { 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, @@ -5131,18 +4561,13 @@ func ReqPlayroomGuide(player *Player, buf []byte) error { return nil } -func ReqCatnip(player *Player, buf []byte) error { +func ReqCatnip(player *Player, req *msg.ReqCatnip) error { player.CatnipBackData() return nil } // TODO : 猫草大作战邀请好友 -func ReqCatnipInvite(player *Player, buf []byte) error { - req := &msg.ReqCatnipInvite{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error { activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipInvite{ @@ -5153,7 +4578,7 @@ func ReqCatnipInvite(player *Player, buf []byte) error { } activityInfo := player.GetActivityInfo(activityId) CatnipMod := player.PlayMod.getCatnipMod() - err = CatnipMod.Invite(int(req.Uid), int(req.Id)) + err := CatnipMod.Invite(int(req.Uid), int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResCatnipInvite{ Code: msg.RES_CODE_FAIL, @@ -5183,12 +4608,7 @@ func ReqCatnipInvite(player *Player, buf []byte) error { return nil } -func ReqCatnipAgree(player *Player, buf []byte) error { - req := &msg.ReqCatnipAgree{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) activityInfo := player.GetActivityInfo(activityId) @@ -5199,7 +4619,7 @@ func ReqCatnipAgree(player *Player, buf []byte) error { }) return fmt.Errorf("activity not active") } - _, err = CatnipMod.Agree(int(req.Id), int(req.Uid)) + _, err := CatnipMod.Agree(int(req.Id), int(req.Uid)) if err != nil { player.SendErrClienRes(&msg.ResCatnipAgree{ Code: msg.RES_CODE_FAIL, @@ -5238,12 +4658,7 @@ func ReqCatnipAgree(player *Player, buf []byte) error { } // TODO : 猫草大作战设置倍数 -func ReqCatnipMultiply(player *Player, buf []byte) error { - req := &msg.ReqCatnipMultiply{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5253,7 +4668,7 @@ func ReqCatnipMultiply(player *Player, buf []byte) error { }) return fmt.Errorf("activity not active") } - err = CatnipMod.Multiply(int(req.Multiply)) + err := CatnipMod.Multiply(int(req.Multiply)) if err != nil { player.SendErrClienRes(&msg.ResCatnipMultiply{ Code: msg.RES_CODE_FAIL, @@ -5274,12 +4689,7 @@ func ReqCatnipMultiply(player *Player, buf []byte) error { } // TODO : 猫草大作战开始游戏 -func ReqCatnipPlay(player *Player, buf []byte) error { - req := &msg.ReqCatnipPlay{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5336,12 +4746,7 @@ func ReqCatnipPlay(player *Player, buf []byte) error { } // TODO : 猫草大作战领取奖励 -func ReqCatnipReward(player *Player, buf []byte) error { - req := &msg.ReqCatnipReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5382,12 +4787,7 @@ func ReqCatnipReward(player *Player, buf []byte) error { } // 猫草大作战领取大奖 -func ReqCatnipGrandReward(player *Player, buf []byte) error { - req := &msg.ReqCatnipGrandReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5424,12 +4824,7 @@ func ReqCatnipGrandReward(player *Player, buf []byte) error { return nil } -func ReqCatnipRefuse(player *Player, buf []byte) error { - req := &msg.ReqCatnipRefuse{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5439,7 +4834,7 @@ func ReqCatnipRefuse(player *Player, buf []byte) error { }) return fmt.Errorf("activity not active") } - 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, @@ -5469,12 +4864,12 @@ func ReqCatnipRefuse(player *Player, buf []byte) error { return nil } -func ReqActPass(player *Player, buf []byte) error { +func ReqActPass(player *Player, req *msg.ReqActPass) error { player.ActPassBackData() return nil } -func ReqActPassReward(player *Player, buf []byte) error { +func ReqActPassReward(player *Player, req *msg.ReqActPassReward) error { PassMod := player.PlayMod.getPassMod() items, newLevel := PassMod.GetRewardItems() err := player.HandleItem(items, msg.ITEM_POP_LABEL_ActPassReward.String()) @@ -5497,12 +4892,7 @@ func ReqActPassReward(player *Player, buf []byte) error { return nil } -func ReqGetChessRetireReward(player *Player, buf []byte) error { - req := &msg.ReqGetChessRetireReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) error { ChessMod := player.PlayMod.getChessMod() items, err := ChessMod.GetRetireReward(req.Id) if err != nil { @@ -5533,12 +4923,7 @@ func ReqGetChessRetireReward(player *Player, buf []byte) error { return nil } -func ReqCatnipEmoji(player *Player, buf []byte) error { - req := &msg.ReqCatnipEmoji{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go index f0334c05..a68b98d6 100644 --- a/src/server/game/req_func_friend.go +++ b/src/server/game/req_func_friend.go @@ -13,11 +13,9 @@ import ( GoUtil "server/game_util" "server/msg" "strconv" - - "google.golang.org/protobuf/proto" ) -func ReqFriendRecommend(player *Player, buf []byte) error { +func ReqFriendRecommend(player *Player, req *msg.ReqFriendRecommend) error { FriendMod := player.PlayMod.getFriendMod() RecommendList := make([]*msg.ResPlayerSimple, 0) FriendNum := FriendMod.GetFriendNum() @@ -56,12 +54,7 @@ func ReqFriendRecommend(player *Player, buf []byte) error { } // 搜索用户 -func ReqSearchPlayer(player *Player, buf []byte) error { - req := &msg.ReqSearchPlayer{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSearchPlayer(player *Player, req *msg.ReqSearchPlayer) error { Uid, err := strconv.Atoi(req.Uid) list := make([]*msg.ResPlayerSimple, 0) if err == nil { @@ -102,12 +95,7 @@ func ReqSearchPlayer(player *Player, buf []byte) error { } // 申请好友 -func ReqApplyFriend(player *Player, buf []byte) error { - req := &msg.ReqApplyFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error { Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() if Uid == int(player.M_DwUin) { @@ -195,12 +183,7 @@ func ReqApplyFriend(player *Player, buf []byte) error { } // 同意申请 -func ReqAgreeFriend(player *Player, buf []byte) error { - req := &msg.ReqAgreeFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error { Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() if !FriendMod.CheckApply(Uid) { @@ -247,12 +230,7 @@ func ReqAgreeFriend(player *Player, buf []byte) error { } // 删除好友 -func ReqDelFriend(player *Player, buf []byte) error { - req := &msg.ReqDelFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDelFriend(player *Player, req *msg.ReqDelFriend) error { Uid := int(req.Uid) m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_DEL, @@ -277,12 +255,7 @@ func ReqDelFriend(player *Player, buf []byte) error { } // 拒绝申请 -func ReqRefuseFriend(player *Player, buf []byte) error { - req := &msg.ReqRefuseFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseFriend(player *Player, req *msg.ReqRefuseFriend) error { Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() FriendMod.RefuseApply(Uid) @@ -304,32 +277,27 @@ func ReqRefuseFriend(player *Player, buf []byte) error { return nil } -func ReqFriendList(player *Player, buf []byte) error { +func ReqFriendList(player *Player, req *msg.ReqFriendList) error { player.FriendListBackData() return nil } -func ReqFriendApply(player *Player, buf []byte) error { +func ReqFriendApply(player *Player, req *msg.ReqFriendApply) error { player.FriendApplyBackData() return nil } -func ReqFriendCardMsg(player *Player, buf []byte) error { +func ReqFriendCardMsg(player *Player, req *msg.ReqFriendCardMsg) error { player.FriendCardBackData() return nil } -func ReqFriendTimeLine(player *Player, buf []byte) error { +func ReqFriendTimeLine(player *Player, req *msg.ReqFriendTimeLine) error { player.FriendLogBackData() return nil } -func ReqFriendTLUpvote(player *Player, buf []byte) error { - req := &msg.ReqFriendTLUpvote{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error { FriendMod := player.PlayMod.getFriendMod() Items, FUid, err := FriendMod.Upvote(int(req.Id)) if err != nil { @@ -370,12 +338,7 @@ func ReqFriendTLUpvote(player *Player, buf []byte) error { return nil } -func ReqFriendTReward(player *Player, buf []byte) error { - req := &msg.ReqFriendTReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTReward(player *Player, req *msg.ReqFriendTReward) error { FriendMod := player.PlayMod.getFriendMod() Items, err := FriendMod.GetReward(int(req.Id)) if err != nil { @@ -401,12 +364,7 @@ func ReqFriendTReward(player *Player, buf []byte) error { return nil } -func ReqFriendReplyHandle(player *Player, buf []byte) error { - req := &msg.ReqFriendReplyHandle{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error { FriendMod := player.PlayMod.getFriendMod() ReplyInfo := FriendMod.ReplyFriend(int(req.LogId)) if ReplyInfo == nil { @@ -486,7 +444,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { } } if len(items) > 0 { - 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, @@ -505,12 +463,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { return nil } -func ReqFriendByCode(player *Player, buf []byte) error { - req := &msg.ReqFriendByCode{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error { if req.Code == "" { player.SendErrClienRes(&msg.ResFriendByCode{ Code: msg.RES_CODE_FAIL, @@ -550,14 +503,9 @@ func ReqFriendByCode(player *Player, buf []byte) error { return nil } -func ReqAddNpc(player *Player, buf []byte) error { - req := &msg.ReqAddNpc{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAddNpc(player *Player, req *msg.ReqAddNpc) error { FriendMod := player.PlayMod.getFriendMod() - err = FriendMod.SetNpc(int(req.NpcId)) + err := FriendMod.SetNpc(int(req.NpcId)) if err != nil { player.SendErrClienRes(&msg.ResAddNpc{ Code: msg.RES_CODE_FAIL, diff --git a/src/server/game/req_func_fur.go b/src/server/game/req_func_fur.go index d107a030..a1a0087d 100644 --- a/src/server/game/req_func_fur.go +++ b/src/server/game/req_func_fur.go @@ -2,26 +2,19 @@ package game import ( "server/msg" - - "google.golang.org/protobuf/proto" ) -func ReqPetFur(player *Player, buf []byte) error { +func ReqPetFur(player *Player, req *msg.ReqPetFur) error { FurMod := player.GetFurMod() player.PushClientRes(FurMod.BackData()) return nil } -func ReqPetFurBuy(player *Player, buf []byte) error { - var req msg.ReqPetFurBuy - err := proto.Unmarshal(buf, &req) - if err != nil { - return err - } +func ReqPetFurBuy(player *Player, req *msg.ReqPetFurBuy) error { FurMod := player.GetFurMod() costList, AddItem := FurMod.GetFurBuyCost(int(req.FurId)) // 扣除物品 - err = player.HandleLoseItem(costList, msg.ITEM_POP_LABEL_PetFurShop.String()) + err := player.HandleLoseItem(costList, msg.ITEM_POP_LABEL_PetFurShop.String()) if err != nil { return err } @@ -34,14 +27,9 @@ func ReqPetFurBuy(player *Player, buf []byte) error { return nil } -func ReqFurSet(player *Player, buf []byte) error { - var req msg.ReqFurSet - err := proto.Unmarshal(buf, &req) - if err != nil { - return err - } +func ReqFurSet(player *Player, req *msg.ReqFurSet) error { FurMod := player.GetFurMod() - err = FurMod.SetFur(int(req.FurId)) + err := FurMod.SetFur(int(req.FurId)) if err != nil { return err }