feat(pet): 完善宠物异色功能和战斗逻辑

- 优化宠物异色生成逻辑,当Ext不为0时使用Ext值生成异色效果
- 修复战斗中我方放弃出手时的先后手判断逻辑
- 更新宠物融合和还原操作的调试日志输出
```
This commit is contained in:
2025-12-31 00:57:28 +08:00
parent 2dcf80f694
commit b86ab8d5a9
4 changed files with 13 additions and 29 deletions

View File

@@ -76,11 +76,10 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
}
c.Service.Pet.PetAdd(r)
println(len(c.Info.PetList), data.Mcatchtime, data.Auxcatchtime, Mcatchpetinfo.CatchTime, Auxpetinfo.CatchTime)
println(c.Info.UserID, "进行融合", len(c.Info.PetList), Mcatchpetinfo.ID, Auxpetinfo.ID, r.ID)
c.PetDel(data.Auxcatchtime)
c.PetDel(data.Mcatchtime)
//fmt.Println(len(c.Info.PetList))
// g.Dump(c.Info.PetList)
//todo材料扣除
return &pet.PetFusionInfo{
ObtainTime: r.CatchTime,