refactor: 重命名函数为标准命名规范

2026-04-29 04:30:19 +08:00
parent 4f7f1b5072
commit 99fd21e2fa
17 changed files with 50 additions and 50 deletions
--- a/logic/controller/action_大师杯.go
+++ b/logic/controller/action_大师杯.go
@@ -43,8 +43,8 @@ var masterCupRequiredItems = map[uint32][]ItemS{
 	},
 }

-// DASHIbei 处理控制器请求。
-func (h Controller) DASHIbei(req *C2s_MASTER_REWARDS, c *player.Player) (result *S2C_MASTER_REWARDS, err errorcode.ErrorCode) {
+// GetMasterCupRewards 处理控制器请求。
+func (h Controller) GetMasterCupRewards(req *C2s_MASTER_REWARDS, c *player.Player) (result *S2C_MASTER_REWARDS, err errorcode.ErrorCode) {
 	_ = req
 	result = &S2C_MASTER_REWARDS{}
 	items := c.Service.Item.Get(masterCupRewardItemMin, masterCupRewardItemMax)
@@ -53,8 +53,8 @@ func (h Controller) DASHIbei(req *C2s_MASTER_REWARDS, c *player.Player) (result
 	return
 }

-// DASHIbeiR 处理控制器请求。
-func (h Controller) DASHIbeiR(req *C2s_MASTER_REWARDSR, c *player.Player) (result *S2C_MASTER_REWARDSR, err errorcode.ErrorCode) {
+// ClaimMasterCupReward 处理控制器请求。
+func (h Controller) ClaimMasterCupReward(req *C2s_MASTER_REWARDSR, c *player.Player) (result *S2C_MASTER_REWARDSR, err errorcode.ErrorCode) {
 	result = &S2C_MASTER_REWARDSR{}

 	requiredItems, ok := masterCupRequiredItems[req.ElementType]
--- a/logic/controller/action_炫彩碎片.go
+++ b/logic/controller/action_炫彩碎片.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gogf/gf/v2/util/grand"
 )

-// Draw15To10WithBitSet 15抽10，返回标记抽取结果的uint32（位1表示选中）
+// drawTenOfFifteenBitset 15抽10，返回标记抽取结果的uint32（位1表示选中）
 // 规则：uint32的第n位（0≤n≤14）=1 → 选中第n+1号元素
-func Draw15To10WithBitSet() uint32 {
+func drawTenOfFifteenBitset() uint32 {
 	// 初始化随机数生成器
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))

@@ -37,8 +37,8 @@ func Draw15To10WithBitSet() uint32 {
 	return resultBits
 }

-// GET_XUANCAI 处理控制器请求。
-func (h Controller) GET_XUANCAI(data *C2s_GET_XUANCAI, c *player.Player) (result *S2C_GET_XUANCAI, err errorcode.ErrorCode) {
+// ClaimXuanCaiShards 处理控制器请求。
+func (h Controller) ClaimXuanCaiShards(data *C2s_GET_XUANCAI, c *player.Player) (result *S2C_GET_XUANCAI, err errorcode.ErrorCode) {
 	result = &S2C_GET_XUANCAI{}
 	selectedCount := 0        // 已选中的数量
 	res := c.Info.GetTask(13) //第一期
--- a/logic/controller/action_超时空隧道.go
+++ b/logic/controller/action_超时空隧道.go
@@ -10,7 +10,7 @@ import (
 )

 // 进入超时空隧道
-func (h Controller) TimeMap(data *C2s_SP, c *player.Player) (result *S2C_SP, err errorcode.ErrorCode) {
+func (h Controller) GetTimeTunnelMaps(data *C2s_SP, c *player.Player) (result *S2C_SP, err errorcode.ErrorCode) {
 	result = &S2C_SP{}
 	mapPitService := service.NewMapPitService()
 	maps := service.NewMapService().GetTimeMap()
--- a/logic/controller/active_寒流枪.go
+++ b/logic/controller/active_寒流枪.go
@@ -12,7 +12,7 @@ import (
 // data: 空输入结构
 // c: 当前玩家对象
 // 返回: 捕捉结果（消耗的EV值）和错误码
-func (h Controller) HanLiuQiang(data *C2S_2608, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ClaimColdFlowGunReward(data *C2S_2608, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	if c.ItemAdd(100245, 1) {
 		return
--- a/logic/controller/fight_base.go
+++ b/logic/controller/fight_base.go
@@ -182,8 +182,8 @@ func (h Controller) LoadPercent(data *LoadPercentInboundInfo, c *player.Player)
 	return nil, -1
 }

-// UsePetItemInboundInfo 使用宠物道具
-func (h Controller) UsePetItemInboundInfo(data *UsePetItemInboundInfo, c *player.Player) (result *info.UsePetIteminfo, err errorcode.ErrorCode) {
+// UsePetItemInFight 使用宠物道具
+func (h Controller) UsePetItemInFight(data *UsePetItemInboundInfo, c *player.Player) (result *info.UsePetIteminfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
--- a/logic/controller/fight_pvp_king.go
+++ b/logic/controller/fight_pvp_king.go
@@ -13,7 +13,7 @@ import (

 //大乱斗

-func (h Controller) PetMelee(data *StartPetWarInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) JoinPetMelee(data *StartPetWarInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	c.Fightinfo.Mode = info.BattleMode.PET_MELEE
 	c.Fightinfo.Status = info.BattleMode.PET_MELEE
@@ -71,8 +71,8 @@ func (h Controller) PetMelee(data *StartPetWarInboundInfo, c *player.Player) (re
 	return
 }

-// PetKing 处理控制器请求。
-func (h Controller) PetKing(data *PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// JoinPetKing 处理控制器请求。
+func (h Controller) JoinPetKing(data *PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL
 	// ElementTypeNumbers 是控制器层共享变量。
--- a/logic/controller/fight_塔.go
+++ b/logic/controller/fight_塔.go
@@ -35,7 +35,7 @@ type towerChoiceState struct {
 }

 // 暗黑门进入boss
-func (h Controller) FreshOpen(data *C2S_OPEN_DARKPORTAL, c *player.Player) (result *fight.S2C_OPEN_DARKPORTAL, err errorcode.ErrorCode) {
+func (h Controller) OpenDarkPortal(data *C2S_OPEN_DARKPORTAL, c *player.Player) (result *fight.S2C_OPEN_DARKPORTAL, err errorcode.ErrorCode) {
 	result = &fight.S2C_OPEN_DARKPORTAL{}

 	towerBosses := service.NewTower110Service().Boss(uint32(data.Level))
@@ -55,8 +55,8 @@ func (h Controller) FreshOpen(data *C2S_OPEN_DARKPORTAL, c *player.Player) (resu
 	return result, 0
 }

-// FreshChoiceFightLevel 处理玩家选择挑战模式（试炼之塔或勇者之塔）
-func (h Controller) FreshChoiceFightLevel(data *C2S_FRESH_CHOICE_FIGHT_LEVEL, c *player.Player) (result *fight.S2C_FreshChoiceLevelRequestInfo, err errorcode.ErrorCode) {
+// ChooseTowerFightLevel 处理玩家选择挑战模式（试炼之塔或勇者之塔）
+func (h Controller) ChooseTowerFightLevel(data *C2S_FRESH_CHOICE_FIGHT_LEVEL, c *player.Player) (result *fight.S2C_FreshChoiceLevelRequestInfo, err errorcode.ErrorCode) {
 	result = &fight.S2C_FreshChoiceLevelRequestInfo{}
 	c.Info.CurrentFreshStage = utils.Max(c.Info.CurrentFreshStage, 1)
 	c.Info.CurrentStage = utils.Max(c.Info.CurrentStage, 1)
@@ -81,8 +81,8 @@ func (h Controller) FreshChoiceFightLevel(data *C2S_FRESH_CHOICE_FIGHT_LEVEL, c
 	return result, 0
 }

-// FreshLeaveFightLevel 处理控制器请求。
-func (h Controller) FreshLeaveFightLevel(data *FRESH_LEAVE_FIGHT_LEVEL, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// LeaveTowerFightLevel 处理控制器请求。
+func (h Controller) LeaveTowerFightLevel(data *FRESH_LEAVE_FIGHT_LEVEL, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	_ = data
 	defer c.GetSpace().EnterMap(c)

@@ -92,8 +92,8 @@ func (h Controller) FreshLeaveFightLevel(data *FRESH_LEAVE_FIGHT_LEVEL, c *playe
 	return result, 0
 }

-// PetTawor 处理控制器请求。
-func (h Controller) PetTawor(data *StartTwarInboundInfo, c *player.Player) (result *fight.S2C_ChoiceLevelRequestInfo, err errorcode.ErrorCode) {
+// StartTowerFight 处理控制器请求。
+func (h Controller) StartTowerFight(data *StartTwarInboundInfo, c *player.Player) (result *fight.S2C_ChoiceLevelRequestInfo, err errorcode.ErrorCode) {
 	if err = c.CanFight(); err != 0 {
 		return nil, err
 	}
--- a/logic/controller/fight_巅峰.go
+++ b/logic/controller/fight_巅峰.go
@@ -20,8 +20,8 @@ type PetTOPLEVELnboundInfo struct {
 	TianxuanPetIDs    []uint32 `json:"tianxuanPetIds"`
 }

-// JoINtop 处理控制器请求。
-func (h Controller) JoINtop(data *PetTOPLEVELnboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// JoinPeakQueue 处理控制器请求。
+func (h Controller) JoinPeakQueue(data *PetTOPLEVELnboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	err = pvp.JoinPeakQueue(c, data.Mode)
 	if err != 0 {
 		return nil, err
--- a/logic/controller/fight_擂台.go
+++ b/logic/controller/fight_擂台.go
@@ -145,9 +145,9 @@ func (h Controller) ArenaGetInfo(data *ARENA_GET_INFO, c *player.Player) (result
 	return
 }

-// ArenaUpfight 放弃擂台挑战的包
-// ArenaUpfight 都需要通过2419包广播更新擂台状态
-func (h Controller) ArenaUpfight(data *ARENA_UPFIGHT, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// LeaveArena 放弃擂台挑战的包
+// LeaveArena 都需要通过2419包广播更新擂台状态
+func (h Controller) LeaveArena(data *ARENA_UPFIGHT, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	//原子操作，修改擂台状态
 	if atomic.LoadUint32(&c.GetSpace().Owner.UserID) != c.GetInfo().UserID { //说明已经有人了
 		return nil, errorcode.ErrorCodes.ErrChampionCannotCancel
@@ -164,12 +164,12 @@ func (h Controller) ArenaUpfight(data *ARENA_UPFIGHT, c *player.Player) (result

 }

-// ArenaOwnerAcce 此包为擂台战对战结束后 胜方前端会发送给后端 具体作用为通知后端发送2419包更新擂台信息。
+// ConfirmArenaFightResult 此包为擂台战对战结束后 胜方前端会发送给后端 具体作用为通知后端发送2419包更新擂台信息。
 // 前端到后端无数据内容
 // 后端到前端无数据内容
 // public static const ARENA_OWENR_OUT:uint = 2423;
-// ArenaOwnerAcce 此包不清楚具体怎么触发 但已知此包为后端主动发送。不清楚什么情况下回用到
-func (h Controller) ArenaOwnerAcce(data *ARENA_OWENR_ACCE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// ConfirmArenaFightResult 此包不清楚具体怎么触发 但已知此包为后端主动发送。不清楚什么情况下回用到
+func (h Controller) ConfirmArenaFightResult(data *ARENA_OWENR_ACCE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	s := c.GetSpace()

--- a/logic/controller/inbound_user.go
+++ b/logic/controller/inbound_user.go
@@ -16,8 +16,8 @@ type MAIN_LOGIN_IN struct {
 	Sid  []byte             `struc:"[16]byte"`
 }

-// CheakSession 校验登录session。
-func (l *MAIN_LOGIN_IN) CheakSession() (bool, uint32) {
+// CheckSession 校验登录session。
+func (l *MAIN_LOGIN_IN) CheckSession() (bool, uint32) {
 	t1 := hex.EncodeToString(l.Sid)
 	r, err := cool.CacheManager.Get(context.Background(), fmt.Sprintf("session:%d", l.Head.UserID))
 	if err != nil {
--- a/logic/controller/item_use.go
+++ b/logic/controller/item_use.go
@@ -69,7 +69,7 @@ func (h Controller) UsePetItemOutOfFight(data *C2S_USE_PET_ITEM_OUT_OF_FIGHT, c
 			refreshPetPaneKeepHP(currentPet, oldHP)
 		}
 	case itemID == 300212:
-		errcode = h.handlexuancaiItem(currentPet, c)
+		errcode = h.handleXuanCaiItem(currentPet, c)
 	case itemCfg.Bonus != 0:
 		errcode = errorcode.ErrorCodes.ErrItemUnusable
 	case itemCfg.HP != 0:
@@ -121,7 +121,7 @@ func (h Controller) handleNeuronItem(currentPet *model.PetInfo, c *player.Player
 }

 // 炫彩碎片 处理神300212
-func (h Controller) handlexuancaiItem(currentPet *model.PetInfo, c *player.Player) errorcode.ErrorCode {
+func (h Controller) handleXuanCaiItem(currentPet *model.PetInfo, c *player.Player) errorcode.ErrorCode {
 	petCfg, ok := xmlres.PetMAP[int(currentPet.ID)]
 	if !ok {
 		return errorcode.ErrorCodes.ErrSystemError
@@ -302,12 +302,12 @@ func (h Controller) UseSpeedupItem(data *C2S_USE_SPEEDUP_ITEM, c *player.Player)
 // 能量吸收器相关方法
 // ==============================

-// UseEnergyXishou 使用能量吸收器
+// UseEnergyAbsorber 使用能量吸收器
 // data: 包含使用的能量吸收器物品ID的输入信息
 // c: 当前玩家对象
 // 返回: 无数据（响应包单独组装）和错误码
 // 说明：使用后扣减道具并更新玩家能量吸收器剩余次数
-func (h Controller) UseEnergyXishou(data *C2S_USE_ENERGY_XISHOU, c *player.Player) (result *item.S2C_USE_ENERGY_XISHOU, err errorcode.ErrorCode) {
+func (h Controller) UseEnergyAbsorber(data *C2S_USE_ENERGY_XISHOU, c *player.Player) (result *item.S2C_USE_ENERGY_XISHOU, err errorcode.ErrorCode) {
 	// 1. 校验道具是否存在且数量充足
 	itemCount := c.Service.Item.CheakItem(data.ItemID)
 	if itemCount <= 0 {
--- a/logic/controller/login_main.go
+++ b/logic/controller/login_main.go
@@ -51,7 +51,7 @@ func (h Controller) Login(data *MAIN_LOGIN_IN, c gnet.Conn) (result *user.LoginM
 		defer c.Close()
 		return
 	}
-	isSessionValid, hashcode := data.CheakSession()
+	isSessionValid, hashcode := data.CheckSession()
 	if !isSessionValid {

 		defer c.Close()
--- a/logic/controller/pet_elo.go
+++ b/logic/controller/pet_elo.go
@@ -12,8 +12,8 @@ import (
 	"github.com/jinzhu/copier"
 )

-// PetELV 处理控制器请求。
-func (h Controller) PetELV(data *C2S_PET_EVOLVTION, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// EvolvePet 处理控制器请求。
+func (h Controller) EvolvePet(data *C2S_PET_EVOLVTION, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	_, currentPet, found := c.FindPet(data.CacthTime)
 	if !found {
 		return nil, errorcode.ErrorCodes.Err10401
--- a/logic/controller/pet_ev.go
+++ b/logic/controller/pet_ev.go
@@ -12,11 +12,11 @@ const (
 	petEVMaxSingle uint32 = 255
 )

-// PetEVDiy 自定义分配宠物努力值（EV）
+// CustomizePetEV 自定义分配宠物努力值（EV）
 // data: 包含宠物捕获时间和EV分配数据的输入信息
 // c: 当前玩家对象
 // 返回: 分配结果和错误码
-func (h Controller) PetEVDiy(data *PetEV, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) CustomizePetEV(data *PetEV, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	slot, found := c.FindPetBagSlot(data.CacthTime)
 	if !found {
 		return nil, errorcode.ErrorCodes.Err10401
--- a/logic/controller/pet_ev_test.go
+++ b/logic/controller/pet_ev_test.go
@@ -7,7 +7,7 @@ import (
 	playermodel "blazing/modules/player/model"
 )

-func TestPetEVDiy_AppliesToBackupPet(t *testing.T) {
+func TestCustomizePetEV_AppliesToBackupPet(t *testing.T) {
 	p := player.NewPlayer(nil)
 	p.Info = &playermodel.PlayerInfo{
 		EVPool: 20,
@@ -28,9 +28,9 @@ func TestPetEVDiy_AppliesToBackupPet(t *testing.T) {
 		EVs:       [6]uint32{0, 8, 4, 0, 0, 0},
 	}

-	_, err := (Controller{}).PetEVDiy(data, p)
+	_, err := (Controller{}).CustomizePetEV(data, p)
 	if err != 0 {
-		t.Fatalf("PetEVDiy returned error: %v", err)
+		t.Fatalf("CustomizePetEV returned error: %v", err)
 	}

 	got := p.Info.BackupPetList[0].Ev
--- a/logic/controller/user_action.go
+++ b/logic/controller/user_action.go
@@ -102,11 +102,11 @@ func (h Controller) ChangePlayerDoodle(data *ChangeDoodleInboundInfo, player *pl
 	return
 }

-// ChangeNONOColor 修改NONO颜色
+// ChangeNonoColor 修改NONO颜色
 // data: 包含NONO颜色信息的输入数据
 // player: 当前玩家对象
 // 返回: NONO颜色更改结果和错误码
-func (h Controller) ChangeNONOColor(data *ChangeNONOColorInboundInfo, player *player.Player) (result *user.ChangeNONOColorOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ChangeNonoColor(data *ChangeNONOColorInboundInfo, player *player.Player) (result *user.ChangeNONOColorOutboundInfo, err errorcode.ErrorCode) {
 	//player.Info.Coins -= 200
 	player.Info.NONO.NonoColor = data.Color

@@ -185,8 +185,8 @@ func (h Controller) ChangePlayerName(data *ChangePlayerNameInboundInfo, c *playe
 	return result, 0
 }

-// ChangeTile 处理控制器请求。
-func (h Controller) ChangeTile(data *ChangeTitleInboundInfo, c *player.Player) (result *user.ChangeTitleOutboundInfo, err errorcode.ErrorCode) {
+// ChangeTitle 处理控制器请求。
+func (h Controller) ChangeTitle(data *ChangeTitleInboundInfo, c *player.Player) (result *user.ChangeTitleOutboundInfo, err errorcode.ErrorCode) {
 	result = &user.ChangeTitleOutboundInfo{

 		UserID: c.Info.UserID,
--- a/logic/controller/user_cdk.go
+++ b/logic/controller/user_cdk.go
@@ -11,8 +11,8 @@ import (
 	"time"
 )

-// CDK 处理控制器请求。
-func (h Controller) CDK(data *C2S_GET_GIFT_COMPLETE, player *logicplayer.Player) (result *user.S2C_GET_GIFT_COMPLETE, err errorcode.ErrorCode) {
+// RedeemGiftCode 处理控制器请求。
+func (h Controller) RedeemGiftCode(data *C2S_GET_GIFT_COMPLETE, player *logicplayer.Player) (result *user.S2C_GET_GIFT_COMPLETE, err errorcode.ErrorCode) {
 	result = &user.S2C_GET_GIFT_COMPLETE{}

 	userInfo := baseservice.NewBaseSysUserService().GetPerson(data.Head.UserID)