pick changes of scene addressable

4 年前 · b80b3f14
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
  m_Name: AddressableAssetSettings
  m_EditorClassIdentifier: 
  m_DefaultGroup: ae971df5c2b654af9a3670c7d1a6fc27
+  m_OptimizeCatalogSize: 0
+  m_BundleLocalCatalog: 0
+  m_CatalogRequestsTimeout: 0
+  m_IgnoreUnsupportedFilesInBuild: 0
+  m_NonRecursiveBuilding: 0
+  m_maxConcurrentWebRequests: 500
+  m_ContiguousBundles: 0
+  m_ShaderBundleNaming: 0
+  m_ShaderBundleCustomNaming: 
+  m_MonoScriptBundleNaming: 0
+  m_MonoScriptBundleCustomNaming: 
+  m_ContentStateBuildPath: 
  m_overridePlayerVersion: 
  m_GroupAssets:
  - {fileID: 11400000, guid: 283cfc36cc7e3476c947ddc708efef12, type: 2}
  - {fileID: 11400000, guid: 8092aa13f89a049a185fbb3e2e152534, type: 2}
+  - {fileID: 11400000, guid: 5e24b560f19099247bc7d0cfeda3807c, type: 2}
+  - {fileID: 11400000, guid: ce07084a329a84a49ba4ab6ee2b8d49f, type: 2}
  m_BuildSettings:
    m_CompileScriptsInVirtualMode: 0
    m_CleanupStreamingAssetsAfterBuilds: 1
--- a/Assets/Resources/AppManager.prefab
+++ b/Assets/Resources/AppManager.prefab
  m_Script: {fileID: 11500000, guid: 6de62f03c3364421389a6c95485ec756, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  mSceneLevelIsland:
+    m_AssetGUID: e49366a21c3d84388bfb33016c0e77e2
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+  mSceneDemoIsland:
+    m_AssetGUID: b3bf1324da98a41e796a5881dd3812eb
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
  maxRenderSize: 3
  variableResolution: 0
  axisBias: 0.5
  loadingScreen:
    m_AssetGUID: 179a2376fe443449d9046bc913164c8b
    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
 --- !u!114 &8490184438857729681
 MonoBehaviour:
  m_ObjectHideFlags: 0
      boatPrefab:
        m_AssetGUID: 405c4bc591de844a3a100e1538790229
        m_SubObjectName: 
+        m_SubObjectType: 
+        m_EditorAssetChanged: 0
      livery:
        primaryColor: {r: 0.8773585, g: 0.09518514, b: 0.09518514, a: 0}
        trimColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 0}
        m_AssetGUID: 70d78230a0527e74dabc4f14906eef98
        m_SubObjectName: 
+        m_SubObjectType: 
+        m_EditorAssetChanged: 0
      livery:
        primaryColor: {r: 0.11053756, g: 0.8679245, b: 0.17524286, a: 0}
        trimColor: {r: 0.7354654, g: 0.122774996, b: 0.8396226, a: 0}
        m_AssetGUID: 405c4bc591de844a3a100e1538790229
        m_SubObjectName: 
+        m_SubObjectType: 
+        m_EditorAssetChanged: 0
      livery:
        primaryColor: {r: 0.098039225, g: 0.8980392, b: 0.8708881, a: 0}
        trimColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 0}
        m_AssetGUID: 70d78230a0527e74dabc4f14906eef98
        m_SubObjectName: 
