From e2bfab5131de22827e8172ecebc87533efe83410 Mon Sep 17 00:00:00 2001
From: xinian <eBCmZThyqEBRX6cZZseEVK+xinian@noreply.cnb.cool>
Date: Thu, 26 Feb 2026 11:44:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A0=E7=89=A9?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=89=A9=E5=93=81=E6=B6=88=E8=80=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9B=BEBoss?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复宠物融合功能中物品消耗逻辑错误，从批量更新改为逐个更新物品
移除地图玩家列表获取中多余的MapBoss信息发送条件判断
---
 logic/controller/map.go        | 5 +----
 logic/controller/pet_fusion.go | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

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,