1

logic/controller/pet_fusion.go

@@ -64,6 +64,12 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
 		c.Service.Item.UPDATE(v, -1)
 
 	}
+	result = &pet.PetFusionInfo{
+
+		SoulID: 1000017,
+
+		CostItemFlag: 0,
+	}
 	if resid == 0 {
 
 		_, ok := lo.Find(data.GoldItem1[:], func(item uint32) bool {
@@ -71,6 +77,7 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
 		})
 		if c.Service.Item.CheakItem(300044) > 0 && ok {
 			c.Service.Item.UPDATE(300044, -1)
+			result.CostItemFlag = 1
 
 		} else {
 			if Auxpetinfo.Level > 5 {
@@ -112,17 +119,14 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
 
 	if c.Service.Item.CheakItem(300043) > 0 && ok2 {
 		c.Service.Item.UPDATE(300043, -1)
+		result.CostItemFlag = 1
 	} else {
 
 		c.PetDel(data.Auxcatchtime)
 
 	}
-
+	result.ObtainTime = r.CatchTime
+	result.StarterCpTm = r.ID
 	//todo材料扣除
-	return &pet.PetFusionInfo{
-		ObtainTime:   r.CatchTime,
-		SoulID:       1000017,
-		StarterCpTm:  r.ID,
-		CostItemFlag: 0,
-	}, 0
+	return result, 0
 }