From bb9b0510ce5de6689bf1ceec31510e36b2a979e3 Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Sun, 21 Sep 2025 08:07:17 +0000
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=B3=A8=E9=87=8A=EF=BC=8C=E7=A7=BB=E9=99=A4Java?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B3=A8=E8=A7=A3=E5=92=8C=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/service/fight/cmd.go            | 14 +++++---------
 logic/service/fight/info/info.go      | 10 ++++------
 logic/service/item/item.go            | 23 +++++++++--------------
 logic/service/login/create_player.go  |  5 ++---
 logic/service/nono/nono.go            |  4 ++--
 logic/service/pet/list.go             |  2 +-
 logic/service/pet/pet.go              |  4 ++--
 logic/service/room/FitmentShowInfo.go |  8 ++++----
 logic/service/task/AcceptTask.go      |  6 +++---
 logic/service/task/AddTask.go         |  8 ++++----
 logic/service/task/CompleteTask.go    | 18 +++++++++---------
 logic/service/task/Delete_Task.go     |  4 ++--
 logic/service/task/GetTask.go         |  8 ++++----
 modules/blazing/model/task.go         |  2 +-
 14 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/logic/service/fight/cmd.go b/logic/service/fight/cmd.go
index d7aa4cfd8..d02554afe 100644
--- a/logic/service/fight/cmd.go
+++ b/logic/service/fight/cmd.go
@@ -10,7 +10,7 @@ import (
 type FightNpcMonsterInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2408" struc:"[0]pad"`
 	// Number 地图刷新怪物结构体对应的序号（1-9的位置序号）
-	// @UInt long类型，使用uint32保持无符号特性
+
 	Number uint32 `fieldDesc:"地图刷新怪物结构体对应的序号 1 - 9 的位置序号" `
 }
 type ChallengeBossInboundInfo struct {
@@ -31,7 +31,7 @@ type EscapeFightInboundInfo struct {
 }
 
 // HandleFightInviteInboundInfo 处理战斗邀请的入站消息
-// 回空包就行
+
 type HandleFightInviteInboundInfo struct {
 	Head   player.TomeeHeader `cmd:"2403" struc:"[0]pad"`
 	UserID uint32             `json:"userId" codec:"userId,uint"` // 邀请我对战人的userid
@@ -39,16 +39,13 @@ type HandleFightInviteInboundInfo struct {
 	Mode   uint32             `json:"mode" codec:"mode,uint"`     // 战斗类型 1 = 1v1 2 = 6v6
 }
 
-// InviteToFightInboundInfo 对应 Java 的 InviteToFightInboundInfo 类
-// 实现 InboundMessage 接口
 type InviteToFightInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2401" struc:"[0]pad"`
-	// UserID 被邀请人的userid
-	// 对应 Java 注解: @FieldDescription("被邀请人的userid") @UInt
+
 	UserID uint32 `codec:"true"`
 
 	// Mode 战斗类型 1 = 1v1 2 = 6v6
-	// 对应 Java 注解: @FieldDescription("战斗类型 1 = 1v1 2 = 6v6") @UInt
+
 	Mode info.EnumBattleMode `codec:"true"`
 }
 
@@ -59,7 +56,6 @@ type NoteHandleFightInviteOutboundInfo struct {
 	Result   uint32 // 0=拒绝 1=同意 2=在线超6小时 3=无出战精灵 4=不在线
 }
 
-// 实现入站消息接口（Go中通过方法集隐式实现）
 type UseSkillInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2405" struc:"[0]pad"`
 	// 技能id，
@@ -73,6 +69,6 @@ type ChangePetInboundInfo struct {
 type CatchMonsterInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2409" struc:"[0]pad"`
 	// CapsuleId 胶囊id
-	// 对应Java的@UInt long类型，映射为uint64
+
 	CapsuleId uint32 `json:"capsuleId" fieldDescription:"胶囊id" uint:"true"`
 }
diff --git a/logic/service/fight/info/info.go b/logic/service/fight/info/info.go
index 01512ba17..15c698e19 100644
--- a/logic/service/fight/info/info.go
+++ b/logic/service/fight/info/info.go
@@ -266,13 +266,11 @@ type FightOverInfo struct {
 	LearnTimes     uint32 // 双倍学习器剩余次数
 }
 
-// CatchMonsterOutboundInfo 捕捉怪物的出站消息结构体
-// 对应Java的CatchMonsterOutboundInfo类
 type CatchMonsterOutboundInfo struct {
 	// CatchTime 捕捉时间
-	// 对应Java的@UInt long类型，映射为uint64
-	CatchTime uint32 `json:"catchTime" fieldDescription:"捕捉时间" uint:"true"`
+
+	CatchTime uint32 `json:"catchTime"  `
 	// PetId 宠物编号
-	// 对应Java的@UInt long类型，映射为uint64
-	PetId uint32 `json:"petId" fieldDescription:"宠物编号" uint:"true"`
+
+	PetId uint32 `json:"petId" `
 }
diff --git a/logic/service/item/item.go b/logic/service/item/item.go
index 0427ae24f..474dcfcd6 100644
--- a/logic/service/item/item.go
+++ b/logic/service/item/item.go
@@ -8,30 +8,25 @@ import (
 // 实现了入站消息接口（Go中通过方法集隐式实现）
 type ItemListInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2605" struc:"[0]pad"`
-	// 查询物品id的开始，对应Java的@UInt long
-	Param1 uint32 `fieldDesc:"查询物品id的开始" messageType:"Item_List"`
-	// 查询物品id的结尾，对应Java的@UInt long
-	Param2 uint32 `fieldDesc:"查询物品id的结尾"`
-	// 默认值2，对应Java的@UInt long
-	Param3 uint32 `fieldDesc:"默认值2"`
+	// 查询物品id的开始，
+	Param1 uint32
+	// 查询物品id的结尾
+	Param2 uint32
+	// 默认值2
+	Param3 uint32
 }
 
 type ItemListOutboundInfo struct {
 	// 物品列表，
-	ItemListLen uint32                 `struc:"sizeof=ItemList"`
-	ItemList    []model.SingleItemInfo `autoCodec:"true" messageType:"Item_List" fieldDesc:"物品列表"`
+	ItemListLen uint32 `struc:"sizeof=ItemList"`
+	ItemList    []model.SingleItemInfo
 }
 
-// SingleItemInfo 单个物品信息结构体，对应Java的SingleItemInfo类
-
 type GoldOnlineRemainInboundInfo struct {
 	Head player.TomeeHeader `cmd:"1106" struc:"[0]pad"`
 }
 
-// GoldOnlineRemainOutboundInfo 对应Java的GoldOnlineRemainOutboundInfo
-// 实现OutboundMessage接口，包含金豆数量信息
 type GoldOnlineRemainOutboundInfo struct {
 	// GoldNumber 金豆数量（后端返回实际数量需要*100）
-	// 对应Java的@UInt long类型，使用uint64
-	GoldNumber uint32 `json:"goldNumber" fieldDescription:"金豆数量, 后端返回实际数量需要*100" uint:"true"`
+	GoldNumber uint32 `json:"goldNumber" `
 }
diff --git a/logic/service/login/create_player.go b/logic/service/login/create_player.go
index 74123d264..0f186ca1b 100644
--- a/logic/service/login/create_player.go
+++ b/logic/service/login/create_player.go
@@ -19,12 +19,11 @@ type CreatePlayerOutInfo struct {
 type ChangePlayerNameInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2061" struc:"[0]pad"` //玩家登录
 
-	// 玩家昵称，@ArraySerialize注解
+	// 玩家昵称
 	Nickname string `struc:"[16]byte"` //  固定长度16字节
 }
 
-// ChangePlayerNameOutboundInfo 对应Java的ChangePlayerNameOutboundInfo类
 type ChangePlayerNameOutboundInfo struct {
-	UserID   uint32 `fieldDescription:"米米号" uint:"true"`
+	UserID   uint32
 	Nickname string `struc:"[16]byte"` //  固定长度16字节
 }
diff --git a/logic/service/nono/nono.go b/logic/service/nono/nono.go
index af5cce921..f70a25195 100644
--- a/logic/service/nono/nono.go
+++ b/logic/service/nono/nono.go
@@ -57,6 +57,6 @@ type NonoInboundInfo struct {
 	// 消息头部，命令ID对应MessageCommandIDRegistry.Nono_Info
 	Head player.TomeeHeader `cmd:"9003" struc:"[0]pad"`
 
-	// 米米号，对应Java的@UInt long类型
-	UserID uint32 `fieldDescription:"米米号" struc:"uint32" uint:"true"`
+	// 米米号
+	UserID uint32
 }
diff --git a/logic/service/pet/list.go b/logic/service/pet/list.go
index 2e8d30a04..477aa2942 100644
--- a/logic/service/pet/list.go
+++ b/logic/service/pet/list.go
@@ -12,7 +12,7 @@ type GetPetListOutboundInfo struct {
 
 // PetShortInfo 精灵简要信息结构体
 type PetShortInfo struct {
-	ID        uint32 // 精灵类型ID（对应Java中的id）
+	ID        uint32 // 精灵类型ID（
 	CatchTime uint32 // 精灵生成时间
 	Level     uint32 // 精灵等级
 	SkinID    uint32 // 精灵皮肤ID
diff --git a/logic/service/pet/pet.go b/logic/service/pet/pet.go
index 266c5f548..c3f12935d 100644
--- a/logic/service/pet/pet.go
+++ b/logic/service/pet/pet.go
@@ -67,14 +67,14 @@ type PetOneCureOutboundInfo struct {
 	CatchTime uint32 `json:"catchTime" fieldDescription:"精灵捕捉时间" uint:"true"`
 }
 
-// PetDefaultInboundInfo 对应Java的PetDefaultInboundInfo类
+// PetDefaultInboundInfo
 // 实现了InboundMessage接口
 type PetDefaultInboundInfo struct {
 	Head      player.TomeeHeader `cmd:"2308" struc:"[0]pad"`
 	CatchTime uint32             `json:"catchTime" fieldDescription:"精灵捕捉时间" uint:"true" autoCodec:"true" inboundMessageType:"Pet_Default"`
 }
 
-// PetDefaultOutboundInfo 对应Java的PetDefaultOutboundInfo类
+// PetDefaultOutboundInfo
 // 实现了OutboundMessage接口
 type PetDefaultOutboundInfo struct {
 	IsDefault uint32 `json:"isDefault" fieldDescription:"0: 首发设置失败，1: 首发设置成功" uint:"true" autoCodec:"true" outboundMessageType:"Pet_Default"`
diff --git a/logic/service/room/FitmentShowInfo.go b/logic/service/room/FitmentShowInfo.go
index 0b5ee0082..90b24f944 100644
--- a/logic/service/room/FitmentShowInfo.go
+++ b/logic/service/room/FitmentShowInfo.go
@@ -58,14 +58,14 @@ type FitmentAllOutboundInfo struct {
 	Fitments []FitmentItemInfo `codec:"auto" json:"fitments"`
 }
 
-// FitmentItemInfo 对应Java的FitmentItemInfo类
+// FitmentItemInfo
 type FitmentItemInfo struct {
-	// Id 家具id 或 默认房型id: 500001（对应Java的@UInt long id）
+	// Id 家具id 或 默认房型id: 500001（
 	Id uint32 `json:"id"`
 
-	// UsedCount 使用数量（默认房型id项目的使用数据固定为1）（对应Java的@UInt long usedCount）
+	// UsedCount 使用数量（默认房型id项目的使用数据固定为1）（
 	UsedCount uint32 `json:"usedCount"`
 
-	// AllCount 拥有数量（默认房型id项目的拥有数量固定为1）（对应Java的@UInt long allCount）
+	// AllCount 拥有数量（默认房型id项目的拥有数量固定为1）（
 	AllCount uint32 `json:"allCount"`
 }
diff --git a/logic/service/task/AcceptTask.go b/logic/service/task/AcceptTask.go
index 699c569d9..1d389f7c1 100644
--- a/logic/service/task/AcceptTask.go
+++ b/logic/service/task/AcceptTask.go
@@ -2,13 +2,13 @@ package task
 
 import "blazing/logic/service/player"
 
-// AcceptTaskInboundInfo 对应Java的AcceptTaskInboundInfo类
+// AcceptTaskInboundInfo
 // 用于接收任务的入站信息
 type AcceptTaskInboundInfo struct {
 	Head   player.TomeeHeader `cmd:"2201|2231" struc:"[0]pad"`
-	TaskId uint32             `json:"taskId" description:"任务ID"` // 任务ID，对应Java的@UInt long
+	TaskId uint32             `json:"taskId" description:"任务ID"` // 任务ID，
 }
 
 type AcceptTaskOutboundInfo struct {
-	TaskId uint32 `json:"taskId" description:"任务ID"` // 任务ID，对应Java的@UInt long
+	TaskId uint32 `json:"taskId" description:"任务ID"` // 任务ID，
 }
diff --git a/logic/service/task/AddTask.go b/logic/service/task/AddTask.go
index b59fa4cfe..5476b0f59 100644
--- a/logic/service/task/AddTask.go
+++ b/logic/service/task/AddTask.go
@@ -2,13 +2,13 @@ package task
 
 import "blazing/logic/service/player"
 
-// AddTaskBufInboundInfo 对应Java的AddTaskBufInboundInfo类
+// AddTaskBufInboundInfo
 // 用于接收添加任务缓冲区的入站信息
 type AddTaskBufInboundInfo struct {
 	Head     player.TomeeHeader `cmd:"2204|2235" struc:"[0]pad"`
-	TaskId   uint32             `json:"taskId" description:"任务ID"` // 任务ID，对应Java的@UInt long
-	TaskList []uint32           `struc:"[20]byte"`                 // 任务步骤信息，对应Java的@ArraySerialize注解
+	TaskId   uint32             `json:"taskId" description:"任务ID"` // 任务ID，
+	TaskList []uint32           `struc:"[20]byte"`                 // 任务步骤信息，
 }
 type AddTaskBufOutboundInfo struct {
-	// 该结构体没有字段，对应Java中的空类
+	// 该结构体没有字段，
 }
diff --git a/logic/service/task/CompleteTask.go b/logic/service/task/CompleteTask.go
index 63c697212..71e2ce090 100644
--- a/logic/service/task/CompleteTask.go
+++ b/logic/service/task/CompleteTask.go
@@ -4,20 +4,20 @@ import "blazing/logic/service/player"
 
 type CompleteTaskInboundInfo struct {
 	Head     player.TomeeHeader `cmd:"2202|2233" struc:"[0]pad"`
-	TaskId   uint32             `json:"taskId" description:"任务ID"` // 任务ID，对应Java的@UInt long
-	OutState uint32             `json:"outState"  分支"`             // 当前状态，1表示完成任务，对应Java的@UInt long
+	TaskId   uint32             `json:"taskId" description:"任务ID"` // 任务ID，
+	OutState uint32             `json:"outState"  分支"`             // 当前状态，1表示完成任务，
 }
 type CompleteTaskOutboundInfo struct {
-	TaskId      uint32     `json:"taskId" description:"任务ID"`           // 任务ID，对应Java的@UInt long
-	PetTypeId   uint32     `json:"petTypeId" description:"发放的精灵ID"`     // 发放的精灵ID，对应Java的@UInt long
-	CaptureTime uint32     `json:"captureTime" description:"发放的精灵捕获时间"` // 发放的精灵捕获时间，对应Java的@UInt long
+	TaskId      uint32     `json:"taskId" description:"任务ID"`           // 任务ID，
+	PetTypeId   uint32     `json:"petTypeId" description:"发放的精灵ID"`     // 发放的精灵ID，
+	CaptureTime uint32     `json:"captureTime" description:"发放的精灵捕获时间"` // 发放的精灵捕获时间，
 	ItemLen     uint32     `struc:"sizeof=ItemList"`
-	ItemList    []ItemInfo `json:"itemList" description:"发放物品的数组"` // 发放物品的数组，对应Java的List<ItemInfo>
+	ItemList    []ItemInfo `json:"itemList" description:"发放物品的数组"` // 发放物品的数组，
 }
 
-// ItemInfo 对应Java的ItemInfo类
+// ItemInfo
 // 用于表示发放物品的信息
 type ItemInfo struct {
-	ItemId    uint32 `json:"itemId" description:"发放物品ID"`     // 发放物品ID，对应Java的@UInt long
-	ItemCount uint32 `json:"itemCount" description:"发放物品的数量"` // 发放物品的数量，对应Java的@UInt long
+	ItemId    uint32 `json:"itemId" description:"发放物品ID"`     // 发放物品ID，
+	ItemCount uint32 `json:"itemCount" description:"发放物品的数量"` // 发放物品的数量，
 }
diff --git a/logic/service/task/Delete_Task.go b/logic/service/task/Delete_Task.go
index 9d3198358..adefefcab 100644
--- a/logic/service/task/Delete_Task.go
+++ b/logic/service/task/Delete_Task.go
@@ -2,10 +2,10 @@ package task
 
 import "blazing/logic/service/player"
 
-// DeleteTaskInboundInfo 对应Java的DeleteTaskInboundInfo类
+// DeleteTaskInboundInfo
 type DeleteTaskInboundInfo struct {
 	Head   player.TomeeHeader `cmd:"2205|2232" struc:"[0]pad"`
-	TaskId uint32             `json:"taskId" description:"任务ID"` // 使用uint64对应Java的@UInt long
+	TaskId uint32             `json:"taskId" description:"任务ID"` // 使用uint64
 }
 type DeleteTaskOutboundInfo struct {
 	TaskId uint32 `json:"taskId" description:"任务ID"` // 对应@UInt long和@FieldDescription
diff --git a/logic/service/task/GetTask.go b/logic/service/task/GetTask.go
index c20627942..0d8ea37e3 100644
--- a/logic/service/task/GetTask.go
+++ b/logic/service/task/GetTask.go
@@ -11,12 +11,12 @@ import (
 type GetTaskBufInboundInfo struct {
 	Head player.TomeeHeader `cmd:"2203|2234" struc:"[0]pad"`
 
-	TaskId uint32 `json:"taskId" description:"任务ID"` // 任务ID，对应Java的@UInt long
+	TaskId uint32 `json:"taskId" description:"任务ID"` // 任务ID，
 }
 type GetTaskBufOutboundInfo struct {
-	TaskId   uint32   `json:"taskId" description:"任务ID"` // 任务ID，对应Java的@UInt long
-	Flag     uint32   `json:"flag" description:"暂时未知"`   // 暂时未知，对应Java的@UInt long
-	TaskList []uint32 `struc:"[20]byte"`                 // 任务步骤信息，对应Java的@ArraySerialize注解
+	TaskId   uint32   `json:"taskId" description:"任务ID"` // 任务ID，
+	Flag     uint32   `json:"flag" description:"暂时未知"`   // 暂时未知，
+	TaskList []uint32 `struc:"[20]byte"`                 // 任务步骤信息，
 }
 
 // 获得任务数组
diff --git a/modules/blazing/model/task.go b/modules/blazing/model/task.go
index 169471afb..595e766ca 100644
--- a/modules/blazing/model/task.go
+++ b/modules/blazing/model/task.go
@@ -17,7 +17,7 @@ type Task struct {
 
 // TaskInfo 单个任务的详细信息，包含任务步骤状态和整体状态
 type TaskInfo struct {
-	// TaskInfo 任务步骤信息，对应Java的@ArraySerialize(FIXED_LENGTH=20)注解
+	// TaskInfo 任务步骤信息，
 	// struc:"[20]byte" 确保二进制序列化时固定20字节长度，json标签指定JSON字段名
 	//TaskID   uint32   `json:"task_id"` //区分是每日任务还是常规任务,常规为0,每日为1
 	Info []uint32 `struc:"[20]byte" json:"task_info"`