+action data

author: chai <chaifix@163.com> 2021-09-08 23:46:05 +0800
committer: chai <chaifix@163.com> 2021-09-08 23:46:05 +0800
commit: aaea0c7f800a39f5e43e36e18837b174d344afdf (patch)
tree: 6c9f085f969750ff11ed4a7fa8e34dd19e42332b
parent: 2fa67922f08ef39b4d70bad001592aedf22c9018 (diff)
82 files changed, 460 insertions, 1504 deletions
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
index c9358f98..a52a87ff 100644
--- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs
+++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
@@ -113,6 +113,7 @@ namespace ActionTool
 
             float y = kToolbarHeight + 5;
             GUI_Detail(ref y);
+			GUI_Properties(ref y);
 			GUI_Parameters(ref y);
 			GUI_Toggle(ref y);
 			GUI_Curves(ref y);
@@ -341,12 +342,14 @@ namespace ActionTool
 		{
 			float xl = 5, xr = xl + 105;
 			GUI.Label(new Rect(xl, y, 105, 15), "Playback Frame:", styles.textMiddle);
-			GUI.Label(new Rect(xr, y, 510, 15), ActionManager.actionData.curAnimFrame.ToString("f2"), styles.textMiddleBold);
+			GUI.Label(new Rect(xr, y, 110, 15), ActionManager.actionData.curAnimFrame.ToString("f2"), styles.textMiddleBold);
 			GUI.Label(new Rect(xl + 150, y, 105, 15), "Normalized Time:", styles.textMiddle);
-			GUI.Label(new Rect(xr + 150, y, 510, 15), ActionManager.actionData.curAnimTimeNormal.ToString("f2"), styles.textMiddleBold);
+			GUI.Label(new Rect(xr + 150, y, 110, 15), ActionManager.actionData.curAnimTimeNormal.ToString("f2"), styles.textMiddleBold);
             GUI.Label(new Rect(xl + 150 * 2, y, 105, 15), "Event Frame:", styles.textMiddle);
-            GUI.Label(new Rect(xr + 150 + 125, y, 510, 15), ((int)ActionManager.actionData.curAnimFrame).ToString(), styles.textMiddleBold);
-            y += 15;
+            GUI.Label(new Rect(xr + 150 + 125, y, 110, 15), ((int)ActionManager.actionData.curAnimFrame).ToString(), styles.textMiddleBold);
+			GUI.Label(new Rect(xl + 150 + 130 + 130, y, 105, 15), "Time:", styles.textMiddle);
+			GUI.Label(new Rect(xr + 150 + 130 + 70 , y, 510, 15), ((int)ActionManager.actionData.curAnimFrame).ToString(), styles.textMiddleBold);
+			y += 15;
 		}
 
 
@@ -364,6 +367,24 @@ namespace ActionTool
             y += 15;
         }
 
