diff --git a/logic/controller/map.go b/logic/controller/map.go index 30a00b7e4..6b3163342 100644 --- a/logic/controller/map.go +++ b/logic/controller/map.go @@ -68,10 +68,7 @@ func (h Controller) GetMapPlayerList(data *space.ListMapPlayerInboundInfo, c *pl if atomic.LoadUint32(&c.GetSpace().TimeBoss.Flag) == 1 { c.SendPackCmd(2022, &c.GetSpace().TimeBoss) } - if len(c.GetSpace().MapBossSInfo.INFO) > 0 { - c.SendPackCmd(2021, &c.GetSpace().MapBossSInfo) - - } + c.SendPackCmd(2021, &c.GetSpace().MapBossSInfo) return nil, -1 } diff --git a/logic/controller/pet_fusion.go b/logic/controller/pet_fusion.go index 1f07fa874..f2cfbf9d2 100644 --- a/logic/controller/pet_fusion.go +++ b/logic/controller/pet_fusion.go @@ -61,12 +61,12 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result if effect == 0 { return result, errorcode.ErrorCodes.ErrSpiritOrbNotExists } - c.Service.Item.UPDATEM(data.Item1[:], -1) + //c.Service.Item.UPDATEM(data.Item1[:], -1) - // for _, v := range data.Item1 { - // c.Service.Item.UPDATE(v, -1) + for _, v := range data.Item1 { + c.Service.Item.UPDATE(v, -1) - // } + } result = &pet.PetFusionInfo{ SoulID: 1000017,