From ac93e899d5c6331e89ccae552ecbb502a9652d01 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 27 一月 2026 18:49:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Mingge/MinggeManager.cs | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/Main/System/Mingge/MinggeManager.cs b/Main/System/Mingge/MinggeManager.cs
index 361fbeb..02c1557 100644
--- a/Main/System/Mingge/MinggeManager.cs
+++ b/Main/System/Mingge/MinggeManager.cs
@@ -14,7 +14,7 @@
public int equipShowPresetID; // 鏄剧ず瑁呭鏃讹紝褰撳墠鐨勫瓙鏂规ID
public ItemModel selectFloorEquip;
- bool waitTYOPPack;
+ public bool waitTYOPPack;
public event Action<int> OnOPCallbackEvent;
public Dictionary<int, long> minggeAttrDict = new Dictionary<int, long>();
@@ -115,6 +115,7 @@
public bool CalcEquip()
{
var items = PackManager.Instance.GetItems(PackType.MinggeDrop);
+ Debug.Log("鍛芥牸鎺夎惤鑳屽寘涓殑鐗╁搧鏁伴噺锛�" + items.Count);
if (items.IsNullOrEmpty())
{
if (UIManager.Instance.IsOpened<MinggeEquipWin>())
@@ -146,10 +147,10 @@
}
- //鎰忓悜鎶�鑳絀D锛氥�恎uid..銆�
+ //鑾峰彇褰撳墠鍦ㄤ娇鐢ㄦ柟妗堢殑鎶�鑳戒俊鎭� 鎰忓悜鎶�鑳界被鍨婭D锛氥�愮墿鍝乬uid..銆�
public Dictionary<int, List<string>> GetMinggeSkillTypeIDDict()
{
- var presetID = FuncPresetManager.Instance.GetFuncPresetID((int)BattlePreSetType.Story, (int)FuncPresetType.Mingge);
+ var presetID = FuncPresetManager.Instance.GetFuncPresetIDByBattleType((int)BattlePreSetType.Story, (int)FuncPresetType.Mingge);
var startIndex = (presetID - 1) * TotleEquip;//瀵瑰簲鍗︾帀鑳屽寘绱㈠紩 = (濂楃紪鍙�-1)*12+瑁呭浣�-1
var dict = new Dictionary<int, List<string>>();
@@ -170,6 +171,7 @@
return dict;
}
+ //鑾峰彇鎸囧畾鏂规鐨勬妧鑳戒俊鎭� 鎰忓悜鎶�鑳界被鍨婭D锛氭暟閲�
public Dictionary<int, int> GetMinggeSkillCountDictByPresetID(int presetID)
{
var startIndex = (presetID - 1) * TotleEquip;//瀵瑰簲鍗︾帀鑳屽寘绱㈠紩 = (濂楃紪鍙�-1)*12+瑁呭浣�-1
@@ -204,15 +206,11 @@
return false;
}
- if (UIManager.Instance.IsOpened<MinggeEquipWin>())
- {
- return false;
- }
//鑷姩澶勭悊锛� 鍒ゆ柇鍒嗚В 鍜屾垬鍔涢珮浣� 鍜屽喅瀹氭槸鍝釜鏂规涓嬬殑瑁呭瀵规瘮
//闈炶嚜鍔ㄦ儏鍐典笅锛岄粯璁ゅ綋鍓嶆柟妗�
- equipShowPresetID = FuncPresetManager.Instance.GetFuncPresetID((int)BattlePreSetType.Story, (int)FuncPresetType.Mingge);
+ equipShowPresetID = FuncPresetManager.Instance.GetFuncPresetIDByBattleType((int)BattlePreSetType.Story, (int)FuncPresetType.Mingge);
selectFloorEquip = equip;
if (UIManager.Instance.IsOpened<MinggeWin>())
{
@@ -221,7 +219,10 @@
Debug.LogError($"閰嶇疆閿欒鐗╁搧 {selectFloorEquip.itemId} 瑁呭浣嶄负0");
return true;
}
- UIManager.Instance.OpenWindow<MinggeEquipWin>();
+ if (!UIManager.Instance.IsOpened<MinggeEquipWin>())
+ {
+ UIManager.Instance.OpenWindow<MinggeEquipWin>();
+ }
}
return true;
@@ -234,16 +235,20 @@
public void SendTY(int count)
{
- if (CalcEquip())
- {
- return;
- }
- if (waitTYOPPack)
- {
- return;
- }
+ // if (CalcEquip())
+ // {
+ // return;
+ // }
+ // if (waitTYOPPack)
+ // {
+ // return;
+ // }
- if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, count, 2))
+ // if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, count, 2))
+ // {
+ // return;
+ // }
+ if (waitTYOPPack)
{
return;
}
@@ -276,7 +281,7 @@
{
minggeAttrDict.Clear(); //韬笂鍛芥牸灞炴�ч噸缃�
- var minggePresetID = FuncPresetManager.Instance.GetFuncPresetID((int)BattlePreSetType.Story, (int)FuncPresetType.Mingge);
+ var minggePresetID = FuncPresetManager.Instance.GetFuncPresetIDByBattleType((int)BattlePreSetType.Story, (int)FuncPresetType.Mingge);
var starIndex = (minggePresetID - 1) * TotleEquip;
for (int i = starIndex; i < starIndex + TotleEquip; i++)
--
Gitblit v1.8.0