From 36723ae9517f34be4a476e87314660868f370bea Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 7 Apr 2026 16:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/GameLogic.go | 29 ++++++++++++------------ src/server/game/register_network_func.go | 18 +++++++-------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go index fa32b36b..a598cb0e 100644 --- a/src/server/game/GameLogic.go +++ b/src/server/game/GameLogic.go @@ -724,19 +724,19 @@ func (ad *GameLogic) RegisterNetWorkFunc() { RegisterNewMsgProcessFunc("ReqId2Verify", ReqId2Verify) // 身份证验证 // 玩家 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) // 观看广告 + RegisterNewMsgProcessFunc("ReqSetName", ReqSetName) // 设置名字 + RegisterNewMsgProcessFunc("ReqLang", ReqLang) // 设置语言 + RegisterNewMsgProcessFunc("ReqSetPetName", ReqSetPetName) // 设置宠物名字 + RegisterNewMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl) // 设置facebook地址 + RegisterNewMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfo) // 请求玩家基本信息 + RegisterNewMsgProcessFunc("ReqKv", ReqKv) // 保存客户端数据 + RegisterNewMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD) // 看广告获取能量 + RegisterNewMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy) // 购买能量 + RegisterNewMsgProcessFunc("ReqAdWatch", ReqAdWatch) // 观看广告 // #region 棋盘 RegisterNewMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessData) RegisterNewMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessData) // 更新棋盘数据 - RegisterNewMsgProcessFunc("ReqSetEnergyMul", RegSetEneryFunc) //设置能量倍数 + RegisterNewMsgProcessFunc("ReqSetEnergyMul", ReqSetEnergyMul) //设置能量倍数 RegisterNewMsgProcessFunc("ReqChessEx", ReqChessEx) // 转换棋子 RegisterNewMsgProcessFunc("ReqGetChessFromBuff", ReqGetChessFromBuff) // 从buff中获取棋子 RegisterNewMsgProcessFunc("ReqPutPartInBag", ReqPutPartInBag) // 把零件放入背包 @@ -908,9 +908,10 @@ func (ad *GameLogic) RegisterNetWorkFunc() { RegisterNewMsgProcessFunc("ReqCatnipGrandReward", ReqCatnipGrandReward) // 猫草大作战领取大奖 RegisterNewMsgProcessFunc("ReqCatnipEmoji", ReqCatnipEmoji) // 猫猫回礼 - RegisterNewMsgProcessFunc("ReqCatReturnGift", ReqCatReturnGift) // 请求猫猫回礼数据 - RegisterNewMsgProcessFunc("ReqCatReturnGiftReward", ReqCatReturnGiftReward) // 领取猫猫回礼奖励 - RegisterNewMsgProcessFunc("ReqCatReturnGiftScore", ReqCatReturnGiftScore) // 领取猫猫回礼积分 + RegisterNewMsgProcessFunc("ReqCatReturnGift", ReqCatReturnGift) // 请求猫猫回礼数据 + RegisterNewMsgProcessFunc("ReqCatReturnGiftReward", ReqCatReturnGiftReward) // 领取猫猫回礼奖励 + RegisterNewMsgProcessFunc("ReqCatReturnGiftScore", ReqCatReturnGiftScore) // 领取猫猫回礼积分 + RegisterNewMsgProcessFunc("ReqCatReturnGiftRewardGift", ReqCatReturnGiftRewardGift) // 领取猫猫回礼奖励礼物 // 活动通行证 RegisterNewMsgProcessFunc("ReqActPass", ReqActPass) // 请求活动通行证数据 RegisterNewMsgProcessFunc("ReqActPassReward", ReqActPassReward) // 领取活动通行证奖励 @@ -931,7 +932,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() { RegisterNewMsgProcessFunc("ReqPlayroomFlipReward", ReqPlayroomFlipReward) // 翻牌奖励 RegisterNewMsgProcessFunc("ReqPlayroomChip", ReqPlayroomChip) // 消除碎片 RegisterNewMsgProcessFunc("ReqPlayroomOutline", ReqPlayroomOutline) // 打工离线 - RegisterNewMsgProcessFunc("ReqPlayroomWrokOutline", ReqPlayroomWrokOutline) // 打工离线完成 + RegisterNewMsgProcessFunc("ReqPlayroomWorkOutline", ReqPlayroomWorkOutline) // 打工离线完成 RegisterNewMsgProcessFunc("ReqPlayroomShop", ReqPlayroomShop) // playroom 商店 RegisterNewMsgProcessFunc("ReqPlayroomBuyItem", ReqPlayroomBuyItem) // 购买playroom物品 RegisterNewMsgProcessFunc("ReqPlayroomUpvote", ReqPlayroomUpvote) // 点赞别人的playroom diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index 53762087..279dcc29 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -47,7 +47,7 @@ func ReqPlayerAsset(player *Player, req *msg.ReqPlayerAsset) error { } // 请求玩家基础信息 -func ReqPlayerBaseInfofunction(player *Player, req *msg.ReqPlayerBaseInfo) error { +func ReqPlayerBaseInfo(player *Player, req *msg.ReqPlayerBaseInfo) error { player.PlayerBaseMod.ResPlayerBaseInfo(player) return nil } @@ -123,7 +123,7 @@ func ReqSynGameData(player *Player, req *msg.ReqSynGameData) error { return nil } -func RegSetEneryFunc(player *Player, req *msg.ReqSetEnergyMul) error { +func ReqSetEnergyMul(player *Player, req *msg.ReqSetEnergyMul) error { maxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) BaseMod := player.PlayMod.getBaseMod() energyMul := BaseMod.GetEnergyMul() @@ -1957,7 +1957,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error } // 同意卡牌交换 -func ReqAgreeCardExchange(player *Player, req *msg.ReqSelectCardExchange) error { +func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2145,7 +2145,7 @@ func ReqRank(player *Player, req *msg.ReqRank) error { } // 请求竞标赛榜单 -func ReqChampshipRank(player *Player, req *msg.ReqRank) error { +func ReqChampshipRank(player *Player, req *msg.ReqChampshipRank) error { res, err := SendMsgToCenterSync(&MsqMod.Msg{ From: int(player.M_DwUin), HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_RANK_LIST, @@ -2162,7 +2162,7 @@ func ReqChampshipRank(player *Player, req *msg.ReqRank) error { return nil } -func ReqChampshipPreRank(player *Player, req *msg.ReqRank) error { +func ReqChampshipPreRank(player *Player, req *msg.ReqChampshipPreRank) error { res, err := SendMsgToCenterSync(&MsqMod.Msg{ From: int(player.M_DwUin), HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_PRE_RANK, @@ -3777,12 +3777,12 @@ func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error { return nil } -func ReqPlayroomWrokOutline(player *Player, req *msg.ReqPlayroomWrokOutline) error { +func ReqPlayroomWorkOutline(player *Player, req *msg.ReqPlayroomWorkOutline) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.SetWorkOutline(0) player.PlayMod.save() player.PushClientRes(PlayroomMod.NotifyStatus()) - player.PushClientRes(&msg.ResPlayroomWrokOutline{ + player.PushClientRes(&msg.ResPlayroomWorkOutline{ Code: msg.RES_CODE_SUCCESS, }) return nil @@ -5019,11 +5019,11 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err return nil } -func ReqCatReturnGiftRewardGfit(player *Player, req *msg.ReqCatReturnGiftRewardGfit) error { +func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardGift) error { items := limitedTimeEventCfg.GetCatReturnGiftItems() err := player.HandleLoseItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String()) if err != nil { - player.SendErrClienRes(&msg.ResCatReturnGiftRewardGfit{ + player.SendErrClienRes(&msg.ResCatReturnGiftRewardGift{ Code: msg.RES_CODE_FAIL, Msg: err.Error(), })