1

道具扣除判断，因为判断扣完大于0，所以导致只剩一个的时候，道具成功使用但是不会扣除数量

.gitignore

@@ -46,4 +46,5 @@ public/login-linux-amd64
 .cache/gomod/**
 public/login-login-linux-amd64
 public/logic_linux-amd64_1
-.cache/**
+.cache/**
+.agents/**

.ide/Dockerfile

@@ -18,9 +18,11 @@ ENV GOMODCACHE=/workspace/.cache/gomod
 # ==========================================
 # 2. Codex 配置 (更换时修改这里，重新 build)
 # ==========================================
-ENV CODEX_BASE_URL="https://kuaipao.ai/v1"
-ENV CODEX_MODEL="gpt-5.3-codex"
-ENV OPENAI_API_KEY="sk-iv5TV88RjnnKiZtkROKjiR0tN9GTVPyV02nf9bxCqawUjqZG"
+ENV CODEX_BASE_URL="https://api.jucode.cn/v1"
+
+ENV CODEX_MODEL="gpt-5.4"
+
+ENV OPENAI_API_KEY="sk-E0ZZIFNnD0RkhMC9pT2AGMutz9vNy2VLNrgyyobT5voa81pQ"
 
 # ==========================================
 # 3. 安装系统依赖、Golang、Code-server

.ide/help.md

@@ -1,12 +1,7 @@
-青氧,十九禁给
-https://api.aibh.site/console  张晟    2922919493Zs.
-RUN curl -fsSL https://oss.itbzzb.cn/setup-codex.sh | \
-    YES=1 bash -s -- --base-url https://api.aibh.site \
-    --api-key sk-foAHgsJtmanACECtBlFYZE2z4LkwBboEOYETO3ZdWvCxdmNr \
-    --mirror auto
+ 
 
-
-https://api.gemai.cc/console/token  免费给部分额度 ,还有100块
+https://api.jucode.cn/  
+ fastai.fast 使用谷歌邮箱https://linshiguge.com/白嫖
 https://zread.ai/tawer-blog/lmarena-2api/1-overview   GLM web2 pai
 
 https://crazyrouter.com/console   模型最便宜,看看能不能1:10
@@ -14,7 +9,7 @@ https://crazyrouter.com/console   模型最便宜,看看能不能1:10
 https://agentrouter.org/pricing  签到给,有175
 
 
-kuaipao.ai  充了十块 cjf19970621  cjf19970621
+
 
 充了十块 
 使用网址：https://www.jnm.lol
@@ -26,3 +21,10 @@ kuaipao.ai  充了十块 cjf19970621  cjf19970621
 
 
 
+
+
+fastai.fast  575560454@qq.com 575560454
+
+
+
+

.vscode/launch.json

@@ -29,7 +29,7 @@
       "request": "launch",
       "mode": "auto",
       "cwd": "${workspaceFolder}",
-      "args": ["-id=2"],
+      "args": ["-id=99"],
 
       "program": "${workspaceFolder}/logic"
     }

.woodpecker/my-first-workflow.yaml

@@ -144,14 +144,14 @@ steps:
   scp-exe-to-servers:  # 与fetch-deploy-config同级，缩进2个空格
     image: appleboy/drone-scp:1.6.2  # 子元素，缩进4个空格
     settings:  # 子元素，缩进4个空格
-      host: &ssh_host 2697v22.mc5173.cn
-      port: &ssh_port 16493
+      host: &ssh_host  43.248.3.21
+      port: &ssh_port 22
       username: &ssh_user root
-      password: &ssh_pass xIy9PQcBF96C
+      password: &ssh_pass KQv7yzna7BDukK
 
       source:
         - blazing/build/**
-      target: /opt/blazing/
+      target: /ext/blazing/
       strip_components: 1  # 统一缩进6个空格
       skip_verify: true  # 统一缩进6个空格
       timeout: 30s  # 统一缩进6个空格
@@ -167,7 +167,7 @@ steps:
       password: *ssh_pass
       script:
               - |
-                cd /opt/blazing/build
+                cd /ext/blazing/build
                 ls -t login_* 2>/dev/null | head -1
                 BIN_NAME=$(ls -t login_* 2>/dev/null | head -1)
                 echo "BIN_NAME: $BIN_NAME"
@@ -201,9 +201,9 @@ steps:
                 # 移动logic产物到public目录
                 LOGIC_BIN=$(ls -t logic_* 2>/dev/null | head -1)
                 if [ -n "$LOGIC_BIN" ]; then
-                  mkdir -p /opt/blazing/build/public
-                  mv $LOGIC_BIN /opt/blazing/build/public/
-                  echo "✅ Logic产物已移动到 /opt/blazing/build/public/ | 文件: $(basename $LOGIC_BIN)"
+                  mkdir -p /ext/blazing/build/public
+                  mv $LOGIC_BIN /ext/blazing/build/public/
+                  echo "✅ Logic产物已移动到 /ext/blazing/build/public/ | 文件: $(basename $LOGIC_BIN)"
                 else
                   echo "⚠️ 未找到Logic产物"
                 fi

common/contrib/drivers/pgsql/cmd/codexcheck/main.go

@@ -0,0 +1,56 @@
+package main
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+
+	_ "github.com/lib/pq"
+)
+
+func main() {
+	const dsn = "user=user_YrK4j7 password=password_jSDm76 host=43.248.3.21 port=5432 dbname=bl sslmode=disable timezone=Asia/Shanghai"
+
+	db, err := sql.Open("postgres", dsn)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer db.Close()
+
+	var (
+		id                  int64
+		cdkCode             string
+		cdkType             int64
+		exchangeRemainCount int64
+		bindUserID          int64
+		validEndTime        sql.NullTime
+		remark              sql.NullString
+	)
+
+	err = db.QueryRow(`
+		select id, cdk_code, type, exchange_remain_count, bind_user_id, valid_end_time, remark
+		from config_gift_cdk
+		where cdk_code = $1
+	`, "nrTbdXFBhKkaTdDk").Scan(
+		&id,
+		&cdkCode,
+		&cdkType,
+		&exchangeRemainCount,
+		&bindUserID,
+		&validEndTime,
+		&remark,
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fmt.Printf("id=%d\ncdk_code=%s\ntype=%d\nexchange_remain_count=%d\nbind_user_id=%d\nvalid_end_time=%v\nremark=%q\n",
+		id,
+		cdkCode,
+		cdkType,
+		exchangeRemainCount,
+		bindUserID,
+		validEndTime.Time,
+		remark.String,
+	)
+}

common/cool/coolconfig/config.go

@@ -1,121 +1,121 @@
-package coolconfig
-
-import (
-	"time"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-// cool config
-type sConfig struct {
-	AutoMigrate bool   `json:"auto_migrate,omitempty"` // 是否自动创建表
-	Eps         bool   `json:"eps,omitempty"`          // 是否开启eps
-	File        *file  `json:"file,omitempty"`         // 文件上传配置
-	Name        string `json:"name"`                   // 项目名称
-	//	LoginPort    string `json:"port"`
-	GameOnlineID uint32 `json:"port_bl"` //这个是命令行输入的参数
-	ServerInfo   ServerList
-
-	Address string //rpc端口
-
-}
-type ServerList struct {
-	OnlineID uint32 `gorm:"column:online_id;comment:'在线ID';uniqueIndex" json:"online_id"`
-	//服务器名称Desc
-	Name   string `gorm:"comment:'服务器名称'" json:"name"`
-	IP     string `gorm:"type:string;comment:'服务器IP'" json:"ip"`
-	Port   uint32 `gorm:"comment:'端口号，通常是小整数'" json:"port"`
-	IsOpen uint8  `gorm:"default:0;not null;comment:'是否开启'" json:"is_open"`
-	//登录地址
-	LoginAddr string `gorm:"type:string;comment:'登录地址'" json:"login_addr"`
-	//账号
-	Account string `gorm:"type:string;comment:'账号'" json:"account"`
-	//密码
-	Password string   `gorm:"type:string;comment:'密码'" json:"password"`
-	CanPort  []uint32 `gorm:"type:jsonb;comment:'可连接端口'" json:"can_port"`
-	//是否测试服
-	IsVip uint32 `gorm:"default:0;not null;comment:'是否为VIP服务器'" json:"is_vip"`
-	//isdebug 是否本地服
-	IsDebug uint8 `gorm:"default:0;comment:'是否为调试模式'" json:"is_debug"`
-
-	//服务器属主Desc
-	Owner     uint32 `gorm:"comment:'服务器属主'" json:"owner"`
-	Desc      string `gorm:"comment:'服务器描述'" json:"desc"`
-	OldScreen string `gorm:"comment:'服务器screen参数'" json:"old_screen"`
-	//到期时间ServerList
-	ExpireTime time.Time `gorm:"default:0;comment:'到期时间'" json:"expire_time"`
-}
-
-func (s *ServerList) GetID() string {
-	return gconv.String(100000*s.OnlineID + s.Port)
-}
-
-// OSS相关配置
-type oss struct {
-	Endpoint        string `json:"endpoint"`
-	AccessKeyID     string `json:"accessKeyID"`
-	SecretAccessKey string `json:"secretAccessKey"`
-	UseSSL          bool   `json:"useSSL"`
-	BucketName      string `json:"bucketName"`
-	Location        string `json:"location"`
-}
-
-// 文件上传配置
-type file struct {
-	Mode   string `json:"mode"`   // 模式 local oss
-	Domain string `json:"domain"` // 域名 http://
-	Oss    *oss   `json:"oss,omitempty"`
-}
-
-// NewConfig new config
-func newConfig() *sConfig {
-	var ctx g.Ctx
-	config := &sConfig{
-		AutoMigrate: GetCfgWithDefault(ctx, "blazing.autoMigrate", g.NewVar(false)).Bool(),
-		Name:        GetCfgWithDefault(ctx, "server.name", g.NewVar("")).String(),
-
-		Eps: GetCfgWithDefault(ctx, "blazing.eps", g.NewVar(false)).Bool(),
-		//	LoginPort: string(GetCfgWithDefault(ctx, "server.port", g.NewVar("8080")).String()),
-		Address: GetCfgWithDefault(ctx, "server.address", g.NewVar("8080")).String(),
-		//GamePort:    GetCfgWithDefault(ctx, "server.game", g.NewVar("8080")).Uint64s(),
-
-		File: &file{
-			Mode:   GetCfgWithDefault(ctx, "blazing.file.mode", g.NewVar("none")).String(),
-			Domain: GetCfgWithDefault(ctx, "blazing.file.domain", g.NewVar("http://127.0.0.1:8300")).String(),
-			Oss: &oss{
-				Endpoint:        GetCfgWithDefault(ctx, "blazing.file.oss.endpoint", g.NewVar("127.0.0.1:9000")).String(),
-				AccessKeyID:     GetCfgWithDefault(ctx, "blazing.file.oss.accessKeyID", g.NewVar("")).String(),
-				SecretAccessKey: GetCfgWithDefault(ctx, "blazing.file.oss.secretAccessKey", g.NewVar("")).String(),
-				UseSSL:          GetCfgWithDefault(ctx, "blazing.file.oss.useSSL", g.NewVar(false)).Bool(),
-				BucketName:      GetCfgWithDefault(ctx, "blazing.file.oss.bucketName", g.NewVar("blazing")).String(),
-				Location:        GetCfgWithDefault(ctx, "blazing.file.oss.location", g.NewVar("us-east-1")).String(),
-			},
-		},
-	}
-
-	return config
-}
-
-// qiniu 七牛云配置
-type qiniu struct {
-	AccessKey string `json:"ak"`
-	SecretKey string `json:"sk"`
-	Bucket    string `json:"bucket"`
-	CDN       string `json:"cdn"`
-}
-
-// Config config
-var Config = newConfig()
-
-// GetCfgWithDefault get config with default value
-func GetCfgWithDefault(ctx g.Ctx, key string, defaultValue *g.Var) *g.Var {
-	value, err := g.Cfg().GetWithEnv(ctx, key)
-	if err != nil {
-		return defaultValue
-	}
-	if value.IsEmpty() || value.IsNil() {
-		return defaultValue
-	}
-	return value
-}
+package coolconfig
+
+import (
+	"time"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// cool config
+type sConfig struct {
+	AutoMigrate bool   `json:"auto_migrate,omitempty"` // 是否自动创建表
+	Eps         bool   `json:"eps,omitempty"`          // 是否开启eps
+	File        *file  `json:"file,omitempty"`         // 文件上传配置
+	Name        string `json:"name"`                   // 项目名称
+	//	LoginPort    string `json:"port"`
+	GameOnlineID uint32 `json:"port_bl"` //这个是命令行输入的参数
+	ServerInfo   ServerList
+
+	Address string //rpc端口
+
+}
+type ServerList struct {
+	OnlineID uint32 `gorm:"column:online_id;comment:'在线ID';uniqueIndex" json:"online_id"`
+	//服务器名称Desc
+	Name   string `gorm:"comment:'服务器名称'" json:"name"`
+	IP     string `gorm:"type:string;comment:'服务器IP'" json:"ip"`
+	Port   uint32 `gorm:"comment:'端口号，通常是小整数'" json:"port"`
+	IsOpen uint8  `gorm:"default:0;not null;comment:'是否开启'" json:"is_open"`
+	//登录地址
+	LoginAddr string `gorm:"type:string;comment:'登录地址'" json:"login_addr"`
+	//账号
+	Account string `gorm:"type:string;comment:'账号'" json:"account"`
+	//密码
+	Password string   `gorm:"type:string;comment:'密码'" json:"password"`
+	CanPort  []uint32 `gorm:"type:jsonb;comment:'可连接端口'" json:"can_port"`
+	//是否测试服
+	IsVip uint32 `gorm:"default:0;not null;comment:'是否为VIP服务器'" json:"is_vip"`
+	//isdebug 是否本地服
+	IsDebug uint8 `gorm:"default:0;comment:'是否为调试模式'" json:"is_debug"`
+
+	//服务器属主Desc
+	Owner     uint32 `gorm:"comment:'服务器属主'" json:"owner"`
+	Desc      string `gorm:"comment:'服务器描述'" json:"desc"`
+	OldScreen string `gorm:"comment:'服务器screen参数'" json:"old_screen"`
+	//到期时间ServerList
+	ExpireTime time.Time `gorm:"default:0;comment:'到期时间'" json:"expire_time"`
+}
+
+func (s *ServerList) GetID() string {
+	return gconv.String(100000*s.OnlineID + s.Port)
+}
+
+// OSS相关配置
+type oss struct {
+	Endpoint        string `json:"endpoint"`
+	AccessKeyID     string `json:"accessKeyID"`
+	SecretAccessKey string `json:"secretAccessKey"`
+	UseSSL          bool   `json:"useSSL"`
+	BucketName      string `json:"bucketName"`
+	Location        string `json:"location"`
+}
+
+// 文件上传配置
+type file struct {
+	Mode   string `json:"mode"`   // 模式 local oss
+	Domain string `json:"domain"` // 域名 http://
+	Oss    *oss   `json:"oss,omitempty"`
+}
+
+// NewConfig new config
+func newConfig() *sConfig {
+	var ctx g.Ctx
+	config := &sConfig{
+		AutoMigrate: GetCfgWithDefault(ctx, "blazing.autoMigrate", g.NewVar(false)).Bool(),
+		Name:        GetCfgWithDefault(ctx, "server.name", g.NewVar("")).String(),
+
+		Eps: GetCfgWithDefault(ctx, "blazing.eps", g.NewVar(false)).Bool(),
+		//	LoginPort: string(GetCfgWithDefault(ctx, "server.port", g.NewVar("8080")).String()),
+		Address: GetCfgWithDefault(ctx, "server.address", g.NewVar("8080")).String(),
+		//GamePort:    GetCfgWithDefault(ctx, "server.game", g.NewVar("8080")).Uint64s(),
+
+		File: &file{
+			Mode:   GetCfgWithDefault(ctx, "blazing.file.mode", g.NewVar("none")).String(),
+			Domain: GetCfgWithDefault(ctx, "blazing.file.domain", g.NewVar("http://127.0.0.1:8300")).String(),
+			Oss: &oss{
+				Endpoint:        GetCfgWithDefault(ctx, "blazing.file.oss.endpoint", g.NewVar("127.0.0.1:9000")).String(),
+				AccessKeyID:     GetCfgWithDefault(ctx, "blazing.file.oss.accessKeyID", g.NewVar("")).String(),
+				SecretAccessKey: GetCfgWithDefault(ctx, "blazing.file.oss.secretAccessKey", g.NewVar("")).String(),
+				UseSSL:          GetCfgWithDefault(ctx, "blazing.file.oss.useSSL", g.NewVar(false)).Bool(),
+				BucketName:      GetCfgWithDefault(ctx, "blazing.file.oss.bucketName", g.NewVar("blazing")).String(),
+				Location:        GetCfgWithDefault(ctx, "blazing.file.oss.location", g.NewVar("us-east-1")).String(),
+			},
+		},
+	}
+
+	return config
+}
+
+// qiniu 七牛云配置
+type qiniu struct {
+	AccessKey string `json:"ak"`
+	SecretKey string `json:"sk"`
+	Bucket    string `json:"bucket"`
+	CDN       string `json:"cdn"`
+}
+
+// Config config
+var Config = newConfig()
+
+// GetCfgWithDefault get config with default value
+func GetCfgWithDefault(ctx g.Ctx, key string, defaultValue *g.Var) *g.Var {
+	value, err := g.Cfg().GetWithEnv(ctx, key)
+	if err != nil {
+		return defaultValue
+	}
+	if value.IsEmpty() || value.IsNil() {
+		return defaultValue
+	}
+	return value
+}

common/cool/global.go

@@ -22,8 +22,14 @@ var ctx = context.TODO()
 type Cmd struct {
 	Func reflect.Value //方法函数
 	Req  reflect.Type  //请求体
+	// HeaderFieldIndex 是请求结构体中 TomeeHeader 字段的索引路径。
+	HeaderFieldIndex []int
+	// UseConn 标记第二个参数是否为 gnet.Conn。
+	UseConn bool
 	// 新增：预缓存的req创建函数（返回结构体指针）
 	NewReqFunc func() interface{}
+	// NewReqValue 返回请求结构体指针的 reflect.Value，避免重复构造类型信息。
+	NewReqValue func() reflect.Value
 	//Res  reflect.Value //返回体
 }
 

common/cool/initdb.go

@@ -3,6 +3,7 @@ package cool
 import (
 	_ "blazing/contrib/drivers/pgsql"
 	"blazing/cool/cooldb"
+	"sync"
 
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
@@ -10,6 +11,11 @@ import (
 	"gorm.io/gorm"
 )
 
+var (
+	autoMigrateMu     sync.Mutex
+	autoMigrateModels []IModel
+)
+
 // 初始化数据库连接供gorm使用
 func InitDB(group string) (*gorm.DB, error) {
 	// var ctx context.Context
@@ -54,9 +60,33 @@ func getDBbyModel(model IModel) *gorm.DB {
 
 // 根据entity结构体创建表
 func CreateTable(model IModel) error {
-	if Config.AutoMigrate {
+	autoMigrateMu.Lock()
+	autoMigrateModels = append(autoMigrateModels, model)
+	autoMigrateMu.Unlock()
+	return nil
+}
+
+// RunAutoMigrate 显式执行已注册模型的建表/迁移。
+func RunAutoMigrate() error {
+	if !Config.AutoMigrate {
+		return nil
+	}
+	autoMigrateMu.Lock()
+	models := append([]IModel(nil), autoMigrateModels...)
+	autoMigrateMu.Unlock()
+
+	seen := make(map[string]struct{}, len(models))
+	for _, model := range models {
+		key := model.GroupName() + ":" + model.TableName()
+		if _, ok := seen[key]; ok {
+			continue
+		}
+		seen[key] = struct{}{}
+
 		db := getDBbyModel(model)
-		return db.AutoMigrate(model)
+		if err := db.AutoMigrate(model); err != nil {
+			return err
+		}
 	}
 	return nil
 }

common/cool/rpc.go

@@ -6,6 +6,16 @@ func AddClient(id uint32, client *ClientHandler) {
 	Clientmap.Store(id, client) // sync.Map存值
 }
 
+// 清理指定client（uid=100000*onlineID+port）
+func DeleteClientOnly(uid uint32) {
+	Clientmap.Delete(uid)
+}
+
+// 清理指定client（onlineID+port）
+func DeleteClient(id, port uint32) {
+	Clientmap.Delete(100000*id + port)
+}
+
 // 取值示例
 func GetClient(id, port uint32) (*ClientHandler, bool) {
 	// 普通map：client, ok := Clientmap[id]

common/data/Element/element.go

@@ -42,15 +42,15 @@ const (
 	maxMatrixSize = 227 // 矩阵维度（覆盖最大属性ID 226）
 )
 
-// 合法单属性ID集合（快速校验）
-var validSingleElementIDs = map[int]bool{
+// 合法单属性ID集合（按ID直接索引，避免运行时 map 查找）
+var validSingleElementIDs = [maxMatrixSize]bool{
 	1: true, 2: true, 3: true, 4: true, 5: true, 6: true, 7: true, 8: true, 9: true, 10: true,
 	11: true, 12: true, 13: true, 14: true, 15: true, 16: true, 17: true, 18: true, 19: true, 20: true,
 	221: true, 222: true, 223: true, 224: true, 225: true, 226: true,
 }
 
-// 元素名称映射（全属性对应，便于日志输出）
-var elementNameMap = map[ElementType]string{
+// 元素名称映射（按ID直接索引，便于日志输出）
+var elementNameMap = [maxMatrixSize]string{
 	ElementTypeGrass:     "GRASS",
 	ElementTypeWater:     "WATER",
 	ElementTypeFire:      "FIRE",
@@ -198,46 +198,55 @@ type ElementCombination struct {
 	ID        int          // 组合唯一ID
 }
 
-// 全局预加载资源（程序启动时init初始化，运行时直接使用）
+// 全局预加载资源（程序启动时初始化，运行时只读）
 var (
-	// 元素组合池：key=组合ID，value=组合实例（预加载所有合法组合）
-	elementCombinationPool = make(map[int]*ElementCombination, 150) // 128双+26单=154，预分配足够容量
-	// 单属性克制矩阵（预初始化所有特殊克制关系，默认1.0）
-	matrix [maxMatrixSize][maxMatrixSize]float64
+	validCombinationIDs      [maxMatrixSize]bool
+	elementCombinationPool   [maxMatrixSize]ElementCombination
+	dualElementSecondaryPool [maxMatrixSize]ElementType
+	matrix                   [maxMatrixSize][maxMatrixSize]float64
+	Calculator               *ElementCalculator
 )
 
 // init 预加载所有资源（程序启动时执行一次，无并发问题）
 func init() {
-	// 1. 初始化单属性克制矩阵
 	initFullTableMatrix()
+	initElementCombinationPool()
+	Calculator = NewElementCalculator()
+}
 
-	// 2. 预加载所有单属性组合
-	for id := range validSingleElementIDs {
-		combo := &ElementCombination{
-			Primary:   ElementType(id),
-			Secondary: nil,
-			ID:        id,
+func initElementCombinationPool() {
+	for id, valid := range validSingleElementIDs {
+		if !valid {
+			continue
+		}
+		validCombinationIDs[id] = true
+		elementCombinationPool[id] = ElementCombination{
+			Primary: ElementType(id),
+			ID:      id,
 		}
-		elementCombinationPool[id] = combo
 	}
 
-	// 3. 预加载所有双属性组合
 	for dualID, atts := range dualElementMap {
 		primaryID, secondaryID := atts[0], atts[1]
-		// 按ID升序排序，保证组合一致性
 		primary, secondary := ElementType(primaryID), ElementType(secondaryID)
 		if primary > secondary {
 			primary, secondary = secondary, primary
 		}
-		combo := &ElementCombination{
+
+		dualElementSecondaryPool[dualID] = secondary
+		validCombinationIDs[dualID] = true
+		elementCombinationPool[dualID] = ElementCombination{
 			Primary:   primary,
-			Secondary: &secondary,
+			Secondary: &dualElementSecondaryPool[dualID],
 			ID:        dualID,
 		}
-		elementCombinationPool[dualID] = combo
 	}
 }
 
+func isValidCombinationID(id int) bool {
+	return id > 0 && id < maxMatrixSize && validCombinationIDs[id]
+}
+
 // IsDual 判断是否为双属性
 func (ec *ElementCombination) IsDual() bool {
 	return ec.Secondary != nil
@@ -245,84 +254,82 @@ func (ec *ElementCombination) IsDual() bool {
 
 // Elements 获取所有属性列表
 func (ec *ElementCombination) Elements() []ElementType {
-	if ec.IsDual() {
-		return []ElementType{ec.Primary, *ec.Secondary}
+	if secondary := ec.Secondary; secondary != nil {
+		return []ElementType{ec.Primary, *secondary}
 	}
 	return []ElementType{ec.Primary}
 }
 
 // String 友好格式化输出
 func (ec *ElementCombination) String() string {
-	primaryName := elementNameMap[ec.Primary]
-	if !ec.IsDual() {
-		return fmt.Sprintf("(%s)", primaryName)
+	if secondary := ec.Secondary; secondary != nil {
+		return fmt.Sprintf("(%s, %s)", elementNameMap[ec.Primary], elementNameMap[*secondary])
 	}
-	return fmt.Sprintf("(%s, %s)", primaryName, elementNameMap[*ec.Secondary])
+	return fmt.Sprintf("(%s)", elementNameMap[ec.Primary])
 }
 
-// ElementCalculator 无锁元素克制计算器（依赖预加载资源）
+// ElementCalculator 无锁元素克制计算器（所有倍数在初始化阶段预计算）
 type ElementCalculator struct {
-	offensiveCache map[string]float64 // 攻击克制缓存（运行时填充，无并发写）
+	offensiveTable [maxMatrixSize][maxMatrixSize]float64
 }
 
-// NewElementCalculator 创建计算器实例（仅初始化缓存）
+// NewElementCalculator 创建计算器实例（构建只读查表缓存）
 func NewElementCalculator() *ElementCalculator {
-	return &ElementCalculator{
-		offensiveCache: make(map[string]float64, 4096), // 预分配大容量缓存
+	c := &ElementCalculator{}
+	c.initOffensiveTable()
+	return c
+}
+
+func (c *ElementCalculator) initOffensiveTable() {
+	for attackerID, valid := range validCombinationIDs {
+		if !valid {
+			continue
+		}
+		attacker := &elementCombinationPool[attackerID]
+		for defenderID, valid := range validCombinationIDs {
+			if !valid {
+				continue
+			}
+			defender := &elementCombinationPool[defenderID]
+			c.offensiveTable[attackerID][defenderID] = c.calculateMultiplier(attacker, defender)
+		}
 	}
 }
 
 // getMatrixValue 直接返回矩阵值（修复核心问题：不再将0转换为1）
 func (c *ElementCalculator) getMatrixValue(attacker, defender ElementType) float64 {
-	return matrix[attacker][defender] // 矩阵默认已初始化1.0，特殊值直接返回
+	return matrix[attacker][defender]
 }
 
-// GetCombination 获取元素组合（直接从预加载池读取）
+// GetCombination 获取元素组合（直接按ID索引）
 func (c *ElementCalculator) GetCombination(id int) (*ElementCombination, error) {
-	combo, exists := elementCombinationPool[id]
-	if !exists {
+	if !isValidCombinationID(id) {
 		return nil, fmt.Errorf("invalid element combination ID: %d", id)
 	}
-	return combo, nil
+	return &elementCombinationPool[id], nil
 }
 
-// GetOffensiveMultiplier 计算攻击方→防御方的克制倍数（缓存优先）
+// GetOffensiveMultiplier 计算攻击方→防御方的克制倍数（只读查表）
 func (c *ElementCalculator) GetOffensiveMultiplier(attackerID, defenderID int) (float64, error) {
-	// 1. 获取预加载的组合实例
-	attacker, err := c.GetCombination(attackerID)
-	if err != nil {
-		return 0, fmt.Errorf("attacker invalid: %w", err)
+	if !isValidCombinationID(attackerID) {
+		return 0, fmt.Errorf("attacker invalid: invalid element combination ID: %d", attackerID)
 	}
-	defender, err := c.GetCombination(defenderID)
-	if err != nil {
-		return 0, fmt.Errorf("defender invalid: %w", err)
+	if !isValidCombinationID(defenderID) {
+		return 0, fmt.Errorf("defender invalid: invalid element combination ID: %d", defenderID)
 	}
-
-	// 2. 缓存键（全局唯一）
-	cacheKey := fmt.Sprintf("a%d_d%d", attackerID, defenderID)
-	if val, exists := c.offensiveCache[cacheKey]; exists {
-		return val, nil
-	}
-
-	// 3. 核心计算+缓存
-	val := c.calculateMultiplier(attacker, defender)
-	c.offensiveCache[cacheKey] = val
-	return val, nil
+	return c.offensiveTable[attackerID][defenderID], nil
 }
 
 // calculateMultiplier 核心克制计算逻辑
 func (c *ElementCalculator) calculateMultiplier(attacker, defender *ElementCombination) float64 {
-	// 场景1：单→单
 	if !attacker.IsDual() && !defender.IsDual() {
 		return c.getMatrixValue(attacker.Primary, defender.Primary)
 	}
 
-	// 场景2：单→双
 	if !attacker.IsDual() {
 		y1, y2 := defender.Primary, *defender.Secondary
 		m1 := c.getMatrixValue(attacker.Primary, y1)
 		m2 := c.getMatrixValue(attacker.Primary, y2)
-
 		switch {
 		case m1 == 2 && m2 == 2:
 			return 4.0
@@ -333,12 +340,10 @@ func (c *ElementCalculator) calculateMultiplier(attacker, defender *ElementCombi
 		}
 	}
 
-	// 场景3：双→单
 	if !defender.IsDual() {
 		return c.calculateDualToSingle(attacker.Primary, *attacker.Secondary, defender.Primary)
 	}
 
-	// 场景4：双→双
 	x1, x2 := attacker.Primary, *attacker.Secondary
 	y1, y2 := defender.Primary, *defender.Secondary
 	coeffY1 := c.calculateDualToSingle(x1, x2, y1)
@@ -350,7 +355,6 @@ func (c *ElementCalculator) calculateMultiplier(attacker, defender *ElementCombi
 func (c *ElementCalculator) calculateDualToSingle(attacker1, attacker2, defender ElementType) float64 {
 	k1 := c.getMatrixValue(attacker1, defender)
 	k2 := c.getMatrixValue(attacker2, defender)
-
 	switch {
 	case k1 == 2 && k2 == 2:
 		return 4.0
@@ -361,60 +365,49 @@ func (c *ElementCalculator) calculateDualToSingle(attacker1, attacker2, defender
 	}
 }
 
-var Calculator = NewElementCalculator()
-
 // TestAllScenarios 全场景测试（验证预加载和计算逻辑）
 func TestAllScenarios() {
-
-	// 测试1：单→单（草→水）
 	m1, _ := Calculator.GetOffensiveMultiplier(1, 2)
 	fmt.Println("草→水: %.2f（预期2.0）", m1)
 	if math.Abs(m1-2.0) > 0.001 {
 		fmt.Println("测试1失败：实际%.2f", m1)
 	}
 
-	// 测试2：特殊单→单（混沌→虚空）
 	m2, _ := Calculator.GetOffensiveMultiplier(222, 226)
 	fmt.Println("混沌→虚空: %.2f（预期0.0）", m2)
 	if math.Abs(m2-0.0) > 0.001 {
 		fmt.Println("测试2失败：实际%.2f", m2)
 	}
 
-	// 测试3：单→双（火→冰龙（43））
 	m3, _ := Calculator.GetOffensiveMultiplier(3, 43)
 	fmt.Println("火→冰龙: %.2f（预期1.5）", m3)
 	if math.Abs(m3-1.5) > 0.001 {
 		fmt.Println("测试3失败：实际%.2f", m3)
 	}
 
-	// 测试4：双→特殊单（混沌暗影（92）→神灵（223））
 	m4, _ := Calculator.GetOffensiveMultiplier(92, 223)
 	fmt.Println("混沌暗影→神灵: %.2f（预期1.25）", m4)
 	if math.Abs(m4-1.25) > 0.001 {
 		fmt.Println("测试4失败：实际%.2f", m4)
 	}
 
-	// 测试5：双→双（虚空邪灵（113）→混沌远古（98））
 	m5, _ := Calculator.GetOffensiveMultiplier(113, 98)
 	fmt.Println("虚空邪灵→混沌远古: %.2f（预期0.875", m5)
 	if math.Abs(m5-0.875) > 0.001 {
 		fmt.Println("测试5失败：实际%.2f", m5)
 	}
 
-	// 测试6：缓存命中
 	m6, _ := Calculator.GetOffensiveMultiplier(113, 98)
 	if math.Abs(m6-m5) > 0.001 {
 		fmt.Println("测试6失败：缓存未命中")
 	}
 
-	// 测试7：含无效组合（电→地面）
 	m7, _ := Calculator.GetOffensiveMultiplier(5, 7)
 	fmt.Println("电→地面: %.2f（预期0.0）", m7)
 	if math.Abs(m7-0.0) > 0.001 {
 		fmt.Println("测试7失败：实际%.2f", m7)
 	}
 
-	// 测试8：双属性含无效（电战斗→地面）
 	m8, _ := Calculator.GetOffensiveMultiplier(35, 7)
 	fmt.Println("电战斗→地面: %.2f（预期0.25）", m8)
 	if math.Abs(m8-0.25) > 0.001 {

common/data/xmlres/effectarg.go

@@ -5,7 +5,7 @@ type EffectArg struct {
 		SideEffect []struct {
 			ID                 int    `json:"ID"`
 			SideEffectArgcount int    `json:"SideEffectArgcount"`
-			SideEffectArg      string `json:"SideEffectArg,omitempty"`
+			SideEffectArg      rawFlexibleString `json:"SideEffectArg,omitempty"`
 		} `json:"SideEffect"`
 	} `json:"SideEffects"`
 }

common/data/xmlres/file.go

@@ -5,7 +5,7 @@ import (
 
 	_ "blazing/common/data/xmlres/packed"
 	"encoding/json"
-	"os"
+	"fmt"
 
 	"github.com/ECUST-XX/xml"
 	"github.com/gogf/gf/v2/os/gres"
@@ -14,22 +14,36 @@ import (
 
 var path string
 
+func readConfigContent(path string) []byte {
+	return gres.GetContent(path)
+}
+
 func getXml[T any](path string) T {
 
 	// 解析XML到结构体
 	var xmls T
 
-	t1 := gres.GetContent(path)
+	t1 := readConfigContent(path)
 	xml.Unmarshal(t1, &xmls)
 
 	return xmls
 }
 func getJson[T any](path string) T {
 
-	// 解析XML到结构体
+	// 解析JSON到结构体
 	var xmls T
-	t1 := gres.GetContent(path)
-	json.Unmarshal(t1, &xmls)
+	t1 := readConfigContent(path)
+	if len(t1) == 0 {
+		fmt.Printf("[xmlres] getJson empty content: path=%s\n", path)
+		return xmls
+	}
+	if err := json.Unmarshal(t1, &xmls); err != nil {
+		head := string(t1)
+		if len(head) > 300 {
+			head = head[:300]
+		}
+		fmt.Printf("[xmlres] getJson unmarshal failed: path=%s len=%d err=%v head=%q\n", path, len(t1), err, head)
+	}
 
 	return xmls
 }
@@ -58,8 +72,6 @@ var (
 
 func Initfile() {
 	//gres.Dump()
-	path1, _ := os.Getwd()
-	path = path1 + "/public/config/"
 	path = "config/"
 	MapConfig = getXml[Maps](path + "210.xml")
 
@@ -87,10 +99,10 @@ func Initfile() {
 		return gconv.Int(m.ProductID)
 
 	})
-	Skill := getXml[MovesTbl](path + "227.xml")
+	skillConfig := getJson[MovesJSON](path + "moves_flash.json")
 
-	SkillMap = make(map[int]Move, len(Skill.Moves))
-	for _, v := range Skill.Moves {
+	SkillMap = make(map[int]Move, len(skillConfig.MovesTbl.Moves.Move))
+	for _, v := range skillConfig.MovesTbl.Moves.Move {
 		v.SideEffectS = ParseSideEffectArgs(v.SideEffect)
 		v.SideEffectArgS = ParseSideEffectArgs(v.SideEffectArg)
 		SkillMap[v.ID] = v
@@ -101,7 +113,11 @@ func Initfile() {
 
 	})
 
-	PetMAP = utils.ToMap[PetInfo, int](getXml[Monsters](path+"226.xml").Monsters, func(m PetInfo) int {
+	pets := getXml[Monsters](path + "226.xml").Monsters
+	for i := range pets {
+		pets[i].YieldingEVValues = parseYieldingEV(pets[i].YieldingEV)
+	}
+	PetMAP = utils.ToMap[PetInfo, int](pets, func(m PetInfo) int {
 		return m.ID
 
 	})

common/data/xmlres/json_compat_test.go

@@ -0,0 +1,26 @@
+package xmlres
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestMoveUnmarshalJSONAcceptsNumericName(t *testing.T) {
+	var move Move
+	if err := json.Unmarshal([]byte(`{"ID":10001,"Name":1,"Category":1,"Type":8,"Power":35,"MaxPP":35,"Accuracy":95}`), &move); err != nil {
+		t.Fatalf("unmarshal move failed: %v", err)
+	}
+	if move.Name != "1" {
+		t.Fatalf("expected numeric name to convert to string, got %q", move.Name)
+	}
+}
+
+func TestEffectArgUnmarshalJSONAcceptsNumericSideEffectArg(t *testing.T) {
+	var cfg EffectArg
+	if err := json.Unmarshal([]byte(`{"SideEffects":{"SideEffect":[{"ID":1,"SideEffectArgcount":1,"SideEffectArg":3}]}}`), &cfg); err != nil {
+		t.Fatalf("unmarshal effect arg failed: %v", err)
+	}
+	if got := string(cfg.SideEffects.SideEffect[0].SideEffectArg); got != "3" {
+		t.Fatalf("expected numeric side effect arg to convert to string, got %q", got)
+	}
+}

common/data/xmlres/pet.go

@@ -1,6 +1,11 @@
 package xmlres
 
-import "github.com/ECUST-XX/xml"
+import (
+	"strconv"
+	"strings"
+
+	"github.com/ECUST-XX/xml"
+)
 
 // Move 表示怪物可学习的技能
 type PetMoves struct {
@@ -45,6 +50,7 @@ type PetInfo struct {
 	Recycle            int            `xml:"Recycle,attr"`            // 是否可回收
 	LearnableMoves     LearnableMoves `xml:"LearnableMoves"`          // 可学习的技能
 	NaturalEnemy       string         `xml:"NaturalEnemy,attr"`       //天敌
+	YieldingEVValues   []int64        `xml:"-"`                       // 预解析后的努力值奖励
 }
 
 func (basic *PetInfo) GetBasic() uint32 {
@@ -61,3 +67,16 @@ type Monsters struct {
 	XMLName  xml.Name  `xml:"Monsters"`
 	Monsters []PetInfo `xml:"Monster"`
 }
+
+func parseYieldingEV(raw string) []int64 {
+	values := make([]int64, 6)
+	parts := strings.Fields(raw)
+	for i := 0; i < len(parts) && i < len(values); i++ {
+		value, err := strconv.ParseInt(parts[i], 10, 64)
+		if err != nil {
+			continue
+		}
+		values[i] = value
+	}
+	return values
+}

common/data/xmlres/skill.go

@@ -1,6 +1,7 @@
 package xmlres
 
 import (
+	"encoding/json"
 	"encoding/xml"
 	"fmt"
 	"io"
@@ -33,51 +34,156 @@ type MovesTbl struct {
 	Moves   []Move       `xml:"Moves>Move"`
 	EFF     []SideEffect `xml:"SideEffects>SideEffect"`
 }
+
+type MovesJSON struct {
+	MovesTbl MovesJSONRoot `json:"MovesTbl"`
+}
+
+type MovesJSONRoot struct {
+	Moves struct {
+		Move []Move `json:"Move"`
+	} `json:"Moves"`
+	SideEffects struct {
+		SideEffect []SideEffect `json:"SideEffect"`
+	} `json:"SideEffects"`
+}
+
 type MovesMap struct {
 	XMLName xml.Name `xml:"MovesTbl"`
 	Moves   map[int]Move
 	EFF     []SideEffect `xml:"SideEffects>SideEffect"`
 }
 
+type rawFlexibleString string
+
+func (s *rawFlexibleString) UnmarshalJSON(data []byte) error {
+	text := strings.TrimSpace(string(data))
+	if text == "" || text == "null" {
+		*s = ""
+		return nil
+	}
+
+	if len(text) >= 2 && text[0] == '"' && text[len(text)-1] == '"' {
+		var decoded string
+		if err := json.Unmarshal(data, &decoded); err != nil {
+			return err
+		}
+		*s = rawFlexibleString(decoded)
+		return nil
+	}
+
+	*s = rawFlexibleString(text)
+	return nil
+}
+
 // Move 定义单个技能的结构
 type Move struct {
-	ID   int    `xml:"ID,attr"`
-	Name string `xml:"Name,attr"`
+	ID   int    `xml:"ID,attr" json:"ID"`
+	Name string `xml:"Name,attr" json:"Name"`
 
-	Category       int    `xml:"Category,attr"`                 //属性
-	Type           int    `xml:"Type,attr"`                     //类型
-	Power          int    `xml:"Power,attr"`                    //威力
-	MaxPP          int    `xml:"MaxPP,attr"`                    //最大PP
-	Accuracy       int    `xml:"Accuracy,attr"`                 //命中率
-	CritRate       int    `xml:"CritRate,attr,omitempty"`       //暴击率
-	Priority       int    `xml:"Priority,attr,omitempty"`       //优先级
-	MustHit        int    `xml:"MustHit,attr,omitempty"`        //是否必中
-	SwapElemType   int    `xml:"SwapElemType,attr,omitempty"`   //技能交换属性
-	CopyElemType   int    `xml:"CopyElemType,attr,omitempty"`   // 技能复制属性
-	CritAtkFirst   int    `xml:"CritAtkFirst,attr,omitempty"`   // 先出手时必定致命一击
-	CritAtkSecond  int    `xml:"CritAtkSecond,attr,omitempty"`  //后出手时必定致命一击
-	CritSelfHalfHp int    `xml:"CritSelfHalfHp,attr,omitempty"` //自身体力低于一半时必定致命一击
-	CritFoeHalfHp  int    `xml:"CritFoeHalfHp,attr,omitempty"`  //对方体力低于一半时必定致命一击
-	DmgBindLv      int    `xml:"DmgBindLv,attr,omitempty"`      //使对方受到的伤害值等于自身的等级
-	PwrBindDv      int    `xml:"PwrBindDv,attr,omitempty"`      //威力（power）取决于自身的潜力（个体值）
-	PwrDouble      int    `xml:"PwrDouble,attr,omitempty"`      //攻击时，若对方处于异常状态, 则威力翻倍;
-	DmgBindHpDv    int    `xml:"DmgBindHpDv,attr,omitempty"`    //使对方受到的伤害值等于自身的体力值
-	SideEffect     string `xml:"SideEffect,attr,omitempty"`
-	SideEffectArg  string `xml:"SideEffectArg,attr,omitempty"`
+	Category       int    `xml:"Category,attr" json:"Category"`                                 //属性
+	Type           int    `xml:"Type,attr" json:"Type"`                                         //类型
+	Power          int    `xml:"Power,attr" json:"Power"`                                       //威力
+	MaxPP          int    `xml:"MaxPP,attr" json:"MaxPP"`                                       //最大PP
+	Accuracy       int    `xml:"Accuracy,attr" json:"Accuracy"`                                 //命中率
+	CritRate       int    `xml:"CritRate,attr,omitempty" json:"CritRate,omitempty"`             //暴击率
+	Priority       int    `xml:"Priority,attr,omitempty" json:"Priority,omitempty"`             //优先级
+	MustHit        int    `xml:"MustHit,attr,omitempty" json:"MustHit,omitempty"`               //是否必中
+	SwapElemType   int    `xml:"SwapElemType,attr,omitempty" json:"SwapElemType,omitempty"`     //技能交换属性
+	CopyElemType   int    `xml:"CopyElemType,attr,omitempty" json:"CopyElemType,omitempty"`     // 技能复制属性
+	CritAtkFirst   int    `xml:"CritAtkFirst,attr,omitempty" json:"CritAtkFirst,omitempty"`     // 先出手时必定致命一击
+	CritAtkSecond  int    `xml:"CritAtkSecond,attr,omitempty" json:"CritAtkSecond,omitempty"`   //后出手时必定致命一击
+	CritSelfHalfHp int    `xml:"CritSelfHalfHp,attr,omitempty" json:"CritSelfHalfHp,omitempty"` //自身体力低于一半时必定致命一击
+	CritFoeHalfHp  int    `xml:"CritFoeHalfHp,attr,omitempty" json:"CritFoeHalfHp,omitempty"`   //对方体力低于一半时必定致命一击
+	DmgBindLv      int    `xml:"DmgBindLv,attr,omitempty" json:"DmgBindLv,omitempty"`           //使对方受到的伤害值等于自身的等级
+	PwrBindDv      int    `xml:"PwrBindDv,attr,omitempty" json:"PwrBindDv,omitempty"`           //威力（power）取决于自身的潜力（个体值）
+	PwrDouble      int    `xml:"PwrDouble,attr,omitempty" json:"PwrDouble,omitempty"`           //攻击时，若对方处于异常状态, 则威力翻倍;
+	DmgBindHpDv    int    `xml:"DmgBindHpDv,attr,omitempty" json:"DmgBindHpDv,omitempty"`       //使对方受到的伤害值等于自身的体力值
+	SideEffect     string `xml:"SideEffect,attr,omitempty" json:"SideEffect,omitempty"`
+	SideEffectArg  string `xml:"SideEffectArg,attr,omitempty" json:"SideEffectArg,omitempty"`
 	SideEffectS    []int
 	SideEffectArgS []int
-	AtkNum         int    `xml:"AtkNum,attr,omitempty"`
-	Url            string `xml:"Url,attr,omitempty"`
+	AtkNum         int    `xml:"AtkNum,attr,omitempty" json:"AtkNum,omitempty"`
+	AtkType        int    `xml:"AtkType,attr,omitempty" json:"AtkType,omitempty"` // 0:所有人 1:仅己方 2:仅对方 3:仅自己
+	Url            string `xml:"Url,attr,omitempty" json:"Url,omitempty"`
 
-	Info string `xml:"info,attr,omitempty"`
+	Info string `xml:"info,attr,omitempty" json:"info,omitempty"`
 
-	CD *int `xml:"CD,attr"`
+	CD *int `xml:"CD,attr" json:"CD"`
+}
+
+func (m *Move) UnmarshalJSON(data []byte) error {
+	type moveAlias struct {
+		ID             int               `json:"ID"`
+		Name           rawFlexibleString `json:"Name"`
+		Category       int               `json:"Category"`
+		Type           int               `json:"Type"`
+		Power          int               `json:"Power"`
+		MaxPP          int               `json:"MaxPP"`
+		Accuracy       int               `json:"Accuracy"`
+		CritRate       int               `json:"CritRate,omitempty"`
+		Priority       int               `json:"Priority,omitempty"`
+		MustHit        int               `json:"MustHit,omitempty"`
+		SwapElemType   int               `json:"SwapElemType,omitempty"`
+		CopyElemType   int               `json:"CopyElemType,omitempty"`
+		CritAtkFirst   int               `json:"CritAtkFirst,omitempty"`
+		CritAtkSecond  int               `json:"CritAtkSecond,omitempty"`
+		CritSelfHalfHp int               `json:"CritSelfHalfHp,omitempty"`
+		CritFoeHalfHp  int               `json:"CritFoeHalfHp,omitempty"`
+		DmgBindLv      int               `json:"DmgBindLv,omitempty"`
+		PwrBindDv      int               `json:"PwrBindDv,omitempty"`
+		PwrDouble      int               `json:"PwrDouble,omitempty"`
+		DmgBindHpDv    int               `json:"DmgBindHpDv,omitempty"`
+		SideEffect     rawFlexibleString `json:"SideEffect,omitempty"`
+		SideEffectArg  rawFlexibleString `json:"SideEffectArg,omitempty"`
+		AtkNum         int               `json:"AtkNum,omitempty"`
+		AtkType        int               `json:"AtkType,omitempty"`
+		Url            string            `json:"Url,omitempty"`
+		Info           string            `json:"info,omitempty"`
+		CD             *int              `json:"CD"`
+	}
+
+	var aux moveAlias
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	*m = Move{
+		ID:             aux.ID,
+		Name:           string(aux.Name),
+		Category:       aux.Category,
+		Type:           aux.Type,
+		Power:          aux.Power,
+		MaxPP:          aux.MaxPP,
+		Accuracy:       aux.Accuracy,
+		CritRate:       aux.CritRate,
+		Priority:       aux.Priority,
+		MustHit:        aux.MustHit,
+		SwapElemType:   aux.SwapElemType,
+		CopyElemType:   aux.CopyElemType,
+		CritAtkFirst:   aux.CritAtkFirst,
+		CritAtkSecond:  aux.CritAtkSecond,
+		CritSelfHalfHp: aux.CritSelfHalfHp,
+		CritFoeHalfHp:  aux.CritFoeHalfHp,
+		DmgBindLv:      aux.DmgBindLv,
+		PwrBindDv:      aux.PwrBindDv,
+		PwrDouble:      aux.PwrDouble,
+		DmgBindHpDv:    aux.DmgBindHpDv,
+		SideEffect:     string(aux.SideEffect),
+		SideEffectArg:  string(aux.SideEffectArg),
+		AtkNum:         aux.AtkNum,
+		AtkType:        aux.AtkType,
+		Url:            aux.Url,
+		Info:           aux.Info,
+		CD:             aux.CD,
+	}
+	return nil
 }
 
 type SideEffect struct {
-	ID   int    `xml:"ID,attr"`
-	Help string `xml:"help,attr"`
-	Des  string `xml:"des,attr"`
+	ID   int    `xml:"ID,attr" json:"ID"`
+	Help string `xml:"help,attr" json:"help"`
+	Des  string `xml:"des,attr" json:"des"`
 }
 
 // ReadHTTPFile 通过HTTP GET请求获取远程文件内容

common/rpc/func.go

@@ -2,17 +2,21 @@ package rpc
 
 import (
 	"blazing/cool"
-	"context"
+	"blazing/logic/service/fight/pvp"
+	"blazing/logic/service/fight/pvpwire"
+
 	"fmt"
 	"time"
 
 	"github.com/gogf/gf/v2/database/gredis"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 // ListenFunc 监听函数
-// ListenFunc 改造后的 Redis PubSub 监听函数，支持自动重连和心跳保活
+// ListenFunc 改造后的 Redis PubSub 监听函数，支持自动重连。
+// 注意：PubSub 连接只负责订阅和接收，避免在同一连接上并发 PING。
 func ListenFunc(ctx g.Ctx) {
 	if !cool.IsRedisMode {
 		panic(gerror.New("集群模式下, 请使用Redis作为缓存"))
@@ -20,9 +24,8 @@ func ListenFunc(ctx g.Ctx) {
 
 	// 定义常量配置
 	const (
-		subscribeTopic    = "cool:func"      // 订阅的主题
-		retryDelay        = 10 * time.Second // 连接失败重试间隔
-		heartbeatInterval = 30 * time.Second // 心跳保活间隔
+		subscribeTopic = "cool:func"      // 订阅的主题
+		retryDelay     = 10 * time.Second // 连接失败重试间隔
 	)
 
 	// 外层循环：负责连接断开后的整体重连
@@ -43,47 +46,25 @@ func ListenFunc(ctx g.Ctx) {
 			continue
 		}
 
-		// 2. 启动心跳保活协程，防止连接因空闲被断开
-		heartbeatCtx, heartbeatCancel := context.WithCancel(context.Background())
-		go func() {
-			ticker := time.NewTicker(heartbeatInterval)
-			defer func() {
-				ticker.Stop()
-				heartbeatCancel()
-			}()
-
-			for {
-				select {
-				case <-heartbeatCtx.Done():
-					cool.Logger.Info(ctx, "心跳协程退出")
-					return
-				case <-ticker.C:
-					// 发送 PING 心跳，保持连接活跃
-					_, pingErr := conn.Do(ctx, "PING")
-					if pingErr != nil {
-						cool.Logger.Error(ctx, "Redis 心跳失败，触发重连", "error", pingErr)
-						// 心跳失败时主动关闭连接，触发外层重连
-						_ = conn.Close(ctx)
-						return
-					}
-
-				}
-			}
-		}()
-
-		// 3. 订阅主题
+		// 2. 订阅主题
 		_, err = conn.Do(ctx, "subscribe", subscribeTopic)
 		if err != nil {
 			cool.Logger.Error(ctx, "订阅 Redis 主题失败", "topic", subscribeTopic, "error", err)
-			heartbeatCancel() // 关闭心跳协程
 			_ = conn.Close(ctx)
 			time.Sleep(retryDelay)
 			continue
 		}
 		cool.Logger.Info(ctx, "成功订阅 Redis 主题", "topic", subscribeTopic)
 		_, err = conn.Do(ctx, "subscribe", "sun:join") //加入队列
+		if err != nil {
+			cool.Logger.Error(ctx, "订阅 Redis 主题失败", "topic", "sun:join", "error", err)
+			_ = conn.Close(ctx)
+			time.Sleep(retryDelay)
+			continue
+		}
+		cool.Logger.Info(ctx, "成功订阅 Redis 主题", "topic", "sun:join")
 
-		// 4. 循环接收消息
+		// 3. 循环接收消息
 		connError := false
 		for !connError {
 			select {
@@ -126,15 +107,15 @@ func ListenFunc(ctx g.Ctx) {
 			}
 		}
 
-		// 5. 清理资源，准备重连
-		heartbeatCancel()   // 关闭心跳协程
+		// 4. 清理资源，准备重连
 		_ = conn.Close(ctx) // 关闭当前连接
-		//	Logger.Warn(ctx, "Redis 连接异常，准备重连", "retry_after", retryDelay)
+		cool.Logger.Info(ctx, "Redis 订阅连接异常，准备重连", "retry_after", retryDelay)
 		time.Sleep(retryDelay)
 	}
 }
 
-// ListenFight 完全对齐 ListenFunc 写法，修复收不到消息问题
+// ListenFight 完全对齐 ListenFunc 写法，修复收不到消息问题。
+// 注意：PubSub 连接只负责订阅和接收，避免在同一连接上并发 PING。
 func ListenFight(ctx g.Ctx) {
 	if !cool.IsRedisMode {
 		panic(gerror.New("集群模式下, 请使用Redis作为缓存"))
@@ -142,14 +123,15 @@ func ListenFight(ctx g.Ctx) {
 
 	// 定义常量配置（对齐 ListenFunc 风格）
 	const (
-		retryDelay        = 10 * time.Second // 连接失败重试间隔
-		heartbeatInterval = 30 * time.Second // 心跳保活间隔
+		retryDelay = 10 * time.Second // 连接失败重试间隔
 	)
 
 	// 提前拼接订阅主题（避免重复拼接，便于日志打印）
 	serverID := cool.Config.ServerInfo.GetID()
 	startTopic := "sun:start:" + serverID
 	sendPackTopic := "sendpack:" + serverID
+	pvpServerTopic := pvpwire.ServerTopic(gconv.Uint32(serverID))
+	pvpCoordinatorTopic := pvpwire.CoordinatorTopicPrefix
 
 	// 外层循环：负责连接断开后的整体重连
 	for {
@@ -170,45 +152,26 @@ func ListenFight(ctx g.Ctx) {
 			continue
 		}
 
-		// 2. 启动心跳保活协程（完全对齐 ListenFunc 逻辑）
-		heartbeatCtx, heartbeatCancel := context.WithCancel(context.Background())
-		go func() {
-			ticker := time.NewTicker(heartbeatInterval)
-			defer func() {
-				ticker.Stop()
-				heartbeatCancel()
-			}()
-
-			for {
-				select {
-				case <-heartbeatCtx.Done():
-					cool.Logger.Info(ctx, "心跳协程退出")
-					return
-				case <-ticker.C:
-					// 发送 PING 心跳，保持连接活跃
-					_, pingErr := conn.Do(ctx, "PING")
-					if pingErr != nil {
-						cool.Logger.Error(ctx, "Redis 心跳失败，触发重连", "error", pingErr)
-						// 心跳失败时主动关闭连接，触发外层重连
-						_ = conn.Close(ctx)
-						return
-					}
-					cool.Logger.Debug(ctx, "Redis 心跳发送成功，连接正常")
-				}
+		// 2. 订阅主题（对齐 ListenFunc 的错误处理，替换 panic 为优雅重连）
+		subscribeTopics := []string{startTopic, pvpServerTopic}
+		if cool.Config.GameOnlineID == pvp.CoordinatorOnlineID {
+			subscribeTopics = append(subscribeTopics, pvpCoordinatorTopic)
+		}
+		subscribeFailed := false
+		for _, topic := range subscribeTopics {
+			_, err = conn.Do(ctx, "subscribe", topic)
+			if err != nil {
+				cool.Logger.Error(ctx, "订阅 Redis 主题失败", "topic", topic, "error", err)
+				_ = conn.Close(ctx)
+				time.Sleep(retryDelay)
+				subscribeFailed = true
+				break
 			}
-		}()
-
-		// 3. 订阅主题（对齐 ListenFunc 的错误处理，替换 panic 为优雅重连）
-		// 订阅 sun:start:服务器ID
-		_, err = conn.Do(ctx, "subscribe", startTopic)
-		if err != nil {
-			cool.Logger.Error(ctx, "订阅 Redis 主题失败", "topic", startTopic, "error", err)
-			heartbeatCancel() // 关闭心跳协程
-			_ = conn.Close(ctx)
-			time.Sleep(retryDelay)
+			cool.Logger.Info(ctx, "成功订阅 Redis 主题", "topic", topic)
+		}
+		if subscribeFailed {
 			continue
 		}
-		cool.Logger.Info(ctx, "成功订阅 Redis 主题", "topic", startTopic)
 
 		// // 订阅 sun:sendpack:服务器ID
 		// _, err = conn.Do(ctx, "subscribe", sendPackTopic)
@@ -224,7 +187,7 @@ func ListenFight(ctx g.Ctx) {
 		// 打印监听提示（保留原有日志）
 		fmt.Println("监听战斗", startTopic)
 
-		// 4. 循环接收消息（完全对齐 ListenFunc 逻辑）
+		// 3. 循环接收消息（完全对齐 ListenFunc 逻辑）
 		connError := false
 		for !connError {
 			select {
@@ -255,6 +218,10 @@ func ListenFight(ctx g.Ctx) {
 					// universalClient, _ := g.Redis("cool").Client().(goredis.UniversalClient)
 				}
 
+				if dataMap.Channel == pvpServerTopic || dataMap.Channel == pvpCoordinatorTopic {
+					pvp.HandleRedisMessage(dataMap.Channel, dataMap.Payload)
+				}
+
 				// 【可选】处理 sun:sendpack:服务器ID 消息（如果需要）
 				if dataMap.Channel == sendPackTopic {
 					fmt.Println("收到战斗包", dataMap.Payload)
@@ -262,9 +229,9 @@ func ListenFight(ctx g.Ctx) {
 			}
 		}
 
-		// 5. 清理资源，准备重连（完全对齐 ListenFunc）
-		heartbeatCancel()   // 关闭心跳协程
+		// 4. 清理资源，准备重连（完全对齐 ListenFunc）
 		_ = conn.Close(ctx) // 关闭当前连接
+		cool.Logger.Info(ctx, "Redis 战斗订阅连接异常，准备重连", "retry_after", retryDelay)
 		time.Sleep(retryDelay)
 	}
 }

common/rpc/pvp_match.go

@@ -0,0 +1,163 @@
+package rpc
+
+import (
+	"blazing/cool"
+	"blazing/logic/service/fight/pvpwire"
+	"context"
+	"encoding/json"
+	"fmt"
+	"sync"
+	"time"
+)
+
+const (
+	pvpMatchQueueTTL      = 12 * time.Second
+	pvpMatchBanPickSecond = 45
+)
+
+type PVPMatchJoinPayload struct {
+	RuntimeServerID uint32   `json:"runtimeServerId"`
+	UserID          uint32   `json:"userId"`
+	Nick            string   `json:"nick"`
+	FightMode       uint32   `json:"fightMode"`
+	Status          uint32   `json:"status"`
+	CatchTimes      []uint32 `json:"catchTimes"`
+}
+
+type pvpMatchCoordinator struct {
+	mu       sync.Mutex
+	queues   map[uint32][]pvpwire.QueuePlayerSnapshot
+	lastSeen map[uint32]time.Time
+}
+
+var defaultPVPMatchCoordinator = &pvpMatchCoordinator{
+	queues:   make(map[uint32][]pvpwire.QueuePlayerSnapshot),
+	lastSeen: make(map[uint32]time.Time),
+}
+
+func DefaultPVPMatchCoordinator() *pvpMatchCoordinator {
+	return defaultPVPMatchCoordinator
+}
+
+func (m *pvpMatchCoordinator) JoinOrUpdate(payload PVPMatchJoinPayload) error {
+	if payload.UserID == 0 || payload.RuntimeServerID == 0 || payload.FightMode == 0 {
+		return fmt.Errorf("invalid pvp match payload: uid=%d server=%d mode=%d", payload.UserID, payload.RuntimeServerID, payload.FightMode)
+	}
+
+	now := time.Now()
+	player := pvpwire.QueuePlayerSnapshot{
+		RuntimeServerID: payload.RuntimeServerID,
+		UserID:          payload.UserID,
+		Nick:            payload.Nick,
+		FightMode:       payload.FightMode,
+		Status:          payload.Status,
+		JoinedAtUnix:    now.Unix(),
+		CatchTimes:      append([]uint32(nil), payload.CatchTimes...),
+	}
+
+	var match *pvpwire.MatchFoundPayload
+
+	m.mu.Lock()
+	m.pruneExpiredLocked(now)
+	m.removeUserLocked(payload.UserID)
+	m.lastSeen[payload.UserID] = now
+
+	queue := m.queues[payload.FightMode]
+	if len(queue) > 0 {
+		host := queue[0]
+		queue = queue[1:]
+		m.queues[payload.FightMode] = queue
+		delete(m.lastSeen, host.UserID)
+		delete(m.lastSeen, payload.UserID)
+
+		result := pvpwire.MatchFoundPayload{
+			SessionID:      buildPVPMatchSessionID(host.UserID, payload.UserID),
+			Stage:          pvpwire.StageBanPick,
+			Host:           host,
+			Guest:          player,
+			BanPickTimeout: pvpMatchBanPickSecond,
+		}
+		match = &result
+	} else {
+		m.queues[payload.FightMode] = append(queue, player)
+	}
+	m.mu.Unlock()
+
+	if match == nil {
+		return nil
+	}
+	if err := publishPVPMatchMessage(pvpwire.ServerTopic(match.Host.RuntimeServerID), pvpwire.MessageTypeMatchFound, *match); err != nil {
+		return err
+	}
+	if match.Guest.RuntimeServerID != match.Host.RuntimeServerID {
+		if err := publishPVPMatchMessage(pvpwire.ServerTopic(match.Guest.RuntimeServerID), pvpwire.MessageTypeMatchFound, *match); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (m *pvpMatchCoordinator) Cancel(userID uint32) {
+	if userID == 0 {
+		return
+	}
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	delete(m.lastSeen, userID)
+	m.removeUserLocked(userID)
+}
+
+func (m *pvpMatchCoordinator) pruneExpiredLocked(now time.Time) {
+	for mode, queue := range m.queues {
+		next := make([]pvpwire.QueuePlayerSnapshot, 0, len(queue))
+		for _, queued := range queue {
+			last := m.lastSeen[queued.UserID]
+			if last.IsZero() || now.Sub(last) > pvpMatchQueueTTL {
+				delete(m.lastSeen, queued.UserID)
+				continue
+			}
+			next = append(next, queued)
+		}
+		m.queues[mode] = next
+	}
+}
+
+func (m *pvpMatchCoordinator) removeUserLocked(userID uint32) {
+	for mode, queue := range m.queues {
+		next := make([]pvpwire.QueuePlayerSnapshot, 0, len(queue))
+		for _, queued := range queue {
+			if queued.UserID == userID {
+				continue
+			}
+			next = append(next, queued)
+		}
+		m.queues[mode] = next
+	}
+}
+
+func publishPVPMatchMessage(topic, msgType string, body any) error {
+	payload, err := json.Marshal(body)
+	if err != nil {
+		return err
+	}
+	envelope, err := json.Marshal(pvpwire.Envelope{
+		Type: msgType,
+		Body: payload,
+	})
+	if err != nil {
+		return err
+	}
+	conn, err := cool.Redis.Conn(context.Background())
+	if err != nil {
+		return err
+	}
+	defer conn.Close(context.Background())
+
+	_, err = conn.Do(context.Background(), "publish", topic, envelope)
+	return err
+}
+
+func buildPVPMatchSessionID(hostUserID, guestUserID uint32) string {
+	return fmt.Sprintf("xsvr-%d-%d-%d", hostUserID, guestUserID, time.Now().UnixNano())
+}

common/rpc/rpc.go

@@ -1,106 +1,166 @@
-package rpc
-
-import (
-	"blazing/common/data/share"
-	"blazing/cool"
-
-	"context"
-	"fmt"
-	"log"
-
-	config "blazing/modules/config/service"
-
-	"github.com/filecoin-project/go-jsonrpc"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-// Define the server handler
-type ServerHandler struct{}
-
-// 实现踢人
-func (*ServerHandler) Kick(_ context.Context, userid uint32) error {
-
-	useid1, _ := share.ShareManager.GetUserOnline(userid)
-	if useid1 == 0 {
-		return nil
-	}
-
-	cl, ok := cool.GetClientOnly(useid1)
-	if !ok {
-		return nil
-	}
-	cl.KickPerson(userid) //实现指定服务器踢人
-	return nil
-}
-
-// 注册logic服务器
-func (*ServerHandler) RegisterLogic(ctx context.Context, id, port uint32) error {
-	fmt.Println("注册logic服务器", id, port)
-
-	//TODO 待修复滚动更新可能导致的玩家可以同时在旧服务器和新服务器同时在线的bug
-	revClient, ok := jsonrpc.ExtractReverseClient[cool.ClientHandler](ctx)
-	if !ok {
-		return fmt.Errorf("no reverse client")
-	}
-	t := config.NewServerService().GetServerID((id))
-
-	aa, ok := cool.GetClient(t.OnlineID, t.Port)
-	if ok && aa != nil { //如果已经存在且这个端口已经被存过
-		aa.QuitSelf(0)
-	}
-	cool.AddClient(100000*id+port, &revClient)
-
-	//Refurh()
-	return nil
-
-}
-
-func CServer() *jsonrpc.RPCServer {
-	// create a new server instance
-	rpcServer := jsonrpc.NewServer(jsonrpc.WithReverseClient[cool.ClientHandler](""))
-
-	rpcServer.Register("", &ServerHandler{})
-
-	return rpcServer
-
-}
-
-var closer jsonrpc.ClientCloser
-
-func StartClient(id, port uint32, callback any) *struct {
-	Kick func(uint32) error
-
-	RegisterLogic func(uint32, uint32) error
-} {
-	//cool.Config.File.Domain = "127.0.0.1"
-	var rpcaddr = "ws://" + cool.Config.File.Domain + gconv.String(cool.Config.Address) + "/rpc"
-
-	closer1, err := jsonrpc.NewMergeClient(context.Background(),
-		rpcaddr, "", []interface{}{
-			&RPCClient,
-		}, nil, jsonrpc.WithClientHandler("", callback),
-		jsonrpc.WithReconnFun(func() { RPCClient.RegisterLogic(id, port) }),
-	)
-	if err != nil {
-		log.Fatalf("Failed to create client: %v", err)
-	}
-
-	//if port != 0 { //注册logic
-	defer RPCClient.RegisterLogic(id, port)
-
-	//}
-
-	closer = closer1
-
-	return &RPCClient
-}
-
-// Setup RPCClient with reverse call handler
-var RPCClient struct {
-	Kick func(uint32) error //踢人
-
-	RegisterLogic func(uint32, uint32) error
-
-	//	UserLogin  func(int32, int32) error //用户登录事件
-	//	UserLogout func(int32, int32) error //用户登出事件
-}
+package rpc
+
+import (
+	"blazing/common/data/share"
+	"blazing/cool"
+
+	"context"
+	"fmt"
+	"log"
+	"time"
+
+	config "blazing/modules/config/service"
+
+	"github.com/filecoin-project/go-jsonrpc"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// Define the server handler
+type ServerHandler struct{}
+
+const kickForwardTimeout = 3 * time.Second
+
+// 实现踢人
+func (*ServerHandler) Kick(_ context.Context, userid uint32) error {
+	useid1, err := share.ShareManager.GetUserOnline(userid)
+	if err != nil || useid1 == 0 {
+		// 请求到达时用户已离线，直接视为成功
+		return nil
+	}
+
+	cl, ok := cool.GetClientOnly(useid1)
+	if !ok || cl == nil {
+		// 目标服务器不在线，清理僵尸在线标记并视为成功
+		_ = share.ShareManager.DeleteUserOnline(userid)
+		cool.DeleteClientOnly(useid1)
+		return nil
+	}
+
+	resultCh := make(chan error, 1)
+	go func() {
+		resultCh <- cl.KickPerson(userid) // 实现指定服务器踢人
+	}()
+
+	select {
+	case callErr := <-resultCh:
+		if callErr == nil {
+			return nil
+		}
+
+		// 调用失败后兜底：用户若已离线/切服/目标服不在线都算成功
+		useid2, err2 := share.ShareManager.GetUserOnline(userid)
+		if err2 != nil || useid2 == 0 || useid2 != useid1 {
+			return nil
+		}
+		if cl2, ok2 := cool.GetClientOnly(useid2); !ok2 || cl2 == nil {
+			_ = share.ShareManager.DeleteUserOnline(userid)
+			cool.DeleteClientOnly(useid2)
+			return nil
+		}
+
+		// 仍在线则返回失败，不按成功处理
+		return callErr
+	case <-time.After(kickForwardTimeout):
+		// 仅防止无限等待；超时不算成功
+		useid2, err2 := share.ShareManager.GetUserOnline(userid)
+		if err2 != nil || useid2 == 0 || useid2 != useid1 {
+			return nil
+		}
+		if cl2, ok2 := cool.GetClientOnly(useid2); !ok2 || cl2 == nil {
+			_ = share.ShareManager.DeleteUserOnline(userid)
+			cool.DeleteClientOnly(useid2)
+			return nil
+		}
+
+		return fmt.Errorf("kick timeout, user still online: uid=%d server=%d", userid, useid2)
+	}
+}
+
+// 注册logic服务器
+func (*ServerHandler) RegisterLogic(ctx context.Context, id, port uint32) error {
+	fmt.Println("注册logic服务器", id, port)
+
+	//TODO 待修复滚动更新可能导致的玩家可以同时在旧服务器和新服务器同时在线的bug
+	revClient, ok := jsonrpc.ExtractReverseClient[cool.ClientHandler](ctx)
+	if !ok {
+		return fmt.Errorf("no reverse client")
+	}
+	t := config.NewServerService().GetServerID((id))
+
+	aa, ok := cool.GetClient(t.OnlineID, t.Port)
+	if ok && aa != nil { //如果已经存在且这个端口已经被存过
+		aa.QuitSelf(0)
+	}
+	cool.AddClient(100000*id+port, &revClient)
+
+	//Refurh()
+	return nil
+
+}
+
+func (*ServerHandler) MatchJoinOrUpdate(_ context.Context, payload PVPMatchJoinPayload) error {
+	return DefaultPVPMatchCoordinator().JoinOrUpdate(payload)
+}
+
+func (*ServerHandler) MatchCancel(_ context.Context, userID uint32) error {
+	DefaultPVPMatchCoordinator().Cancel(userID)
+	return nil
+}
+
+func CServer() *jsonrpc.RPCServer {
+	// create a new server instance
+	rpcServer := jsonrpc.NewServer(jsonrpc.WithReverseClient[cool.ClientHandler](""))
+
+	rpcServer.Register("", &ServerHandler{})
+
+	return rpcServer
+
+}
+
+var closer jsonrpc.ClientCloser
+
+func StartClient(id, port uint32, callback any) *struct {
+	Kick func(uint32) error
+
+	RegisterLogic func(uint32, uint32) error
+
+	MatchJoinOrUpdate func(PVPMatchJoinPayload) error
+
+	MatchCancel func(uint32) error
+} {
+	//cool.Config.File.Domain = "127.0.0.1"
+	var rpcaddr = "ws://" + cool.Config.File.Domain + gconv.String(cool.Config.Address) + "/rpc"
+
+	closer1, err := jsonrpc.NewMergeClient(context.Background(),
+		rpcaddr, "", []interface{}{
+			&RPCClient,
+		}, nil, jsonrpc.WithClientHandler("", callback),
+		jsonrpc.WithReconnFun(func() { RPCClient.RegisterLogic(id, port) }),
+	)
+	if err != nil {
+		log.Fatalf("Failed to create client: %v", err)
+	}
+
+	//if port != 0 { //注册logic
+	defer RPCClient.RegisterLogic(id, port)
+
+	//}
+
+	closer = closer1
+
+	return &RPCClient
+}
+
+// Setup RPCClient with reverse call handler
+var RPCClient struct {
+	Kick func(uint32) error //踢人
+
+	RegisterLogic func(uint32, uint32) error
+
+	MatchJoinOrUpdate func(PVPMatchJoinPayload) error
+
+	MatchCancel func(uint32) error
+
+	//	UserLogin  func(int32, int32) error //用户登录事件
+	//	UserLogout func(int32, int32) error //用户登出事件
+}

common/socket/ServerEvent.go

@@ -1,24 +1,29 @@
 package socket
 
 import (
+	"blazing/common/socket/codec"
+	"blazing/cool"
+	"blazing/logic/service/player"
+	"blazing/modules/config/service"
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
-	"io"
 	"log"
 	"os"
 	"sync/atomic"
 	"time"
 
-	"blazing/cool"
-	"blazing/logic/service/player"
-	"blazing/modules/config/service"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/panjf2000/gnet/v2"
 )
 
+const (
+	minPacketLen = 17
+	maxPacketLen = 10 * 1024
+)
+
 func (s *Server) Boot(serverid, port uint32) error {
 	//	go s.bootws()
 	s.serverid = serverid
@@ -53,62 +58,43 @@ func (s *Server) Stop() error {
 func (s *Server) OnClose(c gnet.Conn, err error) (action gnet.Action) {
 	defer func() {
 		if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值
-			// 1. 打印错误信息
 			if t, ok := c.Context().(*player.ClientData); ok {
 				if t.Player != nil {
 					if t.Player.Info != nil {
 						cool.Logger.Error(context.TODO(), "OnClose 错误：", cool.Config.ServerInfo.OnlineID, t.Player.Info.UserID, err)
-						t.Player.Service.Info.Save(*t.Player.Info)
+						go t.Player.SaveOnDisconnect()
 					}
 
 				}
-
 			} else {
 				cool.Logger.Error(context.TODO(), "OnClose 错误：", cool.Config.ServerInfo.OnlineID, err)
-
 			}
-
 		}
 	}()
-	// 识别 RST 导致的连接中断（错误信息含 "connection reset"）
-	// if err != nil && (strings.Contains(err.Error(), "connection reset") || strings.Contains(err.Error(), "reset by peer")) {
-	// 	remoteIP := c.RemoteAddr().(*net.TCPAddr).IP.String()
 
-	// 	log.Printf("RST 攻击检测: 来源 %s, 累计攻击次数 %d", remoteIP)
-
-	// 	// 防护逻辑：临时封禁异常 IP（可扩展为 IP 黑名单）
-	// 	//	go s.tempBlockIP(remoteIP, 5*time.Minute)
-	// }
-	//fmt.Println(err, c.RemoteAddr().String(), "断开连接")
 	atomic.AddInt64(&cool.Connected, -1)
 
-	//logging.Infof("conn[%v] disconnected", c.RemoteAddr().String())
 	v, _ := c.Context().(*player.ClientData)
-
-	v.LF.Close()
-	//	v.LF.Close()
-	//close(v.MsgChan)
-	if v.Player != nil {
-		v.Player.Save() //保存玩家数据
-
+	if v != nil {
+		v.Close()
+		if v.Player != nil {
+			v.Player.Save() //保存玩家数据
+		}
 	}
-
-	//}
-	//关闭连接
 	return
 }
+
 func (s *Server) OnTick() (delay time.Duration, action gnet.Action) {
 	g.Log().Async().Info(context.Background(), gtime.Now().ISO8601(), "服务器ID", cool.Config.ServerInfo.OnlineID, "链接数", atomic.LoadInt64(&cool.Connected))
 	if s.quit && atomic.LoadInt64(&cool.Connected) == 0 {
-		//执行正常退出逻辑
 		os.Exit(0)
 	}
 	return 30 * time.Second, gnet.None
 }
+
 func (s *Server) OnBoot(eng gnet.Engine) gnet.Action {
 	s.eng = eng
-
-	service.NewServerService().SetServerID(s.serverid, s.port) //设置当前服务器端口
+	service.NewServerService().SetServerID(s.serverid, s.port)
 	return gnet.None
 }
 
@@ -116,59 +102,68 @@ func (s *Server) OnOpen(conn gnet.Conn) (out []byte, action gnet.Action) {
 	if s.network != "tcp" {
 		return nil, gnet.Close
 	}
-
 	if conn.Context() == nil {
-		conn.SetContext(player.NewClientData(conn)) //注入data
+		conn.SetContext(player.NewClientData(conn))
 	}
-
 	atomic.AddInt64(&cool.Connected, 1)
-
 	return nil, gnet.None
 }
 
 func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) {
 	defer func() {
-		if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值
-			// 1. 打印错误信息
+		if err := recover(); err != nil {
 			if t, ok := c.Context().(*player.ClientData); ok {
-				if t.Player != nil {
-					if t.Player.Info != nil {
-						cool.Logger.Error(context.TODO(), "OnTraffic 错误：", cool.Config.ServerInfo.OnlineID, t.Player.Info.UserID, err)
-						t.Player.Service.Info.Save(*t.Player.Info)
-
-					}
-
+				if t.Player != nil && t.Player.Info != nil {
+					cool.Logger.Error(context.TODO(), "OnTraffic 错误：", cool.Config.ServerInfo.OnlineID, t.Player.Info.UserID, err)
+					t.Player.Service.Info.Save(*t.Player.Info)
 				}
-
 			}
-
 		}
 	}()
 
-	ws := c.Context().(*player.ClientData).Wsmsg
-	if ws.Tcp { //升级失败时候防止缓冲区溢出
-		return s.handleTCP(c)
-
+	client := c.Context().(*player.ClientData)
+	if s.discorse && !client.IsCrossDomainChecked() {
+		handled, ready, action := handle(c)
+		if action != gnet.None {
+			return action
+		}
+		if handled {
+			client.MarkCrossDomainChecked()
+			return gnet.None
+		}
+		if !ready {
+			return gnet.None
+		}
+		client.MarkCrossDomainChecked()
 	}
 
-	tt, len1 := ws.ReadBufferBytes(c)
-	if tt == gnet.Close {
+	ws := client.Wsmsg
+	if ws.Tcp {
+		return s.handleTCP(c)
+	}
 
+	readAction, inboundLen := ws.ReadBufferBytes(c)
+	if readAction == gnet.Close {
 		return gnet.Close
 	}
 
-	ok, action := ws.Upgrade(c)
-	if action != gnet.None { //连接断开
+	state, action := ws.Upgrade(c)
+	if action != gnet.None {
 		return action
 	}
-	if !ok { //升级失败,说明是tcp连接
-		ws.Tcp = true
-
-		return s.handleTCP(c)
-
+	if state == player.UpgradeNeedMoreData {
+		return gnet.None
+	}
+	if state == player.UpgradeUseTCP {
+		return s.handleTCP(c)
+	}
+
+	if inboundLen > 0 {
+		if _, err := c.Discard(inboundLen); err != nil {
+			return gnet.Close
+		}
+		ws.ResetInboundMirror()
 	}
-	//	fmt.Println(ws.Buf.Bytes())
-	c.Discard(len1)
 
 	messages, err := ws.Decode(c)
 	if err != nil {
@@ -179,91 +174,93 @@ func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) {
 	}
 
 	for _, msg := range messages {
-
-		s.onevent(c, msg.Payload)
-		//t.OnEvent(msg.Payload)
+		if !s.onevent(c, msg.Payload) {
+			return gnet.Close
+		}
 	}
-
 	return gnet.None
 }
 
-const maxBodyLen = 10 * 1024 // 业务最大包体长度，按需调整
 func (s *Server) handleTCP(conn gnet.Conn) (action gnet.Action) {
+	client := conn.Context().(*player.ClientData)
+	if s.discorse && !client.IsCrossDomainChecked() {
+		handled, ready, action := handle(conn)
+		if action != gnet.None {
+			return action
+		}
+		if !ready {
+			return gnet.None
+		}
+		if handled {
+			client.MarkCrossDomainChecked()
+			return gnet.None
+		}
+		client.MarkCrossDomainChecked()
+	}
 
-	conn.Context().(*player.ClientData).IsCrossDomain.Do(func() { //跨域检测
-		handle(conn)
-	})
-
-	//	handle(c)
-	// 先读取4字节的包长度
-	lenBuf, err := conn.Peek(4)
-
+	body, err := s.codec.Decode(conn)
 	if err != nil {
-		if errors.Is(err, io.ErrShortBuffer) {
-			return
+		if errors.Is(err, codec.ErrIncompletePacket) {
+			return gnet.None
 		}
 		return gnet.Close
 	}
-
-	bodyLen := binary.BigEndian.Uint32(lenBuf)
-
-	if bodyLen > maxBodyLen {
+	if !s.onevent(conn, body) {
 		return gnet.Close
 	}
-
-	if conn.InboundBuffered() < int(bodyLen) {
-		return
-	}
-	// 提取包体
-	body, err := conn.Next(int(bodyLen))
-	if err != nil {
-		if errors.Is(err, io.ErrShortBuffer) {
-			return
-		}
-		return gnet.Close
-	}
-
-	s.onevent(conn, body)
-
 	if conn.InboundBuffered() > 0 {
-		if err := conn.Wake(nil); err != nil { // wake up the connection manually to avoid missing the leftover data
-
+		if err := conn.Wake(nil); err != nil {
 			return gnet.Close
 		}
 	}
 	return action
-
 }
 
-// CROSS_DOMAIN 定义跨域策略文件内容
 const CROSS_DOMAIN = "<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy><cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\x00"
-
-// TEXT 定义跨域请求的文本格式
 const TEXT = "<policy-file-request/>\x00"
 
-func handle(c gnet.Conn) {
+func handle(c gnet.Conn) (handled bool, ready bool, action gnet.Action) {
+	probeLen := c.InboundBuffered()
+	if probeLen == 0 {
+		return false, false, gnet.None
+	}
+	if probeLen > len(TEXT) {
+		probeLen = len(TEXT)
+	}
 
-	// 读取数据并检查是否为跨域请求
-	data, err := c.Peek(len(TEXT))
+	data, err := c.Peek(probeLen)
 	if err != nil {
 		log.Printf("Error reading cross-domain request: %v", err)
-		return
+		return false, false, gnet.Close
 	}
-
-	if string(data) == TEXT { //判断是否是跨域请求
-		//log.Printf("Received cross-domain request from %s", c.RemoteAddr())
-		// 处理跨域请求
-		c.Write([]byte(CROSS_DOMAIN))
-		c.Discard(len(TEXT))
-
-		return
+	if !bytes.Equal(data, []byte(TEXT[:probeLen])) {
+		return false, true, gnet.None
 	}
-
-	//return
+	if probeLen < len(TEXT) {
+		return false, false, gnet.None
+	}
+	if _, err := c.Write([]byte(CROSS_DOMAIN)); err != nil {
+		return false, true, gnet.Close
+	}
+	if _, err := c.Discard(len(TEXT)); err != nil {
+		return false, true, gnet.Close
+	}
+	return true, true, gnet.None
 }
 
-func (s *Server) onevent(c gnet.Conn, v []byte) {
+func (s *Server) onevent(c gnet.Conn, v []byte) bool {
+	if !isValidPacket(v) {
+		return false
+	}
 	if t, ok := c.Context().(*player.ClientData); ok {
 		t.PushEvent(v, s.workerPool.Submit)
 	}
+	return true
+}
+
+func isValidPacket(v []byte) bool {
+	if len(v) < minPacketLen || len(v) > maxPacketLen {
+		return false
+	}
+	return binary.BigEndian.Uint32(v[0:4]) == uint32(len(v))
 }

common/utils/go-sensitive-word-1.3.3/go.mod

@@ -2,33 +2,4 @@ module github.com/zmexing/go-sensitive-word
 
 go 1.20
 
-require (
-	 
-	github.com/orcaman/concurrent-map/v2 v2.0.1
-)
-
-require (
-	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/onsi/ginkgo/v2 v2.16.0 // indirect
-	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
-	github.com/quic-go/quic-go v0.40.1 // indirect
-	github.com/refraction-networking/utls v1.6.3 // indirect
-	github.com/stretchr/testify v1.11.1 // indirect
-	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-)
+require github.com/orcaman/concurrent-map/v2 v2.0.1

common/utils/go-sensitive-word-1.3.3/go.sum

@@ -1,55 +1,2 @@
-github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
-github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/imroc/req/v3 v3.42.3 h1:ryPG2AiwouutAopwPxKpWKyxgvO8fB3hts4JXlh3PaE=
-github.com/imroc/req/v3 v3.42.3/go.mod h1:Axz9Y/a2b++w5/Jht3IhQsdBzrG1ftJd1OJhu21bB2Q=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
-github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
 github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
 github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
-github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
-github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-github.com/quic-go/quic-go v0.40.1 h1:X3AGzUNFs0jVuO3esAGnTfvdgvL4fq655WaOi1snv1Q=
-github.com/quic-go/quic-go v0.40.1/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c=
-github.com/refraction-networking/utls v1.6.3 h1:MFOfRN35sSx6K5AZNIoESsBuBxS2LCgRilRIdHb6fDc=
-github.com/refraction-networking/utls v1.6.3/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

docs/boss-script-hookaction-guide-2026-04-05.md

@@ -0,0 +1,183 @@
+# Boss Script（HookAction）接入说明
+
+日期：2026-04-05
+
+## 1. 执行流程
+
+1. 先执行战斗效果链 `HookAction()`
+2. 执行脚本 `hookAction(hookaction)`
+3. 用脚本返回值决定是否继续出手
+4. 脚本可直接调用 Go 绑定函数：`useSkill()`、`switchPet()`
+
+## 2. JS 可调用的 Go 函数
+
+1. `useSkill(skillId: number)`
+2. `switchPet(catchTime: number)`
+
+## 3. `hookaction` 参数字段
+
+基础字段：
+
+1. `hookaction.hookaction: boolean`
+2. `hookaction.round: number`
+3. `hookaction.is_first: boolean`
+4. `hookaction.our: { pet_id, catch_time, hp, max_hp } | null`
+5. `hookaction.opp: { pet_id, catch_time, hp, max_hp } | null`
+6. `hookaction.skills: Array<{ skill_id, pp, can_use }>`
+
+AttackValue 映射字段（重点）：
+
+1. `hookaction.our_attack`
+2. `hookaction.opp_attack`
+
+结构：
+
+```ts
+{
+  skill_id: number;
+  attack_time: number;
+  is_critical: number;
+  lost_hp: number;
+  gain_hp: number;
+  remain_hp: number;
+  max_hp: number;
+  state: number;
+  offensive: number;
+  status: number[]; // 对应 AttackValue.Status[20]
+  prop: number[];   // 对应 AttackValue.Prop[6]
+}
+```
+
+其中：
+
+- `prop` 索引：`[攻, 防, 特攻, 特防, 速度, 命中]`
+- 对应值 `> 0` 代表强化，`< 0` 代表下降，`0` 代表无变化
+
+返回值：
+
+- `true`：继续行动
+- `false`：阻止行动
+- 不返回：默认回退到 `hookaction.hookaction`
+
+## 4. 脚本示例
+
+### 4.1 判断对方是否存在强化（你问的这个）
+
+```js
+function hookAction(hookaction) {
+  if (!hookaction.hookaction) return false;
+
+  var oppAtk = hookaction.opp_attack;
+  var oppHasBuff = false;
+  if (oppAtk && oppAtk.prop) {
+    for (var i = 0; i < oppAtk.prop.length; i++) {
+      if (oppAtk.prop[i] > 0) {
+        oppHasBuff = true;
+        break;
+      }
+    }
+  }
+
+  if (oppHasBuff) {
+    // 对方有强化时，放一个针对技能
+    useSkill(5001);
+    return true;
+  }
+
+  return true;
+}
+```
+
+### 4.2 判断对方是否有异常状态
+
+```js
+function hookAction(hookaction) {
+  if (!hookaction.hookaction) return false;
+
+  var oppAtk = hookaction.opp_attack;
+  var hasStatus = false;
+  if (oppAtk && oppAtk.status) {
+    for (var i = 0; i < oppAtk.status.length; i++) {
+      if (oppAtk.status[i] > 0) {
+        hasStatus = true;
+        break;
+      }
+    }
+  }
+
+  if (!hasStatus) {
+    // 没有异常时尝试上异常
+    useSkill(6002);
+  }
+
+  return true;
+}
+```
+
+## 5. Monaco 类型提示
+
+```ts
+import * as monaco from "monaco-editor";
+
+monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+  allowNonTsExtensions: true,
+  checkJs: true,
+  target: monaco.languages.typescript.ScriptTarget.ES2020,
+});
+
+monaco.languages.typescript.javascriptDefaults.addExtraLib(
+  `
+interface BossHookPetContext {
+  pet_id: number;
+  catch_time: number;
+  hp: number;
+  max_hp: number;
+}
+
+interface BossHookSkillContext {
+  skill_id: number;
+  pp: number;
+  can_use: boolean;
+}
+
+interface BossHookAttackContext {
+  skill_id: number;
+  attack_time: number;
+  is_critical: number;
+  lost_hp: number;
+  gain_hp: number;
+  remain_hp: number;
+  max_hp: number;
+  state: number;
+  offensive: number;
+  status: number[];
+  prop: number[];
+}
+
+interface BossHookActionContext {
+  hookaction: boolean;
+  round: number;
+  is_first: boolean;
+  our: BossHookPetContext | null;
+  opp: BossHookPetContext | null;
+  skills: BossHookSkillContext[];
+  our_attack: BossHookAttackContext | null;
+  opp_attack: BossHookAttackContext | null;
+}
+
+declare function hookAction(hookaction: BossHookActionContext): boolean;
+declare function HookAction(hookaction: BossHookActionContext): boolean;
+declare function hookaction(hookaction: BossHookActionContext): boolean;
+
+declare function useSkill(skillId: number): void;
+declare function switchPet(catchTime: number): void;
+`,
+  "ts:boss-script.d.ts"
+);
+```
+
+## 6. 后端代码
+
+- 脚本执行器与函数绑定：`modules/config/model/boss_pet.go`
+- AI 出手转发与上下文构建：`logic/service/fight/input/ai.go`
+

docs/fight-group-implementation-checklist-2026-04-04.md

@@ -0,0 +1,400 @@
+# 战斗系统对齐 `flash/group` 组队战斗实施清单（执行版）
+
+日期：2026-04-04  
+适用仓库：`E:\newcode\sun`  
+参考客户端仓库：`E:\newcode\flash`
+
+---
+
+## 1. 结论与范围
+
+### 1.1 结论
+
+- `sun` 当前战斗系统具备多战位骨架（`ActorIndex/TargetIndex`、`Our/Opp []*input.Input`），但未完成组队战斗全链路。
+- `flash` 的 `group` 分支当前 HEAD 已回滚组队重构；组队实现主要存在于历史提交 `4c07fa07`。
+- 因此本次不是“直接搬代码”，而是“按协议与行为对齐实现”。
+
+### 1.2 本清单目标
+
+- 在不破坏现有 `1v1` 的前提下，落地组队战斗可运行版本（MVP）。
+- 对齐 `flash`/社区实现中的关键行为（开战、出招、切宠、道具、结算、战斗结束）。
+- 协议层采用“一个统一结构体 + phase 字段”方案，单打/双打共用同一序列化模型。
+- 保留旧 `24xx/25xx` 流程入口，通过服务端适配映射到统一结构体。
+
+### 1.3 非目标
+
+- 不要求一次性 100% 复刻客户端所有 UI/演出细节。
+- 不要求一次性改完全部 effect；先保证核心流程可跑，再分批清理。
+
+---
+
+## 2. 基线事实（实施前必须统一认知）
+
+### 2.1 `flash` 仓库事实
+
+- `group` 分支相对 `main` 的提交：
+  - `4c07fa07 refactor(group-fight)`（引入组队）
+  - `a410bfca Revert "refactor(group-fight)"`（回滚组队）
+  - `e2382a4f`（地图重构）
+  - `bd84f206`（.gitignore）
+- 所以 `group` HEAD 不再包含 `GroupFightDLL`、`core/group/*` 组队代码；需参考 `4c07fa07` 的内容。
+
+### 2.2 `sun` 战斗现状
+
+- 已有多战位骨架：
+  - `logic/service/fight/input.go`：`Our/Opp []*input.Input`
+  - `logic/service/fight/action/BattleAction.go`：`ActorIndex/TargetIndex`
+  - `logic/service/fight/new_options.go`：`WithFightPlayersOnSide/WithFightInputs`
+- 仍有关键缺口：
+  - 控制器入站仍是单战位参数（如 `2405/2406/2407` 只传技能/道具/catchTime）
+  - 回合主链仍以双动作兼容流程为中心
+  - 组队相关特性存在 TODO（例如 `501/502/503`）
+
+### 2.3 外部实现参考（本次新增）
+
+- `arcadia-star/seer2-fight-ui`
+  - 双打核心模型不是独立命令集，而是统一帧模型 + `uiStyle + side + position`。
+  - `uiStyle` 支持 `2v2/2v1`，战位通过 `position(main/sub)` 区分。
+- `arcadia-star/seer2-next-message/src/entity/fight.rs`
+  - 采用统一战斗实体结构：`team/user/pet` + `side/position`。
+  - 行为包拆分为 `Load/Hurt/Change/Escape/...`，但底层字段模型统一。
+- `ukuq/seer2-server/src/seer2/fight`
+  - `ArenaResourceLoadCMD -> TeamInfo -> FightUserInfo -> FighterInfo` 为层级化统一结构。
+  - `FighterInfo` 直接包含 `position/hp/maxHp/anger/skills`，适合直接映射为本项目统一结构体。
+
+---
+
+## 3. 协议对齐清单（按优先级）
+
+> 说明：本清单改为“统一协议结构体”路线，不再强制先实现 `75xx` 独立命令族。  
+> 推荐做法：保留旧入口命令，服务端内部统一转为 `FightActionEnvelope/FightStateEnvelope`。
+
+### 3.1 P0 必做（MVP 必须）
+
+- [ ] 统一入站动作结构 `FightActionEnvelope`
+  - 最少字段：`actionType/actorIndex/targetIndex/skillId/itemId/catchTime/escape/chat`
+  - 兼容映射：
+    - `2405 -> actionType=skill`
+    - `2406 -> actionType=item`
+    - `2407 -> actionType=change`
+    - `2410 -> actionType=escape`
+- [ ] 统一出站状态结构 `FightStateEnvelope`
+  - 最少字段：
+    - `phase`（`start/skill_hurt/change/over/load/chat`）
+    - `left[]/right[]`（元素为统一 `FighterState`）
+    - `meta`（回合号、天气、胜负、结束原因）
+- [ ] 统一战位子结构 `FighterState`
+  - 每项至少包含：`side/position(userSlot)/userId/petId(catchTime)/hp/maxHp/level/anger/status/prop/skills`
+
+### 3.2 P1 强烈建议（提升一致性）
+
+- [ ] 完善 `phase=skill_hurt`
+  - 至少带：施法方快照、受击方快照、技能、暴击、伤害、HP 变更
+- [ ] 完善 `phase=change`
+  - 至少带：切宠发起位、切入目标位、新精灵状态
+- [ ] 完善 `phase=over`
+  - 至少带：结束原因、胜方、收益主体
+- [ ] 完善 `phase=load/chat`
+  - 组队加载进度、战斗内聊天统一走同一 envelope
+
+### 3.3 P2 视时间补齐
+
+- [ ] `phase=sprite_die/sprite_notice/win_close`
+- [ ] `phase=skill_wait/skill_wait_notice`
+- [ ] `phase=overtime/timeout_exit/relation_notice`
+
+---
+
+## 4. 代码改造任务清单（可直接分工）
+
+## 4.1 协议与结构层（Owner A）
+
+- [ ] 新增统一协议结构文件
+  - 建议新建：`logic/service/fight/cmd_unified.go`
+  - 要求：统一定义 `FightActionEnvelope` 和映射辅助结构
+
+- [ ] 新增统一出站结构
+  - 建议新建：`logic/service/fight/info/unified_info.go`
+  - 要求：定义 `FightStateEnvelope/FighterState`，支持单打与双打
+
+- [ ] 统一战位字段命名规范
+  - `actorIndex`：我方执行位
+  - `targetIndex`：敌方目标位
+  - `side+pos` 与 `actorIndex/targetIndex` 转换规则写入注释
+
+验收：
+
+- [ ] 旧 cmd（`2405/2406/2407/2410`）可无损映射到统一入站结构。
+- [ ] 统一出站结构在 `start/skill_hurt/change/over` phase 均可序列化。
+
+---
+
+## 4.2 控制器与路由层（Owner B）
+
+- [ ] 新增统一动作入口（可单文件）
+  - 建议新建：`logic/controller/fight_unified.go`
+  - 用途：将旧包和未来扩展包统一落到 `FightActionEnvelope`
+
+- [ ] 兼容旧协议入口
+  - `2405/2406/2407` 保持可用（默认 `actorIndex=0,targetIndex=0`）
+  - 组队场景由 `actorIndex/targetIndex` 与战斗上下文决定，不再依赖独立 `75xx`
+
+- [ ] 增加战前校验
+  - 成员是否在同一组队房间
+  - 战斗状态互斥
+  - 战位可操作权限
+
+验收：
+
+- [ ] 任意技能动作都能转化为 `UseSkillAt(...)`（含 `actorIndex/targetIndex`）。
+- [ ] 非法战位命令被拒绝，不影响其他战位。
+
+---
+
+## 4.3 战斗核心层（Owner C）
+
+- [ ] 固化“多动作一回合”模型
+  - `collectPlayerActions`：按预期战位数收集，不是按两人收集
+  - `resolveRound`：每回合一次统一排序与执行
+
+- [ ] 降低对“双动作 enterturn”的耦合
+  - 当前 `enterturn(first, second)` 作为兼容层保留
+  - 新逻辑要确保：
+    - 回合开始钩子只执行一次/回合
+    - 回合结束钩子只执行一次/回合
+    - 不因 pair 分片导致重复触发
+
+- [ ] 完善动作-战位映射
+  - `GetInputByAction` 在组队模式下严格按 `playerID + actorIndex/targetIndex` 定位
+  - 超时补默认动作按战位补齐
+
+- [ ] 完善死亡换宠/主动换宠
+  - 按 actorIndex 粒度处理
+  - 切宠广播必须携带 actor 位信息
+
+验收：
+
+- [ ] 2v2 场景一回合四动作都参与排序，不丢动作。
+- [ ] 同玩家多战位动作不会互相覆盖。
+- [ ] 任一战位死亡只影响对应战位换宠链路。
+
+---
+
+## 4.4 组队战报与广播层（Owner D）
+
+- [ ] 统一战报快照结构
+  - 至少包含：
+    - 施法方：`userId/actorIndex/skillId/crit/dmg/hpAfter/status/prop`
+    - 受击方：`userId/actorIndex/hpAfter/status/prop`
+
+- [ ] 完成关键广播
+  - 开战广播
+  - 技能结果广播
+  - 切宠成功广播
+  - 战斗结束广播
+
+- [ ] 保留旧包兼容（必要时双发）
+  - 单打/双打统一走同一结构体
+  - 如前端未升级，可按需保留旧 `2503/2505/2506` 过渡映射
+
+验收：
+
+- [ ] 观战端/队友端收到的战位与 HP 同步一致。
+- [ ] 切宠后不会出现“错位显示”。
+
+---
+
+## 4.5 Effect 与规则层（Owner E）
+
+- [ ] 先补明确组队依赖效果
+  - `logic/service/fight/boss/NewSeIdx_501.go`
+  - `logic/service/fight/boss/NewSeIdx_502.go`
+  - `logic/service/fight/boss/NewSeIdx_503.go`
+
+- [ ] 统一“队友”查询工具函数
+  - 建议在 `input` 或 `fight` 层提供：
+    - 获取同阵营存活战位
+    - 获取队友列表（排除自己）
+    - 群体目标选择上限
+
+- [ ] 扫描组队敏感 effect
+  - 特别关注含“组队对战时无效”描述项（如 effect 457）
+  - 明确：是直接禁用，还是按组队模式替代逻辑
+
+验收：
+
+- [ ] `501/502/503` 在 2v2 场景行为符合设计。
+- [ ] 组队模式下不再出现空指针或越界。
+
+---
+
+## 4.6 测试与回归（Owner F）
+
+- [ ] 单测补齐
+  - `logic/service/fight/action_test.go`：继续扩充多战位覆盖
+  - 新增建议：
+    - `logic/service/fight/loop_multi_test.go`
+    - `logic/service/fight/fight_group_test.go`
+
+- [ ] 集成回归用例（最少）
+  - Case 1：1v1 旧流程
+  - Case 2：2v2 双方四动作
+  - Case 3：同一玩家两战位各自出招
+  - Case 4：中途切宠 + 被动死亡切宠
+  - Case 5：超时默认动作补齐
+  - Case 6：逃跑/掉线结束
+
+- [ ] 构建与测试命令
+  - `cd logic && go test ./service/fight/...`
+  - `cd logic && go test ./controller/...`
+  - `cd logic && go build ./...`
+
+---
+
+## 5. 文件级任务地图（便于派工）
+
+- 协议/结构：
+  - `logic/service/fight/cmd.go`
+  - `logic/service/fight/cmd_unified.go`（新增）
+  - `logic/service/fight/info/info.go`
+  - `logic/service/fight/info/unified_info.go`（新增）
+
+- 控制器：
+  - `logic/controller/fight_base.go`
+  - `logic/controller/fight_pvp_withplayer.go`
+  - `logic/controller/fight_unified.go`（新增）
+
+- 核心流程：
+  - `logic/service/fight/new.go`
+  - `logic/service/fight/new_options.go`
+  - `logic/service/fight/input.go`
+  - `logic/service/fight/action.go`
+  - `logic/service/fight/loop.go`
+  - `logic/service/fight/fightc.go`
+
+- Effect：
+  - `logic/service/fight/boss/NewSeIdx_501.go`
+  - `logic/service/fight/boss/NewSeIdx_502.go`
+  - `logic/service/fight/boss/NewSeIdx_503.go`
+  - 其他含组队语义的 effect 文件
+
+- 测试：
+  - `logic/service/fight/action_test.go`
+  - `logic/service/fight/*_test.go`（新增）
+
+---
+
+## 6. 里程碑与交付标准
+
+### M1（协议可通）
+
+- [ ] 统一结构体可完成 `start/skill_hurt/change/over` 四类下发
+- [ ] 旧命令入口均可映射到 `FightC` indexed 接口
+
+### M2（核心可跑）
+
+- [ ] 2v2 全回合可稳定执行
+- [ ] 切宠/道具/超时可用
+
+### M3（规则可用）
+
+- [ ] 501/502/503 完成
+- [ ] 主要组队战报可用
+
+### M4（回归上线）
+
+- [ ] 1v1 不回归
+- [ ] `go test` 与 `go build` 通过
+- [ ] 文档补充已完成项与遗留项
+
+---
+
+## 7. 风险清单与缓解
+
+- 风险：旧逻辑大量默认 `CurPet[0]`，多人战位容易错位。  
+  缓解：引入统一 `CurrentPetByActor`/`TargetByIndex` 访问函数，禁止新代码直接写死 `[0]`。
+
+- 风险：`enterturn` 兼容层导致钩子重复触发。  
+  缓解：把“回合开始/结束”从 pair 执行中抽离，确保每回合只触发一次。
+
+- 风险：协议切换导致旧客户端不可用。  
+  缓解：服务端保持旧入口不变，先做“旧包 -> 统一结构”映射；前端按版本切流。
+
+- 风险：effect 批量改动引发回归。  
+  缓解：先做组队关键 effect，其他 effect 分批迁移并每批回归。
+
+---
+
+## 8. 实施顺序建议（最小阻塞）
+
+1. 协议结构与控制器入口
+2. 动作收集与回合统一执行
+3. 切宠/道具/超时按战位修正
+4. 关键广播与战报
+5. 组队 effect（501/502/503）
+6. 全量测试与回归
+
+---
+
+## 9. 交接要求（给执行同学）
+
+- 每完成一个里程碑，在 `docs/` 新增一段“完成项/未完成项/阻塞项”。
+- 如改动协议字段，必须附抓包样例或字段注释，不允许只改代码不补说明。
+- 如发现与本清单冲突的历史逻辑，以“兼容线上行为优先”，并在文档记录偏差原因。
+
+---
+
+## 10. 可实现性结论（统一协议结构体）
+
+- 结论：可实现，且风险可控。
+- 依据：
+  - `seer2-fight-ui` 的双打模型本质是统一数据结构 + `uiStyle/side/position`，不是强依赖独立命令族。
+  - `seer2-next-message` 与 `seer2-server` 都采用统一 `team/user/pet` 层级结构，`position` 作为战位核心字段。
+  - 本仓库已具备 `actorIndex/targetIndex` 与 `UseSkillAt/ChangePetAt/UseItemAt` 能力，协议统一后只需补齐映射和广播。
+- 实施建议：
+  - 先完成“旧入口 -> 统一入站结构”映射。
+  - 再完成“统一出站结构 + phase 广播”。
+  - 最后做前端切换与旧包退场（或长期双通道兼容）。
+
+---
+
+## AtkType 目标语义补充（2026-04-05）
+
+来源：`flash` 端 `SkillXMLInfo.getGpFtSkillType(skillID)`，读取 `movesMap/moveStoneMap` 的 `AtkType`。
+
+GBTL 规则（已确认）：
+
+1. `AtkNum`：本技能同时攻击数量，默认 `1`（不能为 `0`）
+2. `AtkType`：目标范围
+   - `0`：所有人
+   - `1`：仅己方
+   - `2`：仅对方
+   - `3`：仅自己
+   - 默认：`2`
+
+前端目标选择行为（`SkillMouseController.attack(skillID, attackType)`）：
+
+1. `attackType=0` -> `allPetWinList`（全体可选）
+2. `attackType=1` -> `membPetWinList`（己方可选，含自己与队友）
+3. `attackType=2` -> `oppPetWinList`（敌方可选）
+4. `attackType=3` -> `[playerMode.petWin]`（仅自己）
+
+后端目标关系判定（组队/多战位必须遵循）：
+
+1. 若协议传 `actor + target(side,pos)`：
+   - `target.side != actor.side` => 对方目标
+   - `target.side == actor.side && target.pos == actor.pos` => 自身目标
+   - `target.side == actor.side && target.pos != actor.pos` => 队友目标
+2. 若协议未显式传目标（旧 `2405`）：
+   - 用 `AtkType` 兜底：
+     - `AtkType=3` => 强制自身
+     - `AtkType=1` => 默认自身（无显式队友位时）
+     - 其他 => 维持旧行为（默认对方 `0` 位）
+
+实施要求（与现有清单并行）：
+
+1. `common/data/xmlres/skill.go` 的 `Move` 需包含 `AtkType` 字段解析。
+2. 动作目标不再依赖“默认 Opp 绑定”；effect 上下文必须使用“本次动作的实际目标”。
+3. 需支持区分 `self` 与 `ally`（例如同为 `AtkType=1` 时，不能混用同一默认目标）。
+4. 保持旧协议兼容：旧入口不报错，但按上述兜底规则执行。
+

docs/fight-input-controller-binding.md

@@ -0,0 +1,194 @@
+# Fight Input 控制绑定说明
+
+日期：2026-04-04
+
+## 1. 背景
+
+当前战斗模型中，一个 `Input` 对应一个战斗站位（`actorIndex`）。  
+每个 `Input` 通过 `Input.Player` 绑定操作者。
+
+当前建战主路径已收敛为：`WithFightInputs(ourInputs, oppInputs)`。
+即：先由调用方创建并组装双方 `Input`，再传给战斗模块。
+
+为了同时支持以下两种玩法，新增了可配置绑定策略：
+
+1. 双打：一个玩家控制多个站位（单人多 `Input`）
+2. 组队：一个玩家控制一个站位（每人一个 `Input`）
+
+## 2. 绑定策略
+
+文件：`logic/service/fight/new_options.go`
+
+- `InputControllerBindingKeep`
+  - 含义：保持输入中已有 `Input.Player` 绑定，不覆盖
+  - 适用：调用方已手动构造 `Input` 绑定
+
+- `InputControllerBindingSingle`
+  - 含义：单侧全部站位统一绑定为 `players[0]`
+  - 适用：双打中一个人控制多个站位
+
+- `InputControllerBindingPerSlot`
+  - 含义：按站位顺序绑定为 `players[i]`
+  - 适用：组队中一人一个站位
+  - 说明：当 `players` 数量不足时，回退绑定 `players[0]`
+
+## 3. 选项接口
+
+文件：`logic/service/fight/new_options.go`
+
+新增选项：
+
+```go
+WithInputControllerBinding(mode int)
+```
+
+## 4. 生效时机
+
+文件：`logic/service/fight/new.go`
+
+在 `buildFight` 中，构建完 `Our/Opp` 输入后，先执行控制绑定，再执行上下文绑定：
+
+1. `bindInputControllers(f.Our, f.OurPlayers, opts.controllerBinding)`
+2. `bindInputControllers(f.Opp, f.OppPlayers, opts.controllerBinding)`
+3. `bindInputFightContext(...)`
+4. `linkTeamViews()`
+5. `linkOppInputs()`
+
+## 5. 使用示例
+
+### 5.1 双打（单人控多站位）
+
+```go
+fight.NewFightWithOptions(
+    fight.WithFightPlayersOnSide(
+        []common.PlayerI{ourPlayer},
+        []common.PlayerI{oppPlayer},
+    ),
+    fight.WithFightInputs(ourInputs, oppInputs),
+    fight.WithInputControllerBinding(fight.InputControllerBindingSingle),
+)
+```
+
+### 5.2 组队（一人一个站位）
+
+```go
+fight.NewFightWithOptions(
+    fight.WithFightPlayersOnSide(
+        []common.PlayerI{ourP1, ourP2},
+        []common.PlayerI{oppP1, oppP2},
+    ),
+    fight.WithFightInputs(ourInputs, oppInputs),
+    fight.WithInputControllerBinding(fight.InputControllerBindingPerSlot),
+)
+```
+
+### 5.3 仅传已绑定 Input（推荐灵活接入）
+
+```go
+ourInputs := []*input.Input{
+    input.NewInput(nil, ourP1), // 站位0
+    input.NewInput(nil, ourP2), // 站位1
+}
+oppInputs := []*input.Input{
+    input.NewInput(nil, oppP1), // 站位0
+    input.NewInput(nil, oppP2), // 站位1
+}
+
+fc, err := fight.NewFightWithOptions(
+    fight.WithFightInputs(ourInputs, oppInputs),
+    // 不传 WithFightPlayersOnSide 也可
+    // owner/opponent 与 side players 会从 inputs 自动提取
+)
+_ = fc
+_ = err
+```
+
+说明：`InputControllerBindingSingle/PerSlot` 会覆盖 `ourInputs/oppInputs` 中原有的 `Input.Player` 绑定；`Keep` 不覆盖。
+
+## 6. 新模式绑定实例（逐模式）
+
+以下示例假设我方有两个站位：`ourInputs[0]`、`ourInputs[1]`。
+
+### 6.1 Keep（保持输入原绑定）
+
+调用：
+
+```go
+fight.NewFightWithOptions(
+    fight.WithFightInputs(ourInputs, oppInputs),
+    fight.WithInputControllerBinding(fight.InputControllerBindingKeep),
+)
+```
+
+输入（调用前）：
+
+- `ourInputs[0].Player = ourP1`
+- `ourInputs[1].Player = ourP2`
+
+结果（调用后）：
+
+- `ourInputs[0].Player = ourP1`
+- `ourInputs[1].Player = ourP2`
+
+适用：调用方已提前把每个站位绑定好，不希望框架覆盖。
+
+### 6.2 Single（单人控制全部站位）
+
+调用：
+
+```go
+fight.NewFightWithOptions(
+    fight.WithFightPlayersOnSide(
+        []common.PlayerI{ourCaptain},
+        []common.PlayerI{oppCaptain},
+    ),
+    fight.WithFightInputs(ourInputs, oppInputs),
+    fight.WithInputControllerBinding(fight.InputControllerBindingSingle),
+)
+```
+
+输入（调用前）：
+
+- `ourInputs[0].Player = ourP1`
+- `ourInputs[1].Player = ourP2`
+
+结果（调用后）：
+
+- `ourInputs[0].Player = ourCaptain`
+- `ourInputs[1].Player = ourCaptain`
+
+适用：双打或多站位由同一玩家操作。
+
+### 6.3 PerSlot（按站位顺序绑定玩家）
+
+调用：
+
+```go
+fight.NewFightWithOptions(
+    fight.WithFightPlayersOnSide(
+        []common.PlayerI{ourP1, ourP2},
+        []common.PlayerI{oppP1, oppP2},
+    ),
+    fight.WithFightInputs(ourInputs, oppInputs),
+    fight.WithInputControllerBinding(fight.InputControllerBindingPerSlot),
+)
+```
+
+输入（调用前）：
+
+- `ourInputs[0].Player = anyA`
+- `ourInputs[1].Player = anyB`
+
+结果（调用后）：
+
+- `ourInputs[0].Player = ourP1`
+- `ourInputs[1].Player = ourP2`
+
+补位规则：若 `players` 数量不足（例如只传一个 `ourP1`），剩余站位回退绑定 `players[0]`。
+
+## 7. 注意事项
+
+1. 默认模式是 `InputControllerBindingKeep`，不影响现有调用。
+2. 若传入 `WithFightInputs(...)` 且每个 `Input.Player` 已预先绑定，可继续用默认模式。
+3. 仅传 `WithFightInputs(...)` 也可工作：框架会从 `ourInputs/oppInputs` 自动提取 `ourPlayers/oppPlayers`，并以各侧首位玩家作为 owner/opponent。
+4. 推荐在新组队逻辑中显式传 `WithInputControllerBinding(...)`，避免调用方歧义。

docs/pvp-login-rpc-match-design-2026-04-09.md

@@ -0,0 +1,224 @@
+# PVP Match Via RPC, Battle Via Redis
+
+## 目标
+
+本次调整先不解决 `login` 更新期间的排队保活和补偿问题，只收敛到一个更简单、可控的方案：
+
+- 匹配请求走 `logic -> login` 的同步 RPC
+- 对战过程仍走 `logic` 本地战斗 + Redis 转发战斗指令
+- `login` 不可用时，`logic` 直接返回“匹配服务不可用”
+- 前端通过轮询重新发起 / 更新匹配请求，不在后端保留离线补偿队列
+
+这个方案的核心是：先把“能否立即判断匹配服务可用”做好，不继续依赖 Redis PubSub 做匹配入口。
+
+## 当前现状
+
+### 现有匹配入口
+
+- 前端 `2458` 进入 [logic/controller/fight_巅峰.go](/workspace/logic/controller/fight_巅峰.go#L19)
+- 当前 `JoINtop` 直接调用 [logic/service/fight/pvp/service.go](/workspace/logic/service/fight/pvp/service.go#L83) 的 `JoinPeakQueue`
+- `JoinPeakQueue` 当前实现是本地建 `localQueueTicket`，并通过 Redis `publish` 发 `queue_join`
+
+### 现有跨服协调
+
+- `logic` 侧订阅 PVP Redis topic 的入口在 [common/rpc/func.go](/workspace/common/rpc/func.go#L153)
+- PVP 匹配状态当前存在 `logic/service/fight/pvp/service.go` 的 manager 内存里：
+  - `queues`
+  - `lastSeen`
+  - `localQueues`
+  - `sessions`
+  - `userSession`
+
+### 现有 RPC 能力
+
+- `logic` 启动时通过 [common/rpc/rpc.go](/workspace/common/rpc/rpc.go#L113) 建立到 `login` 的 RPC client
+- `login` 的 `/rpc/*` 入口绑定在 [modules/base/middleware/middleware.go](/workspace/modules/base/middleware/middleware.go#L152)
+- `login` 侧 RPC server 由 [common/rpc/rpc.go](/workspace/common/rpc/rpc.go#L101) 暴露
+
+### 当前问题
+
+Redis PubSub 适合“广播消息”，不适合“同步判断服务是否可用”。
+
+如果继续让匹配入口走 PubSub：
+
+- `logic` 无法在请求当下知道 `login` 是否真能处理
+- `login` 更新、重启、未订阅时，匹配请求可能直接丢失
+- 前端即使轮询，也只是重复投递，不能精确表达“当前匹配服务可用/不可用”
+
+## 收敛后的职责划分
+
+### login
+
+`login` 只负责匹配控制面：
+
+- 接收 `logic` 发来的同步匹配 RPC
+- 判断当前匹配服务是否可用
+- 维护匹配队列
+- 找到对手后，记录 match 结果
+- 再通过 Redis 或其他异步方式通知对应 `logic` 开始 Ban/Pick / Battle
+
+### logic
+
+`logic` 只负责：
+
+- 接收前端匹配请求
+- 同步 RPC 到 `login`
+- RPC 失败时立即返回“匹配服务不可用”
+- RPC 成功时返回“排队中”
+- 收到 match 结果后负责真正 `fight.NewFight(...)`
+- 对战期间继续使用现有 Redis topic 转发战斗指令
+
+### Redis
+
+Redis 只保留在“对战消息面”：
+
+- `match_found`
+- `ban_pick_submit`
+- `battle_command`
+- `packet_relay`
+- `session_close`
+
+也就是说：
+
+- 匹配入口走 RPC
+- 对战过程走 Redis
+
+## 推荐目标链路
+
+### 1. 前端加入/更新匹配
+
+前端定期轮询 `logic` 的加入/更新接口。
+
+`logic` 处理流程：
+
+1. 校验玩家当前战斗状态
+2. 同步调用 `login` 的匹配 RPC
+3. 如果 RPC 成功：返回排队中
+4. 如果 RPC 失败：清理本地匹配状态，返回匹配服务不可用
+
+### 2. login 完成匹配
+
+`login` 维护排队队列和匹配结果，匹配成功后：
+
+1. 确定 host / guest 所在 `logic`
+2. 通过 Redis 通知两个 `logic`
+3. host `logic` 开战
+4. guest `logic` 设置远端代理并进入 Ban/Pick 或战斗态
+
+### 3. 对战期间
+
+继续复用当前 `logic/service/fight/pvp/service.go` 内的 Redis 指令转发模式：
+
+- 战斗操作通过 Redis topic 转发
+- host `logic` 维持真实战斗对象
+- guest `logic` 维持 remote proxy
+
+## 失败语义
+
+本阶段不做补偿，不做离线保队列。
+
+### login 不在线
+
+如果 `logic -> login` RPC 调用失败：
+
+- 本次匹配直接失败
+- `logic` 清理本地匹配状态
+- 返回前端“匹配服务不可用”
+
+### 前端轮询停止
+
+如果前端不再轮询：
+
+- 视为用户不再持续请求匹配
+- `logic` 不负责继续保活
+- 是否从 `login` 队列移除，由 `login` 的超时策略决定
+
+### login 更新中
+
+如果 `login` 正在更新：
+
+- `logic` 的同步 RPC 会失败
+- 前端当前轮询会收到“匹配服务不可用”
+- 等 `login` 恢复后，前端下一轮再发起匹配
+
+这是本阶段明确接受的行为，不在后端做补偿。
+
+## 最小实现建议
+
+### 一、先增加 RPC 健康/匹配接口
+
+在 [common/rpc/rpc.go](/workspace/common/rpc/rpc.go) 增加面向 `logic -> login` 的 RPC 方法。
+
+建议最小接口：
+
+- `MatchJoinOrUpdate(PVPMatchJoinPayload) error`
+- `MatchCancel(userID) error`
+
+如果需要单独健康检查，也可以加：
+
+- `MatchPing() error`
+
+但在最小方案里，`MatchJoinOrUpdate` 自身就可以承担健康检查职责。
+
+### 二、logic 的匹配入口改为同步 RPC
+
+改造 [logic/controller/fight_巅峰.go](/workspace/logic/controller/fight_巅峰.go#L19) 和 [logic/service/fight/pvp/service.go](/workspace/logic/service/fight/pvp/service.go#L83)：
+
+- 入口不再直接发布 `queue_join`
+- 先发 RPC 到 `login`
+- 成功才更新本地匹配状态
+- 失败直接返回错误
+- 取消匹配时通过 `MatchCancel` 做 best-effort 清理
+
+### 三、保留 Redis 对战链路
+
+[logic/service/fight/pvp/service.go](/workspace/logic/service/fight/pvp/service.go#L170) 之后的 Redis 消费、match result 处理、Ban/Pick、战斗 relay 不需要一次性重写，可以继续保留。
+
+调整重点是：
+
+- 不再让匹配入口依赖 PubSub
+- 让对战过程继续走 Redis
+
+## 对前端的要求
+
+前端不要无脑重复“新 join”，而是按“轮询更新匹配状态”处理。
+
+建议行为：
+
+1. 首次点击匹配时发一次加入
+2. 匹配中每隔 `3~5s` 轮询一次更新
+3. 如果返回“匹配服务不可用”，前端退出匹配态并提示
+4. 如果返回“已匹配/进入 Ban/Pick”，前端切换到对应界面
+
+## 本阶段不做的事
+
+以下内容明确不在这次最小改造内：
+
+- `login` 更新期间的排队保活
+- 持久化消息补偿
+- `login` 重启后的队列恢复
+- Redis Stream 化
+- 多 `login` 实例协调
+- 匹配服务自动拉起目标 `logic`
+
+## 后续可选增强
+
+如果后面要继续提高可用性，可以再逐步演进为：
+
+1. 匹配入口仍走 RPC
+2. `login` 内部把队列落 Redis
+3. 加入 ticket 和续租机制
+4. login 更新时支持恢复匹配状态
+
+但这不是当前阶段的目标。
+
+## 最终收敛结论
+
+当前阶段建议明确成一句话：
+
+`匹配走 RPC，对战走 Redis。`
+
+对应业务语义：
+
+- 需要立即判断服务可用性的时候，用 RPC
+- 需要跨服转发战斗消息的时候，用 Redis

help/report.md

@@ -1,99 +0,0 @@
-# 屎山代码分析报告
-
-## 总体评估
-
-- **质量评分**: 31.03/100
-- **质量等级**: 🌸 偶有异味 - 基本没事，但是有伤风化
-- **分析文件数**: 203
-- **代码总行数**: 20972
-
-## 质量指标
-
-| 指标 | 得分 | 权重 | 状态 |
-|------|------|------|------|
-| 状态管理 | 4.84 | 0.15 | ✓✓ |
-| 循环复杂度 | 6.28 | 0.25 | ✓✓ |
-| 命名规范 | 25.00 | 0.10 | ✓ |
-| 错误处理 | 35.00 | 0.15 | ○ |
-| 代码结构 | 45.00 | 0.20 | ○ |
-| 代码重复度 | 55.00 | 0.15 | • |
-| 注释覆盖率 | 55.94 | 0.15 | • |
-
-## 问题文件 (Top 5)
-
-### 1. /workspace/blazing/common/utils/sturc/field.go (得分: 53.85)
-**问题分类**: 🔄 复杂度问题:10, 📝 注释问题:1, ⚠️ 其他问题:5
-
-**主要问题**:
-- 函数 Size 的循环复杂度较高 (12)，建议简化
-- 函数 packVal 的循环复杂度过高 (23)，考虑重构
-- 函数 Pack 的循环复杂度较高 (14)，建议简化
-- 函数 unpackVal 的循环复杂度过高 (21)，考虑重构
-- 函数 Unpack 的循环复杂度较高 (12)，建议简化
-- 函数 'Size' () 较长 (33 行)，可考虑重构
-- 函数 'Size' () 复杂度过高 (12)，建议简化
-- 函数 'packVal' () 过长 (69 行)，建议拆分
-- 函数 'packVal' () 复杂度严重过高 (23)，必须简化
-- 函数 'Pack' () 较长 (48 行)，可考虑重构
-- 函数 'Pack' () 复杂度过高 (14)，建议简化
-- 函数 'unpackVal' () 过长 (57 行)，建议拆分
-- 函数 'unpackVal' () 复杂度严重过高 (21)，必须简化
-- 函数 'Unpack' () 较长 (33 行)，可考虑重构
-- 函数 'Unpack' () 复杂度过高 (12)，建议简化
-- 代码注释率极低 (1.38%)，几乎没有注释
-
-### 2. /workspace/blazing/common/utils/sturc/fields.go (得分: 46.83)
-**问题分类**: 🔄 复杂度问题:4, 📝 注释问题:1, ⚠️ 其他问题:2
-
-**主要问题**:
-- 函数 Pack 的循环复杂度较高 (12)，建议简化
-- 函数 Unpack 的循环复杂度过高 (21)，考虑重构
-- 函数 'Pack' () 较长 (42 行)，可考虑重构
-- 函数 'Pack' () 复杂度过高 (12)，建议简化
-- 函数 'Unpack' () 过长 (73 行)，建议拆分
-- 函数 'Unpack' () 复杂度严重过高 (21)，必须简化
-- 代码注释率极低 (3.91%)，几乎没有注释
-
-### 3. /workspace/blazing/common/utils/sturc/parse.go (得分: 46.68)
-**问题分类**: 🔄 复杂度问题:4, 📝 注释问题:1, ⚠️ 其他问题:3
-
-**主要问题**:
-- 代码注释率较低 (6.93%)，建议增加注释
-- 函数 parseField 的循环复杂度较高 (13)，建议简化
-- 函数 parseFieldsLocked 的循环复杂度过高 (18)，考虑重构
-- 函数 'parseField' () 过长 (64 行)，建议拆分
-- 函数 'parseField' () 复杂度过高 (13)，建议简化
-- 函数 'parseFieldsLocked' () 过长 (64 行)，建议拆分
-- 函数 'parseFieldsLocked' () 复杂度严重过高 (18)，必须简化
-- 函数 'parseFields' () 较长 (31 行)，可考虑重构
-
-### 4. /workspace/blazing/common/utils/xml/typeinfo.go (得分: 46.13)
-**问题分类**: 🔄 复杂度问题:6, ⚠️ 其他问题:3
-
-**主要问题**:
-- 函数 getTypeInfo 的循环复杂度过高 (18)，考虑重构
-- 函数 structFieldInfo 的循环复杂度过高 (33)，考虑重构
-- 函数 addFieldInfo 的循环复杂度过高 (20)，考虑重构
-- 函数 'getTypeInfo' () 过长 (58 行)，建议拆分
-- 函数 'getTypeInfo' () 复杂度严重过高 (18)，必须简化
-- 函数 'structFieldInfo' () 极度过长 (114 行)，必须拆分
-- 函数 'structFieldInfo' () 复杂度严重过高 (33)，必须简化
-- 函数 'addFieldInfo' () 过长 (66 行)，建议拆分
-- 函数 'addFieldInfo' () 复杂度严重过高 (20)，必须简化
-
-### 5. /workspace/blazing/common/utils/go-jsonrpc/auth/handler.go (得分: 45.61)
-**问题分类**: 📝 注释问题:1, ⚠️ 其他问题:1
-
-**主要问题**:
-- 函数 'ServeHTTP' () 较长 (31 行)，可考虑重构
-- 代码注释率极低 (0.00%)，几乎没有注释
-
-## 改进建议
-
-### 高优先级
-- 继续保持当前的代码质量标准
-
-### 中优先级
-- 可以考虑进一步优化性能和可读性
-- 完善文档和注释，便于团队协作
-

logic/controller/Controller.go

@@ -4,6 +4,7 @@
 package controller
 
 import (
+	"blazing/common/rpc"
 	"blazing/cool"
 	"blazing/logic/service/common"
 	"bytes"
@@ -16,8 +17,10 @@ import (
 
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/lunixbochs/struc"
+	"github.com/panjf2000/gnet/v2"
 )
 
+// Maincontroller 是控制器层共享变量。
 var Maincontroller = &Controller{} //注入service
 
 // Controller 分发cmd逻辑实现
@@ -27,6 +30,10 @@ type Controller struct {
 		Kick func(uint32) error
 
 		RegisterLogic func(uint32, uint32) error
+
+		MatchJoinOrUpdate func(rpc.PVPMatchJoinPayload) error
+
+		MatchCancel func(uint32) error
 	}
 }
 
@@ -44,19 +51,14 @@ func ParseCmd[T any](data []byte) T {
 // Init 初始化控制器，注册所有cmd处理方法
 // 参数 isGame: 标识是否为游戏服务器(true)或登录服务器(false)
 func Init(isGame bool) {
-	// 获取控制器实例的反射值
 	controllerValue := reflect.ValueOf(Maincontroller)
-
-	// 获取控制器类型
 	controllerType := controllerValue.Type()
 
-	// 遍历控制器的所有方法
 	for i := 0; i < controllerType.NumMethod(); i++ {
 		method := controllerType.Method(i)
-		methodValue := controllerValue.MethodByName(method.Name)
+		methodValue := controllerValue.Method(i)
 		methodType := methodValue.Type()
 
-		// 获取方法第一个参数的类型（请求结构体）
 		if methodType.NumIn() == 0 {
 			continue
 		}
@@ -67,43 +69,46 @@ func Init(isGame bool) {
 			continue
 		}
 		reqType := reqArgType.Elem()
+		binding := getCmdBinding(reqType)
 
-		// 解析请求结构体中的cmd标签
-		for _, cmd := range getCmd(reqType) {
-			if cmd == 0 { // 说明不是有效的注册方法
+		for _, cmd := range binding.cmds {
+			if cmd == 0 {
 				glog.Warning(context.Background(), "方法参数必须包含CMD参数", method.Name, "跳过注册")
 				continue
 			}
 
-			// 根据服务器类型过滤cmd
-			// 登录服务器只处理小于1000的cmd
+			if methodType.NumIn() != 2 {
+				glog.Warning(context.Background(), "方法参数数量必须为2", method.Name, "跳过注册")
+				continue
+			}
+
 			if !isGame && cmd > 1000 {
 				continue
 			}
 
-			// 游戏服务器只处理大于等于1000的cmd
 			if isGame && cmd < 1000 {
 				continue
 			}
 
-			// 注册命令处理函数
 			if cool.Config.ServerInfo.IsDebug != 0 {
 				fmt.Println("注册方法", cmd, method.Name)
 			}
 
-			cmdInfo := cool.Cmd{
-				Func: methodValue,
-				Req:  reqType,
-
-				// Res: , // TODO 待实现对不同用户初始化方法以取消全局cmdcache
-			}
-			// 预编译创建req实例的函数：返回结构体指针
 			reqTypeForNew := reqType
-			cmdInfo.NewReqFunc = func() interface{} {
-				return reflect.New(reqTypeForNew).Interface()
+			cmdInfo := cool.Cmd{
+				Func:             methodValue,
+				Req:              reqType,
+				HeaderFieldIndex: append([]int(nil), binding.headerFieldIndex...),
+				UseConn:          methodType.In(1) == connType,
+				NewReqFunc: func() interface{} {
+					return reflect.New(reqTypeForNew).Interface()
+				},
+				NewReqValue: func() reflect.Value {
+					return reflect.New(reqTypeForNew)
+				},
 			}
 
-			if _, exists := cool.CmdCache[cmd]; exists { // 方法已存在
+			if _, exists := cool.CmdCache[cmd]; exists {
 				panic(fmt.Sprintf("命令处理方法已存在，跳过注册 %d %s", cmd, method.Name))
 			}
 			cool.CmdCache[cmd] = cmdInfo
@@ -111,12 +116,20 @@ func Init(isGame bool) {
 	}
 }
 
-var targetType = reflect.TypeOf(common.TomeeHeader{})
-var cmdTypeCache sync.Map
+var (
+	targetType   = reflect.TypeOf(common.TomeeHeader{})
+	connType     = reflect.TypeOf((*gnet.Conn)(nil)).Elem()
+	cmdTypeCache sync.Map
+)
 
 // 默认返回值（无匹配字段/解析失败时）
 const defaultCmdValue = 0
 
+type cmdBinding struct {
+	cmds             []uint32
+	headerFieldIndex []int
+}
+
 func normalizeStructType(typ reflect.Type) reflect.Type {
 	for typ.Kind() == reflect.Ptr {
 		typ = typ.Elem()
@@ -124,92 +137,93 @@ func normalizeStructType(typ reflect.Type) reflect.Type {
 	return typ
 }
 
-// getCmd 从结构体类型中提取绑定的cmd指令（递归查找嵌套结构体，支持值/指针类型的TomeeHeader）
-// 参数 typ: 待解析的结构体类型（支持多层指针）
-// 返回值: 解析到的cmd切片，无匹配/解析失败时返回[defaultCmdValue]
-func getCmd(typ reflect.Type) []uint32 {
+// getCmdBinding 从结构体类型中提取绑定的cmd指令和头字段位置。
+func getCmdBinding(typ reflect.Type) cmdBinding {
 	typ = normalizeStructType(typ)
 	if cached, ok := cmdTypeCache.Load(typ); ok {
-		return cached.([]uint32)
+		return cached.(cmdBinding)
 	}
 
-	// 非结构体类型直接返回默认值
 	if typ.Kind() != reflect.Struct {
-		return []uint32{defaultCmdValue}
+		binding := cmdBinding{cmds: []uint32{defaultCmdValue}}
+		cmdTypeCache.Store(typ, binding)
+		return binding
 	}
 
-	if cmd, ok := findCmd(typ, make(map[reflect.Type]struct{})); ok {
-		cmdTypeCache.Store(typ, cmd)
-		return cmd
+	if binding, ok := findCmdBinding(typ, make(map[reflect.Type]struct{})); ok {
+		cmdTypeCache.Store(typ, binding)
+		return binding
 	}
 
-	// 未找到目标字段/所有解析失败，返回默认值
-	defaultCmd := []uint32{defaultCmdValue}
-	cmdTypeCache.Store(typ, defaultCmd)
-	return defaultCmd
+	binding := cmdBinding{cmds: []uint32{defaultCmdValue}}
+	cmdTypeCache.Store(typ, binding)
+	return binding
 }
 
-func findCmd(typ reflect.Type, visiting map[reflect.Type]struct{}) ([]uint32, bool) {
+func findCmdBinding(typ reflect.Type, visiting map[reflect.Type]struct{}) (cmdBinding, bool) {
 	typ = normalizeStructType(typ)
 	if typ.Kind() != reflect.Struct {
-		return nil, false
+		return cmdBinding{}, false
 	}
 	if _, seen := visiting[typ]; seen {
-		return nil, false
+		return cmdBinding{}, false
 	}
 	visiting[typ] = struct{}{}
 	defer delete(visiting, typ)
 
-	// 遍历结构体字段，查找TomeeHeader字段并解析cmd
 	for i := 0; i < typ.NumField(); i++ {
 		field := typ.Field(i)
 
-		// 尝试解析当前字段的cmd标签
 		cmdSlice, isHeader, err := parseCmdTagWithStructField(field)
-		if isHeader && err == nil { // 解析成功，直接返回结果
-			return cmdSlice, true
+		if isHeader && err == nil {
+			return cmdBinding{
+				cmds:             cmdSlice,
+				headerFieldIndex: append([]int(nil), field.Index...),
+			}, true
 		}
 
-		// 递归处理嵌套结构体（值/指针类型）
 		nestedTyp := normalizeStructType(field.Type)
-		if nestedTyp.Kind() == reflect.Struct {
-			// 递归查找，找到有效cmd则立即返回
-			if nestedCmd, ok := findCmd(nestedTyp, visiting); ok {
-				return nestedCmd, true
-			}
+		if nestedTyp.Kind() != reflect.Struct {
+			continue
 		}
+
+		nestedBinding, ok := findCmdBinding(nestedTyp, visiting)
+		if !ok {
+			continue
+		}
+
+		fieldIndex := make([]int, 0, len(field.Index)+len(nestedBinding.headerFieldIndex))
+		fieldIndex = append(fieldIndex, field.Index...)
+		fieldIndex = append(fieldIndex, nestedBinding.headerFieldIndex...)
+		nestedBinding.headerFieldIndex = fieldIndex
+		return nestedBinding, true
 	}
 
-	return nil, false
+	return cmdBinding{}, false
 }
 
 // parseCmdTagWithStructField 校验字段是否为TomeeHeader（值/指针）并解析cmd标签
 // 参数 field: 结构体字段元信息
 // 返回值: 解析后的cmd切片，是否为目标类型，解析失败错误
 func parseCmdTagWithStructField(field reflect.StructField) ([]uint32, bool, error) {
-	// 判断字段类型是否为 TomeeHeader 或 *TomeeHeader
 	if field.Type != targetType && !(field.Type.Kind() == reflect.Ptr && field.Type.Elem() == targetType) {
 		return nil, false, nil
 	}
 
-	// 提取cmd标签
 	cmdStr := field.Tag.Get("cmd")
 	if cmdStr == "" {
 		return nil, true, fmt.Errorf("field %s cmd tag is empty", field.Name)
 	}
 
-	// 高性能解析标签为uint32切片（替代gconv，减少第三方依赖且可控）
 	result := make([]uint32, 0, strings.Count(cmdStr, "|")+1)
 	remain := cmdStr
 	for idx := 0; ; idx++ {
 		part, next, found := strings.Cut(remain, "|")
-		// 去除空白字符（兼容标签中意外的空格）
 		s := strings.TrimSpace(part)
 		if s == "" {
 			return nil, true, fmt.Errorf("field %s cmd tag part %d is empty", field.Name, idx)
 		}
 
-		// 手动解析uint32，比gconv更可控，避免隐式转换问题
 		num, err := strconv.ParseUint(s, 10, 32)
 		if err != nil {
 			return nil, true, fmt.Errorf("field %s cmd tag part %d parse error: %v (value: %s)",

logic/controller/action_大师杯.go

@@ -43,6 +43,7 @@ var masterCupRequiredItems = map[uint32][]ItemS{
 	},
 }
 
+// DASHIbei 处理控制器请求。
 func (h Controller) DASHIbei(req *C2s_MASTER_REWARDS, c *player.Player) (result *S2C_MASTER_REWARDS, err errorcode.ErrorCode) {
 	_ = req
 	result = &S2C_MASTER_REWARDS{}
@@ -52,6 +53,7 @@ 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) {
 	result = &S2C_MASTER_REWARDSR{}
 
@@ -70,30 +72,37 @@ func (h Controller) DASHIbeiR(req *C2s_MASTER_REWARDSR, c *player.Player) (resul
 	}
 
 	result.ItemList = make([]data.ItemInfo, 0, len(taskInfo.ItemList))
-	c.Service.Task.Exec(masterCupTaskID, func(te *model.Task) bool {
-		progress := bitset32.From(te.Data)
-		if progress.Test(uint(req.ElementType)) {
-			err = errorcode.ErrorCode(errorcode.ErrorCodes.ErrAwardAlreadyClaimed)
-			return false
-		}
+	taskData, taskErr := c.Service.Task.GetTask(masterCupTaskID)
+	if taskErr != nil {
+		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
+	}
 
-		consumeMasterCupItems(c, requiredItems)
-		progress.Set(uint(req.ElementType))
-		te.Data = progress.Bytes()
+	progress := bitset32.From(taskData.Data)
+	if progress.Test(uint(req.ElementType)) {
+		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrAwardAlreadyClaimed)
+	}
 
-		if taskInfo.Pet != nil {
-			c.Service.Pet.PetAdd(taskInfo.Pet, 0)
-			result.CaptureTime = taskInfo.Pet.CatchTime
-			result.PetTypeId = taskInfo.Pet.ID
-		}
+	if err := consumeMasterCupItems(c, requiredItems); err != nil {
+		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrInsufficientItems)
+	}
+	progress.Set(uint(req.ElementType))
+	taskData.Data = progress.Bytes()
+	if taskErr = c.Service.Task.SetTask(taskData); taskErr != nil {
+		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
+	}
 
-		appendMasterCupRewardItems(c, result, taskInfo.ItemList)
-		return true
-	})
+	if taskInfo.Pet != nil {
+		c.Service.Pet.PetAdd(taskInfo.Pet, 0)
+		result.CaptureTime = taskInfo.Pet.CatchTime
+		result.PetTypeId = taskInfo.Pet.ID
+	}
+
+	appendMasterCupRewardItems(c, result, taskInfo.ItemList)
 
 	return
 }
 
+// ItemS 定义请求或响应数据结构。
 type ItemS struct {
 	ItemId  uint32
 	ItemCnt uint32
@@ -123,10 +132,13 @@ func hasEnoughMasterCupItems(c *player.Player, requiredItems []ItemS) bool {
 	return true
 }
 
-func consumeMasterCupItems(c *player.Player, requiredItems []ItemS) {
+func consumeMasterCupItems(c *player.Player, requiredItems []ItemS) error {
 	for _, item := range requiredItems {
-		c.Service.Item.UPDATE(item.ItemId, -int(item.ItemCnt))
+		if err := c.Service.Item.UPDATE(item.ItemId, -int(item.ItemCnt)); err != nil {
+			return err
+		}
 	}
+	return nil
 }
 
 func appendMasterCupRewardItems(c *player.Player, result *S2C_MASTER_REWARDSR, itemList []data.ItemInfo) {
@@ -137,6 +149,7 @@ func appendMasterCupRewardItems(c *player.Player, result *S2C_MASTER_REWARDSR, i
 	}
 }
 
+// C2s_MASTER_REWARDS 定义请求或响应数据结构。
 type C2s_MASTER_REWARDS struct {
 	Head common.TomeeHeader `cmd:"2611" struc:"skip"` //玩家登录
 }
@@ -147,6 +160,7 @@ type S2C_MASTER_REWARDS struct {
 	Reward []uint32 `json:"Reward"`
 }
 
+// C2s_MASTER_REWARDSR 定义请求或响应数据结构。
 type C2s_MASTER_REWARDSR struct {
 	Head        common.TomeeHeader `cmd:"2612" struc:"skip"` //玩家登录
 	ElementType uint32

logic/controller/action_扭蛋.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gogf/gf/v2/util/grand"
 )
 
+// EggGamePlay 处理控制器请求。
 func (h Controller) EggGamePlay(data1 *C2S_EGG_GAME_PLAY, c *player.Player) (result *S2C_EGG_GAME_PLAY, err errorcode.ErrorCode) {
 
 	switch data1.EggNum {
@@ -25,12 +26,11 @@ func (h Controller) EggGamePlay(data1 *C2S_EGG_GAME_PLAY, c *player.Player) (res
 	if data1.EggNum > 10 || data1.EggNum <= 0 {
 		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
 	}
-	if r < 0 {
+	if r <= 0 || data1.EggNum > r {
 		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrGachaTicketsInsufficient)
 	}
-	if data1.EggNum > r {
+	if err := c.Service.Item.UPDATE(400501, int(-data1.EggNum)); err != nil {
 		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrGachaTicketsInsufficient)
-
 	}
 	result = &S2C_EGG_GAME_PLAY{ListInfo: []data.ItemInfo{}}
 	if grand.Meet(int(data1.EggNum), 100) {
@@ -51,8 +51,6 @@ func (h Controller) EggGamePlay(data1 *C2S_EGG_GAME_PLAY, c *player.Player) (res
 	for _, item := range addedItems {
 		result.ListInfo = append(result.ListInfo, data.ItemInfo{ItemId: item.ItemId, ItemCnt: item.ItemCnt})
 	}
-
-	c.Service.Item.UPDATE(400501, int(-data1.EggNum))
 	return
 
 }

logic/controller/action_炫彩碎片.go

@@ -37,6 +37,7 @@ 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) {
 	result = &S2C_GET_XUANCAI{}
 	selectedCount := 0        // 已选中的数量
@@ -56,6 +57,7 @@ func (h Controller) GET_XUANCAI(data *C2s_GET_XUANCAI, c *player.Player) (result
 
 		// 检查该位是否未被选中（避免重复）
 		if (result.Status & mask) == 0 {
+			result.Status |= mask
 			itemID := uint32(400686 + randBitIdx + 1)
 			selectedItems = append(selectedItems, itemID)
 			itemMask[itemID] = mask
@@ -74,6 +76,7 @@ func (h Controller) GET_XUANCAI(data *C2s_GET_XUANCAI, c *player.Player) (result
 
 }
 
+// C2s_GET_XUANCAI 定义请求或响应数据结构。
 type C2s_GET_XUANCAI struct {
 	Head common.TomeeHeader `cmd:"60001" struc:"skip"` //玩家登录
 }

logic/controller/action_超时空隧道.go

@@ -30,6 +30,7 @@ func (h Controller) TimeMap(data *C2s_SP, c *player.Player) (result *S2C_SP, err
 
 }
 
+// C2s_SP 定义请求或响应数据结构。
 type C2s_SP struct {
 	Head common.TomeeHeader `cmd:"60002" struc:"skip"` //超时空地图
 }
@@ -40,6 +41,7 @@ type S2C_SP struct {
 	MapList    []ServerInfo
 }
 
+// ServerInfo 定义请求或响应数据结构。
 type ServerInfo struct {
 	ID             uint32   //地图ID
 	PetLen         uint32   `struc:"sizeof=Pet"`

logic/controller/activce_雷伊特训.go

@@ -7,6 +7,7 @@ import (
 	"blazing/logic/service/player"
 )
 
+// GetLeiyiTrainStatus 处理控制器请求。
 func (h Controller) GetLeiyiTrainStatus(data *C2s_LEIYI_TRAIN_GET_STATUS, c *player.Player) (result *S2C_LEIYI_TRAIN_GET_STATUS, err errorcode.ErrorCode) {
 	result = &S2C_LEIYI_TRAIN_GET_STATUS{}
 
@@ -19,6 +20,7 @@ func (h Controller) GetLeiyiTrainStatus(data *C2s_LEIYI_TRAIN_GET_STATUS, c *pla
 
 }
 
+// C2s_LEIYI_TRAIN_GET_STATUS 定义请求或响应数据结构。
 type C2s_LEIYI_TRAIN_GET_STATUS struct {
 	Head common.TomeeHeader `cmd:"2393" struc:"skip"` //玩家登录
 }
@@ -28,6 +30,7 @@ type S2C_LEIYI_TRAIN_GET_STATUS struct {
 	Status [10]S2C_LEIYI_TRAIN_GET_STATUS_info `json:"status"`
 }
 
+// S2C_LEIYI_TRAIN_GET_STATUS_info 定义请求或响应数据结构。
 type S2C_LEIYI_TRAIN_GET_STATUS_info struct {
 	//	Today   uint32 // 今日训练HP次数
 	Current uint32 // 当前训练HP次数

logic/controller/active_寒流枪.go

@@ -35,6 +35,7 @@ func (h Controller) HanLiuQiang(data *C2S_2608, c *player.Player) (result *fight
 	return result, -1
 }
 
+// C2S_2608 定义请求或响应数据结构。
 type C2S_2608 struct {
 	Head common.TomeeHeader `cmd:"2608" struc:"skip"`
 }

logic/controller/fight_base.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"blazing/common/socket/errorcode"
-	"blazing/modules/player/model"
 
 	"blazing/logic/service/fight"
 	"blazing/logic/service/fight/info"
@@ -18,7 +17,7 @@ func (h Controller) checkFightStatus(c *player.Player) errorcode.ErrorCode {
 }
 
 // OnReadyToFight 准备战斗
-func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnReadyToFight(data *ReadyToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
@@ -26,36 +25,108 @@ func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *playe
 	return nil, -1
 }
 
-// UseSkill 使用技能包
-func (h Controller) UseSkill(data *fight.UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// GroupReadyFightFinish 旧组队协议准备完成。
+func (h Controller) GroupReadyFightFinish(data *GroupReadyFightFinishInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
-	go c.FightC.UseSkill(c, data.SkillId)
+	go c.FightC.ReadyFight(c)
+	return nil, -1
+}
+
+func (h Controller) GroupUseSkill(data *GroupUseSkillInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if err := h.checkFightStatus(c); err != 0 {
+		return nil, err
+	}
+	targetRelation := fight.SkillTargetOpponent
+	if data.TargetSide == 1 {
+		targetRelation = fight.SkillTargetAlly
+	}
+	h.dispatchFightActionEnvelope(c, fight.NewSkillActionEnvelope(data.SkillId, int(data.ActorIndex), int(data.TargetPos), targetRelation, 0))
+	c.SendPackCmd(7558, nil)
+	return nil, -1
+}
+
+func (h Controller) GroupUseItem(data *GroupUseItemInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if err := h.checkFightStatus(c); err != 0 {
+		return nil, err
+	}
+	h.dispatchFightActionEnvelope(c, fight.NewItemActionEnvelope(0, data.ItemId, int(data.ActorIndex), int(data.ActorIndex), fight.SkillTargetSelf))
+	return nil, -1
+}
+
+func (h Controller) GroupChangePet(data *GroupChangePetInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if err := h.checkFightStatus(c); err != 0 {
+		return nil, err
+	}
+	h.dispatchFightActionEnvelope(c, fight.NewChangeActionEnvelope(data.CatchTime, int(data.ActorIndex)))
+	return nil, -1
+}
+
+func (h Controller) GroupEscape(data *GroupEscapeInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if err := h.checkFightStatus(c); err != 0 {
+		return nil, err
+	}
+	if fightC, ok := c.FightC.(*fight.FightC); ok && fightC != nil && fightC.LegacyGroupProtocol {
+		fightC.SendLegacyEscapeSuccess(c, int(data.ActorIndex))
+	}
+	h.dispatchFightActionEnvelope(c, fight.NewEscapeActionEnvelope())
+	return nil, 0
+}
+
+func (h Controller) GroupFightWinClose(data *GroupFightWinCloseInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if c != nil {
+		c.QuitFight()
+	}
+	return nil, -1
+}
+
+func (h Controller) GroupFightTimeoutExit(data *GroupFightTimeoutExitInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if c != nil {
+		c.QuitFight()
+	}
+	return nil, -1
+}
+
+// UseSkill 使用技能包
+func (h Controller) UseSkill(data *UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if err := h.checkFightStatus(c); err != 0 {
+		return nil, err
+	}
+	h.dispatchFightActionEnvelope(c, buildLegacyUseSkillEnvelope(data))
+	return nil, 0
+}
+
+// UseSkillAt 组队/多战位技能包（cmd=7505）。
+// 目标关系：0=对方 1=自己 2=队友。
+func (h Controller) UseSkillAt(data *UseSkillAtInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if err := h.checkFightStatus(c); err != 0 {
+		return nil, err
+	}
+	h.dispatchFightActionEnvelope(c, buildIndexedUseSkillEnvelope(data))
 	return nil, 0
 }
 
 // Escape 战斗逃跑
-func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Escape(data *EscapeFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
-
-	go c.FightC.Over(c, model.BattleOverReason.PlayerEscape)
+	h.dispatchFightActionEnvelope(c, buildLegacyEscapeEnvelope())
 	return nil, 0
 }
 
 // ChangePet 切换精灵
-func (h Controller) ChangePet(data *fight.ChangePetInboundInfo, c *player.Player) (result *info.ChangePetInfo, err errorcode.ErrorCode) {
+func (h Controller) ChangePet(data *ChangePetInboundInfo, c *player.Player) (result *info.ChangePetInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
-	go c.FightC.ChangePet(c, data.CatchTime)
+	h.dispatchFightActionEnvelope(c, buildLegacyChangeEnvelope(data))
 	return nil, -1
 }
 
 // Capture 捕捉精灵
-func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *player.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Capture(data *CatchMonsterInboundInfo, c *player.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
@@ -70,7 +141,7 @@ func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *player.Playe
 }
 
 // LoadPercent 加载进度
-func (h Controller) LoadPercent(data *fight.LoadPercentInboundInfo, c *player.Player) (result *info.LoadPercentOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) LoadPercent(data *LoadPercentInboundInfo, c *player.Player) (result *info.LoadPercentOutboundInfo, err errorcode.ErrorCode) {
 	if c.FightC == nil {
 		return nil, -1
 	}
@@ -79,7 +150,7 @@ func (h Controller) LoadPercent(data *fight.LoadPercentInboundInfo, c *player.Pl
 }
 
 // UsePetItemInboundInfo 使用宠物道具
-func (h Controller) UsePetItemInboundInfo(data *fight.UsePetItemInboundInfo, c *player.Player) (result *info.UsePetIteminfo, err errorcode.ErrorCode) {
+func (h Controller) UsePetItemInboundInfo(data *UsePetItemInboundInfo, c *player.Player) (result *info.UsePetIteminfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
@@ -89,15 +160,15 @@ func (h Controller) UsePetItemInboundInfo(data *fight.UsePetItemInboundInfo, c *
 		}
 	}
 
-	go c.FightC.UseItem(c, data.CatchTime, data.ItemId)
+	h.dispatchFightActionEnvelope(c, buildLegacyUseItemEnvelope(data))
 	return nil, -1
 }
 
 // FightChat 战斗聊天
-func (h Controller) FightChat(data *fight.ChatInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) FightChat(data *ChatInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {
 		return nil, err
 	}
-	go c.FightC.Chat(c, data.Message)
+	h.dispatchFightActionEnvelope(c, buildChatEnvelope(data))
 	return nil, -1
 }

logic/controller/fight_boss野怪和地图怪.go

@@ -4,7 +4,6 @@ import (
 	"blazing/common/data"
 	"blazing/common/data/xmlres"
 	"blazing/common/socket/errorcode"
-	"strings"
 
 	"blazing/logic/service/fight"
 	fightinfo "blazing/logic/service/fight/info"
@@ -18,13 +17,21 @@ import (
 	"github.com/gogf/gf/v2/util/grand"
 )
 
+const (
+	rewardItemExpPool  = 3
+	groupBossSlotLimit = 3
+)
+
 // PlayerFightBoss 挑战地图boss
-func (Controller) PlayerFightBoss(req *fight.ChallengeBossInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (Controller) PlayerFightBoss(req *ChallengeBossInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err = p.CanFight(); err != 0 {
 		return nil, err
 	}
 
-	mapNode := service.NewMapNodeService().GetDataNode(p.Info.MapID, req.BossId)
+	mapNode := p.GetSpace().GetMatchedMapNode(req.BossId)
+	if mapNode == nil {
+		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
+	}
 	bossConfigs, err := loadMapBossConfigs(mapNode)
 	if err != 0 {
 		return nil, err
@@ -36,14 +43,15 @@ func (Controller) PlayerFightBoss(req *fight.ChallengeBossInboundInfo, p *player
 	}
 
 	p.Fightinfo.Status = fightinfo.BattleMode.FIGHT_WITH_NPC
-	p.Fightinfo.Mode = fightinfo.BattleMode.MULTI_MODE
+	p.Fightinfo.Mode = resolveMapNodeFightMode(mapNode)
 
 	ai := player.NewAI_player(monsterInfo)
 	ai.CanCapture = resolveBossCaptureRate(bossConfigs[0].IsCapture, leadMonsterID)
-	ai.Prop[0] = 2
+	ai.BossScript = bossConfigs[0].Script
+	ai.AddBattleProp(0, 2)
 
 	var fightC *fight.FightC
-	fightC, err = fight.NewFight(p, ai, p.GetPetInfo(100), ai.GetPetInfo(0), func(foi model.FightOverInfo) {
+	fightC, err = startMapBossFight(mapNode, p, ai, func(foi model.FightOverInfo) {
 		if mapNode.WinBonusID == 0 {
 			return
 		}
@@ -58,13 +66,40 @@ func (Controller) PlayerFightBoss(req *fight.ChallengeBossInboundInfo, p *player
 	return nil, -1
 }
 
+func startMapBossFight(
+	mapNode *configmodel.MapNode,
+	p *player.Player,
+	ai *player.AI_player,
+	fn func(model.FightOverInfo),
+) (*fight.FightC, errorcode.ErrorCode) {
+	ourPets := p.GetPetInfo(p.CurrentMapPetLevelLimit())
+	oppPets := ai.GetPetInfo(0)
+	if mapNode != nil && mapNode.IsGroupBoss != 0 {
+		if len(ourPets) > 0 && len(oppPets) > 0 {
+			slotLimit := groupBossSlotLimit
+			if mapNode.PkFlag != 0 {
+				slotLimit = 1
+			}
+			return fight.NewLegacyGroupFightSingleController(p, ai, ourPets, oppPets, slotLimit, fn)
+		}
+	}
+	return fight.NewFight(p, ai, ourPets, oppPets, fn)
+}
+
+func resolveMapNodeFightMode(mapNode *configmodel.MapNode) uint32 {
+	if mapNode != nil && mapNode.PkFlag != 0 {
+		return fightinfo.BattleMode.SINGLE_MODE
+	}
+	return fightinfo.BattleMode.MULTI_MODE
+}
+
 // OnPlayerFightNpcMonster 战斗野怪
-func (Controller) OnPlayerFightNpcMonster(req *fight.FightNpcMonsterInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (Controller) OnPlayerFightNpcMonster(req *FightNpcMonsterInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err = p.CanFight(); err != 0 {
 		return nil, err
 	}
-	if req.Number > 9 {
-		return nil, errorcode.ErrorCodes.ErrSystemError
+	if int(req.Number) >= len(p.Data) {
+		return nil, errorcode.ErrorCodes.ErrPokemonNotHere
 	}
 
 	refPet := p.Data[req.Number]
@@ -79,7 +114,7 @@ func (Controller) OnPlayerFightNpcMonster(req *fight.FightNpcMonsterInboundInfo,
 	p.Fightinfo.Status = fightinfo.BattleMode.FIGHT_WITH_NPC
 	p.Fightinfo.Mode = fightinfo.BattleMode.MULTI_MODE
 
-	_, err = fight.NewFight(p, ai, p.GetPetInfo(100), ai.GetPetInfo(0), func(foi model.FightOverInfo) {
+	_, err = fight.NewFight(p, ai, p.GetPetInfo(p.CurrentMapPetLevelLimit()), ai.GetPetInfo(0), func(foi model.FightOverInfo) {
 		handleNpcFightRewards(p, foi, monster)
 	})
 	if err != 0 {
@@ -201,7 +236,7 @@ func shouldGrantBossWinBonus(fightC *fight.FightC, playerID uint32, bossConfig c
 
 func buildNpcMonsterInfo(refPet player.OgrePetInfo, mapID uint32) (*model.PetInfo, *model.PlayerInfo, errorcode.ErrorCode) {
 	if refPet.ID == 0 {
-		return nil, nil, errorcode.ErrorCodes.ErrPokemonNotExists
+		return nil, nil, errorcode.ErrorCodes.ErrPokemonNotHere
 	}
 
 	monster := model.GenPetInfo(
@@ -250,7 +285,7 @@ func handleNpcFightRewards(p *player.Player, foi model.FightOverInfo, monster *m
 	rewards := &fightinfo.S2C_GET_BOSS_MONSTER{}
 
 	p.ItemAdd(3, int64(poolexp+addexp))
-	rewards.ADDitem(3, uint32(poolexp))
+	rewards.AddItem(rewardItemExpPool, uint32(poolexp))
 	p.AddPetExp(foi.Winpet, int64(addexp))
 
 	if p.CanGetItem() {
@@ -258,7 +293,7 @@ func handleNpcFightRewards(p *player.Player, foi model.FightOverInfo, monster *m
 		if itemID != 0 {
 			count := uint32(grand.N(1, 2))
 			if p.ItemAdd(itemID, int64(count)) {
-				rewards.ADDitem(uint32(itemID), count)
+				rewards.AddItem(uint32(itemID), count)
 			}
 		}
 	}
@@ -268,10 +303,12 @@ func handleNpcFightRewards(p *player.Player, foi model.FightOverInfo, monster *m
 		xuanID := uint32(400686 + petType)
 		count := uint32(grand.N(1, 2))
 		if p.ItemAdd(int64(xuanID), int64(count)) {
-			rewards.ADDitem(xuanID, count)
+			rewards.AddItem(xuanID, count)
 		}
 	}
 
-	p.SendPackCmd(8004, rewards)
-	foi.Winpet.AddEV(gconv.Int64s(strings.Fields(petCfg.YieldingEV)))
+	if rewards.HasReward() {
+		p.SendPackCmd(8004, rewards)
+	}
+	foi.Winpet.AddEV(petCfg.YieldingEVValues)
 }

logic/controller/fight_pvp_king.go

@@ -13,7 +13,7 @@ import (
 
 //大乱斗
 
-func (h Controller) PetMelee(data *fight.StartPetWarInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) PetMelee(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
@@ -70,9 +70,12 @@ func (h Controller) PetMelee(data *fight.StartPetWarInboundInfo, c *player.Playe
 
 	return
 }
-func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+
+// PetKing 处理控制器请求。
+func (h Controller) PetKing(data *PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 
 	c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL
+	// ElementTypeNumbers 是控制器层共享变量。
 	var ElementTypeNumbers = []int{1, 2, 3, 5, 11, 4, 6, 7, 9}
 
 	switch data.Type {

logic/controller/fight_pvp_withplayer.go

@@ -12,7 +12,7 @@ import (
 )
 
 // 接收战斗或者取消战斗的包
-func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerHandleFightInvite(data *HandleFightInviteInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if c.IsArenaPVPLocked() {
 		return nil, errorcode.ErrorCodes.ErrSystemError
 	}
@@ -55,7 +55,7 @@ func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInbou
 				return
 			}
 
-			_, err = fight.NewFight(v, c, v.GetInfo().PetList, c.GetInfo().PetList, func(foi model.FightOverInfo) {
+			_, err = fight.NewFight(v, c, v.GetPetInfo(100), c.GetPetInfo(100), func(foi model.FightOverInfo) {
 
 				//println("好友对战测试", foi.Reason)
 
@@ -78,7 +78,7 @@ func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInbou
 }
 
 // 邀请其他人进行战斗
-func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerInviteOtherFight(data *InviteToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if c.IsArenaPVPLocked() {
 		return nil, errorcode.ErrorCodes.ErrSystemError
 	}
@@ -103,7 +103,7 @@ func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInf
 }
 
 // 取消队列
-func (h Controller) OnPlayerCanceledOtherInviteFight(data *fight.InviteFightCancelInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerCanceledOtherInviteFight(data *InviteFightCancelInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	atomic.StoreUint32(&c.Fightinfo.Mode, 0) //设置状态为0
 	return
 }

logic/controller/fight_unified.go

@@ -0,0 +1,79 @@
+package controller
+
+import (
+	"blazing/modules/player/model"
+
+	"blazing/logic/service/fight"
+	"blazing/logic/service/player"
+)
+
+// dispatchFightActionEnvelope 把控制器层收到的统一动作结构分发回现有 FightI 接口。
+func (h Controller) dispatchFightActionEnvelope(c *player.Player, envelope fight.FightActionEnvelope) {
+	if c == nil || c.FightC == nil {
+		return
+	}
+
+	switch envelope.ActionType {
+	case fight.FightActionTypeSkill:
+		go c.FightC.UseSkillAt(c, envelope.SkillID, envelope.ActorIndex, envelope.EncodedTargetIndex())
+	case fight.FightActionTypeItem:
+		go c.FightC.UseItemAt(c, envelope.CatchTime, envelope.ItemID, envelope.ActorIndex, envelope.EncodedTargetIndex())
+	case fight.FightActionTypeChange:
+		go c.FightC.ChangePetAt(c, envelope.CatchTime, envelope.ActorIndex)
+	case fight.FightActionTypeEscape:
+		go c.FightC.Over(c, model.BattleOverReason.PlayerEscape)
+	case fight.FightActionTypeChat:
+		go c.FightC.Chat(c, envelope.Chat)
+	}
+}
+
+// buildLegacyUseSkillEnvelope 把旧 2405 技能包映射成统一动作结构。
+func buildLegacyUseSkillEnvelope(data *UseSkillInInfo) fight.FightActionEnvelope {
+	if data == nil {
+		return fight.NewSkillActionEnvelope(0, 0, 0, fight.SkillTargetOpponent, 0)
+	}
+	return fight.NewSkillActionEnvelope(data.SkillId, 0, 0, fight.SkillTargetOpponent, 0)
+}
+
+// buildIndexedUseSkillEnvelope 把 7505 多战位技能包映射成统一动作结构。
+func buildIndexedUseSkillEnvelope(data *UseSkillAtInboundInfo) fight.FightActionEnvelope {
+	if data == nil {
+		return fight.NewSkillActionEnvelope(0, 0, 0, fight.SkillTargetOpponent, 0)
+	}
+	return fight.NewSkillActionEnvelope(
+		data.SkillId,
+		int(data.ActorIndex),
+		int(data.TargetIndex),
+		data.TargetRelation,
+		data.AtkType,
+	)
+}
+
+// buildLegacyUseItemEnvelope 把旧 2406 道具包映射成统一动作结构。
+func buildLegacyUseItemEnvelope(data *UsePetItemInboundInfo) fight.FightActionEnvelope {
+	if data == nil {
+		return fight.NewItemActionEnvelope(0, 0, 0, 0, fight.SkillTargetOpponent)
+	}
+	return fight.NewItemActionEnvelope(data.CatchTime, data.ItemId, 0, 0, fight.SkillTargetOpponent)
+}
+
+// buildLegacyChangeEnvelope 把旧 2407 切宠包映射成统一动作结构。
+func buildLegacyChangeEnvelope(data *ChangePetInboundInfo) fight.FightActionEnvelope {
+	if data == nil {
+		return fight.NewChangeActionEnvelope(0, 0)
+	}
+	return fight.NewChangeActionEnvelope(data.CatchTime, 0)
+}
+
+// buildLegacyEscapeEnvelope 构造旧 2410 逃跑包对应的统一动作结构。
+func buildLegacyEscapeEnvelope() fight.FightActionEnvelope {
+	return fight.NewEscapeActionEnvelope()
+}
+
+// buildChatEnvelope 把战斗聊天包映射成统一动作结构。
+func buildChatEnvelope(data *ChatInfo) fight.FightActionEnvelope {
+	if data == nil {
+		return fight.NewChatActionEnvelope("")
+	}
+	return fight.NewChatActionEnvelope(data.Message)
+}

logic/controller/fight_塔.go

@@ -36,7 +36,7 @@ type towerChoiceState struct {
 }
 
 // 暗黑门进入boss
-func (h Controller) FreshOpen(data *fight.C2S_OPEN_DARKPORTAL, c *player.Player) (result *fight.S2C_OPEN_DARKPORTAL, err errorcode.ErrorCode) {
+func (h Controller) FreshOpen(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))
@@ -57,7 +57,7 @@ func (h Controller) FreshOpen(data *fight.C2S_OPEN_DARKPORTAL, c *player.Player)
 }
 
 // FreshChoiceFightLevel 处理玩家选择挑战模式（试炼之塔或勇者之塔）
-func (h Controller) FreshChoiceFightLevel(data *fight.C2S_FRESH_CHOICE_FIGHT_LEVEL, c *player.Player) (result *fight.S2C_FreshChoiceLevelRequestInfo, err errorcode.ErrorCode) {
+func (h Controller) FreshChoiceFightLevel(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)
@@ -82,7 +82,8 @@ func (h Controller) FreshChoiceFightLevel(data *fight.C2S_FRESH_CHOICE_FIGHT_LEV
 	return result, 0
 }
 
-func (h Controller) FreshLeaveFightLevel(data *fight.FRESH_LEAVE_FIGHT_LEVEL, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+// FreshLeaveFightLevel 处理控制器请求。
+func (h Controller) FreshLeaveFightLevel(data *FRESH_LEAVE_FIGHT_LEVEL, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	_ = data
 	defer c.GetSpace().EnterMap(c)
 
@@ -92,7 +93,8 @@ func (h Controller) FreshLeaveFightLevel(data *fight.FRESH_LEAVE_FIGHT_LEVEL, c
 	return result, 0
 }
 
-func (h Controller) PetTawor(data *fight.StartTwarInboundInfo, c *player.Player) (result *fight.S2C_ChoiceLevelRequestInfo, err errorcode.ErrorCode) {
+// PetTawor 处理控制器请求。
+func (h Controller) PetTawor(data *StartTwarInboundInfo, c *player.Player) (result *fight.S2C_ChoiceLevelRequestInfo, err errorcode.ErrorCode) {
 	if err = c.CanFight(); err != 0 {
 		return nil, err
 	}
@@ -110,7 +112,7 @@ func (h Controller) PetTawor(data *fight.StartTwarInboundInfo, c *player.Player)
 	result = &fight.S2C_ChoiceLevelRequestInfo{CurFightLevel: currentLevel}
 	appendTowerNextBossPreview(&result.BossID, bossList)
 
-	monsterInfo, ok := buildTowerMonsterInfo(currentBoss)
+	monsterInfo, bossScript, ok := buildTowerMonsterInfo(currentBoss)
 	if !ok {
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
 	}
@@ -119,6 +121,7 @@ func (h Controller) PetTawor(data *fight.StartTwarInboundInfo, c *player.Player)
 	c.Fightinfo.Status = fightinfo.BattleMode.FIGHT_WITH_NPC
 
 	ai := player.NewAI_player(monsterInfo)
+	ai.BossScript = bossScript
 	_, err = fight.NewFight(c, ai, c.GetPetInfo(100), ai.GetPetInfo(0), func(foi model.FightOverInfo) {
 		if foi.Reason != 0 || foi.WinnerId != c.Info.UserID {
 			return
@@ -195,10 +198,10 @@ func appendTowerNextBossPreview(dst *[]uint32, bossList []configmodel.BaseTowerC
 	}
 }
 
-func buildTowerMonsterInfo(towerBoss configmodel.BaseTowerConfig) (*model.PlayerInfo, bool) {
+func buildTowerMonsterInfo(towerBoss configmodel.BaseTowerConfig) (*model.PlayerInfo, string, bool) {
 	bosses := service.NewBossService().Get(towerBoss.BossIds[0])
 	if len(bosses) == 0 {
-		return nil, false
+		return nil, "", false
 	}
 
 	monsterInfo := &model.PlayerInfo{Nick: towerBoss.Name}
@@ -234,7 +237,7 @@ func buildTowerMonsterInfo(towerBoss configmodel.BaseTowerConfig) (*model.Player
 		monsterInfo.PetList = append(monsterInfo.PetList, *monster)
 	}
 
-	return monsterInfo, true
+	return monsterInfo, bosses[0].Script, true
 }
 
 func handleTowerFightWin(c *player.Player, cmd uint32, taskID int, currentLevel uint32) {

logic/controller/fight_巅峰.go

@@ -1,13 +1,12 @@
 package controller
 
 import (
+	"blazing/common/rpc"
 	"blazing/common/socket/errorcode"
-	"blazing/cool"
 	"blazing/logic/service/common"
 	"blazing/logic/service/fight"
-	"blazing/logic/service/fight/info"
+	"blazing/logic/service/fight/pvp"
 	"blazing/logic/service/player"
-	"context"
 )
 
 // 表示"宠物王加入"的入站消息数据
@@ -17,15 +16,50 @@ type PetTOPLEVELnboundInfo struct {
 
 }
 
+// JoINtop 处理控制器请求。
 func (h Controller) JoINtop(data *PetTOPLEVELnboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
-	cool.RedisDo(context.TODO(), "sun:join", info.RPCFightinfo{
-		PlayerID: c.Info.UserID,
-		Mode:     data.Mode,
-		Type:     1,
-	})
-
-	// // 类型断言为 UniversalClient
-	// universalClient, _ := client.(goredis.UniversalClient)
-	// repo.NewPlayerRepository(universalClient).AddPlayerToPool(context.TODO(), data.Head.UserID, 1)
+	err = pvp.JoinPeakQueue(c, data.Mode)
+	if err != 0 {
+		return nil, err
+	}
+	if Maincontroller.RPCClient == nil || Maincontroller.RPCClient.MatchJoinOrUpdate == nil {
+		pvp.CancelPeakQueue(c)
+		return nil, errorcode.ErrorCodes.ErrSystemBusyTryLater
+	}
+	fightMode, status, err := pvp.NormalizePeakMode(data.Mode)
+	if err != 0 {
+		pvp.CancelPeakQueue(c)
+		return nil, err
+	}
+	joinPayload := rpc.PVPMatchJoinPayload{
+		RuntimeServerID: h.UID,
+		UserID:          c.Info.UserID,
+		Nick:            c.Info.Nick,
+		FightMode:       fightMode,
+		Status:          status,
+		CatchTimes:      pvp.AvailableCatchTimes(c.GetPetInfo(0)),
+	}
+	if callErr := Maincontroller.RPCClient.MatchJoinOrUpdate(joinPayload); callErr != nil {
+		pvp.CancelPeakQueue(c)
+		return nil, errorcode.ErrorCodes.ErrSystemBusyTryLater
+	}
+	return nil, -1
+}
+
+// CancelPeakQueue 处理控制器请求。
+func (h Controller) CancelPeakQueue(data *PeakQueueCancelInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if Maincontroller.RPCClient != nil && Maincontroller.RPCClient.MatchCancel != nil {
+		_ = Maincontroller.RPCClient.MatchCancel(c.Info.UserID)
+	}
+	pvp.CancelPeakQueue(c)
+	return nil, -1
+}
+
+// SubmitPeakBanPick 处理控制器请求。
+func (h Controller) SubmitPeakBanPick(data *PeakBanPickSubmitInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	err = pvp.SubmitBanPick(c, data.SelectedCatchTimes, data.BanCatchTimes)
+	if err != 0 {
+		return nil, err
+	}
 	return nil, -1
 }

logic/controller/fight_擂台.go

@@ -1,24 +1,25 @@
 package controller
 
 import (
-	"blazing/common/data"
 	"blazing/common/socket/errorcode"
 	"blazing/modules/player/model"
 	"sync/atomic"
 
+	"blazing/logic/service/common"
 	"blazing/logic/service/fight"
 	"blazing/logic/service/fight/info"
 	"blazing/logic/service/player"
 	"blazing/logic/service/space"
 )
 
+// ARENA_SET_OWENR 定义请求或响应数据结构。
+type ARENA_SET_OWENR struct {
+	Head common.TomeeHeader `cmd:"2417" struc:"skip"`
+}
+
 // ArenaSetOwner 处理玩家占据擂台的请求
-// public static const ARENA_SET_OWENR:uint = 2417;
-// 如果星际擂台上无人,站到星际擂台的包
-// 前端到后端无数据内容 空包
-// 后端到前端无数据内容 空包
 // ArenaSetOwner 都需要通过2419包广播更新擂台状态
-func (h Controller) ArenaSetOwner(data *fight.ARENA_SET_OWENR, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ArenaSetOwner(data *ARENA_SET_OWENR, c *player.Player) (result *struct{}, err errorcode.ErrorCode) {
 	r := c.CanFight()
 	if r != 0 {
 		return nil, r
@@ -35,12 +36,15 @@ func (h Controller) ArenaSetOwner(data *fight.ARENA_SET_OWENR, c *player.Player)
 	return nil, errorcode.ErrorCodes.ErrChampionExists
 }
 
+// ARENA_FIGHT_OWENR 定义请求或响应数据结构。
+type ARENA_FIGHT_OWENR struct {
+	Head common.TomeeHeader `cmd:"2418" struc:"skip"`
+}
+
 // ArenaFightOwner 挑战擂台的包
-// 前端到后端无数据内容 空包
-// 后端到前端无数据内容 空包
 // 还是后端主动发送2503的包给双方前端后 等待前端加载完毕 主动发送2404包通知后端开始战斗
 // ArenaFightOwner 并不会通知对方是否接受挑战。只要有人挑战就直接进入对战
-func (h Controller) ArenaFightOwner(data1 *fight.ARENA_FIGHT_OWENR, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ArenaFightOwner(data1 *ARENA_FIGHT_OWENR, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 
 	r := c.CanFight()
 	if r != 0 {
@@ -86,12 +90,9 @@ func (h Controller) ArenaFightOwner(data1 *fight.ARENA_FIGHT_OWENR, c *player.Pl
 					if addev != 0 {
 						c.Info.EVPool += addev
 
-						c.SendPackCmd(8004, &info.S2C_GET_BOSS_MONSTER{ //发送EV
-							ItemList: []data.ItemInfo{{
-								ItemId:  9,
-								ItemCnt: int64(addev),
-							}},
-						})
+						rewards := &info.S2C_GET_BOSS_MONSTER{}
+						rewards.AddItem(9, uint32(addev))
+						c.SendPackCmd(8004, rewards) //发送EV
 					}
 
 				} else {
@@ -102,12 +103,9 @@ func (h Controller) ArenaFightOwner(data1 *fight.ARENA_FIGHT_OWENR, c *player.Pl
 							if addev != 0 {
 								c.GetSpace().Owner.ARENA_Player.GetInfo().EVPool += addev
 
-								c.GetSpace().Owner.ARENA_Player.SendPackCmd(8004, &info.S2C_GET_BOSS_MONSTER{ //发送EV
-									ItemList: []data.ItemInfo{{
-										ItemId:  9,
-										ItemCnt: int64(addev),
-									}},
-								})
+								rewards := &info.S2C_GET_BOSS_MONSTER{}
+								rewards.AddItem(9, uint32(addev))
+								c.GetSpace().Owner.ARENA_Player.SendPackCmd(8004, rewards) //发送EV
 							}
 
 						}
@@ -141,17 +139,15 @@ func (h Controller) ArenaFightOwner(data1 *fight.ARENA_FIGHT_OWENR, c *player.Pl
 // ArenaGetInfo 获取星际擂台信息的包  进入空间站地图前端会发送请求包   或者 有人站到星际擂台上后 广播回包
 // 前端到后端无数据内容
 // ArenaGetInfo 后端到前端
-func (h Controller) ArenaGetInfo(data *fight.ARENA_GET_INFO, c *player.Player) (result *space.ARENA, err errorcode.ErrorCode) {
+func (h Controller) ArenaGetInfo(data *ARENA_GET_INFO, c *player.Player) (result *space.ARENA, err errorcode.ErrorCode) {
 
 	result = &c.GetSpace().Owner
 	return
 }
 
 // ArenaUpfight 放弃擂台挑战的包
-// 前端到后端无数据内容
-// 后端到前端无数据内容
 // ArenaUpfight 都需要通过2419包广播更新擂台状态
-func (h Controller) ArenaUpfight(data *fight.ARENA_UPFIGHT, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ArenaUpfight(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
@@ -173,7 +169,7 @@ func (h Controller) ArenaUpfight(data *fight.ARENA_UPFIGHT, c *player.Player) (r
 // 后端到前端无数据内容
 // public static const ARENA_OWENR_OUT:uint = 2423;
 // ArenaOwnerAcce 此包不清楚具体怎么触发 但已知此包为后端主动发送。不清楚什么情况下回用到
-func (h Controller) ArenaOwnerAcce(data *fight.ARENA_OWENR_ACCE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ArenaOwnerAcce(data *ARENA_OWENR_ACCE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 
 	s := c.GetSpace()
 

logic/controller/inbound_fight.go

@@ -0,0 +1,198 @@
+package controller
+
+import "blazing/logic/service/common"
+
+// FightNpcMonsterInboundInfo 定义请求或响应数据结构。
+type FightNpcMonsterInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2408" struc:"skip"`
+	Number uint32             `fieldDesc:"地图刷新怪物结构体对应的序号 1 - 9 的位置序号" `
+}
+
+// ChallengeBossInboundInfo 定义请求或响应数据结构。
+type ChallengeBossInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2411" struc:"skip"`
+	BossId uint32             `json:"bossId"`
+}
+
+// ReadyToFightInboundInfo 定义请求或响应数据结构。
+type ReadyToFightInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2404" struc:"skip"`
+}
+
+// GroupReadyFightFinishInboundInfo 旧组队协议准备完成。
+type GroupReadyFightFinishInboundInfo struct {
+	Head common.TomeeHeader `cmd:"7556" struc:"skip"`
+}
+
+type GroupUseSkillInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"7558" struc:"skip"`
+	ActorIndex uint8
+	TargetSide uint8
+	TargetPos  uint8
+	SkillId    uint32
+}
+
+type GroupUseItemInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"7562" struc:"skip"`
+	ActorIndex uint8
+	ItemId     uint32
+}
+
+type GroupChangePetInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"7563" struc:"skip"`
+	ActorIndex uint8
+	CatchTime  uint32
+}
+
+type GroupEscapeInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"7565" struc:"skip"`
+	ActorIndex uint8
+}
+
+type GroupFightWinCloseInboundInfo struct {
+	Head common.TomeeHeader `cmd:"7574" struc:"skip"`
+}
+
+type GroupFightTimeoutExitInboundInfo struct {
+	Head common.TomeeHeader `cmd:"7587" struc:"skip"`
+}
+
+// EscapeFightInboundInfo 定义请求或响应数据结构。
+type EscapeFightInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2410" struc:"skip"`
+}
+
+// StartPetWarInboundInfo 定义请求或响应数据结构。
+type StartPetWarInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2431" struc:"skip"`
+}
+
+// StartTwarInboundInfo 定义请求或响应数据结构。
+type StartTwarInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2429|2415|2425" struc:"skip"`
+}
+
+// ARENA_GET_INFO 定义请求或响应数据结构。
+type ARENA_GET_INFO struct {
+	Head common.TomeeHeader `cmd:"2419" struc:"skip"`
+}
+
+// ARENA_UPFIGHT 定义请求或响应数据结构。
+type ARENA_UPFIGHT struct {
+	Head common.TomeeHeader `cmd:"2420" struc:"skip"`
+}
+
+// ARENA_OWENR_ACCE 定义请求或响应数据结构。
+type ARENA_OWENR_ACCE struct {
+	Head common.TomeeHeader `cmd:"2422" struc:"skip"`
+}
+
+// PetKingJoinInboundInfo 定义请求或响应数据结构。
+type PetKingJoinInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2413" struc:"skip"`
+	Type      uint32
+	FightType uint32
+}
+
+// PeakQueueCancelInboundInfo 定义请求或响应数据结构。
+type PeakQueueCancelInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2459" struc:"skip"`
+}
+
+// PeakBanPickSubmitInboundInfo 定义请求或响应数据结构。
+type PeakBanPickSubmitInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2460" struc:"skip"`
+
+	SelectedCatchTimesLen uint32   `struc:"sizeof=SelectedCatchTimes"`
+	SelectedCatchTimes    []uint32 `json:"selectedCatchTimes"`
+
+	BanCatchTimesLen uint32   `struc:"sizeof=BanCatchTimes"`
+	BanCatchTimes    []uint32 `json:"banCatchTimes"`
+}
+
+// HandleFightInviteInboundInfo 定义请求或响应数据结构。
+type HandleFightInviteInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2403" struc:"skip"`
+	UserID uint32             `json:"userId" codec:"userId,uint"`
+	Flag   uint32             `json:"flag" codec:"flag,uint"`
+	Mode   uint32             `json:"mode" codec:"mode,uint"`
+}
+
+// InviteToFightInboundInfo 定义请求或响应数据结构。
+type InviteToFightInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2401" struc:"skip"`
+	UserID uint32
+	Mode   uint32
+}
+
+// InviteFightCancelInboundInfo 定义请求或响应数据结构。
+type InviteFightCancelInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2402" struc:"skip"`
+}
+
+// UseSkillInInfo 定义请求或响应数据结构。
+type UseSkillInInfo struct {
+	Head    common.TomeeHeader `cmd:"2405" struc:"skip"`
+	SkillId uint32
+}
+
+// UseSkillAtInboundInfo 定义请求或响应数据结构。
+type UseSkillAtInboundInfo struct {
+	Head           common.TomeeHeader `cmd:"7505" struc:"skip"`
+	SkillId        uint32             `json:"skillId"`
+	ActorIndex     uint8              `json:"actorIndex"`
+	TargetIndex    uint8              `json:"targetIndex"`
+	TargetRelation uint8              `json:"targetRelation"`
+	AtkType        uint8              `json:"atkType"`
+}
+
+// ChangePetInboundInfo 定义请求或响应数据结构。
+type ChangePetInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2407" struc:"skip"`
+	CatchTime uint32             `json:"catchTime"`
+}
+
+// CatchMonsterInboundInfo 定义请求或响应数据结构。
+type CatchMonsterInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2409" struc:"skip"`
+	CapsuleId uint32             `json:"capsuleId" fieldDescription:"胶囊id" uint:"true"`
+}
+
+// LoadPercentInboundInfo 定义请求或响应数据结构。
+type LoadPercentInboundInfo struct {
+	Head    common.TomeeHeader `cmd:"2441" struc:"skip"`
+	Percent uint32             `fieldDescription:"加载百分比"`
+}
+
+// UsePetItemInboundInfo 定义请求或响应数据结构。
+type UsePetItemInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2406" struc:"skip"`
+	CatchTime uint32             `description:"精灵捕获时间" codec:"catchTime"`
+	ItemId    uint32             `description:"使用的物品ID" codec:"itemId"`
+	Reversed1 uint32             `description:"填充字段 0" codec:"reversed1"`
+}
+
+// ChatInfo 定义请求或响应数据结构。
+type ChatInfo struct {
+	Head       common.TomeeHeader `cmd:"50002" struc:"skip"`
+	Reserve    uint32             `json:"reserve" fieldDescription:"填充 默认值为0" uint:"true"`
+	MessageLen uint32             `struc:"sizeof=Message"`
+	Message    string             `json:"message" fieldDescription:"消息内容, 结束符为utf-8的数字0"`
+}
+
+// C2S_FRESH_CHOICE_FIGHT_LEVEL 定义请求或响应数据结构。
+type C2S_FRESH_CHOICE_FIGHT_LEVEL struct {
+	Head  common.TomeeHeader `cmd:"2428|2414" struc:"skip"`
+	Level uint               `json:"level"`
+}
+
+// C2S_OPEN_DARKPORTAL 定义请求或响应数据结构。
+type C2S_OPEN_DARKPORTAL struct {
+	Head  common.TomeeHeader `cmd:"2424" struc:"skip"`
+	Level uint32             `json:"level"`
+}
+
+// FRESH_LEAVE_FIGHT_LEVEL 定义请求或响应数据结构。
+type FRESH_LEAVE_FIGHT_LEVEL struct {
+	Head common.TomeeHeader `cmd:"2430|2416|2426" struc:"skip"`
+}

logic/controller/inbound_friend_task.go

@@ -0,0 +1,61 @@
+package controller
+
+import "blazing/logic/service/common"
+
+// SeeOnlineInboundInfo 定义请求或响应数据结构。
+type SeeOnlineInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"2157" struc:"skip"`
+	UserIdsLen uint32             `json:"userIdsLen" struc:"sizeof=UserIds"`
+	UserIds    []uint32           `json:"userIds" `
+}
+
+// FriendAddInboundInfo 定义请求或响应数据结构。
+type FriendAddInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2151" struc:"skip"`
+	UserID uint32             `json:"userID"`
+}
+
+// FriendAnswerInboundInfo 定义请求或响应数据结构。
+type FriendAnswerInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2152" struc:"skip"`
+	UserID uint32             `json:"userID"`
+	Flag   uint32             `json:"flag"`
+}
+
+// FriendRemoveInboundInfo 定义请求或响应数据结构。
+type FriendRemoveInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2153" struc:"skip"`
+	UserID uint32             `json:"userID"`
+}
+
+// AcceptTaskInboundInfo 定义请求或响应数据结构。
+type AcceptTaskInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2201|2231" struc:"skip"`
+	TaskId uint32             `json:"taskId" description:"任务ID"`
+}
+
+// AddTaskBufInboundInfo 定义请求或响应数据结构。
+type AddTaskBufInboundInfo struct {
+	Head     common.TomeeHeader `cmd:"2204|2235" struc:"skip"`
+	TaskId   uint32             `json:"taskId" description:"任务ID"`
+	TaskList []uint32           `struc:"[20]byte"`
+}
+
+// CompleteTaskInboundInfo 定义请求或响应数据结构。
+type CompleteTaskInboundInfo struct {
+	Head     common.TomeeHeader `cmd:"2202|2233" struc:"skip"`
+	TaskId   uint32             `json:"taskId" description:"任务ID"`
+	OutState uint32             `json:"outState" `
+}
+
+// GetTaskBufInboundInfo 定义请求或响应数据结构。
+type GetTaskBufInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2203|2234" struc:"skip"`
+	TaskId uint32             `json:"taskId" description:"任务ID"`
+}
+
+// DeleteTaskInboundInfo 定义请求或响应数据结构。
+type DeleteTaskInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2205|2232" struc:"skip"`
+	TaskId uint32             `json:"taskId" description:"任务ID"`
+}

logic/controller/inbound_item.go

@@ -0,0 +1,102 @@
+package controller
+
+import "blazing/logic/service/common"
+
+// BuyInboundInfo 定义请求或响应数据结构。
+type BuyInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2601" struc:"skip"`
+	ItemId int64              `struc:"uint32"`
+	Count  int64              `struc:"uint32"`
+}
+
+// BuyMultiInboundInfo 定义请求或响应数据结构。
+type BuyMultiInboundInfo struct {
+	Head        common.TomeeHeader `cmd:"2606" struc:"skip"`
+	ItemListLen uint32             `struc:"sizeof=ItemIds"`
+	ItemIds     []uint32           `json:"itemIds" description:"购买的物品ID列表"`
+}
+
+// C2S_GOLD_BUY_PRODUCT 定义请求或响应数据结构。
+type C2S_GOLD_BUY_PRODUCT struct {
+	Head      common.TomeeHeader `cmd:"1104" struc:"skip"`
+	Type      uint32             `json:"type"`
+	ProductID uint32             `json:"product_id"`
+	Count     int64              `struc:"uint32"`
+}
+
+// ItemListInboundInfo 定义请求或响应数据结构。
+type ItemListInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2605|4475" struc:"skip"`
+	Param1 uint32
+	Param2 uint32
+	Param3 uint32
+}
+
+// GoldOnlineRemainInboundInfo 定义请求或响应数据结构。
+type GoldOnlineRemainInboundInfo struct {
+	Head common.TomeeHeader `cmd:"1105|1106" struc:"skip"`
+}
+
+// ExpTotalRemainInboundInfo 定义请求或响应数据结构。
+type ExpTotalRemainInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2319" struc:"skip"`
+}
+
+// ChangePlayerClothInboundInfo 定义请求或响应数据结构。
+type ChangePlayerClothInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"2604" struc:"skip"`
+	ClothesLen uint32             `struc:"sizeof=ClothList" fieldDesc:"穿戴装备的信息" json:"clothes_len"`
+	ClothList  []uint32           `description:"玩家装备列表" codec:"list"`
+}
+
+// TalkCountInboundInfo 定义请求或响应数据结构。
+type TalkCountInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2701" struc:"skip"`
+	ID   uint32             `description:"奖品的Type, 即ID" codec:"uint"`
+}
+
+// TalkCateInboundInfo 定义请求或响应数据结构。
+type TalkCateInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2702" struc:"skip"`
+	ID   uint32             `description:"奖品的Type, 即ID" codec:"uint"`
+}
+
+// C2S_USE_PET_ITEM_OUT_OF_FIGHT 定义请求或响应数据结构。
+type C2S_USE_PET_ITEM_OUT_OF_FIGHT struct {
+	Head      common.TomeeHeader `cmd:"2326" struc:"skip"`
+	CatchTime uint32             `json:"catch_time"`
+	ItemID    int32              `struc:"uint32"`
+}
+
+// C2S_PET_RESET_NATURE 定义请求或响应数据结构。
+type C2S_PET_RESET_NATURE struct {
+	Head      common.TomeeHeader `cmd:"2343" struc:"skip"`
+	CatchTime uint32
+	Nature    uint32
+	ItemId    uint32
+}
+
+// C2S_ITEM_SALE 定义请求或响应数据结构。
+type C2S_ITEM_SALE struct {
+	Head   common.TomeeHeader `cmd:"2602" struc:"skip"`
+	ItemId uint32
+	Amount uint32
+}
+
+// C2S_USE_SPEEDUP_ITEM 定义请求或响应数据结构。
+type C2S_USE_SPEEDUP_ITEM struct {
+	Head   common.TomeeHeader `cmd:"2327" struc:"skip"`
+	ItemID uint32
+}
+
+// C2S_USE_ENERGY_XISHOU 定义请求或响应数据结构。
+type C2S_USE_ENERGY_XISHOU struct {
+	Head   common.TomeeHeader `cmd:"2331" struc:"skip"`
+	ItemID uint32
+}
+
+// C2S_USE_AUTO_FIGHT_ITEM 定义请求或响应数据结构。
+type C2S_USE_AUTO_FIGHT_ITEM struct {
+	Head   common.TomeeHeader `cmd:"2329" struc:"skip"`
+	ItemID uint32
+}

logic/controller/inbound_map_room_nono.go

@@ -0,0 +1,118 @@
+package controller
+
+import (
+	"blazing/logic/service/common"
+	"blazing/modules/player/model"
+)
+
+// EnterMapInboundInfo 定义请求或响应数据结构。
+type EnterMapInboundInfo struct {
+	Head    common.TomeeHeader `cmd:"2001" struc:"skip"`
+	MapType uint32
+	MapId   uint32
+	Point   model.Pos `fieldDesc:"直接给坐标x，y"`
+}
+
+// GetMapHotInboundInfo 定义请求或响应数据结构。
+type GetMapHotInboundInfo struct {
+	Head common.TomeeHeader `cmd:"1004" struc:"skip"`
+}
+
+// LeaveMapInboundInfo 定义请求或响应数据结构。
+type LeaveMapInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2002" struc:"skip"`
+}
+
+// ListMapPlayerInboundInfo 定义请求或响应数据结构。
+type ListMapPlayerInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2003" struc:"skip"`
+}
+
+// AttackBossInboundInfo 定义请求或响应数据结构。
+type AttackBossInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2412" struc:"skip"`
+}
+
+// WalkInInfo 定义请求或响应数据结构。
+type WalkInInfo struct {
+	Head    common.TomeeHeader `cmd:"2101" struc:"skip"`
+	Flag    uint32
+	Point   model.Pos `fieldDesc:"直接给坐标x，y"`
+	PathLen uint32    `struc:"sizeof=Path"`
+	Path    string
+}
+
+// FitmentUseringInboundInfo 定义请求或响应数据结构。
+type FitmentUseringInboundInfo struct {
+	Head         common.TomeeHeader `cmd:"10006" struc:"skip"`
+	TargetUserID uint32             `json:"targetUserId"`
+}
+
+// PetRoomListInboundInfo 定义请求或响应数据结构。
+type PetRoomListInboundInfo struct {
+	Head         common.TomeeHeader `cmd:"2324" struc:"skip"`
+	TargetUserID uint32             `json:"targetUserId"`
+}
+
+// FitmentAllInboundEmpty 定义请求或响应数据结构。
+type FitmentAllInboundEmpty struct {
+	Head common.TomeeHeader `cmd:"10007" struc:"skip"`
+}
+
+// SET_FITMENT 定义请求或响应数据结构。
+type SET_FITMENT struct {
+	Head        common.TomeeHeader      `cmd:"10008" struc:"skip"`
+	RoomID      uint32                  `json:"roomID"`
+	FitmentsLen uint32                  `json:"fitmentsLen" struc:"sizeof=Fitments"`
+	Fitments    []model.FitmentShowInfo `json:"usedList"`
+}
+
+// C2S_PetShowList 定义请求或响应数据结构。
+type C2S_PetShowList struct {
+	CatchTime uint32 `json:"catchTime"`
+	PetID     uint32 `json:"petID"`
+}
+
+// C2S_PET_ROOM_SHOW 定义请求或响应数据结构。
+type C2S_PET_ROOM_SHOW struct {
+	Head           common.TomeeHeader `cmd:"2323" struc:"skip"`
+	PetShowInfoLen uint32             `json:"PetShowInfoLen" struc:"sizeof=PetShowList"`
+	PetShowList    []C2S_PetShowList  `json:"PetShowList"`
+}
+
+// C2S_RoomPetInfo 定义请求或响应数据结构。
+type C2S_RoomPetInfo struct {
+	Head      common.TomeeHeader `cmd:"2325" struc:"skip"`
+	UserID    uint32             `json:"userID"`
+	CatchTime uint32             `json:"catchTime"`
+}
+
+// C2S_BUY_FITMENT 定义请求或响应数据结构。
+type C2S_BUY_FITMENT struct {
+	Head  common.TomeeHeader `cmd:"10004" struc:"skip"`
+	ID    uint32             `json:"id"`
+	Count uint32             `json:"count"`
+}
+
+// NonoInboundInfo 定义请求或响应数据结构。
+type NonoInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"9003" struc:"skip"`
+	UserID uint32
+}
+
+// NonoFollowOrHomeInInfo 定义请求或响应数据结构。
+type NonoFollowOrHomeInInfo struct {
+	Head common.TomeeHeader `cmd:"9019" struc:"skip"`
+	Flag uint32             `fieldDescription:"1为跟随 0为收回 且如果为收回 那么后续结构不需要发送" uint:"true"`
+}
+
+// SwitchFlyingInboundInfo 定义请求或响应数据结构。
+type SwitchFlyingInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2112" struc:"skip"`
+	Type uint32             `description:"开关, 0为取消飞行模式, 大于0为开启飞行模式" codec:"auto" uint:"true"`
+}
+
+// PetCureInboundInfo 定义请求或响应数据结构。
+type PetCureInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2306" struc:"skip"`
+}

logic/controller/inbound_pet.go

@@ -0,0 +1,114 @@
+package controller
+
+import "blazing/logic/service/common"
+
+// GetPetInfoInboundInfo 定义请求或响应数据结构。
+type GetPetInfoInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2301" struc:"skip"`
+	CatchTime uint32
+}
+
+// GetUserBagPetInfoInboundEmpty 定义请求或响应数据结构。
+type GetUserBagPetInfoInboundEmpty struct {
+	Head common.TomeeHeader `cmd:"4483" struc:"skip"`
+}
+
+// SavePetBagOrderInboundInfo 定义请求或响应数据结构。
+type SavePetBagOrderInboundInfo struct {
+	Head common.TomeeHeader `cmd:"4484" struc:"skip"`
+
+	PetListLen       uint32 `struc:"int32,sizeof=PetList"`
+	PetList          []uint32
+	BackupPetListLen uint32 `struc:"int32,sizeof=BackupPetList"`
+	BackupPetList    []uint32
+}
+
+// PetReleaseInboundInfo 定义请求或响应数据结构。
+type PetReleaseInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2304" struc:"skip"`
+	CatchTime uint32
+	Flag      uint32 `json:"flag" fieldDescription:"0为放入仓库，1为放入背包" autoCodec:"true" uint:"true"`
+}
+
+// PetShowInboundInfo 定义请求或响应数据结构。
+type PetShowInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2305" struc:"skip"`
+	CatchTime uint32             `codec:"catchTime" inboundMessageType:"Pet_Show"`
+	Flag      uint32             `codec:"flag"`
+}
+
+// PetOneCureInboundInfo 定义请求或响应数据结构。
+type PetOneCureInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2310" struc:"skip"`
+	CatchTime uint32             `json:"catchTime" fieldDescription:"精灵捕捉时间" uint:"true"`
+}
+
+// PET_ROWEI 定义请求或响应数据结构。
+type PET_ROWEI struct {
+	Head      common.TomeeHeader `cmd:"2321" struc:"skip"`
+	ID        uint32
+	CatchTime uint32 `json:"catchTime" fieldDescription:"精灵捕捉时间" uint:"true"`
+}
+
+// PET_RETRIEVE 定义请求或响应数据结构。
+type PET_RETRIEVE struct {
+	Head      common.TomeeHeader `cmd:"2322" struc:"skip"`
+	CatchTime uint32             `json:"catchTime" fieldDescription:"精灵捕捉时间" uint:"true"`
+}
+
+// PetDefaultInboundInfo 定义请求或响应数据结构。
+type PetDefaultInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2308" struc:"skip"`
+	CatchTime uint32             `json:"catchTime" fieldDescription:"精灵捕捉时间" uint:"true" autoCodec:"true" inboundMessageType:"Pet_Default"`
+}
+
+// PetSetExpInboundInfo 定义请求或响应数据结构。
+type PetSetExpInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2318" struc:"skip"`
+	CatchTime uint32             `fieldDescription:"精灵获取时间" uint:"true" autoCodec:"true"`
+	Exp       int64              `struc:"uint32"`
+}
+
+// PetBargeListInboundInfo 定义请求或响应数据结构。
+type PetBargeListInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"2309" struc:"skip"`
+	StartPetId uint32             `description:"开始精灵id" codec:"startPetId"`
+	EndPetId   uint32             `description:"结束精灵id" codec:"endPetId"`
+}
+
+// ChangeSkillInfo 定义请求或响应数据结构。
+type ChangeSkillInfo struct {
+	Head         common.TomeeHeader `cmd:"2312" struc:"skip"`
+	CatchTime    uint32             `json:"catchTime"`
+	Reserved     uint32             `json:"reserved"`
+	Reserved1    uint32             `json:"reserved1"`
+	HasSkill     uint32             `json:"hasSkill"`
+	ReplaceSkill uint32             `json:"replaceSkill"`
+}
+
+// C2S_Skill_Sort 定义请求或响应数据结构。
+type C2S_Skill_Sort struct {
+	Head  common.TomeeHeader `cmd:"2328" struc:"skip"`
+	CapTm uint32             `json:"capTm"`
+	Skill [4]uint32          `json:"skill_1"`
+}
+
+// GetPetLearnableSkillsInboundInfo 查询当前精灵可学习技能（含额外技能ExtSKill）
+type GetPetLearnableSkillsInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"52312" struc:"skip"`
+	CatchTime uint32             `json:"catchTime"`
+}
+
+type CommitPetSkillsInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"52313" struc:"skip"`
+	CatchTime uint32             `json:"catchTime"`
+	Skill     [4]uint32          `json:"skill"`
+}
+
+type C2S_PetFusion struct {
+	Head         common.TomeeHeader `cmd:"2351" struc:"skip"`
+	Mcatchtime   uint32             `json:"mcatchtime" msgpack:"mcatchtime"`
+	Auxcatchtime uint32             `json:"auxcatchtime" msgpack:"auxcatchtime"`
+	Item1        [4]uint32          `json:"item1" msgpack:"item1"`
+	GoldItem1    [2]uint32          `json:"gold_item1" msgpack:"gold_item1"`
+}

logic/controller/inbound_user.go

@@ -0,0 +1,111 @@
+package controller
+
+import (
+	"blazing/cool"
+	"blazing/logic/service/common"
+	"blazing/modules/player/model"
+	"context"
+	"encoding/hex"
+	"fmt"
+	"hash/crc32"
+)
+
+// MAIN_LOGIN_IN 定义请求或响应数据结构。
+type MAIN_LOGIN_IN struct {
+	Head common.TomeeHeader `cmd:"1001" struc:"skip"`
+	Sid  []byte             `struc:"[16]byte"`
+}
+
+// CheakSession 校验登录session。
+func (l *MAIN_LOGIN_IN) CheakSession() (bool, uint32) {
+	t1 := hex.EncodeToString(l.Sid)
+	r, err := cool.CacheManager.Get(context.Background(), fmt.Sprintf("session:%d", l.Head.UserID))
+	if err != nil {
+		return false, 0
+	}
+	if r.String() != t1 {
+		return false, 0
+	}
+	crc32Table := crc32.MakeTable(crc32.IEEE)
+	crcValue := crc32.Checksum([]byte(l.Sid), crc32Table)
+	cool.CacheManager.Remove(context.Background(), fmt.Sprintf("session:%d", l.Head.UserID))
+	return true, crcValue
+}
+
+// SimUserInfoInboundInfo 定义请求或响应数据结构。
+type SimUserInfoInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2051" struc:"skip"`
+	UserId uint32             `fieldDescription:"米米号" uint:"true" codec:"true"`
+}
+
+// MoreUserInfoInboundInfo 定义请求或响应数据结构。
+type MoreUserInfoInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"2052" struc:"skip"`
+	UserId uint32             `fieldDescription:"米米号" uint:"true" codec:"true"`
+}
+
+// AimatInboundInfo 定义请求或响应数据结构。
+type AimatInboundInfo struct {
+	Head      common.TomeeHeader `cmd:"2104" struc:"skip"`
+	ItemId    uint32             `description:"物品id 射击激光 物品id为0" codec:"auto" uint:"true"`
+	ShootType uint32             `description:"射击类型 未知 给0" codec:"auto" uint:"true"`
+	Point     model.Pos          `description:"射击的坐标 x y" codec:"auto"`
+}
+
+// ChatInboundInfo 定义请求或响应数据结构。
+type ChatInboundInfo struct {
+	Head       common.TomeeHeader `cmd:"2102" struc:"skip"`
+	Reserve    uint32             `json:"reserve" fieldDescription:"填充 默认值为0" uint:"true"`
+	MessageLen uint32             `struc:"sizeof=Message"`
+	Message    string             `json:"message" fieldDescription:"消息内容, 结束符为utf-8的数字0"`
+}
+
+// ChangeColorInboundInfo 定义请求或响应数据结构。
+type ChangeColorInboundInfo struct {
+	Head  common.TomeeHeader `cmd:"2063" struc:"skip"`
+	Color uint32             `codec:"color"`
+}
+
+// ChangeDoodleInboundInfo 定义请求或响应数据结构。
+type ChangeDoodleInboundInfo struct {
+	Head  common.TomeeHeader `cmd:"2062" struc:"skip"`
+	Id    uint32             `codec:"id"`
+	Color uint32             `codec:"color"`
+}
+
+// ChangeNONOColorInboundInfo 定义请求或响应数据结构。
+type ChangeNONOColorInboundInfo struct {
+	Head  common.TomeeHeader `cmd:"9012" struc:"skip"`
+	Color uint32             `codec:"color"`
+}
+
+// C2SDanceAction 定义请求或响应数据结构。
+type C2SDanceAction struct {
+	Head    common.TomeeHeader `cmd:"2103" struc:"skip"`
+	Reserve uint32             `struc:"uint32,big"`
+	Type    uint32             `struc:"uint32,big"`
+}
+
+// C2SPEOPLE_TRANSFROM 定义请求或响应数据结构。
+type C2SPEOPLE_TRANSFROM struct {
+	Head   common.TomeeHeader `cmd:"2111" struc:"skip"`
+	SuitID uint32             `struc:"uint32,big"`
+}
+
+// ChangePlayerNameInboundInfo 定义请求或响应数据结构。
+type ChangePlayerNameInboundInfo struct {
+	Head     common.TomeeHeader `cmd:"2061" struc:"skip"`
+	Nickname string             `struc:"[16]byte"`
+}
+
+// ChangeTitleInboundInfo 定义请求或响应数据结构。
+type ChangeTitleInboundInfo struct {
+	Head   common.TomeeHeader `cmd:"3404" struc:"skip"`
+	TileID uint32
+}
+
+// C2S_GET_GIFT_COMPLETE 定义请求或响应数据结构。
+type C2S_GET_GIFT_COMPLETE struct {
+	Head     common.TomeeHeader `cmd:"2801" struc:"skip"`
+	PassText string             `struc:"[16]byte"`
+}

logic/controller/item_buy.go

@@ -11,7 +11,7 @@ import (
 // 防止封包通过领取来获取道具
 
 // BuyItem 购买单个道具
-func (h Controller) BuyItem(data *item.BuyInboundInfo, player *player.Player) (result *item.BuyOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) BuyItem(data *BuyInboundInfo, player *player.Player) (result *item.BuyOutboundInfo, err errorcode.ErrorCode) {
 	result = &item.BuyOutboundInfo{Coins: player.Info.Coins}
 
 	bought, err := buySeerdouBackpackItem(player, data.ItemId, data.Count)
@@ -31,7 +31,7 @@ func (h Controller) BuyItem(data *item.BuyInboundInfo, player *player.Player) (r
 }
 
 // BuyMultipleItems 批量购买道具
-func (h Controller) BuyMultipleItems(data *item.BuyMultiInboundInfo, player *player.Player) (result *item.BuyMultiOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) BuyMultipleItems(data *BuyMultiInboundInfo, player *player.Player) (result *item.BuyMultiOutboundInfo, err errorcode.ErrorCode) {
 	for _, itemID := range data.ItemIds {
 		bought, buyErr := buySeerdouBackpackItem(player, int64(itemID), 1)
 		if buyErr == errorcode.ErrorCodes.ErrSunDouInsufficient10016 {
@@ -48,7 +48,7 @@ func (h Controller) BuyMultipleItems(data *item.BuyMultiInboundInfo, player *pla
 }
 
 // BuyGoldItem 使用金豆购买商品
-func (h Controller) BuyGoldItem(data *item.C2S_GOLD_BUY_PRODUCT, player *player.Player) (result *item.S2C_GoldBuyProductInfo, err errorcode.ErrorCode) {
+func (h Controller) BuyGoldItem(data *C2S_GOLD_BUY_PRODUCT, player *player.Player) (result *item.S2C_GoldBuyProductInfo, err errorcode.ErrorCode) {
 	pro := service.NewShopService().Get(data.ProductID)
 	if pro == nil {
 		return nil, errorcode.ErrorCodes.ErrTooManyProducts

logic/controller/item_sale.go

@@ -4,7 +4,6 @@ import (
 	"blazing/common/data/xmlres"
 	"blazing/common/socket/errorcode"
 	"blazing/logic/service/fight"
-	"blazing/logic/service/item"
 	"blazing/logic/service/player"
 
 	"github.com/gogf/gf/v2/util/gconv"
@@ -14,15 +13,18 @@ import (
 // data: 包含道具ID和数量的输入信息
 // c: 当前玩家对象
 // 返回: 空结果和错误码
-func (h Controller) ItemSale(data *item.C2S_ITEM_SALE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ItemSale(data *C2S_ITEM_SALE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if c.Service.Item.CheakItem(data.ItemId) < int64(data.Amount) {
 		return nil, errorcode.ErrorCodes.ErrSystemError
 	}
 
+	if err := c.Service.Item.UPDATE(data.ItemId, -gconv.Int(data.Amount)); err != nil {
+		return nil, errorcode.ErrorCodes.ErrInsufficientItems
+	}
+
 	itemConfig := xmlres.ItemsMAP[int(data.ItemId)]
 	if itemConfig.SellPrice != 0 {
 		c.Info.Coins += int64(int64(data.Amount) * int64(itemConfig.SellPrice))
 	}
-	c.Service.Item.UPDATE(data.ItemId, -gconv.Int(data.Amount))
 	return result, 0
 }

logic/controller/item_use.go

@@ -15,13 +15,15 @@ import (
 const (
 	// ItemDefaultLeftTime 道具默认剩余时间（毫秒）
 	ItemDefaultLeftTime = 360000
+	// UniversalNatureItemID 全能性格转化剂Ω
+	UniversalNatureItemID uint32 = 300136
 )
 
 // GetUserItemList 获取用户道具列表
 // data: 包含分页参数的输入信息
 // c: 当前玩家对象
 // 返回: 道具列表和错误码
-func (h Controller) GetUserItemList(data *item.ItemListInboundInfo, c *player.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetUserItemList(data *ItemListInboundInfo, c *player.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
 	result = &item.ItemListOutboundInfo{
 		ItemList: c.Service.Item.GetUserItemList(data.Param1, data.Param2, ItemDefaultLeftTime),
 	}
@@ -32,23 +34,39 @@ func (h Controller) GetUserItemList(data *item.ItemListInboundInfo, c *player.Pl
 // data: 包含道具ID和宠物捕获时间的输入信息
 // c: 当前玩家对象
 // 返回: 使用后的宠物信息和错误码
-func (h Controller) UsePetItemOutOfFight(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGHT, c *player.Player) (result *item.S2C_USE_PET_ITEM_OUT_OF_FIGHT, err errorcode.ErrorCode) {
-	_, currentPet, found := c.FindPet(data.CatchTime)
+func (h Controller) UsePetItemOutOfFight(data *C2S_USE_PET_ITEM_OUT_OF_FIGHT, c *player.Player) (result *item.S2C_USE_PET_ITEM_OUT_OF_FIGHT, err errorcode.ErrorCode) {
+	slot, found := c.FindPetBagSlot(data.CatchTime)
 	if !found {
 		return nil, errorcode.ErrorCodes.Err10401
 	}
 
+	currentPet := slot.PetInfoPtr()
+	if currentPet == nil {
+		return nil, errorcode.ErrorCodes.Err10401
+	}
+
 	itemID := uint32(data.ItemID)
 	if c.Service.Item.CheakItem(itemID) == 0 {
 		return nil, errorcode.ErrorCodes.ErrInsufficientItems
 	}
 
+	oldHP := currentPet.Hp
 	itemCfg, ok := xmlres.ItemsMAP[int(itemID)]
 	if !ok {
-		return nil, errorcode.ErrorCodes.ErrSystemError
+		errcode := h.handleRegularPetItem(itemID, currentPet)
+		if errcode != 0 {
+			return nil, errcode
+		}
+		refreshPetPaneKeepHP(currentPet, oldHP)
+		if err := c.Service.Item.UPDATE(itemID, -1); err != nil {
+			return nil, errorcode.ErrorCodes.ErrInsufficientItems
+		}
+		c.Service.Info.Save(*c.Info)
+		result = &item.S2C_USE_PET_ITEM_OUT_OF_FIGHT{}
+		copier.Copy(&result, currentPet)
+		return result, 0
 	}
 
-	oldHP := currentPet.Hp
 	var errcode errorcode.ErrorCode
 	switch {
 	case itemID == 300036:
@@ -75,7 +93,10 @@ func (h Controller) UsePetItemOutOfFight(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGH
 		return nil, errcode
 	}
 
-	c.Service.Item.UPDATE(itemID, -1)
+	if err := c.Service.Item.UPDATE(itemID, -1); err != nil {
+		return nil, errorcode.ErrorCodes.ErrInsufficientItems
+	}
+	c.Service.Info.Save(*c.Info)
 	result = &item.S2C_USE_PET_ITEM_OUT_OF_FIGHT{}
 	copier.Copy(&result, currentPet)
 	return result, 0
@@ -118,7 +139,9 @@ func (h Controller) handlexuancaiItem(currentPet *model.PetInfo, c *player.Playe
 		return errorcode.ErrorCodes.ErrItemUnusable
 	}
 
-	c.Service.Item.UPDATE(itemid, -100)
+	if err := c.Service.Item.UPDATE(itemid, -100); err != nil {
+		return errorcode.ErrorCodes.ErrInsufficientItems
+	}
 	return 0
 }
 
@@ -166,26 +189,32 @@ func refreshPetPaneKeepHP(currentPet *model.PetInfo, hp uint32) {
 
 // handleRegularPetItem 处理普通宠物道具
 func (h Controller) handleRegularPetItem(itemID uint32, currentPet *model.PetInfo) errorcode.ErrorCode {
-	handler := item.PetItemRegistry.GetHandler(itemID)
-	if handler == nil {
-		return errorcode.ErrorCodes.ErrItemUnusable
-	}
-	if !handler(itemID, currentPet) {
-		return errorcode.ErrorCodes.ErrItemUnusable
-	}
-	return 0
+	return item.PetItemRegistry.Handle(itemID, currentPet)
 }
 
 // ResetNature 重置宠物性格
 // data: 包含道具ID和宠物捕获时间的输入信息
 // c: 当前玩家对象
 // 返回: 无数据和错误码
-func (h Controller) ResetNature(data *item.C2S_PET_RESET_NATURE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
-	_, currentPet, found := c.FindPet(data.CatchTime)
+func (h Controller) ResetNature(data *C2S_PET_RESET_NATURE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	slot, found := c.FindPetBagSlot(data.CatchTime)
 	if !found {
 		return nil, errorcode.ErrorCodes.Err10401
 	}
 
+	currentPet := slot.PetInfoPtr()
+	if currentPet == nil {
+		return nil, errorcode.ErrorCodes.Err10401
+	}
+
+	if data.ItemId != UniversalNatureItemID {
+		return nil, errorcode.ErrorCodes.ErrItemUnusable
+	}
+
+	if _, ok := xmlres.NatureRootMap[int(data.Nature)]; !ok {
+		return nil, errorcode.ErrorCodes.ErrItemUnusable
+	}
+
 	if c.Service.Item.CheakItem(data.ItemId) <= 0 {
 		return nil, errorcode.ErrorCodes.ErrInsufficientItems
 	}
@@ -193,7 +222,10 @@ func (h Controller) ResetNature(data *item.C2S_PET_RESET_NATURE, c *player.Playe
 	currentHP := currentPet.Hp
 	currentPet.Nature = data.Nature
 	refreshPetPaneKeepHP(currentPet, currentHP)
-	c.Service.Item.UPDATE(data.ItemId, -1)
+	if err := c.Service.Item.UPDATE(data.ItemId, -1); err != nil {
+		return nil, errorcode.ErrorCodes.ErrInsufficientItems
+	}
+	c.Service.Info.Save(*c.Info)
 	return result, 0
 }
 
@@ -206,7 +238,7 @@ func (h Controller) ResetNature(data *item.C2S_PET_RESET_NATURE, c *player.Playe
 // c: 当前玩家对象
 // 返回: 无数据（响应包单独组装）和错误码
 // 说明：根据物品ID区分双倍/三倍经验加速器，使用后扣减道具并更新玩家剩余次数
-func (h Controller) UseSpeedupItem(data *item.C2S_USE_SPEEDUP_ITEM, c *player.Player) (result *item.S2C_USE_SPEEDUP_ITEM, err errorcode.ErrorCode) {
+func (h Controller) UseSpeedupItem(data *C2S_USE_SPEEDUP_ITEM, c *player.Player) (result *item.S2C_USE_SPEEDUP_ITEM, err errorcode.ErrorCode) {
 	// 1. 校验道具是否存在且数量充足
 	itemCount := c.Service.Item.CheakItem(data.ItemID)
 	if itemCount <= 0 {
@@ -221,29 +253,38 @@ func (h Controller) UseSpeedupItem(data *item.C2S_USE_SPEEDUP_ITEM, c *player.Pl
 		if c.Info.TwoTimes != 0 {
 			return nil, errorcode.ErrorCodes.ErrItemInUse
 		}
-		c.Info.TwoTimes += 50 // 玩家对象新增 TwoTimesExp 字段存储双倍剩余次数
 	case 300067:
 		if c.Info.TwoTimes != 0 {
 			return nil, errorcode.ErrorCodes.ErrItemInUse
 		}
-		c.Info.TwoTimes += 25 // 玩家对象新增 TwoTimesExp 字段存储双倍剩余次数
 	case 300051: // 假设1002是三倍经验加速器道具ID
 		if c.Info.ThreeTimes != 0 {
 			return nil, errorcode.ErrorCodes.ErrItemInUse
 		}
-		c.Info.ThreeTimes += 50 // 玩家对象新增 ThreeTimesExp 字段存储三倍剩余次数
 	case 300115:
 		if c.Info.ThreeTimes != 0 {
 			return nil, errorcode.ErrorCodes.ErrItemInUse
 		}
-		c.Info.ThreeTimes += 30 // 玩家对象新增 ThreeTimesExp 字段存储三倍剩余次数
 
 	default:
 		return nil, errorcode.ErrorCodes.ErrSystemError // 未知道具ID
 	}
 
 	// 3. 扣减道具（数量-1）
-	c.Service.Item.UPDATE(data.ItemID, -1)
+	if err := c.Service.Item.UPDATE(data.ItemID, -1); err != nil {
+		return nil, errorcode.ErrorCodes.ErrInsufficientItems
+	}
+
+	switch data.ItemID {
+	case 300027: // 假设1001是双倍经验加速器道具ID
+		c.Info.TwoTimes += 50 // 玩家对象新增 TwoTimesExp 字段存储双倍剩余次数
+	case 300067:
+		c.Info.TwoTimes += 25 // 玩家对象新增 TwoTimesExp 字段存储双倍剩余次数
+	case 300051: // 假设1002是三倍经验加速器道具ID
+		c.Info.ThreeTimes += 50 // 玩家对象新增 ThreeTimesExp 字段存储三倍剩余次数
+	case 300115:
+		c.Info.ThreeTimes += 30 // 玩家对象新增 ThreeTimesExp 字段存储三倍剩余次数
+	}
 	result.ThreeTimes = uint32(c.Info.ThreeTimes) // 返回三倍经验剩余次数
 	result.TwoTimes = uint32(c.Info.TwoTimes)     // 返回双倍经验剩余次数
 
@@ -263,7 +304,7 @@ func (h Controller) UseSpeedupItem(data *item.C2S_USE_SPEEDUP_ITEM, c *player.Pl
 // c: 当前玩家对象
 // 返回: 无数据（响应包单独组装）和错误码
 // 说明：使用后扣减道具并更新玩家能量吸收器剩余次数
-func (h Controller) UseEnergyXishou(data *item.C2S_USE_ENERGY_XISHOU, c *player.Player) (result *item.S2C_USE_ENERGY_XISHOU, err errorcode.ErrorCode) {
+func (h Controller) UseEnergyXishou(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 {
@@ -274,10 +315,11 @@ func (h Controller) UseEnergyXishou(data *item.C2S_USE_ENERGY_XISHOU, c *player.
 	}
 	// 2. 核心业务逻辑：更新能量吸收器剩余次数
 	// （注：可根据道具ID配置不同的次数加成，此处默认+1）
+	if err := c.Service.Item.UPDATE(data.ItemID, -1); err != nil {
+		return nil, errorcode.ErrorCodes.ErrInsufficientItems
+	}
 	c.Info.EnergyTime += 40 // 玩家对象新增 EnergyTimes 字段存储能量吸收剩余次数
 
-	// 3. 扣减道具（数量-1）
-	c.Service.Item.UPDATE(data.ItemID, -1)
 	result = &item.S2C_USE_ENERGY_XISHOU{
 		EnergyTimes: uint32(c.Info.EnergyTime),
 	}
@@ -298,7 +340,7 @@ func (h Controller) UseEnergyXishou(data *item.C2S_USE_ENERGY_XISHOU, c *player.
 // c: 当前玩家对象
 // 返回: 无数据（响应包单独组装）和错误码
 // 说明：使用后扣减道具，开启自动战斗（flag设为3）并更新剩余次数
-func (h Controller) UseAutoFightItem(data *item.C2S_USE_AUTO_FIGHT_ITEM, c *player.Player) (result *item.S2C_USE_AUTO_FIGHT_ITEM, err errorcode.ErrorCode) {
+func (h Controller) UseAutoFightItem(data *C2S_USE_AUTO_FIGHT_ITEM, c *player.Player) (result *item.S2C_USE_AUTO_FIGHT_ITEM, err errorcode.ErrorCode) {
 	// 1. 校验道具是否存在且数量充足
 	itemCount := c.Service.Item.CheakItem(data.ItemID)
 
@@ -308,6 +350,9 @@ func (h Controller) UseAutoFightItem(data *item.C2S_USE_AUTO_FIGHT_ITEM, c *play
 	if c.Info.AutoFightTime != 0 {
 		return nil, errorcode.ErrorCodes.ErrItemInUse
 	}
+	if err := c.Service.Item.UPDATE(data.ItemID, -1); err != nil {
+		return nil, errorcode.ErrorCodes.ErrInsufficientItems
+	}
 	result = &item.S2C_USE_AUTO_FIGHT_ITEM{}
 	// 2. 核心业务逻辑：开启自动战斗 + 更新剩余次数
 	c.Info.AutoFight = 3 // 按需求设置自动战斗flag为3（需测试）
@@ -323,8 +368,6 @@ func (h Controller) UseAutoFightItem(data *item.C2S_USE_AUTO_FIGHT_ITEM, c *play
 		c.Info.AutoFightTime += 50
 	}
 	result.AutoFightTimes = c.Info.AutoFightTime
-	// 3. 扣减道具（数量-1）
-	c.Service.Item.UPDATE(data.ItemID, -1)
 
 	return result, 0
 }

logic/controller/item_use_test.go

@@ -0,0 +1,60 @@
+package controller
+
+import (
+	"blazing/common/data/xmlres"
+	"blazing/logic/service/player"
+	playermodel "blazing/modules/player/model"
+	blservice "blazing/modules/player/service"
+	"testing"
+)
+
+func TestUsePetItemOutOfFightAppliesToBackupPetInMemory(t *testing.T) {
+	petID := firstPetIDForControllerTest(t)
+	backupPet := playermodel.GenPetInfo(petID, 31, 0, 0, 50, nil, 0)
+	if backupPet == nil {
+		t.Fatal("failed to generate backup pet")
+	}
+	if backupPet.MaxHp <= 1 {
+		t.Fatalf("expected generated pet to have max hp > 1, got %d", backupPet.MaxHp)
+	}
+	backupPet.Hp = 1
+
+	testPlayer := player.NewPlayer(nil)
+	testPlayer.Info = &playermodel.PlayerInfo{
+		UserID:        1,
+		PetList:       []playermodel.PetInfo{},
+		BackupPetList: []playermodel.PetInfo{*backupPet},
+	}
+	testPlayer.Service = blservice.NewUserService(testPlayer.Info.UserID)
+
+	itemID, recoverHP := firstRecoverHPItemForControllerTest(t)
+	if recoverHP <= 0 {
+		t.Fatalf("expected positive recover hp for item %d, got %d", itemID, recoverHP)
+	}
+
+	_, err := (Controller{}).UsePetItemOutOfFight(&C2S_USE_PET_ITEM_OUT_OF_FIGHT{
+		CatchTime: backupPet.CatchTime,
+		ItemID:    int32(itemID),
+	}, testPlayer)
+	if err != 0 {
+		t.Fatalf("expected backup pet item use to succeed in-memory, got err=%d", err)
+	}
+
+	updatedPet := testPlayer.Info.BackupPetList[0]
+	if updatedPet.Hp <= 1 {
+		t.Fatalf("expected backup pet hp to increase in memory, got hp=%d", updatedPet.Hp)
+	}
+}
+
+func firstRecoverHPItemForControllerTest(t *testing.T) (uint32, int) {
+	t.Helper()
+
+	for id, cfg := range xmlres.ItemsMAP {
+		if cfg.HP > 0 {
+			return uint32(id), cfg.HP
+		}
+	}
+
+	t.Fatal("xmlres.ItemsMAP has no HP recovery item")
+	return 0, 0
+}

logic/controller/login_main.go

@@ -2,14 +2,11 @@ package controller
 
 import (
 	"blazing/common/data/share"
-	"blazing/cool"
-
 	"blazing/common/socket/errorcode"
-
-	"blazing/logic/service/user"
-
+	"blazing/cool"
 	"blazing/logic/service/player"
 	"blazing/logic/service/space"
+	"blazing/logic/service/user"
 	"blazing/modules/player/service"
 	"context"
 	"time"
@@ -17,8 +14,34 @@ import (
 	"github.com/panjf2000/gnet/v2"
 )
 
+const (
+	waitUserOfflineTimeout  = 30 * time.Second
+	waitUserOfflineInterval = 200 * time.Millisecond
+	waitUserOfflineKickGap  = 5 * time.Second
+)
+
+func waitUserOffline(userID uint32, timeout time.Duration) bool {
+	deadline := time.Now().Add(timeout)
+	lastKickAt := time.Now()
+	for {
+		if _, onlineErr := share.ShareManager.GetUserOnline(userID); onlineErr != nil {
+			return true
+		}
+		if time.Now().After(deadline) {
+			return false
+		}
+		if time.Since(lastKickAt) >= waitUserOfflineKickGap {
+			if kickErr := Maincontroller.RPCClient.Kick(userID); kickErr != nil {
+				cool.Logger.Error(context.Background(), "补踢失败", userID, kickErr)
+			}
+			lastKickAt = time.Now()
+		}
+		time.Sleep(waitUserOfflineInterval)
+	}
+}
+
 // Login 处理命令: 1001
-func (h Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.LoginMSInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h Controller) Login(data *MAIN_LOGIN_IN, c gnet.Conn) (result *user.LoginMSInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 
 	if data.Head.UserID == 0 {
 		defer c.Close()
@@ -30,12 +53,18 @@ func (h Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.L
 		defer c.Close()
 		return
 	}
-	_, erre := share.ShareManager.GetUserOnline(data.Head.UserID)
-	if erre == nil {
-		error := Maincontroller.RPCClient.Kick(data.Head.UserID) //通知其他服务器踢人
-		if error != nil {
-			cool.Logger.Error(context.Background(), "踢人失败", err)
 
+	if onlineServerID, onlineErr := share.ShareManager.GetUserOnline(data.Head.UserID); onlineErr == nil {
+		kickErr := Maincontroller.RPCClient.Kick(data.Head.UserID) //通知其他服务器踢人
+		if kickErr != nil {
+			cool.Logger.Error(context.Background(), "踢人失败", data.Head.UserID, onlineServerID, kickErr)
+			err = errorcode.ErrorCodes.ErrSystemBusyTryLater
+			defer c.Close()
+			return
+		}
+		if ok := waitUserOffline(data.Head.UserID, waitUserOfflineTimeout); !ok {
+			cool.Logger.Error(context.Background(), "等待旧会话下线超时", data.Head.UserID, onlineServerID, waitUserOfflineTimeout)
+			err = errorcode.ErrorCodes.ErrSystemBusyTryLater
 			defer c.Close()
 			return
 		}

logic/controller/map.go

@@ -16,7 +16,7 @@ import (
 )
 
 // EnterMap 处理玩家进入地图。
-func (h Controller) EnterMap(data *space.InInfo, c *player.Player) (result *info.SimpleInfo, err errorcode.ErrorCode) {
+func (h Controller) EnterMap(data *EnterMapInboundInfo, c *player.Player) (result *info.SimpleInfo, err errorcode.ErrorCode) {
 	if c.Info.MapID != data.MapId {
 		atomic.StoreUint32(&c.Canmon, 2)
 		c.MapNPC.Reset(6 * time.Second)
@@ -39,7 +39,8 @@ func (h Controller) EnterMap(data *space.InInfo, c *player.Player) (result *info
 	return nil, -1
 }
 
-func (h Controller) GetMapHot(data *maphot.InInfo, c *player.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
+// GetMapHot 处理控制器请求。
+func (h Controller) GetMapHot(data *GetMapHotInboundInfo, c *player.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
 	result = &maphot.OutInfo{
 		HotInfos: space.GetMapHot(),
 	}
@@ -47,7 +48,7 @@ func (h Controller) GetMapHot(data *maphot.InInfo, c *player.Player) (result *ma
 }
 
 // LeaveMap 处理玩家离开地图。
-func (h Controller) LeaveMap(data *space.LeaveMapInboundInfo, c *player.Player) (result *info.LeaveMapOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) LeaveMap(data *LeaveMapInboundInfo, c *player.Player) (result *info.LeaveMapOutboundInfo, err errorcode.ErrorCode) {
 	atomic.StoreUint32(&c.Canmon, 0)
 
 	c.GetSpace().LeaveMap(c) // 从当前空间移除玩家。
@@ -57,7 +58,7 @@ func (h Controller) LeaveMap(data *space.LeaveMapInboundInfo, c *player.Player)
 }
 
 // GetMapPlayerList 获取当前地图内的玩家列表与地图广播信息。
-func (h Controller) GetMapPlayerList(data *space.ListMapPlayerInboundInfo, c *player.Player) (result *info.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetMapPlayerList(data *ListMapPlayerInboundInfo, c *player.Player) (result *info.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) {
 	result = &info.ListMapPlayerOutboundInfo{
 		Player: c.GetSpace().GetInfo(c),
 	}
@@ -71,7 +72,7 @@ func (h Controller) GetMapPlayerList(data *space.ListMapPlayerInboundInfo, c *pl
 }
 
 // AttackBoss 调试扣减当前地图广播BOSS血量。
-func (h Controller) AttackBoss(data *space.AttackBossInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AttackBoss(data *AttackBossInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	for i := 0; i < len(c.GetSpace().MapBossSInfo.INFO); i++ {
 		if atomic.LoadInt32(&c.GetSpace().MapBossSInfo.INFO[i].Hp) > 0 {
 			atomic.AddInt32(&c.GetSpace().MapBossSInfo.INFO[i].Hp, -1)

logic/controller/nono.go

@@ -14,7 +14,8 @@ const (
 	nonoPetCureCost  int64 = 50
 )
 
-func (h Controller) NonoFollowOrHome(data *nono.NonoFollowOrHomeInInfo, c *player.Player) (result *nono.NonoFollowOutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+// NonoFollowOrHome 处理控制器请求。
+func (h Controller) NonoFollowOrHome(data *NonoFollowOrHomeInInfo, c *player.Player) (result *nono.NonoFollowOutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	c.Info.NONO.Flag = data.Flag
 	result = &nono.NonoFollowOutInfo{
 		UserID:     data.Head.UserID,
@@ -29,7 +30,7 @@ func (h Controller) NonoFollowOrHome(data *nono.NonoFollowOrHomeInInfo, c *playe
 }
 
 // GetNonoInfo 获取nono信息
-func (h *Controller) GetNonoInfo(data *nono.NonoInboundInfo, c *player.Player) (result *nono.NonoOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) GetNonoInfo(data *NonoInboundInfo, c *player.Player) (result *nono.NonoOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	_ = data
 
 	result = &nono.NonoOutboundInfo{
@@ -49,7 +50,8 @@ func (h *Controller) GetNonoInfo(data *nono.NonoInboundInfo, c *player.Player) (
 	return
 }
 
-func (h *Controller) SwitchFlying(data *nono.SwitchFlyingInboundInfo, c *player.Player) (result *nono.SwitchFlyingOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+// SwitchFlying 处理控制器请求。
+func (h *Controller) SwitchFlying(data *SwitchFlyingInboundInfo, c *player.Player) (result *nono.SwitchFlyingOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &nono.SwitchFlyingOutboundInfo{
 		UserId: data.Head.UserID,
 		Type:   data.Type,
@@ -59,8 +61,10 @@ func (h *Controller) SwitchFlying(data *nono.SwitchFlyingInboundInfo, c *player.
 	return
 }
 
-func (h *Controller) PlayerPetCure(data *nono.PetCureInboundInfo, c *player.Player) (result *nono.PetCureOutboundEmpty, err errorcode.ErrorCode) { //这个时候player应该是空的
+// PlayerPetCure 处理控制器请求。
+func (h *Controller) PlayerPetCure(data *PetCureInboundInfo, c *player.Player) (result *nono.PetCureOutboundEmpty, err errorcode.ErrorCode) { //这个时候player应该是空的
 	_ = data
+	result = &nono.PetCureOutboundEmpty{}
 	if c.IsArenaHealLocked() {
 		return result, errorcode.ErrorCodes.ErrChampionCannotHeal
 	}
@@ -70,6 +74,9 @@ func (h *Controller) PlayerPetCure(data *nono.PetCureInboundInfo, c *player.Play
 	for i := range c.Info.PetList {
 		c.Info.PetList[i].Cure()
 	}
+	for i := range c.Info.BackupPetList {
+		c.Info.BackupPetList[i].Cure()
+	}
 	c.Info.Coins -= nonoPetCureCost
 	return
 }

logic/controller/pet_bag.go

@@ -9,73 +9,29 @@ import (
 
 // SavePetBagOrder 保存当前主背包和备用背包顺序
 func (h Controller) SavePetBagOrder(
-	data *pet.SavePetBagOrderInboundInfo,
+	data *SavePetBagOrderInboundInfo,
 	player *player.Player) (result *fight.NullOutboundInfo,
 	err errorcode.ErrorCode) {
-	syncBackupPetList(player)
-
-	if len(data.PetList) > 6 || len(data.BackupPetList) > 6 {
+	if !player.SavePetBagOrder(data.PetList, data.BackupPetList) {
 		return nil, errorcode.ErrorCodes.ErrPokemonIDMismatch
 	}
-
-	totalPetCount := len(player.Info.PetList) + len(player.Info.BackupPetList)
-	if len(data.PetList)+len(data.BackupPetList) != totalPetCount {
-		return nil, errorcode.ErrorCodes.ErrPokemonIDMismatch
-	}
-
-	petMap := buildPetInfoMap(player.Info.PetList, player.Info.BackupPetList)
-	used := make(map[uint32]struct{}, totalPetCount)
-
-	battleList, ok := buildOrderedPetList(data.PetList, petMap, used)
-	if !ok {
-		return nil, errorcode.ErrorCodes.ErrPokemonIDMismatch
-	}
-
-	backupList, ok := buildOrderedPetList(data.BackupPetList, petMap, used)
-	if !ok {
-		return nil, errorcode.ErrorCodes.ErrPokemonIDMismatch
-	}
-
-	if len(used) != totalPetCount {
-		return nil, errorcode.ErrorCodes.ErrPokemonIDMismatch
-	}
-
-	player.Info.PetList = battleList
-	player.Info.BackupPetList = backupList
 	player.Service.Info.Save(*player.Info)
 	return nil, 0
 }
 
-// PetRetrieveFromWarehouse 领回仓库精灵
+// PetRetrieveFromWarehouse 从放生仓库领回精灵
 func (h Controller) PetRetrieveFromWarehouse(
-	data *pet.PET_RETRIEVE, player *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
-	if _, ok := findPetListSlot(player, data.CatchTime); ok {
-		return nil, 0
+	data *PET_RETRIEVE, player *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if !player.Service.Pet.UpdateFree(data.CatchTime, 1, 0) {
+		return nil, errorcode.ErrorCodes.ErrPokemonIDMismatch
 	}
 
-	petInfo := player.Service.Pet.PetInfoOneByCatchTime(data.CatchTime)
-	if petInfo == nil {
-		return nil, 0
-	}
-
-	syncBackupPetList(player)
-	changed := false
-	if len(player.Info.PetList) < 6 {
-		player.Info.PetList = append(player.Info.PetList, petInfo.Data)
-		changed = true
-	} else if len(player.Info.BackupPetList) < 6 {
-		player.Info.BackupPetList = append(player.Info.BackupPetList, petInfo.Data)
-		changed = true
-	}
-	if changed {
-		player.Service.Info.Save(*player.Info)
-	}
 	return nil, 0
 }
 
 // TogglePetBagWarehouse 精灵背包仓库切换
 func (h Controller) TogglePetBagWarehouse(
-	data *pet.PetReleaseInboundInfo,
+	data *PetReleaseInboundInfo,
 	player *player.Player) (result *pet.PetReleaseOutboundInfo, err errorcode.ErrorCode) {
 	result = &pet.PetReleaseOutboundInfo{
 		Flag: uint32(data.Flag),
@@ -85,31 +41,26 @@ func (h Controller) TogglePetBagWarehouse(
 		return result, errorcode.ErrorCodes.ErrChampionCannotSwitch
 	}
 
-	syncBackupPetList(player)
-
 	switch data.Flag {
 	case 0:
-		slot, ok := findPetListSlot(player, data.CatchTime)
+		slot, ok := player.FindPetBagSlot(data.CatchTime)
 		if !ok {
 			return result, errorcode.ErrorCodes.ErrPokemonNotExists
 		}
-		if !slot.isValid() {
+		if !slot.IsValid() {
 			return result, errorcode.ErrorCodes.ErrPokemonIDMismatch
 		}
-		if !player.Service.Pet.Update(slot.info) {
+		if !player.Service.Pet.Update(slot.PetInfo()) {
 			return result, errorcode.ErrorCodes.ErrSystemError
 		}
 
-		slot.remove()
-		if slot.kind == petListKindMain {
-			player.Service.Info.Save(*player.Info)
-		}
+		slot.Remove()
 
 	case 1:
 		if len(player.Info.PetList) >= 6 && len(player.Info.BackupPetList) >= 6 {
 			return result, errorcode.ErrorCodes.ErrPokemonIDMismatch
 		}
-		if _, ok := findPetListSlot(player, data.CatchTime); ok {
+		if _, ok := player.FindPetBagSlot(data.CatchTime); ok {
 			return result, 0
 		}
 
@@ -117,77 +68,7 @@ func (h Controller) TogglePetBagWarehouse(
 		if petInfo == nil {
 			return result, errorcode.ErrorCodes.ErrPokemonNotExists
 		}
-		if len(player.Info.PetList) < 6 {
-			player.Info.PetList = append(player.Info.PetList, petInfo.Data)
-		} else {
-			player.Info.BackupPetList = append(player.Info.BackupPetList, petInfo.Data)
-		}
-		result.PetInfo = petInfo.Data
-	}
-
-	if len(player.Info.PetList) > 0 {
-		result.FirstPetTime = player.Info.PetList[0].CatchTime
-	}
-
-	return result, 0
-}
-
-// TogglePetBagWarehouseLegacy 旧版精灵背包仓库切换
-func (h Controller) TogglePetBagWarehouseLegacy(
-	data *pet.PetReleaseLegacyInboundInfo,
-	player *player.Player) (result *pet.PetReleaseOutboundInfo, err errorcode.ErrorCode) {
-	result = &pet.PetReleaseOutboundInfo{
-		Flag: uint32(data.Flag),
-	}
-
-	if player.IsArenaSwitchLocked() {
-		return result, errorcode.ErrorCodes.ErrChampionCannotSwitch
-	}
-
-	switch data.Flag {
-	case 0:
-		index, currentPet, ok := player.FindPet(data.CatchTime)
-		if !ok {
-			break
-		}
-		if index < 0 || index >= len(player.Info.PetList) {
-			return result, errorcode.ErrorCodes.ErrPokemonIDMismatch
-		}
-		if !player.Service.Pet.Update(*currentPet) {
-			return result, errorcode.ErrorCodes.ErrSystemError
-		}
-
-		player.Info.PetList = append(player.Info.PetList[:index], player.Info.PetList[index+1:]...)
-		player.Info.BackupPetList = removePetByCatchTime(player.Info.BackupPetList, data.CatchTime)
-		player.Info.BackupPetList = append(player.Info.BackupPetList, *currentPet)
-
-	case 1:
-		if len(player.Info.PetList) >= 6 {
-			break
-		}
-
-		if _, _, ok := player.FindPet(data.CatchTime); ok {
-			player.Info.BackupPetList = removePetByCatchTime(player.Info.BackupPetList, data.CatchTime)
-			break
-		}
-
-		if index, backupPet, ok := findBackupPet(player, data.CatchTime); ok {
-			if index < 0 || index >= len(player.Info.BackupPetList) {
-				return result, errorcode.ErrorCodes.ErrPokemonIDMismatch
-			}
-
-			result.PetInfo = *backupPet
-			player.Info.PetList = append(player.Info.PetList, *backupPet)
-			player.Info.BackupPetList = append(player.Info.BackupPetList[:index], player.Info.BackupPetList[index+1:]...)
-			break
-		}
-
-		petInfo := player.Service.Pet.PetInfoOneByCatchTime(data.CatchTime)
-		if petInfo == nil {
-			return result, errorcode.ErrorCodes.ErrPokemonNotExists
-		}
-
-		player.Info.PetList = append(player.Info.PetList, petInfo.Data)
+		player.AddPetToAvailableBag(petInfo.Data)
 		result.PetInfo = petInfo.Data
 	}
 

logic/controller/pet_barge.go

@@ -7,7 +7,7 @@ import (
 )
 
 // GetPetBargeList 精灵图鉴
-func (h Controller) GetPetBargeList(data *pet.PetBargeListInboundInfo, player *player.Player) (result *pet.PetBargeListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetPetBargeList(data *PetBargeListInboundInfo, player *player.Player) (result *pet.PetBargeListOutboundInfo, err errorcode.ErrorCode) {
 
 	ret := &pet.PetBargeListOutboundInfo{
 		PetBargeList: make([]pet.PetBargeListInfo, 0),

logic/controller/pet_elo.go

@@ -12,6 +12,7 @@ import (
 	"github.com/jinzhu/copier"
 )
 
+// PetELV 处理控制器请求。
 func (h Controller) PetELV(data *C2S_PET_EVOLVTION, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	_, currentPet, found := c.FindPet(data.CacthTime)
 	if !found {
@@ -36,7 +37,9 @@ func (h Controller) PetELV(data *C2S_PET_EVOLVTION, c *player.Player) (result *f
 		return nil, errorcode.ErrorCodes.ErrInsufficientItemsMulti
 	}
 	if branch.EvolvItem != 0 {
-		c.Service.Item.UPDATE(uint32(branch.EvolvItem), -branch.EvolvItemCount)
+		if err := c.Service.Item.UPDATE(uint32(branch.EvolvItem), -branch.EvolvItemCount); err != nil {
+			return nil, errorcode.ErrorCodes.ErrInsufficientItemsMulti
+		}
 	}
 
 	currentPet.ID = uint32(branch.MonTo)

logic/controller/pet_ev.go

@@ -17,11 +17,16 @@ const (
 // c: 当前玩家对象
 // 返回: 分配结果和错误码
 func (h Controller) PetEVDiy(data *PetEV, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
-	_, currentPet, found := c.FindPet(data.CacthTime)
+	slot, found := c.FindPetBagSlot(data.CacthTime)
 	if !found {
 		return nil, errorcode.ErrorCodes.Err10401
 	}
 
+	currentPet := slot.PetInfoPtr()
+	if currentPet == nil {
+		return nil, errorcode.ErrorCodes.Err10401
+	}
+
 	var targetTotal uint32
 	var currentTotal uint32
 	for i, evValue := range data.EVs {
@@ -63,6 +68,7 @@ func (h Controller) PetEVDiy(data *PetEV, c *player.Player) (result *fight.NullO
 	return result, 0
 }
 
+// PetEV 定义请求或响应数据结构。
 type PetEV struct {
 	Head      common.TomeeHeader `cmd:"50001" struc:"skip"`
 	CacthTime uint32             `description:"捕捉时间" codec:"cacthTime"`

logic/controller/pet_ev_test.go

@@ -0,0 +1,45 @@
+package controller
+
+import (
+	"testing"
+
+	"blazing/logic/service/player"
+	playermodel "blazing/modules/player/model"
+)
+
+func TestPetEVDiy_AppliesToBackupPet(t *testing.T) {
+	p := player.NewPlayer(nil)
+	p.Info = &playermodel.PlayerInfo{
+		EVPool: 20,
+		PetList: []playermodel.PetInfo{
+			{CatchTime: 1},
+		},
+		BackupPetList: []playermodel.PetInfo{
+			{
+				CatchTime: 2,
+				Level:     100,
+				Ev:        [6]uint32{0, 4, 0, 0, 0, 0},
+			},
+		},
+	}
+
+	data := &PetEV{
+		CacthTime: 2,
+		EVs:       [6]uint32{0, 8, 4, 0, 0, 0},
+	}
+
+	_, err := (Controller{}).PetEVDiy(data, p)
+	if err != 0 {
+		t.Fatalf("PetEVDiy returned error: %v", err)
+	}
+
+	got := p.Info.BackupPetList[0].Ev
+	want := [6]uint32{0, 8, 4, 0, 0, 0}
+	if got != want {
+		t.Fatalf("backup pet EV mismatch, got %v want %v", got, want)
+	}
+
+	if gotPool, wantPool := p.Info.EVPool, int64(12); gotPool != wantPool {
+		t.Fatalf("EVPool mismatch, got %d want %d", gotPool, wantPool)
+	}
+}

logic/controller/pet_ext.go

@@ -16,6 +16,7 @@ func (h Controller) PetExt(
 
 }
 
+// C2S_NONO_EXE_LIST 定义请求或响应数据结构。
 type C2S_NONO_EXE_LIST struct {
 	Head common.TomeeHeader `cmd:"9015" struc:"skip"`
 }

logic/controller/pet_fusion.go

@@ -19,7 +19,8 @@ const (
 	petFusionSoulID        = 1000017
 )
 
-func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result *pet.PetFusionInfo, err errorcode.ErrorCode) {
+// PetFusion 处理控制器请求。
+func (h Controller) PetFusion(data *C2S_PetFusion, c *player.Player) (result *pet.PetFusionInfo, err errorcode.ErrorCode) {
 	result = &pet.PetFusionInfo{
 		SoulID: petFusionSoulID,
 	}
@@ -64,16 +65,33 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
 		return result, errorcode.ErrorCodes.ErrSunDouInsufficient10016
 	}
 
-	consumeItems(c, materialCounts)
-	c.Info.Coins -= petFusionCost
-
 	if resultPetID == 0 {
-		if useOptionalItem(c, data.GoldItem1[:], petFusionFailureItemID) {
-			result.CostItemFlag = 1
-		} else if auxPet.Level > 5 {
-			auxPet.Downgrade(auxPet.Level - 5)
+		failedAux := *auxPet
+		if auxPet.Level > 5 {
+			failedAux.Downgrade(auxPet.Level - 5)
 		} else {
-			auxPet.Downgrade(1)
+			failedAux.Downgrade(1)
+		}
+		txResult, errCode := c.Service.PetFusionTx(
+			*c.Info,
+			data.Mcatchtime,
+			data.Auxcatchtime,
+			materialCounts,
+			data.GoldItem1[:],
+			petFusionKeepAuxItemID,
+			petFusionFailureItemID,
+			petFusionCost,
+			nil,
+			&failedAux,
+		)
+		if errCode != 0 {
+			return result, errCode
+		}
+		c.Info.Coins -= petFusionCost
+		if txResult.CostItemUsed {
+			result.CostItemFlag = 1
+		} else if txResult.UpdatedAux != nil {
+			*auxPet = *txResult.UpdatedAux
 		}
 		return &pet.PetFusionInfo{}, 0
 	}
@@ -100,18 +118,37 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
 		newPet.RandomByWeightShiny()
 	}
 
-	c.Service.Pet.PetAdd(newPet, 0)
-	println(c.Info.UserID, "进行融合", len(c.Info.PetList), masterPet.ID, auxPet.ID, newPet.ID)
-
-	c.PetDel(data.Mcatchtime)
-	if useOptionalItem(c, data.GoldItem1[:], petFusionKeepAuxItemID) {
-		result.CostItemFlag = 1
-	} else {
-		c.PetDel(data.Auxcatchtime)
+	txResult, errCode := c.Service.PetFusionTx(
+		*c.Info,
+		data.Mcatchtime,
+		data.Auxcatchtime,
+		materialCounts,
+		data.GoldItem1[:],
+		petFusionKeepAuxItemID,
+		petFusionFailureItemID,
+		petFusionCost,
+		newPet,
+		nil,
+	)
+	if errCode != 0 {
+		return result, errCode
 	}
 
-	result.ObtainTime = newPet.CatchTime
-	result.StarterCpTm = newPet.ID
+	c.Info.Coins -= petFusionCost
+	if txResult.CostItemUsed {
+		result.CostItemFlag = 1
+	} else {
+		removePetFromPlayerInfo(c, data.Auxcatchtime)
+	}
+	removePetFromPlayerInfo(c, data.Mcatchtime)
+
+	if txResult.NewPet == nil {
+		return result, errorcode.ErrorCodes.ErrSystemError
+	}
+	c.Info.PetList = append(c.Info.PetList, *txResult.NewPet)
+
+	result.ObtainTime = txResult.NewPet.CatchTime
+	result.StarterCpTm = txResult.NewPet.ID
 	return result, 0
 }
 
@@ -148,21 +185,10 @@ func hasEnoughItems(c *player.Player, itemCounts map[uint32]int) bool {
 	return true
 }
 
-func consumeItems(c *player.Player, itemCounts map[uint32]int) {
-	for itemID, count := range itemCounts {
-		_ = c.Service.Item.UPDATE(itemID, -count)
+func removePetFromPlayerInfo(c *player.Player, catchTime uint32) {
+	index, _, ok := c.FindPet(catchTime)
+	if !ok {
+		return
 	}
-}
-
-func useOptionalItem(c *player.Player, itemIDs []uint32, target uint32) bool {
-	if c.Service.Item.CheakItem(target) <= 0 {
-		return false
-	}
-	for _, itemID := range itemIDs {
-		if itemID == target {
-			_ = c.Service.Item.UPDATE(target, -1)
-			return true
-		}
-	}
-	return false
+	c.Info.PetList = append(c.Info.PetList[:index], c.Info.PetList[index+1:]...)
 }

logic/controller/pet_info.go

@@ -2,20 +2,24 @@ package controller
 
 import (
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service/common"
 	"blazing/logic/service/pet"
-	"blazing/logic/service/player"
+	playersvc "blazing/logic/service/player"
 	"blazing/modules/player/model"
 )
 
 // GetPetInfo 获取精灵信息
 func (h Controller) GetPetInfo(
-	data *pet.InInfo,
-	player *player.Player) (result *model.PetInfo,
+	data *GetPetInfoInboundInfo,
+	player *playersvc.Player) (result *model.PetInfo,
 	err errorcode.ErrorCode) {
-	_, petInfo, found := player.FindPet(data.CatchTime)
-	if found {
-		result = petInfo
-		return result, 0
+	levelLimit := player.CurrentMapPetLevelLimit()
+	if slot, found := player.FindPetBagSlot(data.CatchTime); found {
+		if petInfo := slot.PetInfoPtr(); petInfo != nil {
+			petCopy := playersvc.ApplyPetLevelLimit(*petInfo, levelLimit)
+			result = &petCopy
+			return result, 0
+		}
 	}
 
 	ret := player.Service.Pet.PetInfoOneByCatchTime(data.CatchTime)
@@ -23,46 +27,57 @@ func (h Controller) GetPetInfo(
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
 	}
 
-	result = &ret.Data
+	petData := ret.Data
+	petData = playersvc.ApplyPetLevelLimit(petData, levelLimit)
+	result = &petData
 	return result, 0
 }
 
 // GetUserBagPetInfo 获取主背包和并列备用精灵列表
 func (h Controller) GetUserBagPetInfo(
-	data *pet.GetUserBagPetInfoInboundEmpty,
-	player *player.Player) (result *pet.GetUserBagPetInfoOutboundInfo,
+	data *GetUserBagPetInfoInboundEmpty,
+	player *playersvc.Player) (result *pet.GetUserBagPetInfoOutboundInfo,
 	err errorcode.ErrorCode) {
-	return buildUserBagPetInfo(player), 0
+	return player.GetUserBagPetInfo(player.CurrentMapPetLevelLimit()), 0
+}
+
+// GetPetListInboundEmpty 定义请求或响应数据结构。
+type GetPetListInboundEmpty struct {
+	Head common.TomeeHeader `cmd:"2303" struc:"skip"`
 }
 
 // GetPetList 获取当前主背包列表
 func (h Controller) GetPetList(
-	data *pet.GetPetListInboundEmpty,
-	player *player.Player) (result *pet.GetPetListOutboundInfo,
+	data *GetPetListInboundEmpty,
+	player *playersvc.Player) (result *pet.GetPetListOutboundInfo,
 	err errorcode.ErrorCode) {
 	return buildPetListOutboundInfo(player.Info.PetList), 0
 }
 
+// GetPetListFreeInboundEmpty 定义请求或响应数据结构。
+type GetPetListFreeInboundEmpty struct {
+	Head common.TomeeHeader `cmd:"2320" struc:"skip"`
+}
+
 // GetPetReleaseList 获取仓库可放生列表
 func (h Controller) GetPetReleaseList(
-	data *pet.GetPetListFreeInboundEmpty,
-	player *player.Player) (result *pet.GetPetListOutboundInfo,
+	data *GetPetListFreeInboundEmpty,
+	player *playersvc.Player) (result *pet.GetPetListOutboundInfo,
 	err errorcode.ErrorCode) {
-	syncBackupPetList(player)
-	return buildPetListOutboundInfo(buildWarehousePetList(player)), 0
+
+	return buildPetListOutboundInfo(player.WarehousePetList()), 0
 }
 
 // PlayerShowPet 精灵展示
 func (h Controller) PlayerShowPet(
-	data *pet.PetShowInboundInfo,
-	player *player.Player) (result *pet.PetShowOutboundInfo, err errorcode.ErrorCode) {
+	data *PetShowInboundInfo,
+	player *playersvc.Player) (result *pet.PetShowOutboundInfo, err errorcode.ErrorCode) {
 	result = &pet.PetShowOutboundInfo{
 		UserID:    data.Head.UserID,
 		CatchTime: data.CatchTime,
 		Flag:      data.Flag,
 	}
 
-	_, currentPet, ok := player.FindPet(data.CatchTime)
 	if data.Flag == 0 {
 		player.SetPetDisplay(0, nil)
 		player.GetSpace().RefreshUserInfo(player)
@@ -70,10 +85,16 @@ func (h Controller) PlayerShowPet(
 		return
 	}
 
+	slot, ok := player.FindPetBagSlot(data.CatchTime)
 	if !ok {
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
 	}
 
+	currentPet := slot.PetInfoPtr()
+	if currentPet == nil {
+		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
+	}
+
 	player.SetPetDisplay(data.Flag, currentPet)
 	player.GetSpace().RefreshUserInfo(player)
 	result = buildPetShowOutboundInfo(data.Head.UserID, data.Flag, currentPet)

logic/controller/pet_info_helpers.go

@@ -2,32 +2,9 @@ package controller
 
 import (
 	"blazing/logic/service/pet"
-	"blazing/logic/service/player"
 	"blazing/modules/player/model"
 )
 
-type petListKind uint8
-
-const (
-	petListKindMain petListKind = iota
-	petListKindBackup
-)
-
-type petListSlot struct {
-	list  *[]model.PetInfo
-	index int
-	info  model.PetInfo
-	kind  petListKind
-}
-
-func (slot petListSlot) isValid() bool {
-	return slot.list != nil && slot.index >= 0 && slot.index < len(*slot.list)
-}
-
-func (slot petListSlot) remove() {
-	*slot.list = append((*slot.list)[:slot.index], (*slot.list)[slot.index+1:]...)
-}
-
 func buildPetShortInfo(info model.PetInfo) pet.PetShortInfo {
 	return pet.PetShortInfo{
 		ID:        info.ID,
@@ -49,163 +26,6 @@ func buildPetListOutboundInfo(petList []model.PetInfo) *pet.GetPetListOutboundIn
 	return result
 }
 
-func removePetByCatchTime(petList []model.PetInfo, catchTime uint32) []model.PetInfo {
-	for i := range petList {
-		if petList[i].CatchTime == catchTime {
-			return append(petList[:i], petList[i+1:]...)
-		}
-	}
-	return petList
-}
-
-func buildCatchTimeSet(petLists ...[]model.PetInfo) map[uint32]struct{} {
-	total := 0
-	for _, petList := range petLists {
-		total += len(petList)
-	}
-
-	catchTimes := make(map[uint32]struct{}, total)
-	for _, petList := range petLists {
-		for _, petInfo := range petList {
-			catchTimes[petInfo.CatchTime] = struct{}{}
-		}
-	}
-	return catchTimes
-}
-
-func buildPetInfoMap(petLists ...[]model.PetInfo) map[uint32]model.PetInfo {
-	total := 0
-	for _, petList := range petLists {
-		total += len(petList)
-	}
-
-	petMap := make(map[uint32]model.PetInfo, total)
-	for _, petList := range petLists {
-		for _, petInfo := range petList {
-			petMap[petInfo.CatchTime] = petInfo
-		}
-	}
-	return petMap
-}
-
-func buildWarehousePetList(player *player.Player) []model.PetInfo {
-	allPets := player.Service.Pet.PetInfo(0)
-	if len(allPets) == 0 {
-		return make([]model.PetInfo, 0)
-	}
-
-	usedCatchTimes := buildCatchTimeSet(player.Info.PetList, player.Info.BackupPetList)
-	result := make([]model.PetInfo, 0, len(allPets))
-	for i := range allPets {
-		catchTime := allPets[i].Data.CatchTime
-		if _, exists := usedCatchTimes[catchTime]; exists {
-			continue
-		}
-		result = append(result, allPets[i].Data)
-	}
-	return result
-}
-
-func findBackupPet(player *player.Player, catchTime uint32) (int, *model.PetInfo, bool) {
-	for i := range player.Info.BackupPetList {
-		if player.Info.BackupPetList[i].CatchTime == catchTime {
-			return i, &player.Info.BackupPetList[i], true
-		}
-	}
-	return -1, nil, false
-}
-
-func findPetListSlot(player *player.Player, catchTime uint32) (petListSlot, bool) {
-	if index, petInfo, ok := player.FindPet(catchTime); ok {
-		return petListSlot{
-			list:  &player.Info.PetList,
-			index: index,
-			info:  *petInfo,
-			kind:  petListKindMain,
-		}, true
-	}
-
-	if index, petInfo, ok := findBackupPet(player, catchTime); ok {
-		return petListSlot{
-			list:  &player.Info.BackupPetList,
-			index: index,
-			info:  *petInfo,
-			kind:  petListKindBackup,
-		}, true
-	}
-
-	return petListSlot{}, false
-}
-
-func syncBackupPetList(player *player.Player) {
-	if player.Info.BackupPetList == nil {
-		player.Info.BackupPetList = make([]model.PetInfo, 0)
-		return
-	}
-
-	bagPets := player.Service.Pet.PetInfo(0)
-	if len(bagPets) == 0 {
-		player.Info.BackupPetList = make([]model.PetInfo, 0)
-		return
-	}
-
-	bagCatchTimes := make(map[uint32]struct{}, len(bagPets))
-	for i := range bagPets {
-		bagCatchTimes[bagPets[i].Data.CatchTime] = struct{}{}
-	}
-
-	mainPetCatchTimes := buildCatchTimeSet(player.Info.PetList)
-	nextBackupList := make([]model.PetInfo, 0, len(player.Info.BackupPetList))
-	for _, petInfo := range player.Info.BackupPetList {
-		if _, inBag := bagCatchTimes[petInfo.CatchTime]; !inBag {
-			continue
-		}
-		if _, inMain := mainPetCatchTimes[petInfo.CatchTime]; inMain {
-			continue
-		}
-		nextBackupList = append(nextBackupList, petInfo)
-	}
-
-	player.Info.BackupPetList = nextBackupList
-}
-
-func buildUserBagPetInfo(player *player.Player) *pet.GetUserBagPetInfoOutboundInfo {
-	syncBackupPetList(player)
-
-	result := &pet.GetUserBagPetInfoOutboundInfo{
-		PetList:       make([]model.PetInfo, len(player.Info.PetList)),
-		BackupPetList: make([]model.PetInfo, len(player.Info.BackupPetList)),
-	}
-	copy(result.PetList, player.Info.PetList)
-	copy(result.BackupPetList, player.Info.BackupPetList)
-	return result
-}
-
-func buildOrderedPetList(
-	catchTimes []uint32,
-	petMap map[uint32]model.PetInfo,
-	used map[uint32]struct{},
-) ([]model.PetInfo, bool) {
-	result := make([]model.PetInfo, 0, len(catchTimes))
-	for _, catchTime := range catchTimes {
-		if catchTime == 0 {
-			return nil, false
-		}
-		if _, exists := used[catchTime]; exists {
-			return nil, false
-		}
-
-		petInfo, exists := petMap[catchTime]
-		if !exists {
-			return nil, false
-		}
-
-		used[catchTime] = struct{}{}
-		result = append(result, petInfo)
-	}
-	return result, true
-}
-
 func buildPetShowOutboundInfo(userID, flag uint32, info *model.PetInfo) *pet.PetShowOutboundInfo {
 	return &pet.PetShowOutboundInfo{
 		UserID:    userID,

logic/controller/pet_manage.go

@@ -6,20 +6,50 @@ import (
 	"blazing/logic/service/fight"
 	"blazing/logic/service/pet"
 	"blazing/logic/service/player"
+	playermodel "blazing/modules/player/model"
 )
 
+func petSetExpLimit(currentPet *playermodel.PetInfo) int64 {
+	if currentPet == nil || currentPet.Level >= 100 {
+		return 0
+	}
+
+	simulatedPet := *currentPet
+	allowedExp := simulatedPet.NextLvExp - simulatedPet.Exp
+	if allowedExp < 0 {
+		allowedExp = 0
+	}
+
+	for simulatedPet.Level < 100 && simulatedPet.NextLvExp > 0 {
+		simulatedPet.Level++
+		simulatedPet.Update(true)
+		if simulatedPet.Level >= 100 {
+			break
+		}
+		allowedExp += simulatedPet.NextLvExp
+	}
+
+	return allowedExp
+}
+
+func minInt64(a, b int64) int64 {
+	if a < b {
+		return a
+	}
+	return b
+}
+
 // PetReleaseToWarehouse 将精灵从仓库包中放生
 func (h Controller) PetReleaseToWarehouse(
-	data *pet.PET_ROWEI, player *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	data *PET_ROWEI, player *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	_, _, inBag := player.FindPet(data.CatchTime)
-	_, _, inBackup := findBackupPet(player, data.CatchTime)
+	_, _, inBackup := player.FindBackupPet(data.CatchTime)
 	freeForbidden := xmlres.PetMAP[int(data.ID)].FreeForbidden
 	if inBag || inBackup || freeForbidden == 1 {
 		return nil, errorcode.ErrorCodes.ErrCannotReleaseNonWarehouse
 	}
-
-	if !player.Service.Pet.UpdateFree(data.CatchTime, 1) {
-		return nil, errorcode.ErrorCodes.ErrSystemError
+	if !player.Service.Pet.UpdateFree(data.CatchTime, 0, 1) {
+		return nil, errorcode.ErrorCodes.ErrCannotReleaseNonWarehouse
 	}
 
 	return nil, 0
@@ -27,14 +57,16 @@ func (h Controller) PetReleaseToWarehouse(
 
 // PetOneCure 单体治疗
 func (h Controller) PetOneCure(
-	data *pet.PetOneCureInboundInfo, player *player.Player) (result *pet.PetOneCureOutboundInfo, err errorcode.ErrorCode) {
+	data *PetOneCureInboundInfo, player *player.Player) (result *pet.PetOneCureOutboundInfo, err errorcode.ErrorCode) {
 	if player.IsArenaHealLocked() {
 		return result, errorcode.ErrorCodes.ErrChampionCannotHeal
 	}
 
-	_, currentPet, ok := player.FindPet(data.CatchTime)
-	if ok {
-		defer currentPet.Cure()
+	if slot, ok := player.FindPetBagSlot(data.CatchTime); ok {
+		currentPet := slot.PetInfoPtr()
+		if currentPet != nil {
+			defer currentPet.Cure()
+		}
 	}
 
 	return &pet.PetOneCureOutboundInfo{
@@ -44,7 +76,7 @@ func (h Controller) PetOneCure(
 
 // PetFirst 精灵首发
 func (h Controller) PetFirst(
-	data *pet.PetDefaultInboundInfo, player *player.Player) (result *pet.PetDefaultOutboundInfo, err errorcode.ErrorCode) {
+	data *PetDefaultInboundInfo, player *player.Player) (result *pet.PetDefaultOutboundInfo, err errorcode.ErrorCode) {
 	if player.IsArenaSwitchLocked() {
 		return result, errorcode.ErrorCodes.ErrChampionCannotSwitch
 	}
@@ -61,13 +93,19 @@ func (h Controller) PetFirst(
 
 // SetPetExp 设置宠物经验
 func (h Controller) SetPetExp(
-	data *pet.PetSetExpInboundInfo,
+	data *PetSetExpInboundInfo,
 	player *player.Player) (result *pet.PetSetExpOutboundInfo, err errorcode.ErrorCode) {
-	_, currentPet, found := player.FindPet(data.CatchTime)
-	if !found || currentPet.Level >= 100 {
+	slot, found := player.FindPetBagSlot(data.CatchTime)
+	currentPet := slot.PetInfoPtr()
+	if !found || currentPet == nil || currentPet.Level >= 100 {
 		return &pet.PetSetExpOutboundInfo{Exp: player.Info.ExpPool}, errorcode.ErrorCodes.ErrSystemError
 	}
 
-	player.AddPetExp(currentPet, data.Exp)
+	allowedExp := petSetExpLimit(currentPet)
+	if allowedExp <= 0 {
+		return &pet.PetSetExpOutboundInfo{Exp: player.Info.ExpPool}, errorcode.ErrorCodes.ErrSystemError
+	}
+
+	player.AddPetExp(currentPet, minInt64(data.Exp, allowedExp))
 	return &pet.PetSetExpOutboundInfo{Exp: player.Info.ExpPool}, 0
 }

logic/controller/pet_manage_test.go

@@ -0,0 +1,75 @@
+package controller
+
+import (
+	"blazing/common/data/xmlres"
+	"blazing/common/socket/errorcode"
+	"blazing/logic/service/player"
+	playermodel "blazing/modules/player/model"
+	"testing"
+)
+
+func firstPetIDForControllerTest(t *testing.T) int {
+	t.Helper()
+
+	for id := range xmlres.PetMAP {
+		return id
+	}
+
+	t.Fatal("xmlres.PetMAP is empty")
+	return 0
+}
+
+func TestSetPetExpCapsLevelAt100(t *testing.T) {
+	petID := firstPetIDForControllerTest(t)
+	petInfo := playermodel.GenPetInfo(petID, 31, 0, 0, 99, nil, 0)
+	if petInfo == nil {
+		t.Fatal("failed to generate test pet")
+	}
+
+	expPool := petInfo.NextLvExp + 10_000
+	testPlayer := player.NewPlayer(nil)
+	testPlayer.Info = &playermodel.PlayerInfo{
+		ExpPool: expPool,
+		PetList: []playermodel.PetInfo{*petInfo},
+	}
+
+	currentPet := &testPlayer.Info.PetList[0]
+	result, err := (Controller{}).SetPetExp(&PetSetExpInboundInfo{
+		CatchTime: currentPet.CatchTime,
+		Exp:       expPool,
+	}, testPlayer)
+	if err != 0 {
+		t.Fatalf("expected SetPetExp to succeed, got err=%d", err)
+	}
+	if currentPet.Level != 100 {
+		t.Fatalf("expected pet level to stop at 100, got %d", currentPet.Level)
+	}
+	if result.Exp != 10_000 {
+		t.Fatalf("expected overflow exp to remain in pool, got %d", result.Exp)
+	}
+}
+
+func TestSetPetExpRejectsPetAtLevel100(t *testing.T) {
+	petID := firstPetIDForControllerTest(t)
+	petInfo := playermodel.GenPetInfo(petID, 31, 0, 0, 100, nil, 0)
+	if petInfo == nil {
+		t.Fatal("failed to generate test pet")
+	}
+
+	testPlayer := player.NewPlayer(nil)
+	testPlayer.Info = &playermodel.PlayerInfo{
+		ExpPool: 50_000,
+		PetList: []playermodel.PetInfo{*petInfo},
+	}
+
+	result, err := (Controller{}).SetPetExp(&PetSetExpInboundInfo{
+		CatchTime: petInfo.CatchTime,
+		Exp:       12_345,
+	}, testPlayer)
+	if err != errorcode.ErrorCodes.ErrSystemError {
+		t.Fatalf("expected level-100 pet to be rejected, got err=%d", err)
+	}
+	if result.Exp != 50_000 {
+		t.Fatalf("expected exp pool to remain unchanged, got %d", result.Exp)
+	}
+}

logic/controller/pet_skill.go

@@ -8,47 +8,136 @@ import (
 	"blazing/logic/service/pet"
 	"blazing/logic/service/player"
 	"blazing/modules/player/model"
-
-	"github.com/samber/lo"
 )
 
+type GetPetLearnableSkillsOutboundInfo struct {
+	SkillListLen uint32   `struc:"sizeof=SkillList"`
+	SkillList    []uint32 `json:"skillList"`
+}
+
+func isSameUint32Slice(a []uint32, b []uint32) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for index := range a {
+		if a[index] != b[index] {
+			return false
+		}
+	}
+	return true
+}
+
+func collectPetLearnableSkillList(currentPet *model.PetInfo) []uint32 {
+	skillSet := make(map[uint32]struct{})
+	skills := make([]uint32, 0)
+
+	appendSkill := func(skillID uint32) {
+		if skillID == 0 {
+			return
+		}
+		if _, exists := skillSet[skillID]; exists {
+			return
+		}
+		skillSet[skillID] = struct{}{}
+		skills = append(skills, skillID)
+	}
+
+	for _, skillID := range currentPet.GetLevelRangeCanLearningSkills(1, currentPet.Level) {
+		appendSkill(skillID)
+	}
+	for _, skillID := range currentPet.ExtSKill {
+		appendSkill(skillID)
+	}
+
+	for _, skill := range currentPet.SkillList {
+		delete(skillSet, skill.ID)
+	}
+
+	result := make([]uint32, 0, len(skillSet))
+	for _, skillID := range skills {
+		if _, exists := skillSet[skillID]; exists {
+			result = append(result, skillID)
+		}
+	}
+	return result
+}
+
+// GetPetLearnableSkills 查询当前精灵可学习技能（等级技能 + 额外技能ExtSKill）
+func (h Controller) GetPetLearnableSkills(
+	data *GetPetLearnableSkillsInboundInfo,
+	c *player.Player,
+) (result *GetPetLearnableSkillsOutboundInfo, err errorcode.ErrorCode) {
+	slot, ok := c.FindPetBagSlot(data.CatchTime)
+	currentPet := slot.PetInfoPtr()
+	if !ok || currentPet == nil {
+		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
+	}
+
+	return &GetPetLearnableSkillsOutboundInfo{
+		SkillList: collectPetLearnableSkillList(currentPet),
+	}, 0
+}
+
 // SetPetSkill 设置宠物技能，消耗50赛尔豆
-func (h Controller) SetPetSkill(data *pet.ChangeSkillInfo, c *player.Player) (result *pet.ChangeSkillOutInfo, err errorcode.ErrorCode) {
+func (h Controller) SetPetSkill(data *ChangeSkillInfo, c *player.Player) (result *pet.ChangeSkillOutInfo, err errorcode.ErrorCode) {
 	const setSkillCost = 50
 
-	if !c.GetCoins(setSkillCost) {
-		return nil, errorcode.ErrorCodes.ErrSunDouInsufficient10016
-	}
-
-	c.Info.Coins -= setSkillCost
-
-	_, currentPet, ok := c.FindPet(data.CatchTime)
-	if !ok {
+	slot, ok := c.FindPetBagSlot(data.CatchTime)
+	currentPet := slot.PetInfoPtr()
+	if !ok || currentPet == nil {
 		return nil, errorcode.ErrorCodes.ErrSystemBusy
 	}
-	canleaernskill := currentPet.GetLevelRangeCanLearningSkills(1, currentPet.Level)
 
-	_, ok = lo.Find(canleaernskill, func(item uint32) bool {
-		return item == data.ReplaceSkill
-	})
-
-	if !ok {
-		return result, errorcode.ErrorCodes.ErrSystemBusy
+	canLearnSkillSet := make(map[uint32]struct{})
+	for _, skillID := range collectPetLearnableSkillList(currentPet) {
+		canLearnSkillSet[skillID] = struct{}{}
 	}
-	_, _, ok = utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool { //已经存在技能
+	if _, exists := canLearnSkillSet[data.ReplaceSkill]; !exists {
+		return nil, errorcode.ErrorCodes.ErrSystemBusy
+	}
+
+	skillInfo, exists := xmlres.SkillMap[int(data.ReplaceSkill)]
+	if !exists {
+		return nil, errorcode.ErrorCodes.ErrSystemBusy
+	}
+
+	_, _, ok = utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
 		return item.ID == data.ReplaceSkill
 	})
 	if ok {
 		return nil, errorcode.ErrorCodes.ErrSystemBusy
 	}
 
-	// 查找要学习的技能并替换
-	_, targetSkill, ok := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
-		return item.ID == data.HasSkill
-	})
-	if ok {
+	if data.HasSkill == 0 && len(currentPet.SkillList) >= 4 {
+		return nil, errorcode.ErrorCodes.ErrSystemBusy
+	}
+
+	if data.HasSkill != 0 {
+		_, _, found := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
+			return item.ID == data.HasSkill
+		})
+		if !found {
+			return nil, errorcode.ErrorCodes.ErrSystemBusy
+		}
+	}
+
+	if !c.GetCoins(setSkillCost) {
+		return nil, errorcode.ErrorCodes.ErrSunDouInsufficient10016
+	}
+
+	c.Info.Coins -= setSkillCost
+	maxPP := uint32(skillInfo.MaxPP)
+	if data.HasSkill != 0 {
+		_, targetSkill, _ := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
+			return item.ID == data.HasSkill
+		})
 		targetSkill.ID = data.ReplaceSkill
-		targetSkill.PP = uint32(xmlres.SkillMap[int(targetSkill.ID)].MaxPP)
+		targetSkill.PP = maxPP
+	} else {
+		currentPet.SkillList = append(currentPet.SkillList, model.SkillInfo{
+			ID: data.ReplaceSkill,
+			PP: maxPP,
+		})
 	}
 
 	return &pet.ChangeSkillOutInfo{
@@ -57,28 +146,142 @@ func (h Controller) SetPetSkill(data *pet.ChangeSkillInfo, c *player.Player) (re
 }
 
 // SortPetSkills 排序宠物技能，消耗50赛尔豆
-func (h Controller) SortPetSkills(data *pet.C2S_Skill_Sort, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) SortPetSkills(data *C2S_Skill_Sort, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	const skillSortCost = 50
 
+	slot, ok := c.FindPetBagSlot(data.CapTm)
+	currentPet := slot.PetInfoPtr()
+	if !ok || currentPet == nil {
+		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
+	}
+
+	usedSkillSet := make(map[uint32]struct{})
+	newSkillList := make([]model.SkillInfo, 0, 4)
+
+	for _, skillID := range data.Skill {
+		if skillID == 0 {
+			continue
+		}
+		if _, used := usedSkillSet[skillID]; used {
+			continue
+		}
+		_, skill, found := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
+			return item.ID == skillID
+		})
+		if !found {
+			continue
+		}
+		newSkillList = append(newSkillList, *skill)
+		usedSkillSet[skillID] = struct{}{}
+	}
+
+	for _, skill := range currentPet.SkillList {
+		if skill.ID == 0 {
+			continue
+		}
+		if _, used := usedSkillSet[skill.ID]; used {
+			continue
+		}
+		newSkillList = append(newSkillList, skill)
+		usedSkillSet[skill.ID] = struct{}{}
+	}
+
+	if len(newSkillList) > 4 {
+		newSkillList = newSkillList[:4]
+	}
+
 	if !c.GetCoins(skillSortCost) {
 		return nil, errorcode.ErrorCodes.ErrSunDouInsufficient10016
 	}
 
 	c.Info.Coins -= skillSortCost
-
-	_, currentPet, ok := c.FindPet(data.CapTm)
-	if ok {
-		var newSkillList []model.SkillInfo
-		for _, skillID := range data.Skill {
-			_, skill, found := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
-				return item.ID == skillID
-			})
-			if found {
-				newSkillList = append(newSkillList, *skill)
-			}
-		}
-		currentPet.SkillList = newSkillList
-	}
+	currentPet.SkillList = newSkillList
+
+	return nil, 0
+}
+
+// CommitPetSkills 按最终技能列表一次性提交学习/替换/排序结果。
+func (h Controller) CommitPetSkills(
+	data *CommitPetSkillsInboundInfo,
+	c *player.Player,
+) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	const setSkillCost = 50
+	const skillSortCost = 50
+
+	slot, ok := c.FindPetBagSlot(data.CatchTime)
+	currentPet := slot.PetInfoPtr()
+	if !ok || currentPet == nil {
+		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
+	}
+
+	currentSkillSet := make(map[uint32]model.SkillInfo, len(currentPet.SkillList))
+	currentSkillOrder := make([]uint32, 0, len(currentPet.SkillList))
+	for _, skill := range currentPet.SkillList {
+		if skill.ID == 0 {
+			continue
+		}
+		currentSkillSet[skill.ID] = skill
+		currentSkillOrder = append(currentSkillOrder, skill.ID)
+	}
+
+	finalSkillIDs := make([]uint32, 0, 4)
+	usedSkillSet := make(map[uint32]struct{}, 4)
+	for _, skillID := range data.Skill {
+		if skillID == 0 {
+			continue
+		}
+		if _, exists := usedSkillSet[skillID]; exists {
+			continue
+		}
+		usedSkillSet[skillID] = struct{}{}
+		finalSkillIDs = append(finalSkillIDs, skillID)
+	}
+
+	if len(finalSkillIDs) == 0 {
+		return nil, errorcode.ErrorCodes.ErrSystemBusy
+	}
+	if len(finalSkillIDs) > 4 {
+		finalSkillIDs = finalSkillIDs[:4]
+	}
+	if isSameUint32Slice(currentSkillOrder, finalSkillIDs) {
+		return nil, 0
+	}
+
+	learnableSkillSet := make(map[uint32]struct{})
+	for _, skillID := range collectPetLearnableSkillList(currentPet) {
+		learnableSkillSet[skillID] = struct{}{}
+	}
+
+	newSkillCount := 0
+	finalSkillList := make([]model.SkillInfo, 0, len(finalSkillIDs))
+	for _, skillID := range finalSkillIDs {
+		if skill, exists := currentSkillSet[skillID]; exists {
+			finalSkillList = append(finalSkillList, skill)
+			continue
+		}
+		if _, exists := learnableSkillSet[skillID]; !exists {
+			return nil, errorcode.ErrorCodes.ErrSystemBusy
+		}
+		skillInfo, exists := xmlres.SkillMap[int(skillID)]
+		if !exists {
+			return nil, errorcode.ErrorCodes.ErrSystemBusy
+		}
+		newSkillCount++
+		finalSkillList = append(finalSkillList, model.SkillInfo{
+			ID: skillID,
+			PP: uint32(skillInfo.MaxPP),
+		})
+	}
+
+	totalCost := int64(newSkillCount * setSkillCost)
+	if newSkillCount == 0 {
+		totalCost += int64(skillSortCost)
+	}
+	if totalCost > 0 && !c.GetCoins(totalCost) {
+		return nil, errorcode.ErrorCodes.ErrSunDouInsufficient10016
+	}
+	c.Info.Coins -= totalCost
+	currentPet.SkillList = finalSkillList
 
 	return nil, 0
 }

logic/controller/pet_收集计划.go

@@ -10,21 +10,20 @@ import (
 	"github.com/samber/lo"
 )
 
+// IsCollect 处理控制器请求。
 func (h Controller) IsCollect(
 	data *pet.C2S_IS_COLLECT, c *player.Player) (result *pet.S2C_IS_COLLECT, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &pet.S2C_IS_COLLECT{
 		ID: data.Type,
 	}
 
-	c.Service.Task.Exec(uint32(1335), func(te *model.Task) bool {
-
-		r := bitset32.From(te.Data)
-		// 分支未完成时，标记完成并发放奖励
+	taskData, taskErr := c.Service.Task.GetTask(uint32(1335))
+	if taskErr == nil {
+		r := bitset32.From(taskData.Data)
 		if r.Test(uint(data.Type)) {
 			result.IsCom = 1
 		}
-		return false
-	})
+	}
 
 	_, ok := lo.Find([]uint32{1, 2, 3, 4, 301}, func(item uint32) bool {
 		return data.Type == item
@@ -49,6 +48,7 @@ var validTypeIDMap = map[int][]uint32{
 	100: {856, 857, 858}, //测试
 }
 
+// Collect 处理控制器请求。
 func (h Controller) Collect(
 	data *pet.C2S_PET_COLLECT, c *player.Player) (result *pet.S2C_PET_COLLECT, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &pet.S2C_PET_COLLECT{ID: data.ID}
@@ -57,14 +57,17 @@ func (h Controller) Collect(
 		return data.Type == item
 	})
 	if res == model.Completed && ok { //这块是为了兼容旧版本
-		c.Service.Task.Exec(uint32(1335), func(te *model.Task) bool {
+		taskData, taskErr := c.Service.Task.GetTask(uint32(1335))
+		if taskErr != nil {
+			return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
+		}
 
-			r := bitset32.From(te.Data)
-
-			r.Set(uint(data.Type))
-			te.Data = r.Bytes()
-			return true
-		})
+		r := bitset32.From(taskData.Data)
+		r.Set(uint(data.Type))
+		taskData.Data = r.Bytes()
+		if taskErr = c.Service.Task.SetTask(taskData); taskErr != nil {
+			return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
+		}
 		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
 	}
 
@@ -78,21 +81,22 @@ func (h Controller) Collect(
 	if !lo.Contains(validIDs, data.ID) {
 		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
 	}
-	c.Service.Task.Exec(uint32(1335), func(te *model.Task) bool {
+	taskData, taskErr := c.Service.Task.GetTask(uint32(1335))
+	if taskErr != nil {
+		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
+	}
 
-		r := bitset32.From(te.Data)
-		// 分支未完成时，标记完成并发放奖励
-		if !r.Test(uint(data.Type)) {
-			r.Set(uint(data.Type))
-			te.Data = r.Bytes()
-			r := model.GenPetInfo(int(data.ID), -1, -1, 0, 1, nil, 0)
-			c.Service.Pet.PetAdd(r, 0)
-			result.CatchTime = r.CatchTime
-
-			return true
+	r := bitset32.From(taskData.Data)
+	if !r.Test(uint(data.Type)) {
+		r.Set(uint(data.Type))
+		taskData.Data = r.Bytes()
+		if taskErr = c.Service.Task.SetTask(taskData); taskErr != nil {
+			return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
 		}
-		return false
-	})
+		petInfo := model.GenPetInfo(int(data.ID), -1, -1, 0, 1, nil, 0)
+		c.Service.Pet.PetAdd(petInfo, 0)
+		result.CatchTime = petInfo.CatchTime
+	}
 
 	if result.CatchTime == 0 {
 		return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrAwardAlreadyClaimed)

logic/controller/pet_繁殖.go

@@ -120,6 +120,7 @@ func canBreedPair(maleID, femaleID uint32) bool {
 	return ok
 }
 
+// GetEggList 处理控制器请求。
 func (ctl Controller) GetEggList(
 	data *pet.C2S_GET_EGG_LIST, player *player.Player) (result *pet.S2C_GET_EGG_LIST, err errorcode.ErrorCode) { //这个时候player应该是空的
 

logic/controller/room_buy.go

@@ -7,7 +7,7 @@ import (
 )
 
 // BuyFitment 购买基地家具
-func (h Controller) BuyFitment(data *room.C2S_BUY_FITMENT, c *player.Player) (result *room.S2C_BUY_FITMENT, err errorcode.ErrorCode) {
+func (h Controller) BuyFitment(data *C2S_BUY_FITMENT, c *player.Player) (result *room.S2C_BUY_FITMENT, err errorcode.ErrorCode) {
 	result = &room.S2C_BUY_FITMENT{Coins: c.Info.Coins}
 
 	bought, err := buySeerdouBackpackItem(c, int64(data.ID), int64(data.Count))

logic/controller/room_info.go

@@ -15,7 +15,7 @@ import (
 // data: 包含目标用户ID的输入信息
 // c: 当前玩家对象
 // 返回: 基地家具信息和错误码
-func (h Controller) GetFitmentUsing(data *room.FitmentUseringInboundInfo, c *player.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetFitmentUsing(data *FitmentUseringInboundInfo, c *player.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.FitmentUseringOutboundInfo{UserId: c.Info.UserID, RoomId: data.TargetUserID}
 	result.Fitments = make([]model.FitmentShowInfo, 0)
 	result.Fitments = append(result.Fitments, model.FitmentShowInfo{Id: 500001, Status: 1, X: 1, Y: 1, Dir: 1})
@@ -29,7 +29,7 @@ func (h Controller) GetFitmentUsing(data *room.FitmentUseringInboundInfo, c *pla
 // data: 包含目标用户ID的输入信息
 // c: 当前玩家对象
 // 返回: 精灵展示列表和错误码
-func (h Controller) GetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *player.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetRoomPetShowInfo(data *PetRoomListInboundInfo, c *player.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.PetRoomListOutboundInfo{}
 	result.Pets = make([]pet.PetShortInfo, 0)
 	roomInfo := c.Service.Room.Get(data.TargetUserID)
@@ -51,7 +51,7 @@ func (h Controller) GetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *pla
 // data: 空输入结构
 // c: 当前玩家对象
 // 返回: 玩家所有家具列表和错误码
-func (h Controller) GetAllFurniture(data *room.FitmentAllInboundEmpty, c *player.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetAllFurniture(data *FitmentAllInboundEmpty, c *player.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.FitmentAllOutboundInfo{}
 	result.Fitments = make([]room.FitmentItemInfo, 0)
 
@@ -75,7 +75,7 @@ func (h Controller) GetAllFurniture(data *room.FitmentAllInboundEmpty, c *player
 // data: 包含用户ID和精灵捕获时间的输入信息
 // c: 当前玩家对象
 // 返回: 精灵详细信息和错误码
-func (h Controller) GetRoomPetInfo(data *room.C2S_RoomPetInfo, c *player.Player) (result *pet.RoomPetInfo, err errorcode.ErrorCode) {
+func (h Controller) GetRoomPetInfo(data *C2S_RoomPetInfo, c *player.Player) (result *pet.RoomPetInfo, err errorcode.ErrorCode) {
 	petInfo := c.Service.Pet.PetInfoOneOther(data.UserID, data.CatchTime)
 	result = &pet.RoomPetInfo{}
 	copier.CopyWithOption(result, &petInfo.Data, copier.Option{DeepCopy: true})

logic/controller/room_set.go

@@ -13,7 +13,7 @@ import (
 // data: 包含家具列表的输入信息
 // c: 当前玩家对象
 // 返回: 空结果和错误码
-func (h Controller) SetFitment(data *room.SET_FITMENT, c *player.Player) (result *room.NullInfo, err errorcode.ErrorCode) {
+func (h Controller) SetFitment(data *SET_FITMENT, c *player.Player) (result *room.NullInfo, err errorcode.ErrorCode) {
 
 	c.Service.Room.Set(data.Fitments)
 	return
@@ -23,7 +23,7 @@ func (h Controller) SetFitment(data *room.SET_FITMENT, c *player.Player) (result
 // data: 包含精灵展示列表的输入信息
 // c: 当前玩家对象
 // 返回: 精灵展示列表和错误码
-func (h Controller) SetPet(data *room.C2S_PET_ROOM_SHOW, c *player.Player) (result *room.S2C_PET_ROOM_SHOW, err errorcode.ErrorCode) {
+func (h Controller) SetPet(data *C2S_PET_ROOM_SHOW, c *player.Player) (result *room.S2C_PET_ROOM_SHOW, err errorcode.ErrorCode) {
 	var showPetCatchTimes []uint32
 	for _, petShowInfo := range data.PetShowList {
 		if petShowInfo.CatchTime != 0 {

logic/controller/systemtime.go

@@ -8,6 +8,7 @@ import (
 	"blazing/logic/service/player"
 )
 
+// SystemTimeInfo 处理控制器请求。
 func (h Controller) SystemTimeInfo(data *InInfo, c *player.Player) (result *OutInfo, err errorcode.ErrorCode) {
 
 	return &OutInfo{

logic/controller/user_action.go

@@ -16,7 +16,7 @@ import (
 // data: 包含射击信息的输入数据
 // player: 当前玩家对象
 // 返回: 射击结果和错误码
-func (h Controller) PlayerAim(data *user.AimatInboundInfo, player *player.Player) (result *user.AimatOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) PlayerAim(data *AimatInboundInfo, player *player.Player) (result *user.AimatOutboundInfo, err errorcode.ErrorCode) {
 	result = &user.AimatOutboundInfo{
 
 		ItemId:    data.ItemId,
@@ -33,7 +33,7 @@ func (h Controller) PlayerAim(data *user.AimatInboundInfo, player *player.Player
 // data: 包含聊天消息的输入数据
 // player: 当前玩家对象
 // 返回: 聊天结果和错误码
-func (h Controller) PlayerChat(data *user.ChatInboundInfo, player *player.Player) (result *user.ChatOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) PlayerChat(data *ChatInboundInfo, player *player.Player) (result *user.ChatOutboundInfo, err errorcode.ErrorCode) {
 
 	result = &user.ChatOutboundInfo{
 
@@ -50,7 +50,7 @@ func (h Controller) PlayerChat(data *user.ChatInboundInfo, player *player.Player
 // data: 包含颜色信息的输入数据
 // player: 当前玩家对象
 // 返回: 颜色更改结果和错误码
-func (h Controller) ChangePlayerColor(data *user.ChangeColorInboundInfo, player *player.Player) (result *user.ChangeColorOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ChangePlayerColor(data *ChangeColorInboundInfo, player *player.Player) (result *user.ChangeColorOutboundInfo, err errorcode.ErrorCode) {
 	const changeColorCost = 50
 
 	if !player.GetCoins(changeColorCost) {
@@ -76,7 +76,7 @@ func (h Controller) ChangePlayerColor(data *user.ChangeColorInboundInfo, player
 // data: 包含涂鸦信息的输入数据
 // player: 当前玩家对象
 // 返回: 涂鸦更改结果和错误码
-func (h Controller) ChangePlayerDoodle(data *user.ChangeDoodleInboundInfo, player *player.Player) (result *user.ChangeDoodleOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ChangePlayerDoodle(data *ChangeDoodleInboundInfo, player *player.Player) (result *user.ChangeDoodleOutboundInfo, err errorcode.ErrorCode) {
 	const changeDoodleCost = 50
 
 	if !player.GetCoins(changeDoodleCost) {
@@ -106,7 +106,7 @@ func (h Controller) ChangePlayerDoodle(data *user.ChangeDoodleInboundInfo, playe
 // data: 包含NONO颜色信息的输入数据
 // player: 当前玩家对象
 // 返回: NONO颜色更改结果和错误码
-func (h Controller) ChangeNONOColor(data *user.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
 
@@ -122,7 +122,7 @@ func (h Controller) ChangeNONOColor(data *user.ChangeNONOColorInboundInfo, playe
 // data: 包含跳舞类型信息的输入数据
 // player: 当前玩家对象
 // 返回: 跳舞动作结果和错误码
-func (h Controller) DanceAction(data *user.C2SDanceAction, player *player.Player) (result *user.S2CDanceAction, err errorcode.ErrorCode) {
+func (h Controller) DanceAction(data *C2SDanceAction, player *player.Player) (result *user.S2CDanceAction, err errorcode.ErrorCode) {
 
 	result = &user.S2CDanceAction{
 		Type:   data.Type,
@@ -136,7 +136,7 @@ func (h Controller) DanceAction(data *user.C2SDanceAction, player *player.Player
 // data: 包含变形信息的输入数据
 // player: 当前玩家对象
 // 返回: 变形结果和错误码
-func (h Controller) PeopleTransform(data *user.C2SPEOPLE_TRANSFROM, player *player.Player) (result *user.S2CPEOPLE_TRANSFROM, err errorcode.ErrorCode) {
+func (h Controller) PeopleTransform(data *C2SPEOPLE_TRANSFROM, player *player.Player) (result *user.S2CPEOPLE_TRANSFROM, err errorcode.ErrorCode) {
 
 	result = &user.S2CPEOPLE_TRANSFROM{
 		SuitID: data.SuitID,
@@ -150,7 +150,7 @@ func (h Controller) PeopleTransform(data *user.C2SPEOPLE_TRANSFROM, player *play
 // data: 包含服装信息的输入数据
 // player: 当前玩家对象
 // 返回: 服装更改结果和错误码
-func (h Controller) ChangePlayerCloth(data *item.ChangePlayerClothInboundInfo, player *player.Player) (result *item.ChangePlayerClothOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ChangePlayerCloth(data *ChangePlayerClothInboundInfo, player *player.Player) (result *item.ChangePlayerClothOutboundInfo, err errorcode.ErrorCode) {
 
 	result = &item.ChangePlayerClothOutboundInfo{
 		UserID:    player.Info.UserID,
@@ -171,7 +171,8 @@ func (h Controller) ChangePlayerCloth(data *item.ChangePlayerClothInboundInfo, p
 	return
 }
 
-func (h Controller) ChangePlayerName(data *user.ChangePlayerNameInboundInfo, c *player.Player) (result *user.ChangePlayerNameOutboundInfo, err errorcode.ErrorCode) {
+// ChangePlayerName 处理控制器请求。
+func (h Controller) ChangePlayerName(data *ChangePlayerNameInboundInfo, c *player.Player) (result *user.ChangePlayerNameOutboundInfo, err errorcode.ErrorCode) {
 	newNickname := cool.Filter.Replace(strings.Trim(data.Nickname, "\x00"), '*')
 
 	c.Info.Nick = newNickname
@@ -183,7 +184,9 @@ func (h Controller) ChangePlayerName(data *user.ChangePlayerNameInboundInfo, c *
 
 	return result, 0
 }
-func (h Controller) ChangeTile(data *user.ChangeTitleInboundInfo, c *player.Player) (result *user.ChangeTitleOutboundInfo, err errorcode.ErrorCode) {
+
+// ChangeTile 处理控制器请求。
+func (h Controller) ChangeTile(data *ChangeTitleInboundInfo, c *player.Player) (result *user.ChangeTitleOutboundInfo, err errorcode.ErrorCode) {
 	result = &user.ChangeTitleOutboundInfo{
 
 		UserID: c.Info.UserID,

logic/controller/user_cdk.go

@@ -2,61 +2,66 @@ package controller
 
 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service/player"
+	logicplayer "blazing/logic/service/player"
 	"blazing/logic/service/user"
-	"blazing/modules/config/service"
-	"blazing/modules/player/model"
+	configservice "blazing/modules/config/service"
+	playerservice "blazing/modules/player/service"
+	"strings"
 	"time"
 )
 
-func (h Controller) CDK(data *user.C2S_GET_GIFT_COMPLETE, player *player.Player) (result *user.S2C_GET_GIFT_COMPLETE, err errorcode.ErrorCode) {
+// CDK 处理控制器请求。
+func (h Controller) CDK(data *C2S_GET_GIFT_COMPLETE, player *logicplayer.Player) (result *user.S2C_GET_GIFT_COMPLETE, err errorcode.ErrorCode) {
 	result = &user.S2C_GET_GIFT_COMPLETE{}
 
-	cdkService := service.NewCdkService()
-	rewardPetService := service.NewPetRewardService()
-	itemRewardService := service.NewItemService()
+	cdkCode := strings.Trim(data.PassText, "\x00")
+	cdkService := configservice.NewCdkService()
 	now := time.Now()
 
-	r := cdkService.Get(data.PassText)
+	r := cdkService.Get(cdkCode)
 	if r == nil {
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeNotExists
 	}
 	if r.BindUserId != 0 && r.BindUserId != data.Head.UserID {
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeFrozen
 	}
-
 	if r.ValidEndTime.Compare(now) == -1 {
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeExpired
 	}
 	if !player.Service.Cdk.CanGet(uint32(r.ID)) {
 		return
 	}
-	if !cdkService.Set(data.PassText) {
+	if !cdkService.Set(cdkCode) {
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeGiftsGone
 	}
 
+	reward, grantErr := playerservice.NewCdkService(data.Head.UserID).GrantConfigReward(uint32(r.ID))
+	if grantErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
+
 	result.Flag = 1
-	for _, rewardID := range r.ElfRewardIds {
-		pet := rewardPetService.Get(rewardID)
-		if pet == nil {
-			continue
+	appendGift := func(giftID, count int64) {
+		if giftID == 0 || count <= 0 {
+			return
 		}
-
-		petInfo := model.GenPetInfo(int(pet.MonID), int(pet.DV), int(pet.Nature), int(pet.Effect), int(pet.Lv), nil, 0)
-		player.Service.Pet.PetAdd(petInfo, 0)
-		result.PetGift = append(result.PetGift, user.PetGiftInfo{PetID: petInfo.ID, CacthTime: petInfo.CatchTime})
+		result.GiftList = append(result.GiftList, user.GiftInfo{GiftID: giftID, Count: count})
 	}
 
-	for _, rewardID := range r.ItemRewardIds {
-		itemInfo := itemRewardService.GetItemCount(rewardID)
-		player.ItemAdd(itemInfo.ItemId, itemInfo.ItemCnt)
-		result.GiftList = append(result.GiftList, user.GiftInfo{GiftID: itemInfo.ItemId, Count: itemInfo.ItemCnt})
+	appendGift(1, reward.Coins)
+	appendGift(3, reward.ExpPool)
+	appendGift(5, reward.Gold)
+	appendGift(9, reward.EVPool)
+	for _, item := range reward.Items {
+		appendGift(item.ItemId, item.ItemCnt)
 	}
-	if r.TitleRewardIds != 0 {
-		player.Service.Title.Give(r.TitleRewardIds)
-		result.Tile = r.TitleRewardIds
+	for _, pet := range reward.Pets {
+		result.PetGift = append(result.PetGift, user.PetGiftInfo{PetID: pet.PetID, CacthTime: pet.CatchTime})
 	}
+	if len(reward.TitleIDs) > 0 {
+		result.Tile = reward.TitleIDs[0]
+	}
+
 	player.Service.Cdk.Log(uint32(r.ID))
-
 	return
 }

logic/controller/user_friend.go

@@ -11,7 +11,7 @@ import (
 // data: 包含用户ID列表的输入信息
 // c: 当前玩家对象
 // 返回: 好友在线信息和错误码
-func (h Controller) GetOnlineFriends(data *friend.SeeOnlineInboundInfo, c *player.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetOnlineFriends(data *SeeOnlineInboundInfo, c *player.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
 	result = &friend.SeeOnlineOutboundInfo{}
 	result.Friends = make([]friend.OnlineInfo, 0)
 	return
@@ -21,7 +21,7 @@ func (h Controller) GetOnlineFriends(data *friend.SeeOnlineInboundInfo, c *playe
 // data: 包含要添加好友的用户ID
 // c: 当前玩家对象
 // 返回: 无数据内容的响应和错误码
-func (h Controller) FriendAdd(data *friend.FriendAddInboundInfo, c *player.Player) (result fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) FriendAdd(data *FriendAddInboundInfo, c *player.Player) (result fight.NullOutboundInfo, err errorcode.ErrorCode) {
 
 	v, ok := c.GetSpace().User.Load(data.UserID)
 
@@ -40,7 +40,7 @@ func (h Controller) FriendAdd(data *friend.FriendAddInboundInfo, c *player.Playe
 // data: 包含发起好友请求的用户ID和回复标志(1为同意，0为拒绝)
 // c: 当前玩家对象
 // 返回: 无数据内容的响应和错误码
-func (h Controller) FriendAnswer(data *friend.FriendAnswerInboundInfo, c *player.Player) (result fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) FriendAnswer(data *FriendAnswerInboundInfo, c *player.Player) (result fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	v, ok := c.GetSpace().User.Load(data.UserID)
 
 	if ok {
@@ -62,7 +62,7 @@ func (h Controller) FriendAnswer(data *friend.FriendAnswerInboundInfo, c *player
 // data: 包含要删除的好友ID
 // c: 当前玩家对象
 // 返回: 无数据内容的响应和错误码
-func (h Controller) FriendRemove(data *friend.FriendRemoveInboundInfo, c *player.Player) (result fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) FriendRemove(data *FriendRemoveInboundInfo, c *player.Player) (result fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	c.Service.Friend.Del(data.UserID)
 	return
 }

logic/controller/user_info.go

@@ -13,7 +13,7 @@ import (
 // data: 包含用户ID的输入信息
 // player: 玩家对象
 // 返回: 模拟用户信息及错误码
-func (h Controller) GetUserSimInfo(data *user.SimUserInfoInboundInfo, player *player.Player) (result *user.SimUserInfoOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetUserSimInfo(data *SimUserInfoInboundInfo, player *player.Player) (result *user.SimUserInfoOutboundInfo, err errorcode.ErrorCode) {
 	result = &user.SimUserInfoOutboundInfo{}
 	t, ok := player.GetSpace().UserInfo.Load(data.UserId)
 	if ok {
@@ -33,7 +33,7 @@ func (h Controller) GetUserSimInfo(data *user.SimUserInfoInboundInfo, player *pl
 // data: 包含用户ID的输入信息
 // player: 当前玩家对象
 // 返回: 包含用户更多信息的输出结果和错误码
-func (h Controller) GetUserMoreInfo(data *user.MoreUserInfoInboundInfo, player *player.Player) (result *user.MoreUserInfoOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetUserMoreInfo(data *MoreUserInfoInboundInfo, player *player.Player) (result *user.MoreUserInfoOutboundInfo, err errorcode.ErrorCode) {
 	result = &user.MoreUserInfoOutboundInfo{}
 	info := player.Service.Info.Person(data.UserId)
 	if info == nil {
@@ -49,7 +49,7 @@ func (h Controller) GetUserMoreInfo(data *user.MoreUserInfoInboundInfo, player *
 // data: 输入信息（无实际内容）
 // player: 当前玩家对象
 // 返回: 玩家金币和代币数量及错误码
-func (h Controller) GetPlayerGoldCount(data *item.GoldOnlineRemainInboundInfo, player *player.Player) (result *item.GoldOnlineRemainOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetPlayerGoldCount(data *GoldOnlineRemainInboundInfo, player *player.Player) (result *item.GoldOnlineRemainOutboundInfo, err errorcode.ErrorCode) {
 
 	return &item.GoldOnlineRemainOutboundInfo{
 
@@ -62,7 +62,7 @@ func (h Controller) GetPlayerGoldCount(data *item.GoldOnlineRemainInboundInfo, p
 // data: 输入信息（无实际内容）
 // player: 当前玩家对象
 // 返回: 玩家总经验值及错误码
-func (h Controller) GetPlayerExp(data *item.ExpTotalRemainInboundInfo, player *player.Player) (result *item.ExpTotalRemainOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetPlayerExp(data *ExpTotalRemainInboundInfo, player *player.Player) (result *item.ExpTotalRemainOutboundInfo, err errorcode.ErrorCode) {
 
 	return &item.ExpTotalRemainOutboundInfo{
 

logic/controller/user_talk.go

@@ -7,7 +7,8 @@ import (
 	"blazing/modules/config/service"
 )
 
-func (h Controller) GetTalkCount(data *item.TalkCountInboundInfo, c *player.Player) (result *item.TalkCountOutboundInfo, err errorcode.ErrorCode) {
+// GetTalkCount 处理控制器请求。
+func (h Controller) GetTalkCount(data *TalkCountInboundInfo, c *player.Player) (result *item.TalkCountOutboundInfo, err errorcode.ErrorCode) {
 	result = &item.TalkCountOutboundInfo{}
 	talkCount, ok := c.Service.Talk.Cheak(c.Info.MapID, int(data.ID))
 	if !ok {
@@ -20,7 +21,7 @@ func (h Controller) GetTalkCount(data *item.TalkCountInboundInfo, c *player.Play
 
 //var talkcacche = make(map[string]uint32)
 
-func (h Controller) GetTalkCategory(data *item.TalkCateInboundInfo, c *player.Player) (result *item.DayTalkInfo, err errorcode.ErrorCode) {
+func (h Controller) GetTalkCategory(data *TalkCateInboundInfo, c *player.Player) (result *item.DayTalkInfo, err errorcode.ErrorCode) {
 	result = &item.DayTalkInfo{}
 	result.OutList = make([]item.CateInfo, 0)
 

logic/controller/user_task.go

@@ -11,7 +11,7 @@ import (
 )
 
 // AcceptTask 接受任务
-func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AcceptTask(data *AcceptTaskInboundInfo, c *player.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
 	//isdaliy := false
 	// if data.Head.CMD != 2201 { //判断是每日任务
 	// 	//isdaliy = true
@@ -28,12 +28,15 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Playe
 	}
 
 	c.Info.SetTask(int(data.TaskId), model.Accepted)
-	c.Service.Task.Exec(uint32(data.TaskId), func(t *model.Task) bool {
-		t.Data = []uint32{}
+	taskData, taskErr := c.Service.Task.GetTask(uint32(data.TaskId))
+	if taskErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
+	taskData.Data = []uint32{}
+	if taskErr = c.Service.Task.SetTask(taskData); taskErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
 
-		return true
-
-	})
 	result = &task.AcceptTaskOutboundInfo{}
 	result.TaskId = data.TaskId
 	return result, 0
@@ -43,15 +46,19 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Playe
 // data: 包含任务ID和任务步骤列表的输入信息
 // c: 当前玩家对象
 // 返回: 空输出结果和错误码
-func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AddTaskBuf(data *AddTaskBufInboundInfo, c *player.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
 
 	if c.Info.GetTask(int(data.TaskId)) != model.Accepted {
 		return result, errorcode.ErrorCodes.ErrAwardAlreadyClaimed
 	}
-	c.Service.Task.Exec(data.TaskId, func(taskEx *model.Task) bool {
-		taskEx.Data = data.TaskList
-		return true
-	})
+	taskData, taskErr := c.Service.Task.GetTask(data.TaskId)
+	if taskErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
+	taskData.Data = data.TaskList
+	if taskErr = c.Service.Task.SetTask(taskData); taskErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
 	return result, 0
 }
 
@@ -59,7 +66,7 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Playe
 // data: 包含任务ID的输入信息
 // c: 当前玩家对象
 // 返回: 任务完成结果和错误码
-func (h Controller) CompleteTask(data1 *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) CompleteTask(data1 *CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
 	if c.Info.GetTask(int(data1.TaskId)) != model.Accepted {
 		return result, errorcode.ErrorCodes.ErrAwardAlreadyClaimed
 	}
@@ -70,52 +77,38 @@ func (h Controller) CompleteTask(data1 *task.CompleteTaskInboundInfo, c *player.
 	// if service.NewTaskService().IsAcceptable(data1.TaskId) == nil {
 	// 	return nil, errorcode.ErrorCodes.ErrSystemError
 	// }
-	c.Info.SetTask(int(data1.TaskId), model.Completed)
-
 	result = &task.CompleteTaskOutboundInfo{
 		TaskId:   data1.TaskId,
 		ItemList: make([]data.ItemInfo, 0),
 	}
 
-	taskInfo := task.GetTaskInfo(int(data1.TaskId), int(data1.OutState))
-	if taskInfo == nil {
-		return nil, errorcode.ErrorCodes.ErrNeedCompleteTaskForPrize
+	if _, err = c.ApplyTaskCompletion(data1.TaskId, int(data1.OutState), result); err != 0 {
+		return nil, err
 	}
-
-	if taskInfo.Pet != nil {
-
-		c.Service.Pet.PetAdd(taskInfo.Pet, 0)
-		result.CaptureTime = taskInfo.Pet.CatchTime
-		result.PetTypeId = taskInfo.Pet.ID
-	}
-
-	for _, item := range taskInfo.ItemList {
-		success := c.ItemAdd(item.ItemId, item.ItemCnt)
-		if success {
-			result.ItemList = append(result.ItemList, item)
-		}
-
+	if taskErr := c.Info.SetTask(int(data1.TaskId), model.Completed); taskErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
 	}
 
 	return result, 0 //通过PUB/SUB回包
 }
 
 // GetTaskBuf 获取任务状态
-func (h Controller) GetTaskBuf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) GetTaskBuf(data *GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	result = &task.GetTaskBufOutboundInfo{
 		TaskId: data.TaskId,
 	}
-	c.Service.Task.Exec(data.TaskId, func(te *model.Task) bool {
 
-		result.TaskList = te.Data
-		return false
-	})
+	taskData, taskErr := c.Service.Task.GetTask(data.TaskId)
+	if taskErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
+	result.TaskList = taskData.Data
 
 	return result, 0
 }
 
 // DeleteTask 删除任务
-func (h Controller) DeleteTask(data *task.DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) DeleteTask(data *DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
 
 	if c.Info.GetTask(int(data.TaskId)) != model.Accepted {
 		return nil, errorcode.ErrorCodes.ErrSystemError

logic/controller/walk.go

@@ -3,11 +3,11 @@ package controller
 import (
 	"blazing/common/socket/errorcode"
 	"blazing/logic/service/player"
-	"blazing/logic/service/space"
 	"blazing/logic/service/space/info"
 )
 
-func (h Controller) PlayerWalk(data *space.WalkInInfo, c *player.Player) (result *info.WalkOutInfo, err errorcode.ErrorCode) {
+// PlayerWalk 处理控制器请求。
+func (h Controller) PlayerWalk(data *WalkInInfo, c *player.Player) (result *info.WalkOutInfo, err errorcode.ErrorCode) {
 	result = &info.WalkOutInfo{
 		Flag:   data.Flag,
 		Point:  data.Point,

logic/main.go

@@ -52,7 +52,7 @@ func PprofWeb() {
 	}
 
 	// 所有端口都失败时的兜底
-	errMsg := fmt.Sprintf("[FATAL] 端口9909/9910均监听失败，pprof服务启动失败")
+	errMsg := "[FATAL] 端口9909/9910均监听失败，pprof服务启动失败"
 	fmt.Println(errMsg)
 	// 可选：根据业务需求决定是否panic
 	// panic(errMsg)
@@ -148,7 +148,7 @@ func monitorMemAndQuit() {
 
 		// 4. 超70%阈值，执行优雅退出
 		if usedRatio >= memThresholdRatio {
-			log.Fatalf("内存占比达%.1f%%，超过90%阈值，程序开始退出", usedRatio*100)
+			log.Fatalf("内存占比达%.1f%%，超过90%%阈值，程序开始退出", usedRatio*100)
 			// ########## 可选：这里添加你的优雅清理逻辑 ##########
 			// 如：关闭数据库连接、释放文件句柄、保存业务状态、推送退出告警等
 			cleanup()

logic/service/common/fight.go

@@ -5,6 +5,7 @@ import (
 	"blazing/modules/player/model"
 )
 
+// FightI 定义 common 服务层依赖的战斗操作接口。
 type FightI interface {
 	Over(c PlayerI, id model.EnumBattleOverReason) //逃跑
 	UseSkill(c PlayerI, id uint32)                 //使用技能

logic/service/common/log.go

@@ -7,24 +7,25 @@ import (
 	"github.com/gogf/gf/v2/os/glog"
 )
 
+// MyWriter 自定义日志写入器，用于逻辑服日志转发。
 type MyWriter struct {
-	logger *glog.Logger
-	user   uint32
+	logger *glog.Logger // 底层 glog 实例。
+	user   uint32       // 关联的玩家 ID。
 }
 
+// Write 实现 io.Writer，并将日志写入系统日志与底层 logger。
 func (w *MyWriter) Write(p []byte) (n int, err error) {
 	var (
 		s = string(p)
-		//ctx = context.Background()
 	)
 
 	service.NewBaseSysLogService().RecordLog(w.user, s)
 	return w.logger.Write(p)
 }
+
 func init() {
 	cool.Logger.SetWriter(&MyWriter{
 		logger: glog.New(),
 	})
 	cool.Logger.SetAsync(true)
-
 }

logic/service/common/pack.go

@@ -8,20 +8,18 @@ import (
 	"github.com/lunixbochs/struc"
 )
 
-// TomeeHeader 结构体字段定义
+// TomeeHeader 定义协议包头。
 type TomeeHeader struct {
-	Len     uint32 `json:"len"`
-	Version byte   `json:"version" struc:"[1]byte"`
-	CMD     uint32 `json:"cmdId" struc:"uint32"`
-	UserID  uint32 `json:"userId"`
-	//Error   uint32 `json:"error" struc:"skip"`
-
-	Result uint32 `json:"result"`
-	Data   []byte `json:"data" struc:"skip"` //组包忽略此字段// struc:"skip"
-	Res    []byte `struc:"skip"`
-	//Return []byte `struc:"skip"`           //返回记录
+	Len     uint32 `json:"len"`                  // 包总长度（包头 + 数据体）。
+	Version byte   `json:"version" struc:"[1]byte"` // 协议版本。
+	CMD     uint32 `json:"cmdId" struc:"uint32"`    // 命令 ID。
+	UserID  uint32 `json:"userId"`               // 玩家 ID。
+	Result  uint32 `json:"result"`               // 结果码。
+	Data    []byte `json:"data" struc:"skip"`  // 数据体，序列化时跳过。
+	Res     []byte `struc:"skip"`                // 预留返回数据，序列化时跳过。
 }
 
+// NewTomeeHeader 创建用于下行封包的默认 TomeeHeader。
 func NewTomeeHeader(cmd uint32, userid uint32) *TomeeHeader {
 
 	return &TomeeHeader{

logic/service/common/playeri.go

@@ -3,10 +3,13 @@ package common
 import (
 	"blazing/common/socket/errorcode"
 	"blazing/logic/service/fight/info"
+	space "blazing/logic/service/space/info"
 	"blazing/modules/player/model"
 )
 
+// PlayerI 定义战斗与 common 服务依赖的最小玩家能力接口。
 type PlayerI interface {
+	ApplyPetDisplayInfo(*space.SimpleInfo)
 	GetPlayerCaptureContext() *info.PlayerCaptureContext
 	Roll(int, int) (bool, float64, float64)
 	//SendPack(b []byte) error

logic/service/fight/action.go

@@ -44,6 +44,7 @@ func (f *FightC) openActionWindow() {
 	f.actionMu.Lock()
 	f.acceptActions = true
 	f.pendingActions = f.pendingActions[:0]
+	f.pendingHead = 0
 	f.actionRound.Store(uint32(f.Round))
 	f.actionMu.Unlock()
 }
@@ -52,6 +53,7 @@ func (f *FightC) closeActionWindow() {
 	f.actionMu.Lock()
 	f.acceptActions = false
 	f.pendingActions = f.pendingActions[:0]
+	f.pendingHead = 0
 	f.actionRound.Store(0)
 	f.actionMu.Unlock()
 
@@ -73,8 +75,10 @@ func (f *FightC) submitAction(act action.BattleActionI) {
 		f.actionMu.Unlock()
 		return
 	}
+	f.compactPendingActionsLocked()
 	replaceIndex := -1
-	for i, pending := range f.pendingActions {
+	for i := f.pendingHead; i < len(f.pendingActions); i++ {
+		pending := f.pendingActions[i]
 		if pending == nil || actionSlotKeyFromAction(pending) != actionSlotKeyFromAction(act) {
 			continue
 		}
@@ -82,6 +86,10 @@ func (f *FightC) submitAction(act action.BattleActionI) {
 		break
 	}
 	if replaceIndex >= 0 {
+		if f.LegacyGroupProtocol {
+			f.actionMu.Unlock()
+			return
+		}
 		f.pendingActions[replaceIndex] = act
 	} else {
 		f.pendingActions = append(f.pendingActions, act)
@@ -101,15 +109,23 @@ func (f *FightC) submitAction(act action.BattleActionI) {
 
 func (f *FightC) nextAction() action.BattleActionI {
 	f.actionMu.Lock()
-	if len(f.pendingActions) == 0 {
+	if f.pendingHead >= len(f.pendingActions) {
+		f.pendingActions = f.pendingActions[:0]
+		f.pendingHead = 0
 		f.actionMu.Unlock()
 		return nil
 	}
 
-	act := f.pendingActions[0]
-	copy(f.pendingActions, f.pendingActions[1:])
-	f.pendingActions = f.pendingActions[:len(f.pendingActions)-1]
-	hasMore := len(f.pendingActions) > 0
+	act := f.pendingActions[f.pendingHead]
+	f.pendingActions[f.pendingHead] = nil
+	f.pendingHead++
+	hasMore := f.pendingHead < len(f.pendingActions)
+	if !hasMore {
+		f.pendingActions = f.pendingActions[:0]
+		f.pendingHead = 0
+	} else {
+		f.compactPendingActionsLocked()
+	}
 	notify := f.actionNotify
 	f.actionMu.Unlock()
 
@@ -123,6 +139,22 @@ func (f *FightC) nextAction() action.BattleActionI {
 	return act
 }
 
+func (f *FightC) compactPendingActionsLocked() {
+	if f.pendingHead == 0 {
+		return
+	}
+	if f.pendingHead < len(f.pendingActions)/2 && len(f.pendingActions) < cap(f.pendingActions) {
+		return
+	}
+	remaining := len(f.pendingActions) - f.pendingHead
+	copy(f.pendingActions, f.pendingActions[f.pendingHead:])
+	for i := remaining; i < len(f.pendingActions); i++ {
+		f.pendingActions[i] = nil
+	}
+	f.pendingActions = f.pendingActions[:remaining]
+	f.pendingHead = 0
+}
+
 // 玩家逃跑/无响应/掉线
 func (f *FightC) Over(c common.PlayerI, res model.EnumBattleOverReason) {
 	if f.closefight {
@@ -143,10 +175,13 @@ func (f *FightC) Over(c common.PlayerI, res model.EnumBattleOverReason) {
 	// }
 
 	f.overl.Do(func() {
-		f.Reason = res
+		f.Reason = normalizeFightOverReason(res)
 		if f.GetInputByPlayer(c, true) != nil {
 			f.WinnerId = f.GetInputByPlayer(c, true).UserID
 		}
+		f.FightOverInfo.Reason = f.Reason
+		f.FightOverInfo.WinnerId = f.WinnerId
+		f.closefight = true
 
 		close(f.quit)
 
@@ -199,7 +234,6 @@ func (f *FightC) UseSkillAt(c common.PlayerI, id uint32, actorIndex, targetIndex
 		BaseAction: action.NewBaseAction(c.GetInfo().UserID),
 	}
 	ret.ActorIndex = actorIndex
-	ret.TargetIndex = targetIndex
 
 	self := f.getInputByUserID(c.GetInfo().UserID, actorIndex, false)
 	if self == nil {
@@ -225,9 +259,28 @@ func (f *FightC) UseSkillAt(c common.PlayerI, id uint32, actorIndex, targetIndex
 		}
 
 	}
+	ret.TargetIndex = normalizeSkillTargetIndex(actorIndex, targetIndex, ret.SkillEntity)
 	f.submitAction(ret)
 }
 
+func normalizeSkillTargetIndex(actorIndex, targetIndex int, skill *info.SkillEntity) int {
+	if skill == nil {
+		return targetIndex
+	}
+	// 约定：非负目标位表示敌方；负值 -(index+1) 表示同侧（自己/队友）
+	if _, targetIsOpposite := DecodeTargetIndex(targetIndex); !targetIsOpposite {
+		return targetIndex
+	}
+	// GBTL.AtkType: 0=所有人 1=仅己方 2=仅对方 3=仅自己（默认2）
+	switch skill.XML.AtkType {
+	case 1, 3:
+		// 旧协议未传目标时，己方类技能默认作用自己；新协议可通过负编码显式指定队友。
+		return EncodeTargetIndex(actorIndex, false)
+	default:
+		return targetIndex
+	}
+}
+
 // 玩家使用技能
 func (f *FightC) Capture(c common.PlayerI, id uint32) {
 	if f.closefight {
@@ -263,9 +316,19 @@ func (f *FightC) UseItemAt(c common.PlayerI, cacthid, itemid uint32, actorIndex,
 
 // ReadyFight 处理玩家战斗准备逻辑，当满足条件时启动战斗循环
 func (f *FightC) ReadyFight(c common.PlayerI) {
-	f.Broadcast(func(ff *input.Input) {
-
-		ff.Player.SendPackCmd(2404, &info.S2C_2404{UserID: c.GetInfo().UserID})
+	if f.LegacyGroupProtocol {
+		input := f.GetInputByPlayer(c, false)
+		if input == nil {
+			return
+		}
+		input.Finished = true
+		if f.checkBothPlayersReady(c) {
+			f.startBattle(f.FightStartOutboundInfo)
+		}
+		return
+	}
+	f.BroadcastPlayers(func(p common.PlayerI) {
+		p.SendPackCmd(2404, &info.S2C_2404{UserID: c.GetInfo().UserID})
 	})
 	// 2. 标记当前玩家已准备完成
 	input := f.GetInputByPlayer(c, false)
@@ -280,15 +343,10 @@ func (f *FightC) buildFightStartInfo() info.FightStartOutboundInfo {
 	startInfo := info.FightStartOutboundInfo{}
 	ourInfos := f.collectFightPetInfos(f.Our)
 	oppInfos := f.collectFightPetInfos(f.Opp)
-	startInfo.Infos = append(startInfo.Infos, ourInfos...)
-	startInfo.Infos = append(startInfo.Infos, oppInfos...)
-	startInfo.InfoLen = uint32(len(startInfo.Infos))
-	if len(ourInfos) > 0 {
-		startInfo.Info1 = ourInfos[0]
-	}
-	if len(oppInfos) > 0 {
-		startInfo.Info2 = oppInfos[0]
-	}
+	startInfo.Info1 = append(startInfo.Info1, ourInfos...)
+	startInfo.Info2 = append(startInfo.Info2, oppInfos...)
+	startInfo.Info1Len = uint32(len(startInfo.Info1))
+	startInfo.Info2Len = uint32(len(startInfo.Info2))
 	return startInfo
 }
 
@@ -312,7 +370,7 @@ func (f *FightC) collectFightPetInfos(inputs []*input.Input) []info.FightPetInfo
 			Hp:               currentPet.Info.Hp,
 			MaxHp:            currentPet.Info.MaxHp,
 			Level:            currentPet.Info.Level,
-			Catchable:        uint32(fighter.CanCapture),
+			Catchable:        fightPetCatchableFlag(fighter.CanCapture),
 		}
 		if fighter.AttackValue != nil {
 			fightInfo.Prop = fighter.AttackValue.Prop
@@ -322,6 +380,13 @@ func (f *FightC) collectFightPetInfos(inputs []*input.Input) []info.FightPetInfo
 	return infos
 }
 
+func fightPetCatchableFlag(catchRate int) uint32 {
+	if catchRate > 0 {
+		return 1
+	}
+	return 0
+}
+
 // checkBothPlayersReady 检查PVP战斗中双方是否都已准备完成
 // 参数c为当前准备的玩家，返回true表示双方均准备完成
 func (f *FightC) checkBothPlayersReady(currentPlayer common.PlayerI) bool {
@@ -342,8 +407,12 @@ func (f *FightC) startBattle(startInfo info.FightStartOutboundInfo) {
 		go f.battleLoop()
 
 		// 向双方广播战斗开始信息
-		f.Broadcast(func(ff *input.Input) {
-			ff.Player.SendPackCmd(2504, &startInfo)
+		f.BroadcastPlayers(func(p common.PlayerI) {
+			if f.LegacyGroupProtocol {
+				f.sendLegacyGroupStart(p)
+				return
+			}
+			f.sendFightPacket(p, fightPacketStart, &startInfo)
 		})
 	})
 }

logic/service/fight/boss/NewSeIdx_247.go

@@ -0,0 +1,99 @@
+package effect
+
+import (
+	"blazing/logic/service/fight/action"
+	"blazing/logic/service/fight/info"
+	"blazing/logic/service/fight/input"
+)
+
+// 247. 固定增加体力/攻击/防御/特攻/特防/速度;（a1-a6: hp/atk/def/spatk/spdef/spd）
+type NewSel247 struct {
+	NewSel0
+}
+
+func (e *NewSel247) TurnStart(fattack *action.SelectSkillAction, sattack *action.SelectSkillAction) {
+	if !e.IsOwner() {
+		return
+	}
+
+	pet := e.Ctx().Our.CurPet[0]
+	if pet == nil {
+		return
+	}
+
+	hpBonus := uint32(e.Args()[0].IntPart())
+	if hpBonus > 0 {
+		pet.Info.MaxHp += hpBonus
+		pet.Info.Hp += hpBonus
+	}
+
+	for i, propIdx := range []int{0, 1, 2, 3, 4} {
+		add := uint32(e.Args()[i+1].IntPart())
+		if add == 0 {
+			continue
+		}
+		pet.Info.Prop[propIdx] += add
+	}
+}
+
+func (e *NewSel247) TurnEnd() {
+	if !e.IsOwner() {
+		return
+	}
+
+	pet := e.Ctx().Our.CurPet[0]
+	if pet == nil {
+		return
+	}
+
+	hpBonus := uint32(e.Args()[0].IntPart())
+	if hpBonus > 0 {
+		if pet.Info.MaxHp > hpBonus {
+			pet.Info.MaxHp -= hpBonus
+		} else {
+			pet.Info.MaxHp = 1
+		}
+		if pet.Info.Hp > pet.Info.MaxHp {
+			pet.Info.Hp = pet.Info.MaxHp
+		}
+	}
+
+	for i, propIdx := range []int{0, 1, 2, 3, 4} {
+		sub := uint32(e.Args()[i+1].IntPart())
+		if sub == 0 {
+			continue
+		}
+		if pet.Info.Prop[propIdx] > sub {
+			pet.Info.Prop[propIdx] -= sub
+		} else {
+			pet.Info.Prop[propIdx] = 1
+		}
+	}
+}
+
+type NewSel239 struct {
+	NewSel0
+}
+
+func (e *NewSel239) ActionStart(a, b *action.SelectSkillAction) bool {
+	if !e.IsOwner() {
+		return true
+	}
+	if e.Ctx().SkillEntity == nil {
+		return true
+	}
+	if e.Ctx().SkillEntity.Category() == info.Category.STATUS {
+		return true
+	}
+	if len(e.Args()) == 0 {
+		return true
+	}
+
+	e.Ctx().SkillEntity.XML.Power += int(e.Args()[0].IntPart())
+	return true
+}
+
+func init() {
+	input.InitEffect(input.EffectType.NewSel, 239, &NewSel239{})
+	input.InitEffect(input.EffectType.NewSel, 247, &NewSel247{})
+}

logic/service/fight/boss/NewSeIdx_26.go

@@ -11,10 +11,9 @@ type NewSel26 struct {
 }
 
 func (e *NewSel26) TurnStart(fattack *action.SelectSkillAction, sattack *action.SelectSkillAction) {
-	e.Ctx().Our.CurPet[0].Info.Prop[int(e.Args()[0].IntPart())] += uint32(e.Args()[1].IntPart())
 }
+
 func (e *NewSel26) TurnEnd() {
-	e.Ctx().Our.CurPet[0].Info.Prop[int(e.Args()[0].IntPart())] -= uint32(e.Args()[1].IntPart())
 }
 func init() {
 	input.InitEffect(input.EffectType.NewSel, 26, &NewSel26{})

logic/service/fight/boss/NewSeIdx_41.go

@@ -10,7 +10,7 @@ type NewSel41 struct {
 	NewSel0
 }
 
-func (e *NewSel41) Skill_Use_ex() bool {
+func (e *NewSel41) Skill_Use() bool {
 	if e.ID().GetCatchTime() != e.Ctx().Our.CurPet[0].Info.CatchTime {
 		return true
 	}

logic/service/fight/boss/NewSeIdx_501.go

@@ -1,26 +1,25 @@
 package effect
 
-import (
-	"blazing/logic/service/fight/input"
-)
+import "blazing/logic/service/fight/input"
 
 // 501. g1. 最后一个死 (只要有队友没死, 则自己又恢复hp和pp)
-// TODO: 需要了解如何判断队友状态并恢复HP和PP
 type NewSel501 struct {
 	NewSel0
 }
 
+// SwitchOut 在拥有者死亡离场时触发；若仍有存活队友，则把自己回满留作后续再上场。
 func (e *NewSel501) SwitchOut(in *input.Input) bool {
-	//魂印特性有不在场的情况,绑定时候将精灵和特性绑定
-	if e.ID().GetCatchTime() != e.Ctx().Our.CurPet[0].Info.CatchTime {
+	owner := e.SourceInput()
+	if owner == nil || in != owner || !e.IsOwner() {
+		return true
+	}
+	currentPet := owner.CurrentPet()
+	if currentPet == nil || currentPet.Info.Hp > 0 || !owner.HasLivingTeammate() {
 		return true
 	}
 
-	// TODO: 检查是否有队友还活着
-	// 如果有队友活着，恢复自身HP和PP
-	// e.Ctx().Our.Heal(e.Ctx().Our, nil, e.Ctx().Our.CurPet[0].GetMaxHP())
-	// TODO: 恢复PP值的方法
-
+	currentPet.Info.Hp = currentPet.Info.MaxHp
+	owner.HealPP(-1)
 	return true
 }
 

logic/service/fight/boss/NewSeIdx_502.go

@@ -1,25 +1,31 @@
 package effect
 
-import (
-	"blazing/logic/service/fight/input"
-)
+import "blazing/logic/service/fight/input"
 
 // 502. g2. 如果自身死亡, 恢复队友所有体力和PP值
-// TODO: 实现恢复队友所有体力和PP值的核心逻辑
 type NewSel502 struct {
 	NewSel0
 }
 
-// TODO: 需要找到精灵死亡时的回调接口
+// SwitchOut 在拥有者死亡离场时触发；把仍在场的队友体力和 PP 恢复到满值。
 func (e *NewSel502) SwitchOut(in *input.Input) bool {
-	//魂印特性有不在场的情况,绑定时候将精灵和特性绑定
-	if e.ID().GetCatchTime() != e.Ctx().Our.CurPet[0].Info.CatchTime {
+	owner := e.SourceInput()
+	if owner == nil || in != owner || !e.IsOwner() {
+		return true
+	}
+	currentPet := owner.CurrentPet()
+	if currentPet == nil || currentPet.Info.Hp > 0 {
 		return true
 	}
 
-	// TODO: 检查精灵是否死亡（HP为0）
-	// 如果死亡，恢复队友所有体力和PP值
-	// 需要遍历队友的精灵并调用相应的方法
+	for _, teammate := range owner.LivingTeammates() {
+		pet := teammate.CurrentPet()
+		if pet == nil {
+			continue
+		}
+		pet.Info.Hp = pet.Info.MaxHp
+		teammate.HealPP(-1)
+	}
 	return true
 }
 

logic/service/fight/boss/NewSeIdx_503.go

@@ -6,20 +6,35 @@ import (
 )
 
 // 503. g3. 群体攻击技能可额外增加一个目标(最多不超过5个目标)
-// TODO: 需要了解如何修改群体攻击技能的目标数量
 type NewSel503 struct {
 	NewSel0
 }
 
+// TurnStart 在拥有者本回合准备出手时触发；若本次技能是群体技能，则把目标数额外加 1。
 func (e *NewSel503) TurnStart(fattack *action.SelectSkillAction, sattack *action.SelectSkillAction) {
-	//魂印特性有不在场的情况,绑定时候将精灵和特性绑定
-	if e.ID().GetCatchTime() != e.Ctx().Our.CurPet[0].Info.CatchTime {
+	owner := e.SourceInput()
+	if owner == nil || !e.IsOwner() {
 		return
 	}
 
-	// TODO: 检查技能是否是群体攻击技能
-	// 如果是群体攻击，增加一个目标（最多不超过5个）
-	// 需要了解技能的目标数量限制机制
+	for _, act := range []*action.SelectSkillAction{fattack, sattack} {
+		if act == nil || act.SkillEntity == nil || act.SkillEntity.Pet == nil {
+			continue
+		}
+		if act.SkillEntity.Pet.Info.CatchTime != e.ID().GetCatchTime() {
+			continue
+		}
+		if act.SkillEntity.XML.AtkType != 0 {
+			return
+		}
+		if act.SkillEntity.XML.AtkNum <= 0 {
+			act.SkillEntity.XML.AtkNum = 1
+		}
+		if act.SkillEntity.XML.AtkNum < 5 {
+			act.SkillEntity.XML.AtkNum++
+		}
+		return
+	}
 }
 
 func init() {

logic/service/fight/boss/NewSeIdx_504.go

@@ -0,0 +1,84 @@
+package effect
+
+import (
+	"blazing/logic/service/fight/info"
+	"blazing/logic/service/fight/input"
+
+	"github.com/alpacahq/alpacadecimal"
+)
+
+// 504. 乱舞：群体攻击提升{0}%的攻击伤害并增加一个攻击目标
+// 说明：
+// 1) 作为 NewSel(魂印/特性)实现，避免影响技能侧的 Effect504 旧逻辑。
+// 2) 目前战斗主链仍是单目标红伤，额外目标以“追加一次同等红伤”方式落地。
+type NewSel504 struct {
+	NewSel0
+}
+
+func (e *NewSel504) isOwnerActive() bool {
+	our := e.Ctx().Our
+	if our == nil || our.CurrentPet() == nil {
+		return false
+	}
+	return e.ID().GetCatchTime() == our.CurrentPet().Info.CatchTime
+}
+
+func (e *NewSel504) Damage_Mul(zone *info.DamageZone) bool {
+	if !e.isOwnerActive() || zone == nil || zone.Type != info.DamageType.Red {
+		return true
+	}
+	if e.Ctx().SkillEntity == nil || e.Ctx().SkillEntity.Category() == info.Category.STATUS {
+		return true
+	}
+	if len(e.Args()) == 0 {
+		return true
+	}
+
+	percent := e.Args()[0]
+	if percent.Cmp(alpacadecimal.Zero) <= 0 {
+		return true
+	}
+	zone.Damage = zone.Damage.Mul(alpacadecimal.NewFromInt(100).Add(percent)).Div(alpacadecimal.NewFromInt(100))
+	return true
+}
+
+func (e *NewSel504) Action_end() bool {
+	if !e.isOwnerActive() {
+		return true
+	}
+	if e.Ctx().SkillEntity == nil || e.Ctx().SkillEntity.Category() == info.Category.STATUS || e.Ctx().SkillEntity.AttackTime == 0 {
+		return true
+	}
+
+	our := e.Ctx().Our
+	if our == nil || our.SumDamage.Cmp(alpacadecimal.Zero) <= 0 {
+		return true
+	}
+
+	currentTarget := e.OpponentInput()
+	var extraTarget *input.Input
+	e.ForEachOpponentSlot(func(target *input.Input) bool {
+		if target == nil || target == currentTarget {
+			return true
+		}
+		pet := target.CurrentPet()
+		if pet == nil || !pet.Alive() {
+			return true
+		}
+		extraTarget = target
+		return false
+	})
+	if extraTarget == nil {
+		return true
+	}
+
+	extraTarget.Damage(our, &info.DamageZone{
+		Type:   info.DamageType.Red,
+		Damage: our.SumDamage,
+	})
+	return true
+}
+
+func init() {
+	input.InitEffect(input.EffectType.NewSel, 504, &NewSel504{})
+}

logic/service/fight/cmd.go

@@ -68,6 +68,52 @@ type PetKingJoinInboundInfo struct {
 	FightType uint32             // 仅当Type为11时有效
 }
 
+// PeakQueueCancelInboundInfo 取消跨服巅峰队列。
+type PeakQueueCancelInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2459" struc:"skip"`
+}
+
+// PeakBanPickSubmitInboundInfo 提交 ban/pick 结果。
+type PeakBanPickSubmitInboundInfo struct {
+	Head common.TomeeHeader `cmd:"2460" struc:"skip"`
+
+	SelectedCatchTimesLen uint32   `struc:"sizeof=SelectedCatchTimes"`
+	SelectedCatchTimes    []uint32 `json:"selectedCatchTimes"`
+
+	BanCatchTimesLen uint32   `struc:"sizeof=BanCatchTimes"`
+	BanCatchTimes    []uint32 `json:"banCatchTimes"`
+}
+
+// CrossServerBanPickStartOutboundInfo 跨服匹配成功后，通知前端进入 ban/pick。
+type CrossServerBanPickPetInfo struct {
+	CatchTime uint32 `json:"catchTime"`
+	PetID     uint32 `json:"petId"`
+	Name      string `struc:"[16]byte" json:"name"`
+	Level     uint32 `json:"level"`
+	Hp        uint32 `json:"hp"`
+	MaxHp     uint32 `json:"maxHp"`
+}
+
+type CrossServerBanPickStartOutboundInfo struct {
+	SessionIDLen uint32 `struc:"sizeof=SessionID"`
+	SessionID    string `json:"sessionId"`
+
+	OpponentUserID uint32 `json:"opponentUserId"`
+	OpponentNick   string `struc:"[16]byte" json:"opponentNick"`
+
+	FightMode uint32 `json:"fightMode"`
+	Status    uint32 `json:"status"`
+
+	TimeoutSeconds  uint32 `json:"timeoutSeconds"`
+	SelectableCount uint32 `json:"selectableCount"`
+
+	MyPetsLen uint32                      `struc:"sizeof=MyPets"`
+	MyPets    []CrossServerBanPickPetInfo `json:"myPets"`
+
+	OpponentPetsLen uint32                      `struc:"sizeof=OpponentPets"`
+	OpponentPets    []CrossServerBanPickPetInfo `json:"opponentPets"`
+}
+
 // HandleFightInviteInboundInfo 处理战斗邀请的入站消息
 
 type HandleFightInviteInboundInfo struct {
@@ -101,6 +147,22 @@ type UseSkillInInfo struct {
 	// 技能id，
 	SkillId uint32
 }
+
+// UseSkillAtInboundInfo 组队/多战位技能使用包（新增）。
+// 目标关系与前端 AtkType 语义对齐：
+// 0=对方 1=自己 2=队友；AtkType: 0=所有人 1=仅己方 2=仅对方 3=仅自己。
+type UseSkillAtInboundInfo struct {
+	Head    common.TomeeHeader `cmd:"7505" struc:"skip"`
+	SkillId uint32             `json:"skillId"`
+	// 出手方槽位（我方）
+	ActorIndex uint8 `json:"actorIndex"`
+	// 目标槽位（按 TargetRelation 所属阵营解释）
+	TargetIndex uint8 `json:"targetIndex"`
+	// 0=对方 1=自己 2=队友
+	TargetRelation uint8 `json:"targetRelation"`
+	// 前端技能目标类型（可选兜底），同 GBTL AtkType 定义
+	AtkType uint8 `json:"atkType"`
+}
 type ChangePetInboundInfo struct {
 	Head common.TomeeHeader `cmd:"2407" struc:"skip"`
 	// CatchTime 捕捉时间

logic/service/fight/cmd_unified.go

@@ -0,0 +1,148 @@
+package fight
+
+import (
+	"blazing/logic/service/common"
+	"blazing/modules/player/model"
+)
+
+// FightActionType 表示统一动作包里的动作类型。
+type FightActionType string
+
+const (
+	// FightActionTypeSkill 表示使用技能。
+	FightActionTypeSkill FightActionType = "skill"
+	// FightActionTypeItem 表示使用道具。
+	FightActionTypeItem FightActionType = "item"
+	// FightActionTypeChange 表示主动切宠。
+	FightActionTypeChange FightActionType = "change"
+	// FightActionTypeEscape 表示逃跑。
+	FightActionTypeEscape FightActionType = "escape"
+	// FightActionTypeChat 表示战斗内聊天。
+	FightActionTypeChat FightActionType = "chat"
+)
+
+// FightActionEnvelope 是统一入站动作结构。
+// 约定：
+// 1. actorIndex 始终表示发起方所在的我方槽位。
+// 2. targetIndex 始终表示目标在所属阵营内的槽位。
+// 3. targetRelation 用来区分 targetIndex 属于敌方、自己还是队友。
+type FightActionEnvelope struct {
+	// ActionType 当前动作类型，例如 skill、item、change、escape、chat。
+	ActionType FightActionType `json:"actionType"`
+	// ActorIndex 发起动作的我方槽位。
+	ActorIndex int `json:"actorIndex"`
+	// TargetIndex 目标在所属阵营中的槽位下标。
+	TargetIndex int `json:"targetIndex"`
+	// TargetRelation 目标关系：0=对方，1=自己，2=队友。
+	TargetRelation uint8 `json:"targetRelation,omitempty"`
+	// SkillID 技能 ID；仅技能动作使用。
+	SkillID uint32 `json:"skillId,omitempty"`
+	// ItemID 道具 ID；仅道具动作使用。
+	ItemID uint32 `json:"itemId,omitempty"`
+	// CatchTime 精灵实例 ID；切宠或部分道具动作使用。
+	CatchTime uint32 `json:"catchTime,omitempty"`
+	// Escape 是否为逃跑动作；主要用于协议层兼容和调试。
+	Escape bool `json:"escape,omitempty"`
+	// Chat 聊天内容；仅聊天动作使用。
+	Chat string `json:"chat,omitempty"`
+	// AtkType 前端技能目标类型兜底值，沿用技能表 AtkType 定义。
+	AtkType uint8 `json:"atkType,omitempty"`
+}
+
+// NewSkillActionEnvelope 构造技能动作 envelope。
+func NewSkillActionEnvelope(skillID uint32, actorIndex, targetIndex int, targetRelation, atkType uint8) FightActionEnvelope {
+	return FightActionEnvelope{
+		ActionType:     FightActionTypeSkill,
+		ActorIndex:     actorIndex,
+		TargetIndex:    targetIndex,
+		TargetRelation: targetRelation,
+		SkillID:        skillID,
+		AtkType:        atkType,
+	}
+}
+
+// NewItemActionEnvelope 构造道具动作 envelope。
+func NewItemActionEnvelope(catchTime, itemID uint32, actorIndex, targetIndex int, targetRelation uint8) FightActionEnvelope {
+	return FightActionEnvelope{
+		ActionType:     FightActionTypeItem,
+		ActorIndex:     actorIndex,
+		TargetIndex:    targetIndex,
+		TargetRelation: targetRelation,
+		ItemID:         itemID,
+		CatchTime:      catchTime,
+	}
+}
+
+// NewChangeActionEnvelope 构造切宠动作 envelope。
+func NewChangeActionEnvelope(catchTime uint32, actorIndex int) FightActionEnvelope {
+	return FightActionEnvelope{
+		ActionType: FightActionTypeChange,
+		ActorIndex: actorIndex,
+		CatchTime:  catchTime,
+	}
+}
+
+// NewEscapeActionEnvelope 构造逃跑动作 envelope。
+func NewEscapeActionEnvelope() FightActionEnvelope {
+	return FightActionEnvelope{
+		ActionType: FightActionTypeEscape,
+		Escape:     true,
+	}
+}
+
+// NewChatActionEnvelope 构造聊天动作 envelope。
+func NewChatActionEnvelope(chat string) FightActionEnvelope {
+	return FightActionEnvelope{
+		ActionType: FightActionTypeChat,
+		Chat:       chat,
+	}
+}
+
+// normalizedTargetRelation 根据 TargetRelation 和 AtkType 兜底出最终目标关系。
+func (e FightActionEnvelope) normalizedTargetRelation() uint8 {
+	if e.TargetRelation <= SkillTargetAlly {
+		return e.TargetRelation
+	}
+	switch e.AtkType {
+	case 3:
+		return SkillTargetSelf
+	case 1:
+		return SkillTargetAlly
+	default:
+		return SkillTargetOpponent
+	}
+}
+
+// EncodedTargetIndex 把统一结构里的目标信息编码成现有 FightC 内部使用的目标格式。
+func (e FightActionEnvelope) EncodedTargetIndex() int {
+	targetIndex := e.TargetIndex
+	switch e.normalizedTargetRelation() {
+	case SkillTargetSelf:
+		targetIndex = e.ActorIndex
+		return EncodeTargetIndex(targetIndex, false)
+	case SkillTargetAlly:
+		return EncodeTargetIndex(targetIndex, false)
+	default:
+		return EncodeTargetIndex(targetIndex, true)
+	}
+}
+
+// HandleActionEnvelope 把统一动作结构派发到现有 FightC 的 indexed 接口上。
+func (f *FightC) HandleActionEnvelope(c common.PlayerI, envelope FightActionEnvelope) {
+	if f == nil || c == nil {
+		return
+	}
+
+	switch envelope.ActionType {
+	case FightActionTypeSkill:
+		f.UseSkillAt(c, envelope.SkillID, envelope.ActorIndex, envelope.EncodedTargetIndex())
+	case FightActionTypeItem:
+		f.UseItemAt(c, envelope.CatchTime, envelope.ItemID, envelope.ActorIndex, envelope.EncodedTargetIndex())
+	case FightActionTypeChange:
+		f.ChangePetAt(c, envelope.CatchTime, envelope.ActorIndex)
+	case FightActionTypeEscape:
+		f.Over(c, model.BattleOverReason.PlayerEscape)
+	case FightActionTypeChat:
+		f.Chat(c, envelope.Chat)
+	}
+}

logic/service/fight/effect/1044.go

@@ -17,9 +17,9 @@ type Effect1044 struct {
 func (e *Effect1044) OnSkill() bool {
 	// 检查对手是否有能力提升状态可以吸取
 
-	for i, v := range e.OpponentInput().Prop[:] {
+	for i, v := range e.TargetInput().Prop[:] {
 		if v > 0 {
-			if e.OpponentInput().SetProp(e.CarrierInput(), int8(i), 0) {
+			if e.TargetInput().SetProp(e.CarrierInput(), int8(i), 0) {
 				e.can = true
 				e.CarrierInput().SetProp(e.CarrierInput(), int8(i), v)
 			}

logic/service/fight/effect/1097_1101.go

@@ -22,7 +22,7 @@ type Effect1097 struct {
 
 func (e *Effect1097) Skill_Use() bool {
 	source := e.SourceInput()
-	target := e.OpponentInput()
+	target := e.TargetInput()
 	if source == nil || target == nil {
 		return true
 	}
@@ -175,7 +175,7 @@ func (e *Effect1098) SkillHit() bool {
 
 func (e *Effect1098) Skill_Use() bool {
 	source := e.SourceInput()
-	target := e.OpponentInput()
+	target := e.TargetInput()
 	if source == nil || target == nil {
 		return true
 	}
@@ -273,7 +273,7 @@ type Effect1099 struct {
 
 func (e *Effect1099) Skill_Use() bool {
 	source := e.SourceInput()
-	target := e.OpponentInput()
+	target := e.TargetInput()
 	if source == nil || target == nil {
 		return true
 	}
@@ -335,7 +335,7 @@ type Effect1100 struct {
 
 func (e *Effect1100) Skill_Use_ex() bool {
 	source := e.SourceInput()
-	target := e.OpponentInput()
+	target := e.TargetInput()
 	if source == nil || target == nil {
 		return true
 	}
@@ -423,7 +423,7 @@ func (e *Effect1101) DamageFloor(zone *info.DamageZone) bool {
 
 func (e *Effect1101) Skill_Use() bool {
 	source := e.SourceInput()
-	target := e.OpponentInput()
+	target := e.TargetInput()
 	if source == nil || target == nil {
 		return true
 	}

logic/service/fight/effect/1146.go

@@ -19,7 +19,7 @@ type Effect1146 struct {
 func (e *Effect1146) OnSkill() bool {
 	// 1. 命中判定失败，不触发
 	count := 0
-	for _, v := range e.OpponentInput().Prop[:] {
+	for _, v := range e.TargetInput().Prop[:] {
 		if v > 0 {
 			count++
 		}
@@ -29,7 +29,7 @@ func (e *Effect1146) OnSkill() bool {
 		return true
 	}
 
-	e.OpponentInput().Damage(e.CarrierInput(), &info.DamageZone{
+	e.TargetInput().Damage(e.CarrierInput(), &info.DamageZone{
 		Type:   info.DamageType.Fixed,
 		Damage: e.Args()[1],
 	})