From 69fdc58cb97714f856df268f08451f2ba7e5ecf2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 21 一月 2026 10:40:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Equip/EquipModel.cs |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index ab0c807..10ca09d 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -305,18 +305,20 @@
             Debug.LogWarning("绌挎埓瑁呭锛屽悜鏈嶅姟鍣ㄨ姹�");
         }
 
-        //鍦ㄨ褰曢攢姣佹垨鏇挎崲鍓嶇殑瑁呭
+        //璁板綍閿�姣佹垨鏇挎崲鍓嶇殑瑁呭
         if ((opType == 1 || opType == 2) && !itemIndexList.IsNullOrEmpty())
         {
             foreach (var index in itemIndexList)
             {
-                var oldEquip = PackManager.Instance.GetItemByIndex(PackType.Equip, index);
-                EquipRecordManager.Instance.oldEquipDic[index] = oldEquip;
+                ItemModel newEquip = PackManager.Instance.GetItemByIndex(PackType.DropItem, index);
+                if (newEquip == null)
+                    continue;
+                int equipPlace = newEquip.config.EquipPlace - 1;
+                ItemModel oldEquip = PackManager.Instance.GetItemByIndex(PackType.Equip, equipPlace);
+                EquipRecordManager.Instance.AddRecord(opType, newEquip, oldEquip);
             }
         }
-
         GameNetSystem.Instance.SendInfo(pack);
-
     }
 
     /// <summary>
@@ -493,6 +495,15 @@
         return equip.GetUseData(19);
     }
 
+    //鎶�鑳絀D鍒楄〃
+    public List<int> GetEquipSkillIDs(ItemModel equip)
+    {
+        if (equip == null)
+        {
+            return new List<int>();
+        }
+        return equip.GetUseData(37);
+    }
 
     //寰楀埌瑁呭浣嶅搴旂殑閮ㄤ綅鍚嶇О
     public string GetEquipPlaceName(int place)

--
Gitblit v1.8.0