``feat(item): 新增物品出售价格属性(SellPrice)并实现物品出售功能，优化宠物面板计算和时区判断逻辑``

logic/controller/pet_fusion.go

@@ -0,0 +1,74 @@
+package controller
+
+import (
+	"blazing/common/data/xmlres"
+	"blazing/common/socket/errorcode"
+	"blazing/logic/service/pet"
+	"blazing/logic/service/player"
+	"blazing/modules/blazing/model"
+	"blazing/modules/blazing/service"
+
+	"github.com/alpacahq/alpacadecimal"
+)
+
+func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result *pet.PetFusionInfo, err errorcode.ErrorCode) {
+	if !c.UseCoins(1000) {
+		return result, errorcode.ErrorCodes.ErrSystemBusy
+	}
+	// g.Dump(c.Info.PetList)
+
+	//防止同一只
+	if data.Mcatchtime == data.Auxcatchtime {
+		return result, errorcode.ErrorCodes.ErrPokemonNotFusionReady
+	}
+
+	_, Mcatchpetinfo, ok := c.FindPet(data.Mcatchtime)
+	if !ok {
+		return result, errorcode.ErrorCodes.ErrPokemonNotFusionReady2
+	}
+
+	if xmlres.PetMAP[int(Mcatchpetinfo.ID)].FuseMaster == 0 {
+		return result, errorcode.ErrorCodes.ErrPokemonNotFusionReady3
+	}
+	_, Auxpetinfo, ok := c.FindPet(data.Auxcatchtime)
+	if !ok {
+		return result, errorcode.ErrorCodes.ErrPokemonNotFusionReady2
+	}
+
+	if xmlres.PetMAP[int(Auxpetinfo.ID)].FuseSub == 0 {
+		return result, errorcode.ErrorCodes.ErrPokemonNotFusionReady3
+	}
+	//println(len(c.Info.PetList), data.Mcatchtime, data.Auxcatchtime, Mcatchpetinfo.CatchTime, Auxpetinfo.CatchTime)
+	///性格生成
+	var natureId int32 = -1
+	if Auxpetinfo.Nature == Mcatchpetinfo.Nature {
+		natureId = int32(Auxpetinfo.Nature)
+	}
+
+	resid := int(service.PetFusionServiceS.Data(Mcatchpetinfo.ID, Auxpetinfo.ID, Mcatchpetinfo.Level+Auxpetinfo.Level))
+
+	if resid == 0 {
+		//todo失败降低等级
+		return &pet.PetFusionInfo{}, 0
+	}
+
+	effect := int(service.PetFusionMaterialServiceIns.Data(data.Item1))
+	dv1 := alpacadecimal.NewFromInt(2).Div(alpacadecimal.NewFromInt(3)).Mul(alpacadecimal.NewFromInt(int64(Mcatchpetinfo.Dv)))
+	dv2 := alpacadecimal.NewFromInt(1).Div(alpacadecimal.NewFromInt(3)).Mul(alpacadecimal.NewFromInt(int64(Auxpetinfo.Dv)))
+	dv := dv1.Add(dv2).Add(alpacadecimal.NewFromInt(1)).IntPart()
+	r := model.GenPetInfo(resid, int(dv), int(natureId), effect, -1, 1)
+	r.OldCatchTime = Mcatchpetinfo.CatchTime
+	c.Service.Pet.PetAdd(r)
+	println(len(c.Info.PetList), data.Mcatchtime, data.Auxcatchtime, Mcatchpetinfo.CatchTime, Auxpetinfo.CatchTime)
+	c.Pet_del(data.Auxcatchtime)
+	c.Pet_del(data.Mcatchtime)
+	//fmt.Println(len(c.Info.PetList))
+	//	g.Dump(c.Info.PetList)
+	//todo材料扣除
+	return &pet.PetFusionInfo{
+		ObtainTime:   r.CatchTime,
+		SoulID:       1000017,
+		StarterCpTm:  r.ID,
+		CostItemFlag: 0,
+	}, 0
+}