upgraded to v3, ending maintenance of v2

Author: michael811125

Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/EditorWindow/BundleConfigGeneratorWindow.cs

@@ -25,7 +25,8 @@ public enum OperationType
         private static BundleConfigGeneratorWindow _instance = null;
         internal static BundleConfigGeneratorWindow GetInstance()
         {
-            if (_instance == null) _instance = GetWindow<BundleConfigGeneratorWindow>();
+            if (_instance == null)
+                _instance = GetWindow<BundleConfigGeneratorWindow>();
             return _instance;
         }
 

Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/EditorWindow/BundleCryptogramUtilityWindow.cs

@@ -14,7 +14,8 @@ public class BundleCryptogramUtilityWindow : EditorWindow
         private static BundleCryptogramUtilityWindow _instance = null;
         internal static BundleCryptogramUtilityWindow GetInstance()
         {
-            if (_instance == null) _instance = GetWindow<BundleCryptogramUtilityWindow>();
+            if (_instance == null)
+                _instance = GetWindow<BundleCryptogramUtilityWindow>();
             return _instance;
         }
 

Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/EditorWindow/BundleUrlConfigGeneratorWindow.cs

@@ -15,7 +15,8 @@ public class BundleUrlConfigGeneratorWindow : EditorWindow
         private static BundleUrlConfigGeneratorWindow _instance = null;
         internal static BundleUrlConfigGeneratorWindow GetInstance()
         {
-            if (_instance == null) _instance = GetWindow<BundleUrlConfigGeneratorWindow>();
+            if (_instance == null)
+                _instance = GetWindow<BundleUrlConfigGeneratorWindow>();
             return _instance;
         }
 

Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/EditorWindow/CryptogramSettingWindow.cs

@@ -19,7 +19,8 @@ public enum CryptogramType
         private static CryptogramSettingWindow _instance = null;
         internal static CryptogramSettingWindow GetInstance()
         {
-            if (_instance == null) _instance = GetWindow<CryptogramSettingWindow>();
+            if (_instance == null)
+                _instance = GetWindow<CryptogramSettingWindow>();
             return _instance;
         }
 

Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/YooAssets/EncryptionServices.cs

@@ -34,7 +34,7 @@ public EncryptResult Encrypt(EncryptFileInfo fileInfo)
         {
             var cryptogramSettings = CryptogramSettingSetup.GetCryptogramSetting();
 
-            string filePath = fileInfo.FilePath;
+            string filePath = fileInfo.FileLoadPath;
 
             int randomSeed = this._randomSeed == null ? cryptogramSettings.randomSeed : (int)this._randomSeed;
             int dummySize = this._dummySize == null ? cryptogramSettings.dummySize : (int)this._dummySize;
@@ -76,7 +76,7 @@ public EncryptResult Encrypt(EncryptFileInfo fileInfo)
         {
             var cryptogramSettings = CryptogramSettingSetup.GetCryptogramSetting();
 
-            string filePath = fileInfo.FilePath;
+            string filePath = fileInfo.FileLoadPath;
 
             byte xorKey = this._xorKey == null ? cryptogramSettings.xorKey : (byte)this._xorKey;
 
@@ -121,7 +121,7 @@ public EncryptResult Encrypt(EncryptFileInfo fileInfo)
         {
             var cryptogramSettings = CryptogramSettingSetup.GetCryptogramSetting();
 
-            string filePath = fileInfo.FilePath;
+            string filePath = fileInfo.FileLoadPath;
 
             byte hXorKey = this._hXorKey == null ? cryptogramSettings.hXorKey : (byte)this._hXorKey;
             byte tXorKey = this._tXorKey == null ? cryptogramSettings.tXorKey : (byte)this._tXorKey;
@@ -170,7 +170,7 @@ public EncryptResult Encrypt(EncryptFileInfo fileInfo)
         {
             var cryptogramSettings = CryptogramSettingSetup.GetCryptogramSetting();
 
-            string filePath = fileInfo.FilePath;
+            string filePath = fileInfo.FileLoadPath;
 
             byte hXorKey = this._hXorKey == null ? cryptogramSettings.hXorPlusKey : (byte)this._hXorKey;
             byte tXorKey = this._tXorKey == null ? cryptogramSettings.tXorPlusKey : (byte)this._tXorKey;
@@ -216,7 +216,7 @@ public EncryptResult Encrypt(EncryptFileInfo fileInfo)
         {
             var cryptogramSettings = CryptogramSettingSetup.GetCryptogramSetting();
 
-            string filePath = fileInfo.FilePath;
+            string filePath = fileInfo.FileLoadPath;
 
             string aesKey = string.IsNullOrEmpty(this._aesKey) ? cryptogramSettings.aesKey : this._aesKey;
             string aesIv = string.IsNullOrEmpty(this._aesIv) ? cryptogramSettings.aesIv : this._aesIv;

Assets/OxGFrame/AssetLoader/Scripts/Runtime/AssetLoaders.cs

@@ -26,12 +26,23 @@ public static class AssetLoaders
         public static async UniTask<BundlePack> LoadSceneAsync(string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
         {
             string packageName = AssetPatcher.GetDefaultPackageName();
-            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, loadSceneMode, activateOnLoad, priority, progression);
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, loadSceneMode, LocalPhysicsMode.None, activateOnLoad, priority, progression);
+        }
+
+        public static async UniTask<BundlePack> LoadSceneAsync(string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, LocalPhysicsMode localPhysicsMode = LocalPhysicsMode.None, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
+        {
+            string packageName = AssetPatcher.GetDefaultPackageName();
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, loadSceneMode, localPhysicsMode, activateOnLoad, priority, progression);
         }
 
         public static async UniTask<BundlePack> LoadSceneAsync(string packageName, string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
         {
-            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, loadSceneMode, activateOnLoad, priority, progression);
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, loadSceneMode, LocalPhysicsMode.None, activateOnLoad, priority, progression);
+        }
+
+        public static async UniTask<BundlePack> LoadSceneAsync(string packageName, string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, LocalPhysicsMode localPhysicsMode = LocalPhysicsMode.None, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
+        {
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, loadSceneMode, localPhysicsMode, activateOnLoad, priority, progression);
         }
 
         /// <summary>
@@ -44,12 +55,23 @@ public static async UniTask<BundlePack> LoadSceneAsync(string packageName, strin
         public static BundlePack LoadScene(string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, Progression progression = null)
         {
             string packageName = AssetPatcher.GetDefaultPackageName();
-            return CacheBundle.GetInstance().LoadScene(packageName, assetName, loadSceneMode, progression);
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, loadSceneMode, LocalPhysicsMode.None, progression);
+        }
+
+        public static BundlePack LoadScene(string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, LocalPhysicsMode localPhysicsMode = LocalPhysicsMode.None, Progression progression = null)
+        {
+            string packageName = AssetPatcher.GetDefaultPackageName();
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, loadSceneMode, localPhysicsMode, progression);
         }
 
         public static BundlePack LoadScene(string packageName, string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, Progression progression = null)
         {
-            return CacheBundle.GetInstance().LoadScene(packageName, assetName, loadSceneMode, progression);
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, loadSceneMode, LocalPhysicsMode.None, progression);
+        }
+
+        public static BundlePack LoadScene(string packageName, string assetName, LoadSceneMode loadSceneMode = LoadSceneMode.Single, LocalPhysicsMode localPhysicsMode = LocalPhysicsMode.None, Progression progression = null)
+        {
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, loadSceneMode, localPhysicsMode, progression);
         }
 
         /// <summary>