+		void GUI_Properties(ref float y)
+		{
+			AnimationData animData = ActionManager.animationData;
+			if (animData == null)
+				return;
+			var properties = animData.properties;
+			float x = 5;
+			GUI.Label(new Rect(x, y, 105, 15), "Properties:", styles.textMiddle);
+			x += 105;
+			GUI.Label(new Rect(x, y, 10, 15), (properties != null ? properties.Count : 0).ToString(), styles.textMiddleBold);
+			x += 20;
+			if (GUI.Button(new Rect(x, y, 50, 15), "Edit"))
+			{
+				EditorWindow.GetWindow<AnimationPropertyEditor>(true);
+			}
+			y += 15;
+		}
+
 		void GUI_Parameters(ref float y)
 		{
 			AnimationData animData = ActionManager.animationData;
diff --git a/Assets/ActionTool/Editor/AnimationPropertyEditor.cs b/Assets/ActionTool/Editor/AnimationPropertyEditor.cs
new file mode 100644
index 00000000..59786bf9
--- /dev/null
+++ b/Assets/ActionTool/Editor/AnimationPropertyEditor.cs
@@ -0,0 +1,54 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace ActionTool
+{
+
+	[CustomPropertyDrawer(typeof(PropertyDictionary))]
+	public class PropertyDictionaryDrawer : SerializableDictionaryPropertyDrawer { }
+
+	public class AnimationPropertyEditor : EditorWindow
+	{
+
+		SerializedObject obj;
+
+		private void OnEnable()
+		{
+			titleContent = new GUIContent("Properties");
+			minSize = new Vector2(300, 200);
+			maxSize = new Vector2(300, 2000);
+		}
+
+		private void OnDisable()
+		{
+		}
+
+		private void Update()
+		{
+		}
+
+		private void OnGUI()
+		{
+			AnimationData animData = ActionManager.animationData;
+			if (animData == null)
+			{
+				this.Close();
+				return;
+			}
+
+			if (obj == null || obj.targetObject != animData)
+			{
+				obj = new SerializedObject(animData);
+			}
+
+			var curves = obj.FindProperty("properties");
+			EditorGUILayout.PropertyField(curves, true);
+			if (obj.ApplyModifiedProperties())
+			{
+			}
+		}
+	}
+
+}
diff --git a/Assets/ActionTool/Editor/AnimationPropertyEditor.cs.meta b/Assets/ActionTool/Editor/AnimationPropertyEditor.cs.meta
new file mode 100644
index 00000000..efdc8fad
--- /dev/null
+++ b/Assets/ActionTool/Editor/AnimationPropertyEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ac9aacf41a77d2d4b8dbda78defdf534
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
index b76e98a5..4627f5df 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 20381b3eecfbfe34a9d9222868969d29
+guid: d467e546efed7054c934b1a97a116c5c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
index 41200932..ab214036 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: abff7cb61c760094f8ab9437379e0f2c
+guid: 063d53dfefca4e3429f5788835b0b4ea
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Bundle/Material.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
index 85215e86..ee2ffc5f 100644
--- a/Assets/Bundle/Material.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8641bb4d4eee8b1419a1c8316ff9aee5
+guid: b82ae836c84f36049bdbdb08743b98e0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
new file mode 100644
index 00000000..e0cb5de8
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c219c63d9953ba84b8cbe80444bdbf22
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
new file mode 100644
index 00000000..640ede12
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 32ad36f78e7f23f46a0ce64fce991723
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
new file mode 100644
index 00000000..4d017390
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93031cff7ea5a314ca110920f817635f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
new file mode 100644
index 00000000..0d171fe4
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 69c2852d26b47fa44a688db1349ae258
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta
deleted file mode 100644
index 92ded933..00000000
--- a/Assets/Bundle/Shader.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a8ba4f43d9a7b24d855cadccb986b60
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta
deleted file mode 100644
index 0914914c..00000000
--- a/Assets/Bundle/UI.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4392471259b05a74a82a4bc72b510eb1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/AnimatorController.meta b/Assets/Bundle/Unit/AnimatorController.meta
deleted file mode 100644
index 5854bffd..00000000
--- a/Assets/Bundle/Unit/AnimatorController.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6bccf23fd118cb34e8464423a307e16d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller b/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller
deleted file mode 100644
index 5ef5e972..00000000
--- a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller
+++ /dev/null
@@ -1,43 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Monster_AnimatorController
-  serializedVersion: 5
-  m_AnimatorParameters: []
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: 1107100304230058010}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1107 &1107100304230058010
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates: []
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 0}
diff --git a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller.meta b/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller.meta
deleted file mode 100644
index 1ce47b32..00000000
--- a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0b81909d05ebb964db0b68025b06b43a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller
deleted file mode 100644
index f6f73b77..00000000
--- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller
+++ /dev/null
@@ -1,646 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: PC_AnimatorController 1
-  serializedVersion: 5
-  m_AnimatorParameters:
-  - m_Name: ToIdle
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToMove
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToJump
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToRise
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToStinger
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToAttack
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToHit
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToTurn
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: Blend
-    m_Type: 1
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: 1107100304230058010}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
-  - serializedVersion: 5
-    m_Name: Attack Layer
-    m_StateMachine: {fileID: 1107681041014594778}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1101 &1101005051643187040
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToAttack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102099224573621780}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.15586424
-  m_TransitionOffset: 0
-  m_ExitTime: 0.84413576
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101070554495638954
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToIdle
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102108504916990050}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.07171363
-  m_TransitionOffset: 0.046414375
-  m_ExitTime: 0.89665186
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101150190650443198
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToIdle
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102108504916990050}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1229167
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8770833
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101201493442508346
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToJump
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102289505320285826}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.09467596
-  m_TransitionOffset: 0
-  m_ExitTime: 0.90532404
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101243288826134708
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToMove
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102474951772684744}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1276235
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8723765
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101476570206594454
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToIdle
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102108504916990050}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1323303
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8676697
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101494853469579572
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToMove
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102474951772684744}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1229167
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8770833
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101573921585606128
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToIdle
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102108504916990050}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1370371
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9900462
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101709092166622032
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToAttack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102099224573621780}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.15115744
-  m_TransitionOffset: 0
-  m_ExitTime: 0.84884256
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101946621754155960
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToJump
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102289505320285826}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.07114208
-  m_TransitionOffset: 0.34830385
-  m_ExitTime: 0.8206018
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101984677742375892
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToTurn
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102530119364819120}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.09938282
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9006172
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1102 &1102099224573621780
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Attack
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101946621754155960}
-  - {fileID: 1101070554495638954}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 602750927a3a2884584fd8824a96685f, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102108504916990050
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Idle
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101984677742375892}
-  - {fileID: 1101494853469579572}
-  - {fileID: 1101709092166622032}
-  - {fileID: 1101201493442508346}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 9e89ea1854d98c8438e8b2e70b121359, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102289505320285826
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Jump
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101573921585606128}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: c81f2b54cf596794e89eeeef68d1d2c2, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102474951772684744
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Move
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101005051643187040}
-  - {fileID: 1101476570206594454}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 17add94a09ebacd48bafd5e74eab053c, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102530119364819120
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Turn
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101243288826134708}
-  - {fileID: 1101150190650443198}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: ac19955e7bd4ac446a29571a278bc6a7, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102758058710279394
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Hit
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 89d09a17e1563a8408eea19dfede6b96, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102817678999412688
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Singer
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: a299acef9ab3af44d8a11eaad43d4993, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102936270698915478
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Rise
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: aed97c7f7249ffd4ea19dae5d904e5c1, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1107 &1107100304230058010
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 1102108504916990050}
-    m_Position: {x: 120, y: -480, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102289505320285826}
-    m_Position: {x: 420, y: -588, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102758058710279394}
-    m_Position: {x: -144, y: -492, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102099224573621780}
-    m_Position: {x: 420, y: -480, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102474951772684744}
-    m_Position: {x: 324, y: -324, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102936270698915478}
-    m_Position: {x: 132, y: -168, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102817678999412688}
-    m_Position: {x: -108, y: -216, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102530119364819120}
-    m_Position: {x: 48, y: -324, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: -12, y: -576, z: 0}
-  m_EntryPosition: {x: 204, y: -636, z: 0}
-  m_ExitPosition: {x: -48, y: -684, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 1102108504916990050}
---- !u!1107 &1107681041014594778
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Attack Layer
-  m_ChildStates: []
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 0}
diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta
deleted file mode 100644
index f555d2c2..00000000
--- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e2d366cf87c3f574bad579686d5b5d21
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller
deleted file mode 100644
index 97d8f1bf..00000000
--- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller
+++ /dev/null
@@ -1,484 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: PC_AnimatorController
-  serializedVersion: 5
-  m_AnimatorParameters:
-  - m_Name: ToIdle
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToMove
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToJump
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToRise
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToStinger
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToAttack
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToHit
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: ToTurn
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: 1107100304230058010}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
-  - serializedVersion: 5
-    m_Name: Attack Layer
-    m_StateMachine: {fileID: 1107681041014594778}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1101 &1101037676296870908
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToTurn
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102530119364819120}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.046343505
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9439586
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 3
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 0
---- !u!1101 &1101144256514140790
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToMove
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102474951772684744}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.07083995
-  m_TransitionOffset: 0
-  m_ExitTime: 0.92931783
-  m_HasExitTime: 0
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 4
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 0
---- !u!1101 &1101301825364227868
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToIdle
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102108504916990050}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.08333343
-  m_TransitionOffset: 0
-  m_ExitTime: 0.91026247
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 3
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 0
---- !u!1101 &1101523671407522470
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToJump
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102289505320285826}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.054671824
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9453282
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 3
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 0
---- !u!1101 &1101604052918910436
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: ToAttack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102099224573621780}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.051469862
-  m_TransitionOffset: 0
-  m_ExitTime: 0.94853014
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 3
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 0
---- !u!1102 &1102099224573621780
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Attack
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 602750927a3a2884584fd8824a96685f, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102108504916990050
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Idle
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 9e89ea1854d98c8438e8b2e70b121359, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102289505320285826
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Jump
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: c81f2b54cf596794e89eeeef68d1d2c2, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102474951772684744
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Move
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 17add94a09ebacd48bafd5e74eab053c, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102530119364819120
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Turn
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: ac19955e7bd4ac446a29571a278bc6a7, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102758058710279394
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Hit
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 89d09a17e1563a8408eea19dfede6b96, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102817678999412688
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Singer
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: a299acef9ab3af44d8a11eaad43d4993, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102936270698915478
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Rise
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: aed97c7f7249ffd4ea19dae5d904e5c1, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1107 &1107100304230058010
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 1102108504916990050}
-    m_Position: {x: 120, y: -480, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102289505320285826}
-    m_Position: {x: 576, y: -432, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102758058710279394}
-    m_Position: {x: 636, y: -312, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102099224573621780}
-    m_Position: {x: 420, y: -504, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102474951772684744}
-    m_Position: {x: 384, y: -312, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102936270698915478}
-    m_Position: {x: 132, y: -168, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102817678999412688}
-    m_Position: {x: -60, y: -276, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102530119364819120}
-    m_Position: {x: 48, y: -384, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions:
-  - {fileID: 1101301825364227868}
-  - {fileID: 1101604052918910436}
-  - {fileID: 1101523671407522470}
-  - {fileID: 1101144256514140790}
-  - {fileID: 1101037676296870908}
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 312, y: -384, z: 0}
-  m_EntryPosition: {x: 204, y: -636, z: 0}
-  m_ExitPosition: {x: -48, y: -684, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 1102108504916990050}
---- !u!1107 &1107681041014594778
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Attack Layer
-  m_ChildStates: []
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 0}
diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller.meta b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller.meta
deleted file mode 100644
index 2a7c8f3f..00000000
--- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc85b30273da8ce4eb42ec6ff4c98074
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
deleted file mode 100644
index ca7266b0..00000000
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a1d7b6e0d8fb1a642a65011fb6cd7d89
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
deleted file mode 100644
index 142f5872..00000000
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6ad7401709700f34db2b795830937d76
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta
deleted file mode 100644
index eeea13e1..00000000
--- a/Assets/Bundle/Unit/NPC.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ced034d375cdfa488814663ea17a79b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset b/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset
index ad5d4207..0a2d8ca8 100644
--- a/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset
+++ b/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset
@@ -13,12 +13,37 @@ MonoBehaviour:
   m_Name: ErikaActionData
   m_EditorClassIdentifier: 
   actions:
