From bdd6aa21fb17cd7785b3b875064f4347ed20b5ea Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 29 九月 2025 17:50:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Utility/ComponentExtersion.cs | 2 +-
Main/System/Main/HomeWin.cs | 8 +++++++-
Main/System/MainLevel/MainBossEnterWin.cs | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 6572837..fef4eaa 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -21,7 +21,7 @@
[SerializeField] Image awardIcon;
[SerializeField] Text awardCnt;
[SerializeField] UIEffectPlayer taskEffect;
-
+ [SerializeField] UIEffectPlayer lvUPEffect;
//鍏冲崱
[SerializeField] Button bossBtn;
@@ -157,6 +157,7 @@
UIManager.Instance.OpenWindow<MainBossEnterWin>();
}
+ int lastLV = 0;
void PlayerDataRefresh(PlayerDataType type)
{
switch (type)
@@ -166,6 +167,11 @@
ShowExp();
break;
case PlayerDataType.LV:
+ if (lastLV != PlayerDatas.Instance.baseData.LV)
+ {
+ lastLV = PlayerDatas.Instance.baseData.LV;
+ lvUPEffect.Play();
+ }
playerLevelText.text = PlayerDatas.Instance.baseData.LV.ToString();
break;
case PlayerDataType.ExAttr1:
diff --git a/Main/System/MainLevel/MainBossEnterWin.cs b/Main/System/MainLevel/MainBossEnterWin.cs
index 1b5962c..058acbf 100644
--- a/Main/System/MainLevel/MainBossEnterWin.cs
+++ b/Main/System/MainLevel/MainBossEnterWin.cs
@@ -22,6 +22,7 @@
[SerializeField] Button rankBtn;
[SerializeField] ItemCell[] passAwards;
[SerializeField] Button fightBtn;
+ [SerializeField] Image fightIcon;
[SerializeField] ScrollerController dropItemScroller;
@@ -108,6 +109,7 @@
var canChallengeBoss = AutoFightModel.Instance.CanChallengeBoss();
fightBtn.SetInteractable(canChallengeBoss);
+ fightIcon.SetActive(canChallengeBoss);
for (int i = 0; i < passAwards.Length; i++)
{
@@ -152,8 +154,8 @@
case PlayerDataType.ExAttr2:
var canChallengeBoss = AutoFightModel.Instance.CanChallengeBoss();
- fightBtn.interactable = canChallengeBoss;
- fightBtn.SetColorful(null, canChallengeBoss);
+ fightBtn.SetInteractable(canChallengeBoss);
+ fightIcon.SetActive(canChallengeBoss);
break;
}
diff --git a/Main/Utility/ComponentExtersion.cs b/Main/Utility/ComponentExtersion.cs
index 34ee978..46de825 100644
--- a/Main/Utility/ComponentExtersion.cs
+++ b/Main/Utility/ComponentExtersion.cs
@@ -278,7 +278,7 @@
if (!_interactable)
_btnText.text = UIHelper.AppendColor(TextColType.NavyGray, _btnText.text); //涓嶆敼鍙樼粍浠堕鑹诧紝鍙敼鍙樻樉绀洪鑹�
else
- _btnText.text = UIHelper.AppendColor(_btnText.color, _btnText.text);
+ _btnText.text = UIHelper.AppendColor(_btnText.color, UIHelper.RemoveColor(_btnText.text));
}
}
--
Gitblit v1.8.0