diff options
Diffstat (limited to 'Assets/Scripts')
| -rw-r--r-- | Assets/Scripts/AbilitySystem/Actions/ActionRush.cs | 18 | ||||
| -rw-r--r-- | Assets/Scripts/AbilitySystem/Actions/ActionRush.cs.meta | 11 | ||||
| -rw-r--r-- | Assets/Scripts/Test/SaionjiScript_Ability.cs | 2 | ||||
| -rw-r--r-- | Assets/Scripts/Tween.meta | 8 | ||||
| -rw-r--r-- | Assets/Scripts/Tween/TweenAlongYAxis.cs | 18 | ||||
| -rw-r--r-- | Assets/Scripts/Tween/TweenAlongYAxis.cs.meta | 11 |
6 files changed, 68 insertions, 0 deletions
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs b/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs new file mode 100644 index 00000000..19f1b625 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionRush : 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/ActionRush.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs.meta new file mode 100644 index 00000000..760ef5f0 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionRush.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 43fb6de9baefcab4087468f33ae40a51 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index 49c0b5e9..b0a124c7 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -127,6 +127,8 @@ public partial class SaionjiScript : MonoBehaviour move.AddTrigger(trigger);
// dash ability
+ trigger = new Trigger(And(new ConditionAnimRange(animator, 0.5f, 1.0f), condCircleCmd), switchToAttk1);
+ dash.AddTrigger(trigger);
trigger = new Trigger(new ConditionAnimAtEnd(animator, Anim_DashWithSword), switchToIdle);
dash.AddTrigger(trigger);
diff --git a/Assets/Scripts/Tween.meta b/Assets/Scripts/Tween.meta new file mode 100644 index 00000000..bd3ad2fe --- /dev/null +++ b/Assets/Scripts/Tween.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9519f0da0d097b546af6c24571fc2065 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Tween/TweenAlongYAxis.cs b/Assets/Scripts/Tween/TweenAlongYAxis.cs new file mode 100644 index 00000000..d5748245 --- /dev/null +++ b/Assets/Scripts/Tween/TweenAlongYAxis.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TweenAlongYAxis : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Tween/TweenAlongYAxis.cs.meta b/Assets/Scripts/Tween/TweenAlongYAxis.cs.meta new file mode 100644 index 00000000..8789d8c7 --- /dev/null +++ b/Assets/Scripts/Tween/TweenAlongYAxis.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0f1644ad01699774c8462c74fdfeb484 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: |