10 files changed, 31 insertions, 73 deletions
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")]