From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Main/AutoFightModel.cs | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/Main/System/Main/AutoFightModel.cs b/Main/System/Main/AutoFightModel.cs
index 203ec8a..acaf4e3 100644
--- a/Main/System/Main/AutoFightModel.cs
+++ b/Main/System/Main/AutoFightModel.cs
@@ -26,18 +26,22 @@
{
get
{
- int value = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoFight_Cost, 0);
- return Math.Min(Math.Max(value, 1), maxCost);
+ string value = QuickSetting.Instance.GetQuickSetting(QuickSettingType.AutoFight_Cost, 0);
+ // value 鏄�16杩涘埗杞暟瀛�
+ int result = Convert.ToInt32(string.IsNullOrEmpty(value) ? "1" : value, 16); // 16杩涘埗杞琲nt
+ return Math.Min(Math.Max(result, 1), maxCost);
}
set
{
- QuickSetting.Instance.SetQuickSetting(QuickSettingType.AutoFight_Cost, value);
+ //鏁板瓧value 杞�16杩涘埗
+ string hexValue = Convert.ToString(value, 16);
+ QuickSetting.Instance.SetQuickSetting(QuickSettingType.AutoFight_Cost, hexValue, 0);
}
}
//鑷姩妯″紡, 鐪熸鐐瑰嚮鎴橀敜娑堣�楀紑鍚紝鍜屼紤鎭紙鎴栨棤鏉愭枡锛夊仠姝�
public bool isPause = false; //濡傛墦BOSS鐨勬儏鍐碉紝鏆傚仠鑷姩鎴樻枟 鍚庣画鍙互琛ュ厖姣廥绉掓娴嬩笅鏄惁鏈夊紓甯�
-
+ public event Action AutoAttackEvent;
bool m_IsAutoAttack = false;
public bool isAutoAttack
{
@@ -51,6 +55,7 @@
return;
m_IsAutoAttack = value;
Debug.Log("isAutoAttack:" + m_IsAutoAttack);
+ AutoAttackEvent?.Invoke();
}
}
@@ -110,7 +115,7 @@
}
}
}
-
+
bool m_IsAutoExchangeDecomposeOld = false;
public bool isAutoExchangeDecomposeOld //鏄惁鏇挎崲鍚庤嚜鍔ㄥ垎瑙ｅ師瑁呭
{
@@ -131,7 +136,6 @@
}
- public event Action<bool> OnAutoChallengeBossEvent;
//鑷姩鎸戞垬棣栭
public bool isAutoChallengeBoss
{
@@ -142,7 +146,6 @@
set
{
QuickSetting.Instance.SetQuickSetting(QuickSettingType.AutoFight_ChallengeBoss, value);
- OnAutoChallengeBossEvent?.Invoke(value);
}
}
@@ -264,6 +267,7 @@
{
nowChallengeCount = 0;
isAutoExchangeDecomposeOld = true;
+ CheckAndResetExpiredCardSettings();
}
Dictionary<string, int> winWaitCloseDict = new Dictionary<string, int>();
@@ -381,7 +385,7 @@
long showFightPower = FightPowerManager.Instance.GetFightPowerChange(item);
- if (showFightPower < 0)
+ if (showFightPower <= 0)
{
EquipModel.Instance.SendEquipOP(new ushort[] { (ushort)item.gridIndex }, 1);
return true;
@@ -571,10 +575,41 @@
UpdateRedpint();
}
+ /// <summary>
+ /// 妫�鏌ュ苟閲嶇疆鏈堝崱杩囨湡鍚庣殑鐗规潈璁剧疆
+ /// </summary>
+ void CheckAndResetExpiredCardSettings()
+ {
+ // 鏈堝崱杩囨湡鏃堕噸缃�熷害鍜岄噸璇曟鏁�
+ if (!InvestModel.Instance.IsInvested(InvestModel.monthCardType))
+ {
+ // 濡傛灉褰撳墠閫熷害鏄湀鍗′笓灞炵殑3鍊嶉�燂紝閲嶇疆涓�1鍊嶉��
+ // 鐩存帴鎿嶄綔QuickSetting锛岀粫杩噑toryBattleField鍙兘涓簄ull鐨勯棶棰�
+ int savedSpeed = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoFight_Speed, 0);
+ if (savedSpeed > 2)
+ {
+ QuickSetting.Instance.SetQuickSetting(QuickSettingType.AutoFight_Speed, 1);
+ if (BattleManager.Instance.storyBattleField != null)
+ {
+ BattleManager.Instance.storyBattleField.SetSpeedRatio(BattleManager.Instance.speedGear[0]);
+ }
+ }
+
+ // 濡傛灉褰撳墠閲嶈瘯娆℃暟瓒呰繃闈炴湀鍗￠檺鍒讹紝閲嶇疆涓�1
+ int savedTry = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoFight_TryChallengeCount, 0);
+ if (savedTry > 1)
+ {
+ QuickSetting.Instance.SetQuickSetting(QuickSettingType.AutoFight_TryChallengeCount, 1);
+ }
+ }
+ }
+
void OnInvestUpdate(int type)
{
if (type > 2)
return;
+
+ CheckAndResetExpiredCardSettings();
UpdateRedpint();
}
}
--
Gitblit v1.8.0