-    m_keys: 00000000020000000600000004000000050000000100000007000000
+    m_keys:
+    - Idle
+    - Move
+    - Landing
+    - LandingGround
+    - Jump
+    - AirAttack0
+    - AirAttack1
+    - AirAttack2
+    - AirAttack3
+    - AirAttack4
+    - AttackToAir
+    - AirDash
+    - Attack0
+    - Attack1
+    - Attack2
+    - Attack3
     m_values:
-    - {fileID: 7400000, guid: 6a53e3ed6230d2742939796aef1e214c, type: 2}
+    - {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2}
+    - {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2}
+    - {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2}
+    - {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2}
     - {fileID: 7400000, guid: 80b0945bbe9b94f468cc20801c050baf, type: 2}
-    - {fileID: 7400000, guid: 21f8513f0b3b0b945b76bbf95e6adc3e, type: 2}
-    - {fileID: 7400000, guid: a7f4564d08baf0342bd790dda3aa1540, type: 2}
-    - {fileID: 7400000, guid: ac5153c0b622f6041984ea8c2155fa8a, type: 2}
-    - {fileID: 7400000, guid: b3b491ff9a4b4204fb54105483e9458f, type: 2}
-    - {fileID: 7400000, guid: f6b472b469a84bd4fb06b3b99d3c08b7, type: 2}
+    - {fileID: 7400000, guid: 3af4a4fdd9720044bacfd86b0c3435b1, type: 2}
+    - {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2}
+    - {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2}
+    - {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2}
+    - {fileID: 7400000, guid: 6543c9aee7b3f7b4d80c8f87fdf3c837, type: 2}
+    - {fileID: 7400000, guid: d2551386674378f4cbedd917bf6348c5, type: 2}
+    - {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2}
+    - {fileID: 7400000, guid: 1c1b573ac9e8cb947afae3a21b84a6ce, type: 2}
+    - {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2}
+    - {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2}
+    - {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2}
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim b/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim
index 0d5beaa3..c27f27ad 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim
@@ -31177,7 +31177,7 @@ AnimationClip:
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
     m_StopTime: 2
