Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
This commit is contained in:
@@ -192,7 +192,7 @@ namespace BrewMonster.Scripts
|
||||
{
|
||||
if (handle.IsValid())
|
||||
{
|
||||
Addressables.Release(handle);
|
||||
Addressables.Release(handle);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ namespace BrewMonster
|
||||
|
||||
void OnDestroy()
|
||||
{
|
||||
BMLogger.Log("AutoInitializer: OnDestroy called, disposing auto initializers");
|
||||
foreach (var autoInitializer in _autoInitializers)
|
||||
{
|
||||
autoInitializer.Dispose();
|
||||
|
||||
@@ -42,10 +42,10 @@ namespace BrewMonster.PerfectWorld.Scripts.Vfx
|
||||
}
|
||||
private void OnDestroy()
|
||||
{
|
||||
if(!string.IsNullOrEmpty(_vfxPath))
|
||||
{
|
||||
AddressableManager.Instance.ReleaseAsset(_vfxPath);
|
||||
}
|
||||
//if(!string.IsNullOrEmpty(_vfxPath))
|
||||
//{
|
||||
// AddressableManager.Instance.ReleaseAsset(_vfxPath);
|
||||
//}
|
||||
}
|
||||
|
||||
private void Update()
|
||||
|
||||
@@ -79,21 +79,6 @@ public class LitModelHolder : MonoSingleton<LitModelHolder>
|
||||
_cts.Cancel();
|
||||
_cts.Dispose();
|
||||
}
|
||||
|
||||
if (addressableObjects == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// go through candidate list and loaded list, unload all objects in those lists.
|
||||
foreach (var kvp in _candidatesForLoading)
|
||||
{
|
||||
kvp.Key.UnloadAsset();
|
||||
}
|
||||
foreach (var obj in _loadedObjects)
|
||||
{
|
||||
obj.UnloadAsset();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
@@ -107,11 +107,6 @@ public partial class CECGameRun
|
||||
private static void Dispose()
|
||||
{
|
||||
instance = null;
|
||||
AddressableManager.Instance.ReleaseAsset(AddressResourceConfig.PlayerPrefab);
|
||||
AddressableManager.Instance.ReleaseAsset(AddressResourceConfig.MonsterPrefab);
|
||||
AddressableManager.Instance.ReleaseAsset(AddressResourceConfig.NpcServerPrefab);
|
||||
//AddressableManager.Instance.ReleaseAsset(AddressResourceConfig.PetServerPrefab);
|
||||
//AddressableManager.Instance.ReleaseAsset(AddressResourceConfig.PetMountServerPrefab);
|
||||
}
|
||||
|
||||
private void LoadPrefabs()
|
||||
|
||||
Reference in New Issue
Block a user