diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index b89effa02..8966ac8c3 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -33,11 +33,11 @@ MonoBehaviour: m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 4c9d045012b65fc4b974bb4e132e6e6a + - m_GUID: 47e757b9a170ab649af14c4d7b80ac41 m_Address: CreateRestaurantPlayer m_ReadOnly: 0 m_SerializedLabels: - - Prefab + - So FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a60e7a432b7eb65419f3942f4f422fb4 m_Address: Voyage diff --git a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab deleted file mode 100644 index 6888b5adb..000000000 --- a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5717669528680924896 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5172050782918397531} - - component: {fileID: 5336591719806944066} - m_Layer: 0 - m_Name: CreateRestaurantPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5172050782918397531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717669528680924896} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5336591719806944066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717669528680924896} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 246a7785bd15ac84b9f240005b987f1f, type: 3} - m_Name: - m_EditorClassIdentifier: - _spawnPosition: {x: 0, y: 0, z: 15} diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index ca7f5ce53..80a6c7d75 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -72,6 +72,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: 5 addedObject: {fileID: 4956037093100801085} + - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1115647804376030753} m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} --- !u!1 &7316134055819320434 stripped GameObject: @@ -102,3 +105,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a83ca1b1f17a934192ef91dd4f073b8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1115647804376030753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316134055819320434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d7e5480ae1ebf54b8537ad2a08696d2, type: 3} + m_Name: + m_EditorClassIdentifier: + _originalMaterial: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} + _replacementMaterial: {fileID: 0} + _isSkinSet: 1 + _initialSkinName: Basic + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] diff --git a/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset new file mode 100644 index 000000000..169223f05 --- /dev/null +++ b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset @@ -0,0 +1,15 @@ +%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: 246a7785bd15ac84b9f240005b987f1f, type: 3} + m_Name: CreateRestaurantPlayer + m_EditorClassIdentifier: + _spawnPosition: {x: 0, y: 0, z: 15} diff --git a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset.meta similarity index 52% rename from Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta rename to Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset.meta index 3124860d8..abd9dd5aa 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta +++ b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 4c9d045012b65fc4b974bb4e132e6e6a -PrefabImporter: +guid: 47e757b9a170ab649af14c4d7b80ac41 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset index 091263bb5..d9e999837 100644 --- a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset +++ b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset @@ -75,7 +75,7 @@ MonoBehaviour: Data: 4|UnityEngine.AddressableAssets.AssetReference, Unity.Addressables - Name: m_AssetGUID Entry: 1 - Data: 4c9d045012b65fc4b974bb4e132e6e6a + Data: 47e757b9a170ab649af14c4d7b80ac41 - Name: m_SubObjectName Entry: 6 Data: diff --git a/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset index 63637150c..85ea2d811 100644 --- a/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset +++ b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset @@ -12,4 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8d0f2d4eb3cfdc45a258a64641fe3e8, type: 3} m_Name: SceneTransitionHandlerSo m_EditorClassIdentifier: - Handlers: [] + Handlers: + - {fileID: 11400000, guid: 2540a16dfa42fb64abe19dda610933fa, type: 2}