-    m_OrientationOffsetY: 0
+    m_OrientationOffsetY: -19.7
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset
index 9ac4cfb7..a49dbcb1 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset
@@ -20,6 +20,9 @@ MonoBehaviour:
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
+  overrideRootMotion: 0
+  rootMotionOverrideData:
+    positions: []
   speedCurve:
     serializedVersion: 2
     m_Curve:
@@ -53,3 +56,6 @@ MonoBehaviour:
   parameters:
     m_keys: 
     m_values: []
+  properties:
+    m_keys: 
+    m_values: []
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset
index 34f21520..c91f8013 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset
@@ -22,6 +22,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -54,6 +60,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -138,3 +150,7 @@ MonoBehaviour:
   parameters:
     m_keys: 
     m_values: []
+  properties:
+    m_keys: 01000000
+    m_values:
+    - 0.07
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset
index 1009b6af..7fdac624 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset
@@ -53,8 +53,12 @@ MonoBehaviour:
   toggles:
     m_keys: 00000000
     m_values:
-    - from: 0.45
+    - from: 0.54
       to: 1
   parameters:
     m_keys: 
     m_values: []
+  properties:
+    m_keys: 01000000
+    m_values:
+    - 0.08
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset
index 0f718029..9cf4efee 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset
@@ -22,6 +22,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -62,6 +68,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -98,27 +110,9 @@ MonoBehaviour:
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
-  overrideRootMotion: 1
+  overrideRootMotion: 0
   rootMotionOverrideData:
