From ce03f2d38a4dcd25c82e17f64a6a00eb131bc077 Mon Sep 17 00:00:00 2001 From: NguyenVanDat Date: Mon, 5 Jan 2026 11:31:22 +0700 Subject: [PATCH] update process bar --- .../Prefab/UI/General/Win_Prgs2.prefab | 8 ++++---- Assets/PerfectWorld/Scripts/UI/Dialogs/DlgHost.cs | 14 ++++++++++++-- .../Scripts/UI/Dialogs/DlgWinPrgs2.cs | 5 +++++ Assets/Scripts/CECHostPlayer.cs | 15 ++++++++++++++- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/Assets/PerfectWorld/Prefab/UI/General/Win_Prgs2.prefab b/Assets/PerfectWorld/Prefab/UI/General/Win_Prgs2.prefab index 1cd9988bc4..19be8c7eb5 100644 --- a/Assets/PerfectWorld/Prefab/UI/General/Win_Prgs2.prefab +++ b/Assets/PerfectWorld/Prefab/UI/General/Win_Prgs2.prefab @@ -33,8 +33,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchoredPosition: {x: -0.17520142, y: 0} + m_SizeDelta: {x: -10.3504, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &977375840943150650 GameObject: @@ -271,7 +271,7 @@ RectTransform: m_Father: {fileID: 2000867345168672731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -535,7 +535,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0 + m_Value: 1 m_OnValueChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgHost.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgHost.cs index ef364fe45f..9d4bea2ab4 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgHost.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgHost.cs @@ -96,7 +96,6 @@ namespace BrewMonster.UI CECCounter counter = _pHost.GetGatherCnt(); if (_pHost.IsGathering()) { - Debug.LogError($"Counter: {counter.GetCounter()}"); int nCur = (int)counter.GetCounter(); int nMax = Mathf.Max((int)counter.GetPeriod(), 1); @@ -107,14 +106,25 @@ namespace BrewMonster.UI // PAUILABEL pLabel = (PAUILABEL)pDlg.GetDlgItem("1"); var percent = AUIPROGRESS_MAX * nCur / nMax; - _dlgWinPrgs.SetProgressAndText(percent,$"{percent}%"); + _dlgWinPrgs.SetProgressAndText(percent*1.0f/100.0f,$"{percent}%"); // pLabel.SetText(percent); // pProgress.SetProgress(AUIPROGRESS_MAX * nCur / nMax); + if (percent >= 100) + { + _dlgWinPrgs.SetActiveProgress(false); + } + else + { + _dlgWinPrgs.SetActiveProgress(true); + } } else { if (_dlgWinPrgs.IsShow()) + { _dlgWinPrgs.Show(false); + _dlgWinPrgs.SetActiveProgress(false); + } } return _dlgWinPrgs.IsShow(); diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgWinPrgs2.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgWinPrgs2.cs index d610c727aa..7a587220a7 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgWinPrgs2.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgWinPrgs2.cs @@ -26,5 +26,10 @@ namespace BrewMonster.UI progressText.text = text; } } + + public void SetActiveProgress(bool active) + { + progressSlider.gameObject.SetActive(active); + } } } \ No newline at end of file diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index 4acd855964..9daafc48a7 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -5598,6 +5598,19 @@ namespace BrewMonster m_pWorkMan.FinishRunningWork(Host_work_ID.WORK_PICKUP); m_pWorkMan.FinishRunningWork(Host_work_ID.WORK_USEITEM); // StopMonsterSpiritConnectGfx(); + var pDlg = EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().GetDialog("Win_Prgs2"); + if (pDlg == null) + { + BMLogger.LogError("Null Win_Prgs2"); + return; + } + + if (pDlg is not DlgWinPrgs2 dlgWinPrgs) + { + BMLogger.LogError("Can not cast Win_Prgs2"); + return; + } + dlgWinPrgs.SetActiveProgress(false); } else if (cmd == CommandID.MINE_GATHERED) { @@ -5660,7 +5673,7 @@ namespace BrewMonster // it->second.Update(iRealTime); // Gather time counter - if (m_GatherCnt.IncCounter(Time.deltaTime)) + if (m_GatherCnt.IncCounter(Time.realtimeSinceStartup)) m_GatherCnt.Reset(true); // Debug.LogError("Gather counter: "+m_GatherCnt.GetCounter());