diff --git a/Assets/Src/Core/Resource/AssetsMgr.cs b/Assets/Src/Core/Resource/AssetsMgr.cs index f9918b211..2adc80f7d 100644 --- a/Assets/Src/Core/Resource/AssetsMgr.cs +++ b/Assets/Src/Core/Resource/AssetsMgr.cs @@ -1306,10 +1306,11 @@ public class AssetsMgr : SingletonMono } //Sprite sp = UnityEditor.AssetDatabase.LoadAssetAtPath(path); + var currAssetName = assetName[i]; Addressables.LoadAssetAsync(path).Completed += handle => { + assetDict[currAssetName] = handle.Result; loadCount++; - assetDict[assetName[i]] = handle.Result; }; } } @@ -1378,13 +1379,14 @@ public class AssetsMgr : SingletonMono path = string.Format("{0}", assetName[i]); Debug.Log($"TextAsset: Load, {path}"); + var currAssetName = assetName[i]; Addressables.LoadAssetAsync(path).Completed += handle => { Debug.Log($"TextAsset: Load Finish, {handle.Result.name}"); if (handle.Result != null) { loadCount++; - assetDict[assetName[i]] = handle.Result; + assetDict[currAssetName] = handle.Result; } else { diff --git a/Assets/Src/GameLogic/Battle/FighterManager/BattlePrepareManager.cs b/Assets/Src/GameLogic/Battle/FighterManager/BattlePrepareManager.cs index 254871851..836c6b3d1 100644 --- a/Assets/Src/GameLogic/Battle/FighterManager/BattlePrepareManager.cs +++ b/Assets/Src/GameLogic/Battle/FighterManager/BattlePrepareManager.cs @@ -79,9 +79,15 @@ public class BattlePrepareManager : Singleton return mEffectDataCache[id]; } + void DisablePreLoad() + { + mPrecacheAssets.Clear(); + } public void StartLoad() { + DisablePreLoad(); + foreach (var p in mPrecacheAssets) { if(p.Value.Count > 0)