From 92574856a636bad87c01d62fa87394c41f6ff5a2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 10 十二月 2025 23:09:45 +0800
Subject: [PATCH] 0312 新加载进度条; 战斗开始战锤还原第一个武将头像
---
Main/System/Battle/BattleField/BattleField.cs | 2 +
Main/System/Launch/LoadingWin.cs | 8 ++--
Main/Common/EventName.cs | 2
Main/System/Launch/LaunchWin.cs | 38 +++++++++---------
Main/System/Main/MainWin.cs | 19 +++++++++
5 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/Main/Common/EventName.cs b/Main/Common/EventName.cs
index 6c9ab2d..f6a6170 100644
--- a/Main/Common/EventName.cs
+++ b/Main/Common/EventName.cs
@@ -13,7 +13,7 @@
public const string BATTLE_DROP_ITEMS = "BATTLE_DROP_ITEMS";//鎺夎惤鐗╁搧
public const string BATTLE_CAST_SKILL = "BATTLE_CAST_SKILL";//鏂芥斁鎶�鑳�
-
+ public const string BATTLE_START = "BATTLE_START";//鎴樻枟鍒濆鍖�
public const string BATTLE_END = "BATTLE_END";//鎴樻枟缁撴潫
public const string RECORDPLAYER_END = "RECORDPLAYER_END"; //鎴樻枟灏忕墖娈电粨鏉�
diff --git a/Main/System/Battle/BattleField/BattleField.cs b/Main/System/Battle/BattleField/BattleField.cs
index 88a7499..a8e29a4 100644
--- a/Main/System/Battle/BattleField/BattleField.cs
+++ b/Main/System/Battle/BattleField/BattleField.cs
@@ -185,6 +185,8 @@
battleHpRecorder.Add(guid, battleHpRecord);
}
#endif
+
+ EventBroadcast.Instance.Broadcast<string>(EventName.BATTLE_START, guid);
}
private void PreloadResources(List<TeamBase> redTeamList, List<TeamBase> blueTeamList)
diff --git a/Main/System/Launch/LaunchWin.cs b/Main/System/Launch/LaunchWin.cs
index 0476ddb..8294b57 100644
--- a/Main/System/Launch/LaunchWin.cs
+++ b/Main/System/Launch/LaunchWin.cs
@@ -17,8 +17,8 @@
// [SerializeField] Image m_BackGround;
[SerializeField] RectTransform m_AndroidProgressContainer;
[SerializeField] RectTransform m_NetworkContainer;
- [SerializeField] SmoothSlider m_PartProgressSlider;
- [SerializeField] SmoothSlider m_TotalProgressSlider;
+ // [SerializeField] SmoothSlider m_PartProgressSlider;
+ [SerializeField] Slider m_TotalProgressSlider;
[SerializeField] Text m_StageDescription;
[SerializeField] RectTransform m_IosProgressContainer;
[SerializeField] Text m_IosProgressTip;
@@ -72,7 +72,7 @@
backGroundIndex = 0;
if (m_TotalProgressSlider != null)
{
- m_TotalProgressSlider.ResetValue(0f);
+ m_TotalProgressSlider.value = 0f;
}
// m_AlphaTween.SetStartState();
@@ -117,10 +117,10 @@
UpdateProgress();
- if (m_TotalProgressSlider == null)
- {
- m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);
- }
+ // if (m_TotalProgressSlider == null)
+ // {
+ // m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);
+ // }
}
protected override void OnOpen()
@@ -220,10 +220,10 @@
if (progressInfo.stage == LaunchStage.DownLoad)
{
- if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)
- {
- m_PartProgressSlider.SetActive(false);
- }
+ // if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)
+ // {
+ // m_PartProgressSlider.SetActive(false);
+ // }
if (m_TotalProgressSlider != null && m_TotalProgressSlider.gameObject.activeInHierarchy)
{
@@ -232,10 +232,10 @@
}
else
{
- if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)
- {
- m_PartProgressSlider.SetActive(true);
- }
+ // if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)
+ // {
+ // m_PartProgressSlider.SetActive(true);
+ // }
if (m_TotalProgressSlider != null && !m_TotalProgressSlider.gameObject.activeInHierarchy)
{
@@ -247,10 +247,10 @@
m_TotalProgressSlider.value = progressInfo.totalProgress;
}
- if (m_PartProgressSlider != null)
- {
- m_PartProgressSlider.value = progressInfo.partProgress;
- }
+ // if (m_PartProgressSlider != null)
+ // {
+ // m_PartProgressSlider.value = progressInfo.partProgress;
+ // }
}
DisplayStageDescription(progressInfo.stage, progressInfo.step);
diff --git a/Main/System/Launch/LoadingWin.cs b/Main/System/Launch/LoadingWin.cs
index 6453dba..07c41b9 100644
--- a/Main/System/Launch/LoadingWin.cs
+++ b/Main/System/Launch/LoadingWin.cs
@@ -11,8 +11,8 @@
// [SerializeField] UIAlphaTween m_AlphaTween;
[SerializeField] RawImage m_BackGround;
- [SerializeField] SmoothSlider m_PartProgressSlider;
- [SerializeField] SmoothSlider m_TotalProgressSlider;
+ // [SerializeField] SmoothSlider m_PartProgressSlider;
+ [SerializeField] Slider m_TotalProgressSlider;
[SerializeField] Text m_StageDescription;
[SerializeField] Text m_Version;
// [SerializeField] Button m_UserHelp;
@@ -92,12 +92,12 @@
{
currentProgress = (int)Mathf.Lerp(currentProgress, targetProgress, 0.1f);
m_TotalProgressSlider.value = currentProgress / 100f;
- m_PartProgressSlider.value = currentProgress / 100f;
+ // m_PartProgressSlider.value = currentProgress / 100f;
}
else
{
m_TotalProgressSlider.value = currentProgress / 100f;
- m_PartProgressSlider.value = currentProgress / 100f;
+ // m_PartProgressSlider.value = currentProgress / 100f;
}
CopiedLogic_UpdateProgress();
}
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 0ff99d4..cad55b9 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -58,6 +58,7 @@
RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
+ EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
base.OnPreOpen();
// 鍒锋柊UI
@@ -71,6 +72,7 @@
RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
UIManager.Instance.OnCloseWindow -= OnCloseWindow;
GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
+ EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
base.OnPreClose();
isForcePlayFightUIAnim = true;
@@ -345,7 +347,24 @@
}
}
+ void OnBattleStart(string guid)
+ {
+ if (string.IsNullOrEmpty(guid))
+ {
+ var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero("");
+ if (tmpHero != null)
+ {
+ AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
+ }
+ else
+ {
+ Debug.LogError("娌℃湁鎵惧埌涓嬩竴涓敾鍑绘灏�");
+ return;
+ }
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ }
+ }
void RefreshFightIng(bool isfighting = false)
{
--
Gitblit v1.8.0