From cb0d3169ed35fea4716f55ca6596ca88fb6884f0 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 26 十二月 2025 15:56:23 +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, 18 insertions(+), 3 deletions(-)

diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index ad0a9e9..142839b 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -186,18 +186,29 @@
         }
     }
 
+    bool needMoreDrop = false; //鐢变簬鎺夎惤鎸ゅ帇瀵艰嚧锛屾弧鎺夎惤鎺夎惤鑳屽寘鐨勬椂鍊欏鐞嗗悗鍐嶄富鍔ㄨ姹傛帀钀�
     //澶勭悊鎵�鏈夋帀钀界殑鐗╁搧
     public void CalcAllFloorItems()
     {
-        if (PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems().Count == 0)
+        int cnt = PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems().Count;
+        if (cnt == 0)
         {
             Debug.Log("CalcAllFloorItems 娌℃湁鎺夎惤鐗╁搧");
             return;
         }
+
+
+        needMoreDrop = cnt == 20;
+
         //鏋勫缓鎵�鏈夌墿鍝�
         foreach (var item in PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems())
         {
             CalcFloorEquip(item.gridIndex);
+        }
+        if (needMoreDrop)
+        {
+            SendEquipOP(null, 3);
+            needMoreDrop = false;
         }
     }
 
@@ -279,8 +290,11 @@
 
         // NoteFloorEquip(itemIndexList, opType);
         var pack = new CB415_tagCSMainDropItemOP();
-        pack.Count = (byte)itemIndexList.Length;
-        pack.IndexList = itemIndexList;
+        if (itemIndexList != null)
+        {
+            pack.Count = (byte)itemIndexList.Length;
+            pack.IndexList = itemIndexList;
+        }
         pack.OPType = opType;
         pack.OPValue = (byte)(autoDecompose ? 1 : 0); // 鏇挎崲鍚庢槸鍚﹁嚜鍔ㄥ垎瑙e師瑁呭锛�0鍚�1鏄�
 
@@ -291,6 +305,7 @@
             Debug.LogWarning("绌挎埓瑁呭锛屽悜鏈嶅姟鍣ㄨ姹�");
         }
         GameNetSystem.Instance.SendInfo(pack);
+
     }
 
     /// <summary>

--
Gitblit v1.8.0