@@ -63,12 +85,12 @@ public static BundlePack LoadScene(string packageName, string assetName, LoadSce
         public static async UniTask<BundlePack> LoadSingleSceneAsync(string assetName, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
         {
             string packageName = AssetPatcher.GetDefaultPackageName();
-            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Single, activateOnLoad, priority, progression);
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Single, LocalPhysicsMode.None, activateOnLoad, priority, progression);
         }
 
         public static async UniTask<BundlePack> LoadSingleSceneAsync(string packageName, string assetName, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
         {
-            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Single, activateOnLoad, priority, progression);
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Single, LocalPhysicsMode.None, activateOnLoad, priority, progression);
         }
 
         /// <summary>
@@ -80,12 +102,12 @@ public static async UniTask<BundlePack> LoadSingleSceneAsync(string packageName,
         public static BundlePack LoadSingleScene(string assetName, Progression progression = null)
         {
             string packageName = AssetPatcher.GetDefaultPackageName();
-            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Single, progression);
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Single, LocalPhysicsMode.None, progression);
         }
 
         public static BundlePack LoadSingleScene(string packageName, string assetName, Progression progression = null)
         {
-            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Single, progression);
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Single, LocalPhysicsMode.None, progression);
         }
 
         /// <summary>
@@ -99,12 +121,12 @@ public static BundlePack LoadSingleScene(string packageName, string assetName, P
         public static async UniTask<BundlePack> LoadAdditiveSceneAsync(string assetName, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
         {
             string packageName = AssetPatcher.GetDefaultPackageName();
-            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Additive, activateOnLoad, priority, progression);
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Additive, LocalPhysicsMode.None, activateOnLoad, priority, progression);
         }
 
         public static async UniTask<BundlePack> LoadAdditiveSceneAsync(string packageName, string assetName, bool activateOnLoad = true, uint priority = 100, Progression progression = null)
         {
-            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Additive, activateOnLoad, priority, progression);
+            return await CacheBundle.GetInstance().LoadSceneAsync(packageName, assetName, LoadSceneMode.Additive, LocalPhysicsMode.None, activateOnLoad, priority, progression);
         }
 
         /// <summary>
