From f22aaaf0f5a8ca6d9633d10f66d70e19a4a5e0e1 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 17 十月 2025 17:43:24 +0800
Subject: [PATCH] 0312 补充二级标签特效; 修复英雄招募切换账号跳过勾选没有变化问题
---
Main/Utility/TimeUtility.cs | 26 ++++++++++++++++++++++++++
Main/System/HeroUI/HeroPosWin.cs | 14 ++++++++++++++
Main/System/HappyXB/HeroCallWin.cs | 4 ++--
Main/System/HappyXB/HeroCallResultCell.cs | 4 ++--
Main/System/HappyXB/HeroCallResultWin.cs | 2 +-
5 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/Main/System/HappyXB/HeroCallResultCell.cs b/Main/System/HappyXB/HeroCallResultCell.cs
index 8c5d88e..8a58e8b 100644
--- a/Main/System/HappyXB/HeroCallResultCell.cs
+++ b/Main/System/HappyXB/HeroCallResultCell.cs
@@ -27,7 +27,7 @@
async UniTask DisplayAsync(int heroID, int index, bool isForceSkip=false)
{
this.transform.localScale = Vector3.zero;
- int delaytime = LocalSave.GetBool(HeroUIManager.skipKey, false) ? 50 * index : 100 * index;
+ int delaytime = LocalSave.GetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, false) ? 50 * index : 100 * index;
await UniTask.Delay(delaytime);
this.transform.localScale = Vector3.one;
@@ -38,7 +38,7 @@
var quality = heroConfig.Quality;
//鏄惁璺宠繃鍔ㄧ敾
- if (isForceSkip || LocalSave.GetBool(HeroUIManager.skipKey, false))
+ if (isForceSkip || LocalSave.GetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, false))
{
//绾㈣壊鐗规畩
if (!isForceSkip)
diff --git a/Main/System/HappyXB/HeroCallResultWin.cs b/Main/System/HappyXB/HeroCallResultWin.cs
index 609668b..db7ed8f 100644
--- a/Main/System/HappyXB/HeroCallResultWin.cs
+++ b/Main/System/HappyXB/HeroCallResultWin.cs
@@ -77,7 +77,7 @@
protected override void OnPreOpen()
{
- isSkip = LocalSave.GetBool(HeroUIManager.skipKey, false);
+ isSkip = LocalSave.GetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, false);
HappyXBModel.Instance.RefreshXBResultAct += UpdateState;
HappyXBModel.Instance.RefreshXBTypeInfoAct += RefreshBtn;
InitMoney();
diff --git a/Main/System/HappyXB/HeroCallWin.cs b/Main/System/HappyXB/HeroCallWin.cs
index 9459e2a..e1212dd 100644
--- a/Main/System/HappyXB/HeroCallWin.cs
+++ b/Main/System/HappyXB/HeroCallWin.cs
@@ -31,7 +31,7 @@
closeBtn.AddListener(CloseWindow);
skipToggle.AddListener((value) =>
{
- LocalSave.SetBool(HeroUIManager.skipKey, value);
+ LocalSave.SetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, value);
});
ownItemCell.itemID = TreasureSetConfig.Get((int)HappXBTitle.HeroCallAdvanced).CostItemID;
call1Btn.AddListener(SendHeroCall);
@@ -56,7 +56,7 @@
protected override void OnPreOpen()
{
HappyXBModel.Instance.RefreshXBTypeInfoAct += Refresh;
- skipToggle.isOn = LocalSave.GetBool(HeroUIManager.skipKey, false);
+ skipToggle.isOn = LocalSave.GetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, false);
Refresh();
}
diff --git a/Main/System/HeroUI/HeroPosWin.cs b/Main/System/HeroUI/HeroPosWin.cs
index d4c6359..884aa1f 100644
--- a/Main/System/HeroUI/HeroPosWin.cs
+++ b/Main/System/HeroUI/HeroPosWin.cs
@@ -115,6 +115,7 @@
heroListScroller.OnRefreshCell += OnRefreshCell;
HeroUIManager.Instance.OnTeamPosChangeEvent += TeamChangeEvent;
TeamManager.Instance.OnTeamChange += OnTeamChange;
+ SelectTiltleBtn();
CreateScroller();
Display();
}
@@ -129,6 +130,19 @@
}
+ void SelectTiltleBtn()
+ {
+ if (functionOrder == 0)
+ {
+ mainFBBtn.SelectBtn();
+ }
+ else if (functionOrder == 1)
+ {
+ jjcBtn.SelectBtn();
+ }
+ }
+
+
public void Display()
{
OnBattleTeamAttrPer();
diff --git a/Main/Utility/TimeUtility.cs b/Main/Utility/TimeUtility.cs
index 921fbb4..d1aa684 100644
--- a/Main/Utility/TimeUtility.cs
+++ b/Main/Utility/TimeUtility.cs
@@ -252,6 +252,30 @@
return StringUtility.Contact(hours.ToString("D2"), ":", mins.ToString("D2"), ":", seconds.ToString("D2"));
}
+ //璇︾粏鏄剧ず
+ //xx灏忔椂xx鍒哫X绉�
+ //xx鍒哫X绉�
+ //xx绉�
+ public static string SecondsToHMSEx(int _seconds)
+ {
+ int hours = _seconds % 86400 / 3600;
+ int mins = _seconds % 3600 / 60;
+ int seconds = _seconds % 60;
+ if (hours > 0)
+ {
+ return StringUtility.Contact(hours, Language.Get("L1072"), mins, Language.Get("L1073"), seconds, Language.Get("L1075"));
+ }
+ else if (mins > 0)
+ {
+ return StringUtility.Contact(mins, Language.Get("L1073"), seconds, Language.Get("L1075"));
+ }
+ else
+ {
+ return StringUtility.Contact(seconds, Language.Get("L1075"));
+ }
+ }
+
+
//渚嬪瓙锛涘垎锛氱
//xx:xx
public static string SecondsToMS(int _seconds)
@@ -387,6 +411,8 @@
}
return StringUtility.Contact(hours.ToString("D2"), ":", mins.ToString("D2"), ":", seconds.ToString("D2"));
}
+
+
//渚嬪瓙
//x澶�
//x鏃�
--
Gitblit v1.8.0