+        m_SubObjectType: 
+        m_EditorAssetChanged: 0
      livery:
        primaryColor: {r: 0.1481844, g: 0.2092964, b: 0.8490566, a: 0}
        trimColor: {r: 0.9339623, g: 0.7163166, b: 0.074893214, a: 0}
    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
 --- !u!114 &7312333174115242941
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/GameSystem/AppSettings.cs
+++ b/Assets/Scripts/GameSystem/AppSettings.cs
    [ManagerDefaultPrefab("AppManager")]
    public class AppSettings : Manager
    {
+        public AssetReference mSceneLevelIsland;
+        public AssetReference mSceneDemoIsland;
+        
        public enum RenderRes
        {
            _Native,

        public static void LoadScene(string scenePath, LoadSceneMode mode = LoadSceneMode.Single)
        {
-            Debug.Log("Assets/Scripts/GameSystem/AppSettings.cs:183\n\tscenePath: " + scenePath);
-            LoadSceneByPath(scenePath, mode);
+            if (scenePath.Contains("demo_Island"))
+            {
+                Addressables.LoadSceneAsync(Instance.mSceneDemoIsland);
+            }
+            else if (scenePath.Contains("level_Island"))
+            {
+                Addressables.LoadSceneAsync(Instance.mSceneLevelIsland);
+            }
+            else
+            {
+                LoadSceneByPath(scenePath, mode);
+            }
-            Debug.Log("Assets/Scripts/GameSystem/AppSettings.cs:189\n\tscenePath: " + scenePath);
            Application.backgroundLoadingPriority = ThreadPriority.Low;
            switch (mode)
            {

        public static void LoadScene(int buildIndex, LoadSceneMode mode)
        {
-            Debug.Log("Assets/Scripts/GameSystem/AppSettings.cs:206\n\tbuildIndex: " + buildIndex);
            Application.backgroundLoadingPriority = ThreadPriority.Low;
            switch (mode)
            {
            yield return loadingScreenLoading;
            Instance.loadingScreenObject = loadingScreenLoading.Result;
            DontDestroyOnLoad(Instance.loadingScreenObject);
-            Debug.Log($"loading scene {scene} at build index {SceneUtility.GetBuildIndexByScenePath(scene)}");
            SceneManager.LoadScene(scene);
        }

            yield return loadingScreenLoading;
            Instance.loadingScreenObject = loadingScreenLoading.Result;
            DontDestroyOnLoad(Instance.loadingScreenObject);
-            Debug.Log($"loading scene {SceneUtility.GetScenePathByBuildIndex(scene)} at build index {scene}");
            SceneManager.LoadScene(scene);
        }

--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
  - enabled: 1
    path: Assets/scenes/main_menu.unity
    guid: c817c1b09586c49e5b4a849ce1cf119b
-  - enabled: 1
-    path: Assets/scenes/_levels/level_Island.unity
-    guid: e49366a21c3d84388bfb33016c0e77e2
-  - enabled: 1
+  - enabled: 0
+  - enabled: 0
+    path: Assets/scenes/_levels/level_Island.unity
+    guid: e49366a21c3d84388bfb33016c0e77e2
  m_configObjects:
    com.unity.addressableassets: {fileID: 11400000, guid: 3f119a19757f84dac85ee298b9dd65d3,
      type: 2}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
  hideHomeButton: 0
  submitAnalytics: 1
  usePlayerLog: 1
-  autoStreaming: 1
+  autoStreaming: 0
  useAnimationStreaming: 0
  useFontStreaming: 0
  autoStreamingId: /v1/buckets//release_by_badge//content/AS%252F
    Others: 1
  bundleVersion: 0.9
  preloadedAssets:
+  - {fileID: 0}
+  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
    m_APIs: 02000000
    m_Automatic: 0
  - m_BuildTarget: AndroidPlayer
-    m_APIs: 150000000b000000
+    m_APIs: 0b000000
    m_Automatic: 0
  - m_BuildTarget: MacStandaloneSupport
    m_APIs: 10000000
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_BundledAssetGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: scene_demo_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 5e24b560f19099247bc7d0cfeda3807c, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 28ba4bc7b75864163846859a34a42adf
+  m_LoadPath:
+    m_Id: db15ee1355f3d4f138b374d9a49c2974
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_BundledAssetGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: edceee96b3dd52c4cb6685955b666f97
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_ContentUpdateGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: scene_demo_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 5e24b560f19099247bc7d0cfeda3807c, type: 2}
+  m_StaticContent: 1
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_demo_ContentUpdateGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: f1a3af18807f13648aa64cbc0eec5189
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_BundledAssetGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: scene_level_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: ce07084a329a84a49ba4ab6ee2b8d49f, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 28ba4bc7b75864163846859a34a42adf
+  m_LoadPath:
+    m_Id: db15ee1355f3d4f138b374d9a49c2974
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_BundledAssetGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: 6d016056d3626f341bbc6ae81af8841d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_ContentUpdateGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: scene_level_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: ce07084a329a84a49ba4ab6ee2b8d49f, type: 2}
+  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/scene_level_ContentUpdateGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: 92747517976425d46bffce65dffaedb2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/scene_demo.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/scene_demo.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: scene_demo
+  m_EditorClassIdentifier: 
+  m_GroupName: scene_demo
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 515ccd3b864e68749b1a3105ec86218e
+  m_SerializeEntries:
+  - m_GUID: b3bf1324da98a41e796a5881dd3812eb
+    m_Address: Assets/scenes/demo_Island.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 46fc3d082b08c4dacacae72d7016c235, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: edceee96b3dd52c4cb6685955b666f97, type: 2}
+    - {fileID: 11400000, guid: f1a3af18807f13648aa64cbc0eec5189, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/scene_demo.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/scene_demo.asset.meta
+fileFormatVersion: 2
+guid: 5e24b560f19099247bc7d0cfeda3807c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/scene_level.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/scene_level.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: scene_level
+  m_EditorClassIdentifier: 
+  m_GroupName: scene_level
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 970327620c376124aa7f8dfc26657a64
+  m_SerializeEntries:
+  - m_GUID: e49366a21c3d84388bfb33016c0e77e2
+    m_Address: Assets/scenes/_levels/level_Island.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 46fc3d082b08c4dacacae72d7016c235, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 6d016056d3626f341bbc6ae81af8841d, type: 2}
+    - {fileID: 11400000, guid: 92747517976425d46bffce65dffaedb2, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/scene_level.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/scene_level.asset.meta
+fileFormatVersion: 2
+guid: ce07084a329a84a49ba4ab6ee2b8d49f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: