From f0b890b7016eee953c3ca300b24fa1b2582db615 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 29 一月 2026 17:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/MainWin.cs | 15 ++++++-
Main/System/Mingge/MinggeEquipWin.cs | 6 +--
Main/System/Mingge/MinggeManager.cs | 53 +++++++++++++++++---------
3 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 130b27a..5ebb182 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -61,6 +61,7 @@
RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
+ RedpointCenter.Instance.redpointValueChangeEvent += OnRedpointValueChangeEvent;
var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
gameTip.SetActive(false);
if (xbInfo != null && xbInfo.treasureCount < GeneralDefine.herocall10TipLimit)
@@ -84,6 +85,7 @@
GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
+ RedpointCenter.Instance.redpointValueChangeEvent -= OnRedpointValueChangeEvent;
base.OnPreClose();
isForcePlayFightUIAnim = true;
@@ -94,6 +96,16 @@
Display();
}
+ void OnRedpointValueChangeEvent(int id)
+ {
+ if (id == (MainRedDot.RedPoint_Mingge * 10 + 4))
+ {
+ mgTip.SetActive(MinggeManager.Instance.redpointAuto.state != RedPointState.None);
+ }
+ }
+
+
+ //鐢ㄤ簬10杩炴彁绀猴紝娌℃湁10杩炰細鍙栨秷鏃堕棿浜嬩欢濮旀墭
void OnFiveSecondEvent()
{
if (HappyXBModel.Instance.bestXB10Red.state != RedPointState.None)
@@ -109,8 +121,7 @@
GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
}
}
-
- mgTip.SetActive(MinggeManager.Instance.isPauseAuto);
+
}
void DisplayTopBar()
diff --git a/Main/System/Mingge/MinggeEquipWin.cs b/Main/System/Mingge/MinggeEquipWin.cs
index cde2892..ee0e183 100644
--- a/Main/System/Mingge/MinggeEquipWin.cs
+++ b/Main/System/Mingge/MinggeEquipWin.cs
@@ -33,10 +33,7 @@
selectPresetID = MinggeManager.Instance.equipShowPresetID;
// lastDropIndex = MinggeManager.Instance.selectFloorEquip.gridIndex;
// PackManager.Instance.RefreshItemEvent += RefreshItemEvent;
- if (MinggeManager.Instance.isStartAuto)
- {
- MinggeManager.Instance.isPauseAuto = true;
- }
+
Display();
}
@@ -49,6 +46,7 @@
if (!UIManager.Instance.IsOpened<MinggeAutoSetWin>())
{
+ //灏嗘彁绀虹殑鍐掓场鍜岀孩鐐瑰彇娑�
MinggeManager.Instance.isPauseAuto = false;
}
MinggeManager.Instance.redpointAuto.state = RedPointState.None;
diff --git a/Main/System/Mingge/MinggeManager.cs b/Main/System/Mingge/MinggeManager.cs
index 0d97c79..c48f44e 100644
--- a/Main/System/Mingge/MinggeManager.cs
+++ b/Main/System/Mingge/MinggeManager.cs
@@ -480,7 +480,22 @@
LocalSave.SetBool($"MGCost_{PlayerDatas.Instance.baseData.PlayerID}", value);
}
}
+
+ //鍕鹃�夊悗灞曠ず鐢ㄧ殑
public int autoCostCount
+ {
+ get
+ {
+ return LocalSave.GetInt($"MGCostCnt_{PlayerDatas.Instance.baseData.PlayerID}", 1);
+ }
+ set
+ {
+ LocalSave.SetInt($"MGCostCnt_{PlayerDatas.Instance.baseData.PlayerID}", value);
+ }
+ }
+
+ //瀹為檯娑堣�楃敤鐨� 涓嶅嬀閫夌殑鏃跺�欓粯璁よ繑鍥�1
+ public int useAutoCostCnt
{
get
{
@@ -488,12 +503,9 @@
{
return 1;
}
- return LocalSave.GetInt($"MGCostCnt_{PlayerDatas.Instance.baseData.PlayerID}", 1);
+ return autoCostCount;
}
- set
- {
- LocalSave.SetInt($"MGCostCnt_{PlayerDatas.Instance.baseData.PlayerID}", value);
- }
+
}
public bool autoSpeedUP
{
@@ -595,7 +607,7 @@
}
- if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, autoCostCount, 2))
+ if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, useAutoCostCnt, 2))
{
isStartAuto = false;
return;
@@ -819,14 +831,14 @@
return;
}
- if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, autoCostCount, 1))
+ if (!ItemLogicUtility.CheckItemCount(PackType.Item, tyItemID, useAutoCostCnt, 1))
{
isStartAuto = false;
SysNotifyMgr.Instance.ShowTip("MinggeAuto1");
return;
}
autoTYTime = Time.time;
- SendTY(autoCostCount);
+ SendTY(useAutoCostCnt);
}
@@ -845,20 +857,23 @@
{
if (!waitTYOPPack)
{
- //鏄剧ず鐗规晥
- var ui = UIManager.Instance.GetUI<MinggeWin>();
- if (!ui.tyEffect.isPlaying)
+ if (UIManager.Instance.IsOpened<MinggeWin>())
{
- ui.tyEffect.onComplete = null;
- if (autoSpeedUP)
+ //鏄剧ず鐗规晥
+ var ui = UIManager.Instance.GetUI<MinggeWin>();
+ if (!ui.tyEffect.isPlaying)
{
- ui.tyEffect.speedRate = autoTYCDs[0] / autoTYCDs[1];
+ ui.tyEffect.onComplete = null;
+ if (autoSpeedUP)
+ {
+ ui.tyEffect.speedRate = autoTYCDs[0] / autoTYCDs[1];
+ }
+ else
+ {
+ ui.tyEffect.speedRate = 1;
+ }
+ ui.tyEffect.Play();
}
- else
- {
- ui.tyEffect.speedRate = 1;
- }
- ui.tyEffect.Play();
}
}
--
Gitblit v1.8.0