summaryrefslogtreecommitdiff
path: root/Assets/Scripts
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts')
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs18
-rw-r--r--Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/Interactive.meta8
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs17
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs18
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs.meta11
-rw-r--r--Assets/Scripts/Physics/PhysicsHelper.cs40
8 files changed, 113 insertions, 21 deletions
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs b/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs
new file mode 100644
index 00000000..d55270ab
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ActionShakeCamera : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs.meta
new file mode 100644
index 00000000..93a39df8
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Actions/ActionShakeCamera.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a5f356ae9f970af40b86475bc21a0d5c
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive.meta b/Assets/Scripts/AbilitySystem/Conditions/Interactive.meta
new file mode 100644
index 00000000..cf125393
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38b2530cdab57854e90007371516c2bf
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs
new file mode 100644
index 00000000..b50121fe
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// hitbox击中
+public class ConditionHit : ConditionBase
+{
+ public ConditionHit()
+ {
+
+ }
+
+ public override bool Evaluate()
+ {
+ throw new System.NotImplementedException();
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs.meta
new file mode 100644
index 00000000..9c607983
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHit.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c354907230901bf45849e4bb93601b60
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs
new file mode 100644
index 00000000..b4acd71a
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ConditionHurt : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs.meta
new file mode 100644
index 00000000..e54feb2d
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/Interactive/ConditionHurt.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 62448f0af4616f64c987ac12131db584
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics/PhysicsHelper.cs b/Assets/Scripts/Physics/PhysicsHelper.cs
index aa31108e..0bd11ba7 100644
--- a/Assets/Scripts/Physics/PhysicsHelper.cs
+++ b/Assets/Scripts/Physics/PhysicsHelper.cs
@@ -24,7 +24,25 @@ public class PhysicsCollisionInfo
public sealed class PhysicsHelper
{
-#region 简略版的2D检测,忽略z轴,对于格斗游戏来说使用2D物理
+ public static bool BallContains(PhysicsBall ball, Vector3 point)
+ {
+ return false;
+ }
+
+ public static bool BallContains(PhysicsBall ball, Vector2 point)
+ {
+ return false;
+ }
+
+ public static bool BoxContains(PhysicsBox box, Vector3 point)
+ {
+ return false;
+ }
+
+ public static bool BoxContains(PhysicsBox box, Vector2 point)
+ {
+ return false;
+ }
public static bool BallvsBall2D(PhysicsBall ball1, PhysicsBall ball2, out PhysicsCollisionInfo info)
{
@@ -78,24 +96,4 @@ public sealed class PhysicsHelper
}
}
-#endregion
-
- public static bool BallvsBall(PhysicsBall ball1, PhysicsBall ball2, out PhysicsCollisionInfo info)
- {
- info = null;
- return true;
- }
-
- public static bool BoxvsBox(PhysicsBox box1, PhysicsBox box2, out PhysicsCollisionInfo info)
- {
- info = null;
- return true;
- }
-
- public static bool BallvsBox(PhysicsBall ball, PhysicsBox box, out PhysicsCollisionInfo info)
- {
- info = null;
- return true;
- }
-
}