diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index ac946201..9d1ecb28 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: c4619c1b14b5b5049b98f4238209bbb4 m_currentHash: serializedVersion: 2 - Hash: 023e68031035cf6cf9ca11e4270a81fc + Hash: 05488fa2ca1152c3e13a2624325b6680 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 2c7c0445..fcc6e63b 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -85,11 +85,21 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2e2e9935047fd6345b06bd7af6a8838b + m_Address: Prefabs/Platforms/rock_balancing_4 Variant.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 2fe820ca98fb82b439997ab938e6bcd4 m_Address: Enemies/Vine.prefab m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3424d2cc7ecc8d345968fd10001f50b9 + m_Address: Prefabs/Platforms/rock_balancing_2 Variant.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 3e63c3b2fff98dc4282cbc7524015a15 m_Address: Prefabs/powered_door_slab.prefab m_ReadOnly: 0 @@ -180,6 +190,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 60fa7e4c8bfb82b469d3945c09287add + m_Address: Prefabs/Platforms/rock_balancing_1 Variant.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 61292166189d0ff40b1a316dee4a7e4d m_Address: Prefabs/boulder_square_piece1.prefab m_ReadOnly: 0 @@ -225,6 +240,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7aa098410779c2849ad2b71ddd52fdbd + m_Address: Prefabs/Platforms/rock_balancing_0 Variant.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 7b5970f775af787409f4d1645d60cce0 m_Address: Prefabs/DesWall Part1 Dirt.prefab m_ReadOnly: 0 @@ -315,6 +335,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: a9c22b454c5cb38499b75ec55bc548e4 + m_Address: Prefabs/Platforms/rock_balancing_3 Variant.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: aa292110c78b6284f90afc2903965e9a m_Address: Characters/NPC Kaki the Cacticorn.prefab m_ReadOnly: 0 @@ -435,6 +460,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f6a8f0cf88fcb3648be48fed310d9fcc + m_Address: Prefabs/Platforms/rock_balancing.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: f844c8d3ded8047418b2890393ffa110 m_Address: Enemies/Cactus.prefab m_ReadOnly: 0 diff --git a/Assets/Prefabs/Platforms/rock_balancing.prefab b/Assets/Prefabs/Platforms/rock_balancing.prefab index ced784fa..adb9074b 100644 --- a/Assets/Prefabs/Platforms/rock_balancing.prefab +++ b/Assets/Prefabs/Platforms/rock_balancing.prefab @@ -268,10 +268,10 @@ MonoBehaviour: m_EditorClassIdentifier: id: -1 prefabAddress: - m_AssetGUID: + m_AssetGUID: f6a8f0cf88fcb3648be48fed310d9fcc m_SubObjectName: m_SubObjectGUID: m_SubObjectType: m_EditorAssetChanged: 0 - spawnStateId: -1 + spawnStateId: 0 destroyStateId: 2147483647 diff --git a/Assets/Prefabs/Platforms/rock_balancing_0 Variant.prefab b/Assets/Prefabs/Platforms/rock_balancing_0 Variant.prefab index 03a49240..55cd5e64 100644 --- a/Assets/Prefabs/Platforms/rock_balancing_0 Variant.prefab +++ b/Assets/Prefabs/Platforms/rock_balancing_0 Variant.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -2013909967803168731, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} + propertyPath: prefabAddress.m_AssetGUID + value: 7aa098410779c2849ad2b71ddd52fdbd + objectReference: {fileID: 0} - target: {fileID: 5515842397124528773, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} propertyPath: m_Name value: rock_balancing_0 Variant diff --git a/Assets/Prefabs/Platforms/rock_balancing_1 Variant.prefab b/Assets/Prefabs/Platforms/rock_balancing_1 Variant.prefab index 046ccb4f..cabb3776 100644 --- a/Assets/Prefabs/Platforms/rock_balancing_1 Variant.prefab +++ b/Assets/Prefabs/Platforms/rock_balancing_1 Variant.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -2013909967803168731, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} + propertyPath: prefabAddress.m_AssetGUID + value: 60fa7e4c8bfb82b469d3945c09287add + objectReference: {fileID: 0} - target: {fileID: 5515842397124528773, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} propertyPath: m_Name value: rock_balancing_1 Variant diff --git a/Assets/Prefabs/Platforms/rock_balancing_2 Variant.prefab b/Assets/Prefabs/Platforms/rock_balancing_2 Variant.prefab index 559282e7..97964f65 100644 --- a/Assets/Prefabs/Platforms/rock_balancing_2 Variant.prefab +++ b/Assets/Prefabs/Platforms/rock_balancing_2 Variant.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -2013909967803168731, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} + propertyPath: prefabAddress.m_AssetGUID + value: 3424d2cc7ecc8d345968fd10001f50b9 + objectReference: {fileID: 0} - target: {fileID: 5515842397124528773, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} propertyPath: m_Name value: rock_balancing_2 Variant diff --git a/Assets/Prefabs/Platforms/rock_balancing_3 Variant.prefab b/Assets/Prefabs/Platforms/rock_balancing_3 Variant.prefab index d44057aa..1967efe9 100644 --- a/Assets/Prefabs/Platforms/rock_balancing_3 Variant.prefab +++ b/Assets/Prefabs/Platforms/rock_balancing_3 Variant.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -2013909967803168731, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} + propertyPath: prefabAddress.m_AssetGUID + value: a9c22b454c5cb38499b75ec55bc548e4 + objectReference: {fileID: 0} - target: {fileID: 5515842397124528773, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} propertyPath: m_Name value: rock_balancing_3 Variant diff --git a/Assets/Prefabs/Platforms/rock_balancing_4 Variant.prefab b/Assets/Prefabs/Platforms/rock_balancing_4 Variant.prefab index 4d3345e2..80267fac 100644 --- a/Assets/Prefabs/Platforms/rock_balancing_4 Variant.prefab +++ b/Assets/Prefabs/Platforms/rock_balancing_4 Variant.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -2013909967803168731, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} + propertyPath: prefabAddress.m_AssetGUID + value: 2e2e9935047fd6345b06bd7af6a8838b + objectReference: {fileID: 0} - target: {fileID: 5515842397124528773, guid: f6a8f0cf88fcb3648be48fed310d9fcc, type: 3} propertyPath: m_Name value: rock_balancing_4 Variant