From 725b7b2374f43582a2d78b2cae3f8303359651b8 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 10 十一月 2025 14:30:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Equip/EquipModel.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 8828597..4b8f35d 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -11,7 +11,7 @@
public const int TotleEquip = 12; //瑁呭鏍忓ぇ灏�
public bool waitEquipOPPack = false; // 绌挎埓瑁呭鐨勬搷浣� 涓嶅惈鍒嗚В
public event Action<bool, int> OnEquipOPResultAction; //鏄惁鎹笂浜嗘柊瑁呭涓斿垎瑙ｄ簡 瑁呭绱㈠紩
- public event Action<List<int>, RectTransform> OnItemDropEvent;
+ public event Action<BattleDrops> OnItemDropEvent;
//鐢ㄤ簬椋樺姩閫昏緫
// public Dictionary<int, EquipOnFloorInfo> equipFloorInfo = new Dictionary<int, EquipOnFloorInfo>(); //鐪熷疄鑳屽寘鐨勭储寮曪紝瀵瑰簲鍦版澘瑁呭鐨勪俊鎭�
@@ -98,9 +98,9 @@
if (!string.IsNullOrEmpty(guid))
return;
- lastDropIndexs = drops.dropItemPackIndex;
+ // lastDropIndexs = drops.dropItemPackIndex;
// Debug.Log("-鎺夎惤瑁呭 " + lastDropIndexs.Count + " 涓�" + JsonMapper.ToJson(lastDropIndexs));
- NotifyItemDrop(drops.dropItemPackIndex, drops.rectTransform);
+ NotifyItemDrop(drops);
action?.Invoke();
}
@@ -140,7 +140,7 @@
//鎺夎惤閫氱煡
- public void NotifyItemDrop(List<int> indexs, RectTransform rect)
+ public void NotifyItemDrop(BattleDrops drops)//(List<int> indexs, RectTransform rect)
{
// 鐣岄潰涓嶆樉绀哄垯绔嬪嵆澶勭悊
// if (!UIManager.Instance.IsOpened<HomeWin>())
@@ -154,7 +154,7 @@
// {
// OnItemDropEvent?.Invoke(indexs, rect);
// }
- OnItemDropEvent?.Invoke(indexs, rect);
+ OnItemDropEvent?.Invoke(drops);
}
public void CalcFloorEquip(int itemIndex)
--
Gitblit v1.8.0