From d165af063d7365e143d92c3a950a0b52e683a66e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 23 一月 2026 15:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Equip/EquipModel.cs | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 10ca09d..f3c8966 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -190,18 +190,16 @@
//澶勭悊鎵�鏈夋帀钀界殑鐗╁搧
public void CalcAllFloorItems()
{
- int cnt = PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems().Count;
- if (cnt == 0)
- {
- Debug.Log("CalcAllFloorItems 娌℃湁鎺夎惤鐗╁搧");
+
+ var items = PackManager.Instance.GetItems(PackType.DropItem);
+ if (items.IsNullOrEmpty())
return;
- }
-
+ int cnt = items.Count;
needMoreDrop = cnt == 20;
//鏋勫缓鎵�鏈夌墿鍝�
- foreach (var item in PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems())
+ foreach (var item in items)
{
CalcFloorEquip(item.gridIndex);
}
@@ -475,7 +473,7 @@
return equip.GetUseData(23);
}
- //鎴樻枟灞炴�D鍒楄〃
+ //瑁呭鎴樻枟灞炴�D鍒楄〃, 濡傛灉鏄崷鐜夌殑璇濆熀纭�鍜屾垬鏂楅兘鏀句竴璧�
public List<int> GetEquipFightAttrs(ItemModel equip)
{
if (equip == null)
@@ -505,6 +503,17 @@
return equip.GetUseData(37);
}
+ public int GetEquipSkillID(ItemModel equip)
+ {
+ if (equip == null)
+ {
+ return 0;
+ }
+ var _list = equip.GetUseData(37);
+ return _list.IsNullOrEmpty() ? 0 : _list[0];
+ }
+
+
//寰楀埌瑁呭浣嶅搴旂殑閮ㄤ綅鍚嶇О
public string GetEquipPlaceName(int place)
{
--
Gitblit v1.8.0