From 917d82d3e814a82d8f58d5155723934c3c88b189 Mon Sep 17 00:00:00 2001
From: "Bob.Song" <bob.song@ingcreates.com>
Date: Wed, 24 Dec 2025 18:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/Game/Map/Entity/MapRoom.cs             |  2 +-
 Entity/Game/Map/Entity/MapUnitComponent.cs    |  5 ---
 Entity/Game/Map/Entity/MapUnitGear.cs         | 42 -------------------
 .../Handler/C2Map_TakeItemRequestHandler.cs   | 14 +++----
 Hotfix/Game/Map/System/MapUnitSystem.cs       | 13 ------
 Hotfix/Game/Player/Entity/PlayerSystem.cs     |  2 +
 6 files changed, 10 insertions(+), 68 deletions(-)
 delete mode 100644 Entity/Game/Map/Entity/MapUnitGear.cs

diff --git a/Entity/Game/Map/Entity/MapRoom.cs b/Entity/Game/Map/Entity/MapRoom.cs
index 88e2b0b..1d2408a 100644
--- a/Entity/Game/Map/Entity/MapRoom.cs
+++ b/Entity/Game/Map/Entity/MapRoom.cs
@@ -26,7 +26,7 @@ public class MapRoom : Entity
     /// 房间玩家
     /// </summary>
     public Dictionary<long, Player> Units = new Dictionary<long, Player>();
-
+    
     /// <summary>
     /// 房主
     /// </summary>
diff --git a/Entity/Game/Map/Entity/MapUnitComponent.cs b/Entity/Game/Map/Entity/MapUnitComponent.cs
index a8261ae..6ce6049 100644
--- a/Entity/Game/Map/Entity/MapUnitComponent.cs
+++ b/Entity/Game/Map/Entity/MapUnitComponent.cs
@@ -17,11 +17,6 @@ public class MapUnitComponent : Entity
     /// 旋转
     /// </summary>
     public float3 Rotation;
-
-    /// <summary>
-    /// 钓组信息
-    /// </summary>
-    public List<MapUnitGear> Gears = new List<MapUnitGear>();
     
     /// <summary>
     /// 房间Id
diff --git a/Entity/Game/Map/Entity/MapUnitGear.cs b/Entity/Game/Map/Entity/MapUnitGear.cs
deleted file mode 100644
index bcf7bfd..0000000
--- a/Entity/Game/Map/Entity/MapUnitGear.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Fantasy.Entitas;
-using Unity.Mathematics;
-
-namespace NB.Game;
-
-public enum MapGearState
-{
-    None = 0,
-    Take = 1,
-    Put = 2,
-}
-
-/// <summary>
-/// 钓组信息
-/// </summary>
-public class MapUnitGear : Entity
-{
-    /// <summary>
-    /// 杆子
-    /// </summary>
-    public long Item;
-
-    /// <summary>
-    /// 杆子配件
-    /// </summary>
-    public List<long> Rings = new List<long>();
-
-    /// <summary>
-    /// 杆子状态
-    /// </summary>
-    public MapGearState State;
-
-    /// <summary>
-    /// 位置
-    /// </summary>
-    public float3 Position;
-
-    /// <summary>
-    /// 旋转
-    /// </summary>
-    public float3 Rotation;
-}
\ No newline at end of file
diff --git a/Hotfix/Game/Map/Handler/C2Map_TakeItemRequestHandler.cs b/Hotfix/Game/Map/Handler/C2Map_TakeItemRequestHandler.cs
index 3c95820..bccfbcf 100644
--- a/Hotfix/Game/Map/Handler/C2Map_TakeItemRequestHandler.cs
+++ b/Hotfix/Game/Map/Handler/C2Map_TakeItemRequestHandler.cs
@@ -32,13 +32,13 @@ public class C2Map_TakeItemRequestHandler : RouteRPC<Player, C2Map_TakeItemReque
         var itemType = ItemHelper.GetType(item.ConfigId);
         if (itemType == ItemBasicType.Rod)
         {
-            itemContainer.Binding.TryGetValue(item.Id, out var itemRod);
-            //鱼竿
-            var itemGear = mapUnit.GetOrAddItemGear(item);
-            if (itemRod != null)
-            {
-                itemGear.Rings.AddRange(itemRod);
-            }
+            // itemContainer.Binding.TryGetValue(item.Id, out var itemRod);
+            // //鱼竿
+            // var itemGear = mapUnit.GetOrAddItemGear(item);
+            // if (itemRod != null)
+            // {
+            //     itemGear.Rings.AddRange(itemRod);
+            // }
         }
         
         
diff --git a/Hotfix/Game/Map/System/MapUnitSystem.cs b/Hotfix/Game/Map/System/MapUnitSystem.cs
index c165d83..f10bba7 100644
--- a/Hotfix/Game/Map/System/MapUnitSystem.cs
+++ b/Hotfix/Game/Map/System/MapUnitSystem.cs
@@ -5,19 +5,6 @@ namespace NB.Game;
 
 public static class MapUnitComponentSystem
 {
-    public static MapUnitGear GetOrAddItemGear(this MapUnitComponent self, Item item)
-    {
-        var mapItem = self.Gears.Find(t => t.Item == item.Id);
-        if (mapItem == null)
-        {
-            mapItem = new MapUnitGear();
-            mapItem.Item = item.Id;
-            self.Gears.Add(mapItem);
-        }
-
-        return mapItem;
-    }
-    
     public static List<GearInfo> ToMapUnitInfo(this MapUnitComponent self)
     {
         List<GearInfo> ret = new List<GearInfo>();
diff --git a/Hotfix/Game/Player/Entity/PlayerSystem.cs b/Hotfix/Game/Player/Entity/PlayerSystem.cs
index 3361666..44def76 100644
--- a/Hotfix/Game/Player/Entity/PlayerSystem.cs
+++ b/Hotfix/Game/Player/Entity/PlayerSystem.cs
@@ -82,6 +82,8 @@ public static class PlayerSystem
         ret.Rotation.x = mapUnit.Rotation.x;
         ret.Rotation.y = mapUnit.Rotation.y;
         ret.Rotation.z = mapUnit.Rotation.z;
+        
+        // ret.Gears
 
         return ret;
     }