Merge branch 'develop' into hotfix/skilltable

# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/MiniMap/CDlgMiniMap.cs
This commit is contained in:
vuong dinh hoang
2026-05-31 18:02:20 +07:00
2 changed files with 1 additions and 10 deletions
@@ -53,12 +53,6 @@ namespace BrewMonster.Scripts
return _initializationTcs.Task;
}
protected override void Awake()
{
Debug.Log($"[Cuong] AddressableManager: Awake | id={GetInstanceID()} frame={Time.frameCount}");
base.Awake();
}
protected override void Initialize()
{
base.Initialize();
@@ -69,19 +63,16 @@ namespace BrewMonster.Scripts
async UniTaskVoid StartAddressablesInitAsync()
{
Debug.Log("[Cuong] AddressableManager: Đang InitializeAsync Addressables...");
try
{
await AddressablesInitService.EnsureInitializedAsync();
_isInitialized = true;
_initializationTcs.TrySetResult();
BMLogger.Log("AddressableManager: Initialized");
Debug.Log("[Cuong] AddressableManager: InitializeAsync xong — sẵn sàng load asset.");
}
catch (Exception e)
{
BMLogger.LogError($"AddressableManager: Failed to initialize: {e.Message}");
Debug.LogError($"[Cuong] AddressableManager: InitializeAsync thất bại — {e.Message}");
}
}
@@ -190,7 +190,7 @@ namespace PerfectWorld.UI.MiniMap
if (_txtSystemTime != null)
_txtSystemTime.text = strText;
// BMLogger.Log($"[Cuong] {strText}");
//Todo: [Cuong] Show time
}
/// <summary>