*misc

1 files changed, 34 insertions, 28 deletions

diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller
index a8fd68de..07d227e0 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller
+++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller
@@ -14,58 +14,64 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToMove
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToJump
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToRise
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToStinger
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToAttack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToHit
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ToTurn
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  - m_Name: Blend
+    m_Controller: {fileID: 0}
+  - m_Name: IsOnGround
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: Height
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
-    m_Name: Base Layer
+    m_Name: Basic
     m_StateMachine: {fileID: 1107100304230058010}
     m_Mask: {fileID: 0}
     m_Motions: []
@@ -77,7 +83,7 @@ AnimatorController:
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
   - serializedVersion: 5
-    m_Name: Attack Layer
+    m_Name: Attack
     m_StateMachine: {fileID: 1107681041014594778}
     m_Mask: {fileID: 0}
     m_Motions: []
@@ -89,7 +95,7 @@ AnimatorController:
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
   - serializedVersion: 5
-    m_Name: LowerJumpLayer
+    m_Name: UpperBody
     m_StateMachine: {fileID: 1107669995669758872}
     m_Mask: {fileID: 31900000, guid: d5a10d76582efb742a48170e6fcec7ca, type: 2}
     m_Motions: []
@@ -242,13 +248,13 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1323303
+  m_TransitionDuration: 0.13441938
   m_TransitionOffset: 0
-  m_ExitTime: 0.8676697
+  m_ExitTime: 0.7576849
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
-  m_OrderedInterruption: 1
+  m_OrderedInterruption: 0
   m_CanTransitionToSelf: 1
 --- !u!1101 &1101494853469579572
 AnimatorStateTransition:
@@ -267,13 +273,13 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1229167
+  m_TransitionDuration: 0.1207397
   m_TransitionOffset: 0
-  m_ExitTime: 0.8770833
+  m_ExitTime: 0.954483
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
-  m_OrderedInterruption: 1
+  m_OrderedInterruption: 0
   m_CanTransitionToSelf: 1
 --- !u!1101 &1101573921585606128
 AnimatorStateTransition:
@@ -318,7 +324,7 @@ AnimatorStateTransition:
   m_IsExit: 0
   serializedVersion: 3
   m_TransitionDuration: 0.11836755
-  m_TransitionOffset: 0.5
+  m_TransitionOffset: 0
   m_ExitTime: 0.8641487
   m_HasExitTime: 0
   m_HasFixedDuration: 1
@@ -601,11 +607,11 @@ AnimatorStateMachine:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
+  m_Name: Basic
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1102108504916990050}
-    m_Position: {x: 120, y: -480, z: 0}
+    m_Position: {x: 156, y: -456, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102289505320285826}
     m_Position: {x: 420, y: -588, z: 0}
@@ -614,10 +620,10 @@ AnimatorStateMachine:
     m_Position: {x: -144, y: -492, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102099224573621780}
-    m_Position: {x: 420, y: -480, z: 0}
+    m_Position: {x: 420, y: -456, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102474951772684744}
-    m_Position: {x: 324, y: -324, z: 0}
+    m_Position: {x: 420, y: -324, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102936270698915478}
     m_Position: {x: 132, y: -168, z: 0}
@@ -632,8 +638,8 @@ AnimatorStateMachine:
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: -12, y: -576, z: 0}
-  m_EntryPosition: {x: 204, y: -636, z: 0}
+  m_AnyStatePosition: {x: -48, y: -576, z: 0}
+  m_EntryPosition: {x: 144, y: -588, z: 0}
   m_ExitPosition: {x: -48, y: -684, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 1102108504916990050}
@@ -644,7 +650,7 @@ AnimatorStateMachine:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: LowerJumpLayer
+  m_Name: UpperBody
   m_ChildStates: []
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
@@ -663,7 +669,7 @@ AnimatorStateMachine:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack Layer
+  m_Name: Attack
   m_ChildStates: []
   m_ChildStateMachines: []
   m_AnyStateTransitions: []