refactor

2025-05-14 10:51:59 +02:00
parent 62d340853d
commit c3e9f8abe8
110 changed files with 10605 additions and 3849 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_DefaultGroup: 64326db70156abe409df70a80bc62dc5
  m_currentHash:
    serializedVersion: 2
-    Hash: 3481c484c724115ba8ee73619b898201
+    Hash: 356df98a072feafa62a86c7268de6e86
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_CatalogRequestsTimeout: 0
@@ -59,8 +59,10 @@ MonoBehaviour:
  m_BuildAddressablesWithPlayerBuild: 0
  m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
  m_GroupAssets:
+  - {fileID: 11400000, guid: 8a3465f764096f94bbe68d59503be4b0, type: 2}
  - {fileID: 11400000, guid: e468db1926376464080e081fe2d66d57, type: 2}
  - {fileID: 11400000, guid: 75261079cac228443bb2e2ef3f5f716d, type: 2}
+  - {fileID: 11400000, guid: 8b49c61d4f9c56241bb8cc7874bb7642, type: 2}
  m_BuildSettings:
    m_LogResourceManagerExceptions: 1
    m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
@@ -100,6 +102,9 @@ MonoBehaviour:
  m_LabelTable:
    m_LabelNames:
    - default
+    - world
+    - actor
+    - game_mode
  m_SchemaTemplates: []
  m_GroupTemplateObjects:
  - {fileID: 11400000, guid: ce67ab8e01be15442bd2911cedb156c4, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/Jelycho
+++ b/Assets/AddressableAssetsData/AssetGroups/Jelycho
@@ -15,6 +15,29 @@ MonoBehaviour:
  m_GroupName: Jelycho Core
  m_GUID: 64326db70156abe409df70a80bc62dc5
  m_SerializeEntries:
+  - m_GUID: 25696e225f604c542bd24bec74319866
+    m_Address: Assets/jelycho/Worlds/dev/world_dev.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - world
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a732f125f8c344a46917f07872c35378
+    m_Address: Assets/jelycho/MainMenu/world_main_menu.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - world
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: abb7fe7f372ba7640b0ab138239c7f78
+    m_Address: Assets/jelycho/Main/scn_main_menu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b7b55be30d0c5b64892f70dfa3389ee2
+    m_Address: Assets/jelycho/Worlds/rr_astek/world_rr_astek.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - world
+    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: be292ae0883a3be4090cdc42a4c7c131
    m_Address: Assets/jelycho/actors/player/a_player.prefab
    m_ReadOnly: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_BundledAssetGroupSchema.asset
@@ -0,0 +1,47 @@
+%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: game_mode_standard_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 8b49c61d4f9c56241bb8cc7874bb7642, 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: 115914b8d76a9b245b028fc5c5cab06e
+  m_LoadPath:
+    m_Id: f0346b62289721c4ea1836b06909cd39
+  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_UseDefaultSchemaSettings: 0
+  m_SelectedPathPairIndex: 0
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_BundledAssetGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 64a39005ec44653438e1ae92b27987fc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_ContentUpdateGroupSchema.asset
@@ -0,0 +1,16 @@
+%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: game_mode_standard_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 8b49c61d4f9c56241bb8cc7874bb7642, type: 2}
+  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/game_mode_standard_ContentUpdateGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a7859b36a144371498f51fa6a7a0c23c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_BundledAssetGroupSchema.asset
@@ -0,0 +1,47 @@
+%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: map_astek_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 8a3465f764096f94bbe68d59503be4b0, 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: 115914b8d76a9b245b028fc5c5cab06e
+  m_LoadPath:
+    m_Id: f0346b62289721c4ea1836b06909cd39
+  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_UseDefaultSchemaSettings: 0
+  m_SelectedPathPairIndex: 0
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_BundledAssetGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2eed77fc5417fab4dbbeb011e448a24f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_ContentUpdateGroupSchema.asset
@@ -0,0 +1,16 @@
+%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: map_astek_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 8a3465f764096f94bbe68d59503be4b0, type: 2}
+  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/map_astek_ContentUpdateGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce7efc888b3c42c4e825325a26b0faf7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/game_mode_standard.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/game_mode_standard.asset
@@ -0,0 +1,29 @@
+%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: game_mode_standard
+  m_EditorClassIdentifier: 
+  m_GroupName: game_mode_standard
+  m_GUID: a82cff5173833a74787dcac593fe2379
+  m_SerializeEntries:
+  - m_GUID: 09a952812a536084d8f3cd13dc9fec09
+    m_Address: gm_standard
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - game_mode
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 93969247b34433f44bfa755967945828, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 64a39005ec44653438e1ae92b27987fc, type: 2}
+    - {fileID: 11400000, guid: a7859b36a144371498f51fa6a7a0c23c, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/game_mode_standard.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/game_mode_standard.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b49c61d4f9c56241bb8cc7874bb7642
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/map_astek.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/map_astek.asset
@@ -0,0 +1,28 @@
+%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: map_astek
+  m_EditorClassIdentifier: 
+  m_GroupName: map_astek
+  m_GUID: 475667ec0e8585e43a1891f32bd0ad8c
+  m_SerializeEntries:
+  - m_GUID: 348fb8413c38b5247a1093356b47234c
+    m_Address: Assets/jelycho/Worlds/rr_astek/scn_map_astek.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 93969247b34433f44bfa755967945828, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 2eed77fc5417fab4dbbeb011e448a24f, type: 2}
+    - {fileID: 11400000, guid: ce7efc888b3c42c4e825325a26b0faf7, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/map_astek.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/map_astek.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a3465f764096f94bbe68d59503be4b0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: