+ Action Settings

12 files changed, 48 insertions, 2 deletions

diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta
new file mode 100644
index 00000000..9b4ad463
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/AI/Actions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 971e9d55b8bc0894eb6a110fb962000b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta
new file mode 100644
index 00000000..70a86da5
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85b7e0c7ed1d12f42a5178bfbf3d934c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/AnimationData.cs b/Erika/Assets/Scripts/Unit/AnimationData.cs
index 21d90028..5bbc5fc6 100644
--- a/Erika/Assets/Scripts/Unit/AnimationData.cs
+++ b/Erika/Assets/Scripts/Unit/AnimationData.cs
@@ -76,7 +76,7 @@ public enum EAnimationParameter
 [Serializable]

 public class ParameterDictionary : SerializableDictionary<EAnimationParameter, AnimationParameter> { }

 

-// 动画属性

+// 动画属性，不要修改枚举值

 public enum EAnimationProperty

 {

 	ComboTimeOffset       = 1, // 如果是连击跳转过来，动作开始的时间偏移 

@@ -87,11 +87,22 @@ public enum EAnimationProperty
     ORMEnforcement        = 6, // 限制Y坐标的rootmotion不能小于0，仅限override rootmotion

     Endpoint              = 7, // 结束点，范围[0-1]，如果只截取动作的一部分，用这个属性设置

     Startpoint            = 8, // 类似endpoint

+    Invinsible            = 9, // 动作播放期间无敌

 }

 

 [Serializable]

 public class PropertyDictionary : SerializableDictionary<EAnimationProperty, float> { }

 

+/// <summary>

+/// 动作参数配置，后续替换掉parameter。包含伤害、cd等配置

+/// </summary>

+[Serializable]

+public struct ActionSettings

+{

+    [SerializeField] public bool isGun;

+    [SerializeField] public float cooldown; 

+}

+

 [Serializable]

 public class RootMotionOverrideData

 {

@@ -213,6 +224,8 @@ public class AnimationData : ScriptableObject
 

 	public PropertyDictionary properties;

 

+    public ActionSettings actionSettings;

+

 	public const int FPS = 30;

 

 	public AnimationData()

diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta
new file mode 100644
index 00000000..13682d7f
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa5eb9b1f1ac0184b9daa4cab5baaf64
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/Erika.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika.meta
new file mode 100644
index 00000000..e5a13613
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc36e939166eb8b48b8d88cfb7eb50ea
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState.cs
index c3e69830..e551451b 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState.cs
@@ -116,7 +116,7 @@ public partial class PCState : UnitState
         {

             TurnLeft();

             ChangeState(EUnitState.AirDash, new AirDashParam(), true);

-        }

+        } 

         if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D))

         {

             TurnRight();

diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState.cs.meta
index 548a0a91..548a0a91 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs.meta
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState.cs.meta
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_Event.cs
index 73c65a0c..73c65a0c 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_Event.cs
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_Event.cs.meta
index 7dc2d927..7dc2d927 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs.meta
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_Event.cs.meta
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_States.cs
index 1a8d0010..1a8d0010 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_States.cs
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_States.cs.meta
index e314f21e..e314f21e 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs.meta
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/Erika/PCState_States.cs.meta
diff --git a/Erika/Assets/Scripts/Unit/TransitionData.cs b/Erika/Assets/Scripts/Unit/TransitionData.cs
index 53606c35..da79fd14 100644
--- a/Erika/Assets/Scripts/Unit/TransitionData.cs
+++ b/Erika/Assets/Scripts/Unit/TransitionData.cs
@@ -16,6 +16,7 @@ public class TransitionData
 	//// 结束动画

 	//public string toAnimation;

 

+    [Tooltip("是否开启重载")]

 	public bool enabled = true;

 

     public enum TransitionType