admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

``refactor(player): 统一将UseCoins方法重命名为GetCoins并优化宠物融合扣费逻辑``

Browse Source
This commit is contained in:
1
2026-01-03 13:53:38 +00:00
parent 3cce8738cf
commit 77baefef11
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
logic/controller/pet_fusion.go
View File

@@ -14,9 +14,10 @@ import (
)
func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result *pet.PetFusionInfo, err errorcode.ErrorCode) {
if !c.UseCoins(1000) {
if !c.GetCoins(1000) {
return result, errorcode.ErrorCodes.ErrSunDouInsufficient10016
}
c.Info.Coins -= 1000
// g.Dump(c.Info.PetList)
//防止同一只
@@ -49,6 +50,16 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
resid := int(service.NewPetFusionService().Data(Mcatchpetinfo.ID, Auxpetinfo.ID, Mcatchpetinfo.Level+Auxpetinfo.Level))
for _, v := range data.Item1 {
if c.Service.Item.CheakItem(v) == 0 {
return &pet.PetFusionInfo{}, 0
}
}
for _, v := range data.Item1 {
c.Service.Item.UPDATE(v, -1)
}
if resid == 0 {
_, ok := lo.Find(data.GoldItem1[:], func(item uint32) bool {
@@ -69,12 +80,6 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
return &pet.PetFusionInfo{}, 0
}
for _, v := range data.Item1 {
if c.Service.Item.CheakItem(v) == 0 {
return &pet.PetFusionInfo{}, 0
}
}
effect := int(service.NewPetFusionMaterialService().Data(data.Item1))
@@ -114,10 +119,7 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
c.PetDel(data.Auxcatchtime)
}
for _, v := range data.Item1 {
c.Service.Item.UPDATE(v, -1)
}
//todo材料扣除
return &pet.PetFusionInfo{
ObtainTime: r.CatchTime,