diff --git a/Assets/DogAnimationController.controller b/Assets/DogAnimationController.controller index d30a8e0c3ed7abd6a0ebb1d29426d545d2f0e08d..bb635193dbc5520d6badb75d80f92694ee4d664a 100644 --- a/Assets/DogAnimationController.controller +++ b/Assets/DogAnimationController.controller @@ -125,7 +125,7 @@ AnimatorStateTransition: m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.5442685 - m_TransitionOffset: 0.84050137 + m_TransitionOffset: 0.57353204 m_ExitTime: 0.31502604 m_HasExitTime: 1 m_HasFixedDuration: 1 @@ -149,9 +149,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25179565 - m_TransitionOffset: 1.3310483 - m_ExitTime: 0.06373558 + m_TransitionDuration: 0.5448116 + m_TransitionOffset: 1.3834875 + m_ExitTime: 0.07568686 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 diff --git a/Assets/ShopManager.cs b/Assets/ShopManager.cs index 6e0a250e7e04c5d44068a2408b713b75083c09ef..edc2d7f772f0c24ce70ae3f40b8ca3556308b159 100644 --- a/Assets/ShopManager.cs +++ b/Assets/ShopManager.cs @@ -125,7 +125,9 @@ public class ShopManager : MonoBehaviour { } playerCurrency.subtract(healingPetPrice); GameObject pet = Instantiate(healingPet, player.position, Quaternion.identity); - pet.transform.SetParent(player, false); + pet.transform.SetParent(player, true); + pet.transform.SetParent(null, true); + } public void SpawnAttackingPet() @@ -135,8 +137,8 @@ public class ShopManager : MonoBehaviour { } playerCurrency.subtract(attackingPetPrice); GameObject pet = Instantiate(attackingPet, player.position, Quaternion.identity); - pet.transform.SetParent(player, false); - } + pet.transform.SetParent(player, true); + pet.transform.SetParent(null, true); } public void setAccessible(bool value) {