-    positions:
-    - position: {x: 0, y: 0, z: 0}
-      frame: 0
-    - position: {x: 0.79, y: 0.14, z: 0}
-      frame: 3
-    - position: {x: 1.41, y: 0.24, z: 0}
-      frame: 6
-    - position: {x: 2.44, y: 0.28, z: 0}
-      frame: 9
-    - position: {x: 3.41, y: 0.25, z: 0}
-      frame: 12
-    - position: {x: 3.83, y: 0.29, z: 0}
-      frame: 18
-    - position: {x: 4.01, y: 0.26, z: 0}
-      frame: 28
-    - position: {x: 4.09, y: 0.27, z: 0}
-      frame: 42
-    - position: {x: 4.37, y: 0.14, z: 0}
-      frame: 45
+    positions: []
   speedCurve:
     serializedVersion: 2
     m_Curve:
@@ -181,8 +175,12 @@ MonoBehaviour:
   toggles:
     m_keys: 00000000
     m_values:
-    - from: 0.69
+    - from: 0.55
       to: 1
   parameters:
     m_keys: 
     m_values: []
+  properties:
+    m_keys: 01000000
+    m_values:
+    - 0.05
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset
index 694b3f64..27a674b8 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset
@@ -20,6 +20,9 @@ MonoBehaviour:
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
+  overrideRootMotion: 0
+  rootMotionOverrideData:
+    positions: []
   speedCurve:
     serializedVersion: 2
     m_Curve:
