From 4605f58f84e1592e0cc494d7ffc275e2a0e64291 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 27 一月 2026 15:59:20 +0800
Subject: [PATCH] 419 【内政】命格系统
---
Main/System/Mingge/MinggeWin.cs | 11 +++++++++++
Main/System/Mingge/MinggeEquipChangeCell.cs | 14 +++++++++++---
Main/System/Mingge/MinggeManager.cs | 27 ++++++++++++++-------------
3 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/Main/System/Mingge/MinggeEquipChangeCell.cs b/Main/System/Mingge/MinggeEquipChangeCell.cs
index 9fa88de..f19585f 100644
--- a/Main/System/Mingge/MinggeEquipChangeCell.cs
+++ b/Main/System/Mingge/MinggeEquipChangeCell.cs
@@ -152,9 +152,9 @@
}
else
{
- var dict = MinggeManager.Instance.GetMinggeSkillTypeIDDict();
+ var dict = MinggeManager.Instance.GetMinggeSkillCountDictByPresetID(selectMinggePresetID);
//濡傛灉鏄棫瑁呭 鏄剧ず褰撳墠鏁伴噺锛涙柊瑁呭涓嶅悓鎶�鑳芥暟閲�+1锛屽悓鎶�鑳戒笉鍙�
- var hasCnt = dict.ContainsKey(skillID) ? dict[skillID].Count : 0;
+ var hasCnt = dict.ContainsKey(skillID) ? dict[skillID] : 0;
var oldSkillID = isNewEquip && oldEquip != null ? EquipModel.Instance.GetEquipSkillID(oldEquip) : 0;
var showCnt = isNewEquip ? (oldSkillID == skillID ? hasCnt : hasCnt + 1) : hasCnt;
@@ -222,7 +222,15 @@
}
else
{
- MinggeManager.Instance.SendDecompose(new byte[] { (byte)MinggeManager.Instance.selectFloorEquip.gridIndex });
+ var item = PackManager.Instance.GetItemByIndex(PackType.MinggeDrop, MinggeManager.Instance.selectFloorEquip.gridIndex);
+ if (item != null)
+ {
+ MinggeManager.Instance.SendDecompose(new byte[] { (byte)MinggeManager.Instance.selectFloorEquip.gridIndex });
+ }
+ else
+ {
+ Debug.LogError("鍛芥牸鎺夎惤鐗╁搧宸茶鍒犻櫎" + MinggeManager.Instance.selectFloorEquip.gridIndex);
+ }
}
}
diff --git a/Main/System/Mingge/MinggeManager.cs b/Main/System/Mingge/MinggeManager.cs
index fdf0dd7..584eddd 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>())
@@ -235,19 +236,19 @@
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))
- {
- return;
- }
+ // if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, count, 2))
+ // {
+ // return;
+ // }
waitTYOPPack = true;
var pack = new CB250_tagCSMinggeTuiyan();
diff --git a/Main/System/Mingge/MinggeWin.cs b/Main/System/Mingge/MinggeWin.cs
index fa6dcf3..2308b3d 100644
--- a/Main/System/Mingge/MinggeWin.cs
+++ b/Main/System/Mingge/MinggeWin.cs
@@ -214,6 +214,17 @@
{
return;
}
+
+ if (MinggeManager.Instance.waitTYOPPack)
+ {
+ return;
+ }
+
+ if (!ItemLogicUtility.CheckItemCount(PackType.Item, MinggeManager.Instance.tyItemID, 1, 2))
+ {
+ return;
+ }
+
tyEffect.onComplete += () =>
{
MinggeManager.Instance.SendTY(1);
--
Gitblit v1.8.0