```

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

- 优化宠物异色生成逻辑，当Ext不为0时使用Ext值生成异色效果
- 修复战斗中我方放弃出手时的先后手判断逻辑
- 更新宠物融合和还原操作的调试日志输出
```

logic/controller/item_use.go

@@ -52,6 +52,7 @@ func (h Controller) UsePetItemOutOfFight(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGH
 		}
 		oldPetCatchTime := currentPet.CatchTime
 		oldPet := c.Service.Pet.PetInfo_One_Unscoped(currentPet.OldCatchTime)
+		println(c.Info.UserID, "还原", len(c.Info.PetList), currentPet.ID, oldPet.Data.ID)
 		currentPet = &oldPet.Data
 		currentPet.CatchTime = oldPetCatchTime
 	} else {

logic/controller/pet_fusion.go

@@ -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,