@@ -55,3 +58,7 @@ MonoBehaviour:
   parameters:
     m_keys: 
     m_values: []
+  properties:
+    m_keys: 01000000
+    m_values:
+    - 0.03
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
index b372229a..a0695940 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Take 001(Clone)
+  m_Name: Take 001
   m_EditorClassIdentifier: 
   animationName: Take 001
   animationPath: Assets/Art/Animations/Erika/Take 001.anim
@@ -28,6 +28,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -116,6 +122,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -155,6 +167,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -194,6 +212,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -233,6 +257,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
@@ -272,6 +302,12 @@ MonoBehaviour:
       multiHit: 0
       hitResponse: 0
       hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
       freezeFramesSelf: 0
       freezeFramesOther: 0
       sparkPath: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
deleted file mode 100644
index 1d22d5d2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e777b7b5be18d4e4092e116011158c68
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
deleted file mode 100644
index 8c41a6b2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5dc1b71affc68b54594096a1b96a5c00
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta
deleted file mode 100644
index 11148d17..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0d712421d808a43438a43d8a5d34effe
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta
new file mode 100644
index 00000000..b3286831
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b5a895c20fc15c748a20b8f214dd24b5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
deleted file mode 100644
index 7d4b13eb..00000000
--- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 922befa8a94692845b88500a23229d7f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
new file mode 100644
index 00000000..be6badd6
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c46a5a23283c7d428ae8bb13663ab6a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
deleted file mode 100644
index f5434a00..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 07c3b2bf6cb8cc2498422bbb105cbad8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
deleted file mode 100644
index 4ed2c938..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 827d77abe87680a47ae2d71a9e953a18
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
deleted file mode 100644
index 43a52cd1..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a2b72fbb41383047ac45e6c22ea9663
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
deleted file mode 100644
index 85d58a8c..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b2b0838fb0603964e99904eefe81ad7f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
deleted file mode 100644
index dd867045..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c8a678ea9e801f439a1003d04f33cf5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
deleted file mode 100644
index dc530723..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ebf636c7cf7b1934b885298ce1f5f42e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
deleted file mode 100644
index b28b6f04..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2022e8298d3a8624992143eb57c0f8ac
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
deleted file mode 100644
index eeca0d3b..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f6aa859c834c51f498ef0b3c3b83a0f5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
deleted file mode 100644
index 7f91da28..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: df69962f5b01e444a8bea87e31c7d0a4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta
deleted file mode 100644
index affd6eed..00000000
--- a/Assets/Bundle/Unit/Prop.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dafc173db1ebeab4c80641cc3d4fa528
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta
deleted file mode 100644
index 48dd5af5..00000000
--- a/Assets/Data/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4e712aac7b9add047ab7a8691dd1a17a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika.meta b/Assets/Data/AnimationData/Erika.meta
deleted file mode 100644
index 10bf1fb1..00000000
--- a/Assets/Data/AnimationData/Erika.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 02289cc4b0fe1c34988c293ff6dbca02
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/RootMotionData/Erika.meta b/Assets/Data/RootMotionData/Erika.meta
deleted file mode 100644
index 57b03e09..00000000
--- a/Assets/Data/RootMotionData/Erika.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2c4e05f9eb0abc949a472e82070dfef1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta
deleted file mode 100644
index d0809213..00000000
--- a/Assets/Data/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5bdb120d934aa114ab2f20e111a3c4d2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity
index 031b175d..3f59f961 100644
--- a/Assets/Scenes/Demo/AnimationEditScene.unity
+++ b/Assets/Scenes/Demo/AnimationEditScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -361,8 +361,9 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 861741897}
-  m_LocalRotation: {x: 0.03898723, y: -0.000008770729, z: 0.00000033023886, w: 0.9992397}
-  m_LocalPosition: {x: 4.2301955, y: 2.929946, z: -9.518984}
+  m_LocalRotation: {x: -0.022498226, y: 0.000000035994166, z: 0.0000000015155593,
+    w: 0.9997469}
+  m_LocalPosition: {x: 3.323032, y: 1.6318605, z: -7.065481}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
diff --git a/Assets/Scripts/Curve3D.meta b/Assets/Scripts/Curve3D.meta
deleted file mode 100644
index fef1c5e7..00000000
--- a/Assets/Scripts/Curve3D.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ad8b718b6b700d8419838dad07158567
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Drone.meta b/Assets/Scripts/Drone.meta
deleted file mode 100644
index 694cff70..00000000
--- a/Assets/Scripts/Drone.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec3412151f8a72a41b2ed21316763399
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
deleted file mode 100644
index bb96602e..00000000
--- a/Assets/Scripts/Props.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f299520ed9fcf4a45858ad4ef5a8d5d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Robot.meta b/Assets/Scripts/Robot.meta
deleted file mode 100644
index 0b5a087e..00000000
--- a/Assets/Scripts/Robot.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7c09ca1609552d24bbe697d1516f8aa9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta
deleted file mode 100644
index eb7a8716..00000000
--- a/Assets/Scripts/Scene.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eaee2d0f48cff9b40baf0686a8105600
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/AI/Actions.meta b/Assets/Scripts/Unit/AI/Actions.meta
deleted file mode 100644
index 9b4ad463..00000000
--- a/Assets/Scripts/Unit/AI/Actions.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 971e9d55b8bc0894eb6a110fb962000b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/AI/Conditionals.meta b/Assets/Scripts/Unit/AI/Conditionals.meta
deleted file mode 100644
index 70a86da5..00000000
--- a/Assets/Scripts/Unit/AI/Conditionals.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 85b7e0c7ed1d12f42a5178bfbf3d934c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs
index 30762b39..2250da76 100644
--- a/Assets/Scripts/Unit/AnimationData.cs
+++ b/Assets/Scripts/Unit/AnimationData.cs
@@ -76,6 +76,14 @@ public enum EAnimationParameter
 [Serializable]
 public class ParameterDictionary : SerializableDictionary<EAnimationParameter, AnimationParameter> { }
 
