From 6e2e643ed05f27a01255e5f39061d104cd4eaa67 Mon Sep 17 00:00:00 2001 From: ev <85412919+evdial@users.noreply.github.com> Date: Wed, 12 Jul 2023 00:49:54 -0400 Subject: [PATCH] oops --- Assets/Resources/Games/animalAcrobat.prefab | 30 ----------- .../Games/AnimalAcrobat/Elephant.prefab | 50 +++++++++++++------ 2 files changed, 36 insertions(+), 44 deletions(-) diff --git a/Assets/Resources/Games/animalAcrobat.prefab b/Assets/Resources/Games/animalAcrobat.prefab index 38b6c0e6b..1816f020e 100644 --- a/Assets/Resources/Games/animalAcrobat.prefab +++ b/Assets/Resources/Games/animalAcrobat.prefab @@ -991,10 +991,6 @@ PrefabInstance: propertyPath: m_Name value: Elephant objectReference: {fileID: 0} - - target: {fileID: 7540716611123628191, guid: b3040fc162a3d6342971f82026e4335f, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3040fc162a3d6342971f82026e4335f, type: 3} --- !u!4 &1255668799032437719 stripped @@ -1002,29 +998,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 6285390310926959546, guid: b3040fc162a3d6342971f82026e4335f, type: 3} m_PrefabInstance: {fileID: 5068582788322912365} m_PrefabAsset: {fileID: 0} ---- !u!1 &3382547463692624114 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7540716611123628191, guid: b3040fc162a3d6342971f82026e4335f, type: 3} - m_PrefabInstance: {fileID: 5068582788322912365} - m_PrefabAsset: {fileID: 0} ---- !u!95 &4576220083147392467 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3382547463692624114} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: dd5bff53f5bfac2418bdb1b68e751e7a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Resources/Prefabs/Games/AnimalAcrobat/Elephant.prefab b/Assets/Resources/Prefabs/Games/AnimalAcrobat/Elephant.prefab index a2b154d13..5f21d5aa0 100644 --- a/Assets/Resources/Prefabs/Games/AnimalAcrobat/Elephant.prefab +++ b/Assets/Resources/Prefabs/Games/AnimalAcrobat/Elephant.prefab @@ -72,7 +72,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 12 + m_SortingOrder: 22 m_Sprite: {fileID: 687623344, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -95,7 +95,7 @@ GameObject: - component: {fileID: 3049806664453001319} - component: {fileID: 3701238526261399543} m_Layer: 0 - m_Name: Body + m_Name: Trunk m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -109,12 +109,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789032697063422192} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.621, y: 0.35261, z: 0} + m_LocalPosition: {x: 2.621, y: 0.35260996, z: 0} m_LocalScale: {x: 0.62358, y: 0.62358, z: 0.62358} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6285390310926959546} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3701238526261399543 SpriteRenderer: @@ -156,7 +156,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 12 + m_SortingOrder: 26 m_Sprite: {fileID: -1750315707, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -244,7 +244,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 20 m_Sprite: {fileID: -344012854, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -328,7 +328,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 12 + m_SortingOrder: 22 m_Sprite: {fileID: 687623344, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -412,7 +412,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 10 m_Sprite: {fileID: -2107875902, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -433,6 +433,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6285390310926959546} + - component: {fileID: 6198430257364661693} m_Layer: 0 m_Name: Elephant m_TagString: Untagged @@ -453,12 +454,33 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8741749932262346034} - - {fileID: 6382978292509037909} - {fileID: 3049806664453001319} + - {fileID: 6382978292509037909} - {fileID: 310477246139141280} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6198430257364661693 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7540716611123628191} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: dd5bff53f5bfac2418bdb1b68e751e7a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7805847212563886084 GameObject: m_ObjectHideFlags: 0 @@ -531,7 +553,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 11 + m_SortingOrder: 21 m_Sprite: {fileID: 1508047054, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 @@ -615,7 +637,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 11 + m_SortingOrder: 21 m_Sprite: {fileID: 1508047054, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -638,7 +660,7 @@ GameObject: - component: {fileID: 6382978292509037909} - component: {fileID: 70189302174134453} m_Layer: 0 - m_Name: Trunk + m_Name: Body m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -657,7 +679,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6285390310926959546} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &70189302174134453 SpriteRenderer: @@ -699,7 +721,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 16 m_Sprite: {fileID: 82695243, guid: 462e87ccfd1084f4ab799f329db7c3bf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0