@@ -116,29 +138,29 @@ public static async UniTask<BundlePack> LoadAdditiveSceneAsync(string packageNam
         public static BundlePack LoadAdditiveScene(string assetName, Progression progression = null)
         {
             string packageName = AssetPatcher.GetDefaultPackageName();
-            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Additive, progression);
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Additive, LocalPhysicsMode.None, progression);
         }
 
         public static BundlePack LoadAdditiveScene(string packageName, string assetName, Progression progression = null)
         {
-            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Additive, progression);
+            return CacheBundle.GetInstance().LoadScene(packageName, assetName, LoadSceneMode.Additive, LocalPhysicsMode.None, progression);
         }
 
         /// <summary>
         /// Only unload scene from bundle
         /// </summary>
         /// <param name="assetName"></param>
         /// <param name="recursively"></param>
-        public static void UnloadScene(string assetName, bool recursively = false)
+        public async static UniTask UnloadScene(string assetName, bool recursively = false)
         {
             if (!AssetPatcher.IsReleased())
-                CacheBundle.GetInstance().UnloadScene(assetName, recursively);
+                await CacheBundle.GetInstance().UnloadScene(assetName, recursively);
         }
 
-        public static void ReleaseBundleScenes()
+        public async static UniTask ReleaseBundleScenes()
         {
             if (!AssetPatcher.IsReleased())
-                CacheBundle.GetInstance().ReleaseScenes();
+                await CacheBundle.GetInstance().ReleaseScenes();
         }
         #endregion
 
@@ -180,7 +202,7 @@ public static async UniTask<string> GetRawFilePathAsync(string assetName)
                 // Get path from operation handle
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 string filePath = operation.GetRawFilePath();
-                UnloadRawFile(assetName, true);
+                await UnloadRawFile(assetName, true);
                 return filePath;
             }
 
@@ -203,7 +225,7 @@ public static async UniTask<string> GetRawFilePathAsync(string packageName, stri
                 // Get path from operation handle
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 string filePath = operation.GetRawFilePath();
-                UnloadRawFile(assetName, true);
+                await UnloadRawFile(assetName, true);
                 return filePath;
             }
 
@@ -225,7 +247,7 @@ public static string GetRawFilePath(string assetName)
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 // Get path from operation handle
                 string filePath = operation.GetRawFilePath();
-                UnloadRawFile(assetName, true);
+                UnloadRawFile(assetName, true).Forget();
                 return filePath;
             }
 
@@ -248,7 +270,7 @@ public static string GetRawFilePath(string packageName, string assetName)
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 // Get path from operation handle
                 string filePath = operation.GetRawFilePath();
-                UnloadRawFile(assetName, true);
+                UnloadRawFile(assetName, true).Forget();
                 return filePath;
             }
 
@@ -416,16 +438,18 @@ public static T LoadRawFile<T>(string packageName, string assetName, Progression
             return CacheBundle.GetInstance().LoadRawFile<T>(packageName, assetName, progression, maxRetryCount);
         }
 
-        public static void UnloadRawFile(string assetName, bool forceUnload = false)
+        public async static UniTask UnloadRawFile(string assetName, bool forceUnload = false)
         {
-            if (RefineResourcesPath(ref assetName)) Logging.Print<Logger>("<color=#ff0000>【Error】Only Bundle Type</color>");
-            else if (!AssetPatcher.IsReleased()) CacheBundle.GetInstance().UnloadRawFile(assetName, forceUnload);
+            if (RefineResourcesPath(ref assetName))
+                Logging.Print<Logger>("<color=#ff0000>【Error】Only Bundle Type</color>");
+            else if (!AssetPatcher.IsReleased())
+                await CacheBundle.GetInstance().UnloadRawFileAsync(assetName, forceUnload);
         }
 
-        public static void ReleaseBundleRawFiles()
+        public async static UniTask ReleaseBundleRawFiles()
         {
             if (!AssetPatcher.IsReleased())
-                CacheBundle.GetInstance().ReleaseRawFiles();
+                await CacheBundle.GetInstance().ReleaseRawFilesAsync();
         }
         #endregion
 
@@ -938,21 +962,23 @@ public static T InstantiateAsset<T>(string packageName, string assetName, Transf
             }
         }
 
-        public static void UnloadAsset(string assetName, bool forceUnload = false)
+        public async static UniTask UnloadAsset(string assetName, bool forceUnload = false)
         {
-            if (RefineResourcesPath(ref assetName)) CacheResource.GetInstance().UnloadAsset(assetName, forceUnload);
-            else if (!AssetPatcher.IsReleased()) CacheBundle.GetInstance().UnloadAsset(assetName, forceUnload);
+            if (RefineResourcesPath(ref assetName))
+                CacheResource.GetInstance().UnloadAsset(assetName, forceUnload);
+            else if (!AssetPatcher.IsReleased())
+                await CacheBundle.GetInstance().UnloadAsset(assetName, forceUnload);
         }
 
         public static void ReleaseResourceAssets()
         {
             CacheResource.GetInstance().ReleaseAssets();
         }
 
-        public static void ReleaseBundleAssets()
+        public async static UniTask ReleaseBundleAssets()
         {
             if (!AssetPatcher.IsReleased())
-                CacheBundle.GetInstance().ReleaseAssets();
+                await CacheBundle.GetInstance().ReleaseAssets();
         }
         #endregion
         #endregion