+public enum EAnimationProperty
+{
+	ComboTimeOffset = 1, 
+}
+
+[Serializable]
+public class PropertyDictionary : SerializableDictionary<EAnimationProperty, float> { }
+
 [Serializable]
 public class RootMotionOverrideData
 {
@@ -190,6 +198,8 @@ public class AnimationData : ScriptableObject
 
 	public ParameterDictionary parameters;
 
+	public PropertyDictionary properties;
+
 	public const int FPS = 30;
 
 	public AnimationData()
@@ -217,6 +227,20 @@ public class AnimationData : ScriptableObject
 		return null;
 	}
 
+	public bool HasProperty(EAnimationProperty property)
+	{
+		if (!properties.ContainsKey(property))
+			return false;
+		return true;
+	}
+
+	public float GetProperty(EAnimationProperty property)
+	{
+		if (!HasProperty(property))
+			return 0;
+		return properties[property];
+	}
+
 	public bool HasParameter(EAnimationParameter parameterName)
 	{
 		if (!parameters.ContainsKey(parameterName))
diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
index ac2649b7..243ce162 100644
--- a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
+++ b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
@@ -159,21 +159,12 @@ public class PCAnimation : UnitAnimation
     public void AnimAirAttack(int id)
     {
         m_Owner.unitCollider.OnAnimationChange();
-		switch (id)
-		{
-			case 0:
-				CrossFade(EAnimState.AirAttack0, 0.05f);
-				break;
-			case 1:
-				CrossFade(EAnimState.AirAttack1, 0.05f);
-				break;
-			case 2:
-				CrossFade(EAnimState.AirAttack2, 0.05f);
-				break;
-			case 3:
-				CrossFade(EAnimState.AirAttack3, 0.05f);
-				break;
-		}
+		EAnimState state = EAnimState.AirAttack0;
+		if (id == 1) state = EAnimState.AirAttack1;
+		else if (id == 2) state = EAnimState.AirAttack2;
+		else if (id == 3) state = EAnimState.AirAttack3;
+
+		CrossFade(state, 0.05f);
 	}
 
     public void AnimAttackToAir(float offset)
diff --git a/Assets/Scripts/Unit/UnitActionData.cs b/Assets/Scripts/Unit/UnitActionData.cs
index a2bb7a69..8a06a249 100644
--- a/Assets/Scripts/Unit/UnitActionData.cs
+++ b/Assets/Scripts/Unit/UnitActionData.cs
@@ -4,8 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 
 [Serializable]
-public class TriggerAnimationDictionary : SerializableDictionary<string, AnimationClip> { }
-
+public class TriggerAnimationDictionary : SerializableDictionary<string/*override clip name\state name*/, AnimationClip> { }
 
 // 配置角色的动画
 [CreateAssetMenu(fileName = "Unit Action Data")]
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
new file mode 100644
index 00000000..fc69e121
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6b4092aee1925294286c91c8b2f0246b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
new file mode 100644
index 00000000..16dceda0
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f677b222bd908a4eb6e8b6f446f0c95
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
new file mode 100644
index 00000000..3feeaa0c
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f65f99730f449cd42b5428ed33579276
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
new file mode 100644
index 00000000..d2cc8de3
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d1d19a8d9a9258489a54453cbd409bf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
new file mode 100644
index 00000000..60091bee
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5fa002e3b21354f4b847ab441877ecda
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
new file mode 100644
index 00000000..c50ca514
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c9c840958f8546c4e9667f0757d8557a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
index fa9e76cd..20eca756 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e38cb65072bb4a64cbe162792de9bec2
+guid: 0f14f2cbed5e00a40a3fa94241cf6c27
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
new file mode 100644
index 00000000..35b83bfb
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5e705a58e98ec1a409129eb57fa15477
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
new file mode 100644
index 00000000..88f9f501
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c77d30703ebcc5c4bbb57517b133b0f4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
new file mode 100644
index 00000000..4d33dc86
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 142685877fe50f64caba63abfda167a7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/User.meta b/Assets/ThirdParty/BOXOPHOBIC/User.meta
new file mode 100644
index 00000000..293c8b38
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/User.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f0aa5379d96b0e14795df45a380643fb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
new file mode 100644
index 00000000..a5ee5a64
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4c9d2f06234e7e643b2118057d8e0673
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
new file mode 100644
index 00000000..3fdad1c4
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6fcf51a07e84ca941a62046a0b693a19
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
new file mode 100644
index 00000000..94757653
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
new file mode 100644
index 00000000..d2c0b7b4
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: edc7fbbe770e693488770a7aaeae2aa6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
new file mode 100644
index 00000000..069be515
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ed975ceb335a144c93320e22ae1780a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
new file mode 100644
index 00000000..7ea21e4b
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a3babbb69c72f8419243020c0dfb70b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
new file mode 100644
index 00000000..f2a1c8a6
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cd6738b410016744eaf6e182174c0b2b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
new file mode 100644
index 00000000..50e68eff
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f32bd65977ebf9049bd5e40e18d1556c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
new file mode 100644
index 00000000..68664862
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 151a76ee3bec1ae449cd56f31d474de5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
new file mode 100644
index 00000000..aab2c856
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ae8613087e217249a69059295113b1c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant:
author	chai <chaifix@163.com>	2021-09-08 23:46:05 +0800
committer	chai <chaifix@163.com>	2021-09-08 23:46:05 +0800
commit	aaea0c7f800a39f5e43e36e18837b174d344afdf (patch)
tree	6c9f085f969750ff11ed4a7fa8e34dd19e42332b
parent	2fa67922f08ef39b4d70bad001592aedf22c9018 (diff)