summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_1.FBX.meta2
-rw-r--r--Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_2.FBX.meta2
-rw-r--r--Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBXbin0 -> 2252624 bytes
-rw-r--r--Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX.meta1243
-rw-r--r--Assets/Art/AnimContros/AnimContro_Saionji.controller348
-rw-r--r--Assets/Scenes/Demo/SaionjiShowOff.unity31
-rw-r--r--Assets/Scripts/AbilitySystem.meta8
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities.meta8
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs61
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs13
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs18
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs16
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs18
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs40
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs54
-rw-r--r--Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions.meta8
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs26
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs31
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs23
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs105
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs14
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs22
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs21
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs14
-rw-r--r--Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Triggers.meta8
-rw-r--r--Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs29
-rw-r--r--Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta11
-rw-r--r--Assets/Scripts/AbilitySystem/Triggers/Trigger.cs32
-rw-r--r--Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta11
-rw-r--r--Assets/Scripts/Input.meta8
-rw-r--r--Assets/Scripts/Input/CommandType.cs21
-rw-r--r--Assets/Scripts/Input/CommandType.cs.meta11
-rw-r--r--Assets/Scripts/Input/InputManager.cs18
-rw-r--r--Assets/Scripts/Input/InputManager.cs.meta11
-rw-r--r--Assets/Scripts/Physics.meta8
-rw-r--r--Assets/Scripts/Physics/Box.cs18
-rw-r--r--Assets/Scripts/Physics/Box.cs.meta11
-rw-r--r--Assets/Scripts/Physics/DefendBox.cs18
-rw-r--r--Assets/Scripts/Physics/DefendBox.cs.meta11
-rw-r--r--Assets/Scripts/Physics/HitBox.cs18
-rw-r--r--Assets/Scripts/Physics/HitBox.cs.meta11
-rw-r--r--Assets/Scripts/Physics/HurtBox.cs18
-rw-r--r--Assets/Scripts/Physics/HurtBox.cs.meta11
-rw-r--r--Assets/Scripts/Physics/PhysicsUtils.cs18
-rw-r--r--Assets/Scripts/Physics/PhysicsUtils.cs.meta11
-rw-r--r--Assets/Scripts/Test/PhysicsWorldTest.cs2
-rw-r--r--Assets/Scripts/Test/SaionjiScript.cs21
-rw-r--r--Assets/Scripts/Test/SaionjiScript_Ability.cs23
-rw-r--r--Assets/Scripts/Test/SaionjiScript_Ability.cs.meta11
-rw-r--r--Assets/Scripts/Utils/UIDManager.cs18
-rw-r--r--Assets/Scripts/Utils/UIDManager.cs.meta11
66 files changed, 2669 insertions, 21 deletions
diff --git a/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_1.FBX.meta b/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_1.FBX.meta
index d09a28cb..d65cad7e 100644
--- a/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_1.FBX.meta
+++ b/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_1.FBX.meta
@@ -243,7 +243,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
- loopTime: 0
+ loopTime: 1
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
diff --git a/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_2.FBX.meta b/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_2.FBX.meta
index 924dbcd3..53e9e84d 100644
--- a/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_2.FBX.meta
+++ b/Assets/Art/AnimClips/Ninja/Attack/Run_Light_Attk_2.FBX.meta
@@ -239,7 +239,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
- loopTime: 0
+ loopTime: 1
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
diff --git a/Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX b/Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX
new file mode 100644
index 00000000..1cd7a393
--- /dev/null
+++ b/Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX
Binary files differ
diff --git a/Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX.meta b/Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX.meta
new file mode 100644
index 00000000..55d70167
--- /dev/null
+++ b/Assets/Art/AnimClips/Samurai/Action/ChargeAttkLoop.FBX.meta
@@ -0,0 +1,1243 @@
+fileFormatVersion: 2
+guid: f333b7fb31a99cb41b68bc7efd7e4306
+ModelImporter:
+ serializedVersion: 23
+ fileIDToRecycleName:
+ 100000: Bip001 Footsteps
+ 100002: Bip001 HeadNub
+ 100004: Bip001 L Finger0Nub
+ 100006: Bip001 L Finger1Nub
+ 100008: Bip001 L Finger2Nub
+ 100010: Bip001 L Finger3Nub
+ 100012: Bip001 L Finger4Nub
+ 100014: Bip001 L Toe0Nub
+ 100016: Bip001 R Finger0Nub
+ 100018: Bip001 R Finger1Nub
+ 100020: Bip001 R Finger2Nub
+ 100022: Bip001 R Finger3Nub
+ 100024: Bip001 R Finger4Nub
+ 100026: Bip001 R Toe0Nub
+ 100028: BladeL
+ 100030: BladeL_Bone
+ 100032: BladeR
+ 100034: BladeR_Bone
+ 100036: Body
+ 100038: //RootNode
+ 100040: Chest
+ 100042: Fingers
+ 100044: Head
+ 100046: Hips
+ 100048: Joint
+ 100050: LeftArm
+ 100052: LeftFoot
+ 100054: LeftForeArm
+ 100056: LeftHand
+ 100058: LeftIndex1
+ 100060: LeftIndex2
+ 100062: LeftIndex3
+ 100064: LeftLeg
+ 100066: LeftMiddle1
+ 100068: LeftMiddle2
+ 100070: LeftMiddle3
+ 100072: LeftPink1
+ 100074: LeftPink2
+ 100076: LeftPink3
+ 100078: LeftRing1
+ 100080: LeftRing2
+ 100082: LeftRing3
+ 100084: LeftShoulder
+ 100086: LeftThumb1
+ 100088: LeftThumb2
+ 100090: LeftThumb3
+ 100092: LeftToe
+ 100094: LeftUpLeg
+ 100096: Neck
+ 100098: Pelvis
+ 100100: RightArm
+ 100102: RightFoot
+ 100104: RightForeArm
+ 100106: RightHand
+ 100108: RightIndex1
+ 100110: RightIndex2
+ 100112: RightIndex3
+ 100114: RightLeg
+ 100116: RightMiddle1
+ 100118: RightMiddle2
+ 100120: RightMiddle3
+ 100122: RightPinky1
+ 100124: RightPinky2
+ 100126: RightPinky3
+ 100128: RightRing1
+ 100130: RightRing2
+ 100132: RightRing3
+ 100134: RightShoulder
+ 100136: RightThumb1
+ 100138: RightThumb2
+ 100140: RightThumb3
+ 100142: RightToe
+ 100144: RightUpLeg
+ 100146: Spine
+ 100148: Sword_Hold
+ 100150: Sword_Hold_Bone
+ 400000: Bip001 Footsteps
+ 400002: Bip001 HeadNub
+ 400004: Bip001 L Finger0Nub
+ 400006: Bip001 L Finger1Nub
+ 400008: Bip001 L Finger2Nub
+ 400010: Bip001 L Finger3Nub
+ 400012: Bip001 L Finger4Nub
+ 400014: Bip001 L Toe0Nub
+ 400016: Bip001 R Finger0Nub
+ 400018: Bip001 R Finger1Nub
+ 400020: Bip001 R Finger2Nub
+ 400022: Bip001 R Finger3Nub
+ 400024: Bip001 R Finger4Nub
+ 400026: Bip001 R Toe0Nub
+ 400028: BladeL
+ 400030: BladeL_Bone
+ 400032: BladeR
+ 400034: BladeR_Bone
+ 400036: Body
+ 400038: //RootNode
+ 400040: Chest
+ 400042: Fingers
+ 400044: Head
+ 400046: Hips
+ 400048: Joint
+ 400050: LeftArm
+ 400052: LeftFoot
+ 400054: LeftForeArm
+ 400056: LeftHand
+ 400058: LeftIndex1
+ 400060: LeftIndex2
+ 400062: LeftIndex3
+ 400064: LeftLeg
+ 400066: LeftMiddle1
+ 400068: LeftMiddle2
+ 400070: LeftMiddle3
+ 400072: LeftPink1
+ 400074: LeftPink2
+ 400076: LeftPink3
+ 400078: LeftRing1
+ 400080: LeftRing2
+ 400082: LeftRing3
+ 400084: LeftShoulder
+ 400086: LeftThumb1
+ 400088: LeftThumb2
+ 400090: LeftThumb3
+ 400092: LeftToe
+ 400094: LeftUpLeg
+ 400096: Neck
+ 400098: Pelvis
+ 400100: RightArm
+ 400102: RightFoot
+ 400104: RightForeArm
+ 400106: RightHand
+ 400108: RightIndex1
+ 400110: RightIndex2
+ 400112: RightIndex3
+ 400114: RightLeg
+ 400116: RightMiddle1
+ 400118: RightMiddle2
+ 400120: RightMiddle3
+ 400122: RightPinky1
+ 400124: RightPinky2
+ 400126: RightPinky3
+ 400128: RightRing1
+ 400130: RightRing2
+ 400132: RightRing3
+ 400134: RightShoulder
+ 400136: RightThumb1
+ 400138: RightThumb2
+ 400140: RightThumb3
+ 400142: RightToe
+ 400144: RightUpLeg
+ 400146: Spine
+ 400148: Sword_Hold
+ 400150: Sword_Hold_Bone
+ 4300000: Body
+ 4300002: Fingers
+ 4300004: Joint
+ 4300006: Sword_Hold
+ 4300008: BladeL
+ 4300010: BladeR
+ 7400000: ChargeAttk
+ 9500000: //RootNode
+ 13700000: BladeL
+ 13700002: BladeR
+ 13700004: Body
+ 13700006: Fingers
+ 13700008: Joint
+ 13700010: Sword_Hold
+ 2186277476908879412: ImportLogs
+ externalObjects:
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: Texture_Blue
+ second: {fileID: 2100000, guid: 2baf2d6317aa9414c84d5a318aa94102, type: 2}
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: Texture_Gray
+ second: {fileID: 2100000, guid: ae0de904ac57bbf42a70a6c7f2df6883, type: 2}
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: Texture_White
+ second: {fileID: 2100000, guid: c5c671a1261264f4db891206becc4227, type: 2}
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: Texture_Yellow
+ second: {fileID: 2100000, guid: 1edb410947d48da4eb5ec85bc03717b9, type: 2}
+ materials:
+ importMaterials: 1
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 0
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings: "\nClip 'Take 001' has import animation warnings that
+ might lower retargeting quality:\nNote: Activate translation DOF on avatar to
+ improve retargeting quality.\n\t'Chest' has translation animation that will
+ be discarded.\n"
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 3
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations:
+ - serializedVersion: 16
+ name: ChargeAttk
+ takeName: Take 001
+ firstFrame: 0
+ lastFrame: 111
+ wrapMode: 0
+ orientationOffsetY: 0
+ level: 0
+ cycleOffset: 0
+ loop: 0
+ hasAdditiveReferencePose: 0
+ loopTime: 1
+ loopBlend: 0
+ loopBlendOrientation: 1
+ loopBlendPositionY: 1
+ loopBlendPositionXZ: 0
+ keepOriginalOrientation: 1
+ keepOriginalPositionY: 1
+ keepOriginalPositionXZ: 0
+ heightFromFeet: 0
+ mirror: 0
+ bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+ curves: []
+ events: []
+ transformMask:
+ - path:
+ weight: 1
+ - path: BladeL
+ weight: 0
+ - path: BladeR
+ weight: 0
+ - path: Body
+ weight: 0
+ - path: Fingers
+ weight: 0
+ - path: Hips
+ weight: 1
+ - path: Hips/Bip001 Footsteps
+ weight: 0
+ - path: Hips/Pelvis
+ weight: 1
+ - path: Hips/Pelvis/BladeL_Bone
+ weight: 0
+ - path: Hips/Pelvis/LeftUpLeg
+ weight: 1
+ - path: Hips/Pelvis/LeftUpLeg/LeftLeg
+ weight: 1
+ - path: Hips/Pelvis/LeftUpLeg/LeftLeg/LeftFoot
+ weight: 1
+ - path: Hips/Pelvis/LeftUpLeg/LeftLeg/LeftFoot/LeftToe
+ weight: 0
+ - path: Hips/Pelvis/LeftUpLeg/LeftLeg/LeftFoot/LeftToe/Bip001 L Toe0Nub
+ weight: 0
+ - path: Hips/Pelvis/RightUpLeg
+ weight: 1
+ - path: Hips/Pelvis/RightUpLeg/RightLeg
+ weight: 1
+ - path: Hips/Pelvis/RightUpLeg/RightLeg/RightFoot
+ weight: 1
+ - path: Hips/Pelvis/RightUpLeg/RightLeg/RightFoot/RightToe
+ weight: 0
+ - path: Hips/Pelvis/RightUpLeg/RightLeg/RightFoot/RightToe/Bip001 R Toe0Nub
+ weight: 0
+ - path: Hips/Pelvis/Sword_Hold_Bone
+ weight: 0
+ - path: Hips/Spine
+ weight: 1
+ - path: Hips/Spine/Chest
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftIndex1
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftIndex1/LeftIndex2
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftIndex1/LeftIndex2/LeftIndex3
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftIndex1/LeftIndex2/LeftIndex3/Bip001
+ L Finger1Nub
+ weight: 0
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftMiddle1
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftMiddle1/LeftMiddle2
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftMiddle1/LeftMiddle2/LeftMiddle3
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftMiddle1/LeftMiddle2/LeftMiddle3/Bip001
+ L Finger2Nub
+ weight: 0
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftPink1
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftPink1/LeftPink2
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftPink1/LeftPink2/LeftPink3
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftPink1/LeftPink2/LeftPink3/Bip001
+ L Finger4Nub
+ weight: 0
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftRing1
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftRing1/LeftRing2
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftRing1/LeftRing2/LeftRing3
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftRing1/LeftRing2/LeftRing3/Bip001
+ L Finger3Nub
+ weight: 0
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftThumb1
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftThumb1/LeftThumb2
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftThumb1/LeftThumb2/LeftThumb3
+ weight: 1
+ - path: Hips/Spine/Chest/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftThumb1/LeftThumb2/LeftThumb3/Bip001
+ L Finger0Nub
+ weight: 0
+ - path: Hips/Spine/Chest/Neck
+ weight: 1
+ - path: Hips/Spine/Chest/Neck/Head
+ weight: 1
+ - path: Hips/Spine/Chest/Neck/Head/Bip001 HeadNub
+ weight: 0
+ - path: Hips/Spine/Chest/RightShoulder
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/BladeR_Bone
+ weight: 0
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightIndex1
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightIndex1/RightIndex2
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightIndex1/RightIndex2/RightIndex3
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightIndex1/RightIndex2/RightIndex3/Bip001
+ R Finger1Nub
+ weight: 0
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightMiddle1
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightMiddle1/RightMiddle2
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightMiddle1/RightMiddle2/RightMiddle3
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightMiddle1/RightMiddle2/RightMiddle3/Bip001
+ R Finger2Nub
+ weight: 0
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightPinky1
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightPinky1/RightPinky2
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightPinky1/RightPinky2/RightPinky3
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightPinky1/RightPinky2/RightPinky3/Bip001
+ R Finger4Nub
+ weight: 0
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightRing1
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightRing1/RightRing2
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightRing1/RightRing2/RightRing3
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightRing1/RightRing2/RightRing3/Bip001
+ R Finger3Nub
+ weight: 0
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightThumb1
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightThumb1/RightThumb2
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightThumb1/RightThumb2/RightThumb3
+ weight: 1
+ - path: Hips/Spine/Chest/RightShoulder/RightArm/RightForeArm/RightHand/RightThumb1/RightThumb2/RightThumb3/Bip001
+ R Finger0Nub
+ weight: 0
+ - path: Joint
+ weight: 0
+ - path: Sword_Hold
+ weight: 0
+ maskType: 0
+ maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 0
+ isReadable: 1
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ importVisibility: 0
+ importBlendShapes: 1
+ importCameras: 0
+ importLights: 0
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ optimizeMeshForGPU: 1
+ keepQuads: 0
+ weldVertices: 1
+ preserveHierarchy: 0
+ indexFormat: 1
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ previousCalculatedGlobalScale: 0.01
+ hasPreviousCalculatedGlobalScale: 1
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 0
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ importAnimation: 1
+ copyAvatar: 0
+ humanDescription:
+ serializedVersion: 2
+ human:
+ - boneName: Hips
+ humanName: Hips
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftUpLeg
+ humanName: LeftUpperLeg
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightUpLeg
+ humanName: RightUpperLeg
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftLeg
+ humanName: LeftLowerLeg
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightLeg
+ humanName: RightLowerLeg
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftFoot
+ humanName: LeftFoot
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightFoot
+ humanName: RightFoot
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: Spine
+ humanName: Spine
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: Chest
+ humanName: Chest
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: Neck
+ humanName: Neck
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: Head
+ humanName: Head
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftShoulder
+ humanName: LeftShoulder
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightShoulder
+ humanName: RightShoulder
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftArm
+ humanName: LeftUpperArm
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightArm
+ humanName: RightUpperArm
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftForeArm
+ humanName: LeftLowerArm
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightForeArm
+ humanName: RightLowerArm
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftHand
+ humanName: LeftHand
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightHand
+ humanName: RightHand
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftThumb1
+ humanName: Left Thumb Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftThumb2
+ humanName: Left Thumb Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftThumb3
+ humanName: Left Thumb Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftIndex1
+ humanName: Left Index Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftIndex2
+ humanName: Left Index Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftIndex3
+ humanName: Left Index Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftMiddle1
+ humanName: Left Middle Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftMiddle2
+ humanName: Left Middle Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftMiddle3
+ humanName: Left Middle Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftRing1
+ humanName: Left Ring Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftRing2
+ humanName: Left Ring Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftRing3
+ humanName: Left Ring Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftPink1
+ humanName: Left Little Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftPink2
+ humanName: Left Little Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: LeftPink3
+ humanName: Left Little Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightThumb1
+ humanName: Right Thumb Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightThumb2
+ humanName: Right Thumb Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightThumb3
+ humanName: Right Thumb Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightIndex1
+ humanName: Right Index Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightIndex2
+ humanName: Right Index Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightIndex3
+ humanName: Right Index Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightMiddle1
+ humanName: Right Middle Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightMiddle2
+ humanName: Right Middle Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightMiddle3
+ humanName: Right Middle Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightRing1
+ humanName: Right Ring Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightRing2
+ humanName: Right Ring Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightRing3
+ humanName: Right Ring Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightPinky1
+ humanName: Right Little Proximal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightPinky2
+ humanName: Right Little Intermediate
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ - boneName: RightPinky3
+ humanName: Right Little Distal
+ limit:
+ min: {x: 0, y: 0, z: 0}
+ max: {x: 0, y: 0, z: 0}
+ value: {x: 0, y: 0, z: 0}
+ length: 0
+ modified: 0
+ skeleton:
+ - name: T-Pose(Clone)
+ parentName:
+ position: {x: 0, y: 0, z: 0}
+ rotation: {x: 0, y: 0, z: 0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: BladeL
+ parentName:
+ position: {x: -0.15113708, y: 1.1942139, z: 0.21100521}
+ rotation: {x: -0.18157558, y: 0.28872877, z: 0.70160097, w: 0.62563735}
+ scale: {x: 0.40166733, y: 0.40166718, z: 0.4016671}
+ - name: BladeR
+ parentName:
+ position: {x: 0.77731186, y: 1.4427713, z: -0.03480024}
+ rotation: {x: -0.018752001, y: 0.99909246, z: -0.007738284, w: -0.037453506}
+ scale: {x: 0.40166733, y: 0.40166718, z: 0.4016671}
+ - name: Body
+ parentName:
+ position: {x: -0, y: 1.1350908, z: 0.017936246}
+ rotation: {x: 0.00000008146034, y: 0, z: -0, w: 1}
+ scale: {x: 0.6059175, y: 0.6059175, z: 2.5840552}
+ - name: Fingers
+ parentName:
+ position: {x: -0, y: 0, z: 0}
+ rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Hips
+ parentName:
+ position: {x: -0, y: 0.98275, z: 0.013068189}
+ rotation: {x: -0.50000036, y: 0.49999964, z: 0.49999964, w: 0.50000036}
+ scale: {x: 0.99999994, y: 0.99999994, z: 1}
+ - name: Bip001 Footsteps
+ parentName:
+ position: {x: -0, y: 0, z: -0.97846615}
+ rotation: {x: 0, y: 0, z: -0.7071063, w: 0.70710725}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Pelvis
+ parentName:
+ position: {x: -0, y: 0, z: 0}
+ rotation: {x: -0.49999964, y: 0.50000036, z: 0.49999964, w: 0.50000036}
+ scale: {x: 1, y: 0.99999994, z: 0.99999994}
+ - name: Sword_Hold_Bone
+ parentName:
+ position: {x: -0.053873748, y: -0.00053559063, z: 0.1907731}
+ rotation: {x: 0.7116927, y: 0.027398983, z: -0.7010268, w: -0.03611435}
+ scale: {x: 1, y: 1, z: 1}
+ - name: BladeL_Bone
+ parentName:
+ position: {x: -0.21146217, y: 0.19793743, z: 0.15113685}
+ rotation: {x: -0.19716941, y: 0.71719646, z: 0.61004174, w: -0.27313465}
+ scale: {x: 1.0000004, y: 1.0000002, z: 0.9999999}
+ - name: RightUpLeg
+ parentName:
+ position: {x: -0.00000015258789, y: -0.00000007510185, z: -0.08567212}
+ rotation: {x: 0.0055967798, y: 0.99987566, z: -0.0125247305, w: -0.0077794483}
+ scale: {x: 1, y: 1, z: 1}
+ - name: RightLeg
+ parentName:
+ position: {x: -0.440825, y: -5.9604643e-10, z: 0}
+ rotation: {x: 2.5410143e-10, y: 9.314746e-10, z: 0.00059807306, w: 0.9999998}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+ - name: RightFoot
+ parentName:
+ position: {x: -0.41156092, y: -5.9604643e-10, z: -0.000000019073486}
+ rotation: {x: -0.00017353428, y: -0.0048699896, z: -0.006172642, w: 0.99996907}
+ scale: {x: 1, y: 0.9999998, z: 1}
+ - name: RightToe
+ parentName:
+ position: {x: -0.12624253, y: 0.15159549, z: 0}
+ rotation: {x: -0.000000015389459, y: 0.00000001523286, z: -0.7071068, w: 0.7071068}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1}
+ - name: Bip001 R Toe0Nub
+ parentName:
+ position: {x: -0.06818751, y: 0, z: 0}
+ rotation: {x: 2.3283062e-10, y: -1.0749089e-10, z: 2.502717e-20, w: 1}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1}
+ - name: LeftUpLeg
+ parentName:
+ position: {x: 0.00000015258789, y: 0.00000016093254, z: 0.08567212}
+ rotation: {x: 0.0055967877, y: 0.99987566, z: 0.012523336, w: 0.007777982}
+ scale: {x: 1, y: 0.99999994, z: 0.9999999}
+ - name: LeftLeg
+ parentName:
+ position: {x: -0.44082496, y: 5.9604643e-10, z: 0.000000009536743}
+ rotation: {x: -3.637978e-10, y: -2.175777e-13, z: 0.00059807306, w: 0.9999998}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1}
+ - name: LeftFoot
+ parentName:
+ position: {x: -0.4115609, y: 0.0000000011920929, z: 0}
+ rotation: {x: 0.00017353377, y: 0.004869904, z: -0.0061726454, w: 0.99996907}
+ scale: {x: 1, y: 0.9999999, z: 1}
+ - name: LeftToe
+ parentName:
+ position: {x: -0.12624253, y: 0.15159547, z: 0}
+ rotation: {x: 0.000000015554116, y: -0.000000015397479, z: -0.7071068, w: 0.7071068}
+ scale: {x: 0.99999994, y: 1, z: 1}
+ - name: Bip001 L Toe0Nub
+ parentName:
+ position: {x: -0.068187505, y: 0, z: 0.000000009536743}
+ rotation: {x: 1.07519334e-10, y: -6.5836606e-27, z: 1, w: 6.123234e-17}
+ scale: {x: -0.99999994, y: -1, z: -1}
+ - name: Spine
+ parentName:
+ position: {x: 0.00009789228, y: -6.48015e-14, z: 0.10961815}
+ rotation: {x: -0.49674812, y: 0.50323087, z: 0.50323224, w: 0.49674675}
+ scale: {x: 1, y: 1, z: 0.99999994}
+ - name: Chest
+ parentName:
+ position: {x: -0.13123566, y: -0.00025390385, z: -7.042263e-10}
+ rotation: {x: -5.3895156e-15, y: -0.000000019088699, z: 0.0068822834, w: 0.99997634}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1}
+ - name: RightShoulder
+ parentName:
+ position: {x: -0.26259163, y: -0.025448512, z: -0.0525257}
+ rotation: {x: 0.6719964, y: 0.00026653428, z: 0.7405544, w: -0.000295787}
+ scale: {x: 1.0000001, y: 1, z: 1}
+ - name: RightArm
+ parentName:
+ position: {x: -0.12200107, y: -0.0000000023841857, z: 0}
+ rotation: {x: -0.016502982, y: -0.04184747, z: 0.012796432, w: 0.9989058}
+ scale: {x: 0.99999994, y: 1, z: 1}
+ - name: RightForeArm
+ parentName:
+ position: {x: -0.26449493, y: 0.0000000023841857, z: 0}
+ rotation: {x: 2.3283057e-10, y: 1.7977233e-13, z: 0.0007721163, w: 0.9999997}
+ scale: {x: 1.0000001, y: 1, z: 0.99999994}
+ - name: RightHand
+ parentName:
+ position: {x: -0.26449493, y: -0.0000000047683715, z: 0}
+ rotation: {x: 0.69131655, y: -0.040822543, z: 0.030837994, w: 0.72073853}
+ scale: {x: 1, y: 1, z: 1}
+ - name: BladeR_Bone
+ parentName:
+ position: {x: -0.071701124, y: 0.031776886, z: -0.028412627}
+ rotation: {x: 0.99820375, y: -0.02655417, z: 0.04576307, w: -0.02810544}
+ scale: {x: 1.0000002, y: 1.0000001, z: 0.9999999}
+ - name: RightThumb1
+ parentName:
+ position: {x: -0.026743164, y: 0.017545624, z: 0.02198472}
+ rotation: {x: -0.39241087, y: 0.37035063, z: 0.13225652, w: 0.83148205}
+ scale: {x: 1, y: 1, z: 1}
+ - name: RightThumb2
+ parentName:
+ position: {x: -0.047266617, y: 0, z: 0}
+ rotation: {x: 0.000000059604616, y: -0.00000029802308, z: -0.041039895, w: 0.9991575}
+ scale: {x: 1.0000001, y: 1, z: 1}
+ - name: RightThumb3
+ parentName:
+ position: {x: -0.035123177, y: 0, z: 0}
+ rotation: {x: -4.0868053e-10, y: -0.000000014895557, z: -0.027426085, w: 0.99962384}
+ scale: {x: 0.99999994, y: 1.0000001, z: 1}
+ - name: Bip001 R Finger0Nub
+ parentName:
+ position: {x: -0.032480963, y: 0.000000038146972, z: 0}
+ rotation: {x: -1.1102229e-16, y: -0.0000000074505797, z: 1, w: 0.000000014901161}
+ scale: {x: -1, y: -1.0000001, z: -1}
+ - name: RightIndex1
+ parentName:
+ position: {x: -0.09708961, y: -0.0023173522, z: 0.025497504}
+ rotation: {x: 0.003366946, y: 0.039942876, z: -0.04783081, w: 0.99805087}
+ scale: {x: 0.99999994, y: 0.99999994, z: 1.0000001}
+ - name: RightIndex2
+ parentName:
+ position: {x: -0.033342436, y: 0, z: 0.000000009536743}
+ rotation: {x: -0.0000000018242329, y: 0.0000000020145228, z: -0.019235237, w: 0.999815}
+ scale: {x: 1, y: 1, z: 1.0000001}
+ - name: RightIndex3
+ parentName:
+ position: {x: -0.028267898, y: 0, z: 0}
+ rotation: {x: -0.0000000017874366, y: -0.000000006656325, z: 0.011315952, w: 0.999936}
+ scale: {x: 1.0000002, y: 1.0000001, z: 1.0000001}
+ - name: Bip001 R Finger1Nub
+ parentName:
+ position: {x: -0.031239318, y: 0.00000015258789, z: 0}
+ rotation: {x: 8.1490725e-10, y: -0.0000000018626451, z: 1, w: 6.2750226e-17}
+ scale: {x: -1, y: -1, z: -0.99999994}
+ - name: RightMiddle1
+ parentName:
+ position: {x: -0.102270655, y: -0.005095825, z: 0.00012607574}
+ rotation: {x: 0.000411868, y: 0.00019046101, z: -0.05681644, w: 0.9983846}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+ - name: RightMiddle2
+ parentName:
+ position: {x: -0.03603569, y: 0.00000015258789, z: 0}
+ rotation: {x: -0.0000000018646562, y: 2.1613374e-10, z: 0.008959068, w: 0.9999599}
+ scale: {x: 1, y: 1.0000001, z: 1}
+ - name: RightMiddle3
+ parentName:
+ position: {x: -0.031463392, y: 0, z: 0}
+ rotation: {x: 0.000000001891268, y: -6.49575e-10, z: 0.041549757, w: 0.99913645}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Bip001 R Finger2Nub
+ parentName:
+ position: {x: -0.033252105, y: -0.00000015258789, z: 0}
+ rotation: {x: -2.0372681e-10, y: 0.0000000018626449, z: 1, w: 6.1611813e-17}
+ scale: {x: -1, y: -1.0000001, z: -1.0000001}
+ - name: RightPinky1
+ parentName:
+ position: {x: -0.08984596, y: 0.007751617, z: -0.04868637}
+ rotation: {x: 0.056138318, y: -0.044703543, z: -0.038837634, w: 0.99666536}
+ scale: {x: 0.99999994, y: 1.0000002, z: 1}
+ - name: RightPinky2
+ parentName:
+ position: {x: -0.027551498, y: 0, z: 0}
+ rotation: {x: -4.4812335e-12, y: 9.313117e-10, z: 0.0048116883, w: 0.99998844}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+ - name: RightPinky3
+ parentName:
+ position: {x: -0.022705384, y: 0, z: 0}
+ rotation: {x: 0.000000003724863, y: 5.639881e-11, z: 0.015139441, w: 0.99988544}
+ scale: {x: 1, y: 1.0000001, z: 1.0000001}
+ - name: Bip001 R Finger4Nub
+ parentName:
+ position: {x: -0.027051544, y: 0.00000015258789, z: 0}
+ rotation: {x: 0.000000007916242, y: -2.94903e-17, z: 1, w: 0.0000000037252903}
+ scale: {x: -1, y: -1, z: -1}
+ - name: RightRing1
+ parentName:
+ position: {x: -0.09988785, y: -0.0011738586, z: -0.025785293}
+ rotation: {x: 0.12204921, y: -0.035391603, z: -0.045856096, w: 0.99083227}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+ - name: RightRing2
+ parentName:
+ position: {x: -0.035035703, y: 0, z: 0}
+ rotation: {x: 5.734343e-11, y: -0.00000000465626, z: 0.012314407, w: 0.9999242}
+ scale: {x: 1, y: 1, z: 1}
+ - name: RightRing3
+ parentName:
+ position: {x: -0.024122009, y: -0.00000015258789, z: 0}
+ rotation: {x: 0.000000007561276, y: -0.0000000047164517, z: 0.023044286, w: 0.99973446}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Bip001 R Finger3Nub
+ parentName:
+ position: {x: -0.031096954, y: 0.00000015258789, z: 0}
+ rotation: {x: -0.0000000013969838, y: 8.554058e-26, z: 1, w: 6.123234e-17}
+ scale: {x: -1.0000001, y: -1, z: -1}
+ - name: Neck
+ parentName:
+ position: {x: -0.28273398, y: -0.026063131, z: 7.220842e-10}
+ rotation: {x: -9.6328415e-14, y: 0.00000029454483, z: -0.106195845, w: 0.99434525}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Head
+ parentName:
+ position: {x: -0.05109985, y: -0.000000019073486, z: -7.2759575e-14}
+ rotation: {x: 1.4842786e-13, y: -0.00000000970573, z: 0.0035000206, w: 0.99999386}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1}
+ - name: Bip001 HeadNub
+ parentName:
+ position: {x: -0.20441024, y: 0.000000038146972, z: 7.2759575e-14}
+ rotation: {x: -1.7763568e-14, y: 1.323489e-22, z: -0.000000007450581, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: LeftShoulder
+ parentName:
+ position: {x: -0.26259163, y: -0.025448803, z: 0.052525558}
+ rotation: {x: -0.6719964, y: -0.00026858912, z: 0.7405544, w: -0.0002939241}
+ scale: {x: 1.0000001, y: 1, z: 1}
+ - name: LeftArm
+ parentName:
+ position: {x: -0.122001044, y: -0.0000000023841857, z: 0}
+ rotation: {x: 0.016502984, y: 0.041847467, z: 0.012796431, w: 0.9989058}
+ scale: {x: 1, y: 1, z: 1}
+ - name: LeftForeArm
+ parentName:
+ position: {x: -0.26449493, y: 0, z: 0}
+ rotation: {x: 2.3319013e-10, y: -4.6548138e-10, z: 0.0007721173, w: 0.9999997}
+ scale: {x: 1, y: 0.99999994, z: 0.99999994}
+ - name: LeftHand
+ parentName:
+ position: {x: -0.26449496, y: -0.0000000023841857, z: 0}
+ rotation: {x: -0.69131655, y: 0.04082255, z: 0.030838, w: 0.72073853}
+ scale: {x: 1, y: 1.0000001, z: 1.0000001}
+ - name: LeftThumb1
+ parentName:
+ position: {x: -0.02674324, y: 0.017545624, z: -0.02198472}
+ rotation: {x: 0.3924109, y: -0.3703508, z: 0.13225669, w: 0.8314819}
+ scale: {x: 0.9999999, y: 0.9999999, z: 1}
+ - name: LeftThumb2
+ parentName:
+ position: {x: -0.047266576, y: 0, z: 0}
+ rotation: {x: 0.00000011920922, y: -0.0000006258484, z: -0.041043956, w: 0.9991573}
+ scale: {x: 1, y: 0.99999994, z: 0.99999994}
+ - name: LeftThumb3
+ parentName:
+ position: {x: -0.035123214, y: -0.000000038146972, z: 0.00000015258789}
+ rotation: {x: 0.0000000074477784, y: -2.0434032e-10, z: -0.027426092, w: 0.99962384}
+ scale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ - name: Bip001 L Finger0Nub
+ parentName:
+ position: {x: -0.032481004, y: -0.000000038146972, z: 0}
+ rotation: {x: 1.110223e-16, y: -0.000000014901161, z: 0.000000007450581, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: LeftIndex1
+ parentName:
+ position: {x: -0.09708961, y: -0.0023173522, z: -0.025497507}
+ rotation: {x: -0.0033670648, y: -0.039942566, z: -0.04782985, w: 0.9980509}
+ scale: {x: 0.9999999, y: 0.9999998, z: 1}
+ - name: LeftIndex2
+ parentName:
+ position: {x: -0.033342514, y: 0.00000015258789, z: -0.000000009536743}
+ rotation: {x: -1.119638e-10, y: -0.0000000058196896, z: -0.019235233, w: 0.999815}
+ scale: {x: 0.99999994, y: 0.99999994, z: 1}
+ - name: LeftIndex3
+ parentName:
+ position: {x: -0.028267898, y: 0, z: 0}
+ rotation: {x: -0.0000000018934834, y: 0.000000002714507, z: 0.011315952, w: 0.999936}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+ - name: Bip001 L Finger1Nub
+ parentName:
+ position: {x: -0.031239394, y: 0, z: -0.000000009536743}
+ rotation: {x: -0.0000000018626451, y: 0.000000002852175, z: 5.31259e-18, w: 1}
+ scale: {x: 1.0000001, y: 1, z: 1}
+ - name: LeftMiddle1
+ parentName:
+ position: {x: -0.10227058, y: -0.005095825, z: -0.00012608527}
+ rotation: {x: -0.0004119573, y: -0.00019026539, z: -0.05681684, w: 0.9983845}
+ scale: {x: 0.99999994, y: 1, z: 0.99999994}
+ - name: LeftMiddle2
+ parentName:
+ position: {x: -0.036035612, y: 0.00000015258789, z: 0}
+ rotation: {x: 0.000000001867785, y: -5.653657e-10, z: 0.008959068, w: 0.9999599}
+ scale: {x: 1, y: 1.0000001, z: 1}
+ - name: LeftMiddle3
+ parentName:
+ position: {x: -0.03146347, y: -0.00000015258789, z: 0}
+ rotation: {x: -0.0000000018695017, y: 1.2615843e-10, z: 0.041549757, w: 0.99913645}
+ scale: {x: 1, y: 0.99999994, z: 1}
+ - name: Bip001 L Finger2Nub
+ parentName:
+ position: {x: -0.033252027, y: -0.00000015258789, z: 0}
+ rotation: {x: 0.0000000018626449, y: -2.910383e-10, z: 5.4210103e-19, w: 1}
+ scale: {x: 1, y: 1.0000001, z: 1.0000001}
+ - name: LeftPink1
+ parentName:
+ position: {x: -0.08984611, y: 0.007751617, z: 0.04868636}
+ rotation: {x: -0.05613842, y: 0.044704493, z: -0.038838666, w: 0.9966652}
+ scale: {x: 0.9999998, y: 1.0000001, z: 1}
+ - name: LeftPink2
+ parentName:
+ position: {x: -0.027551575, y: 0, z: -0.000000019073486}
+ rotation: {x: -0.0000000037140442, y: -0.0000000023462043, z: 0.004811689, w: 0.99998844}
+ scale: {x: 1, y: 1, z: 1}
+ - name: LeftPink3
+ parentName:
+ position: {x: -0.022705307, y: 0, z: 0.000000019073486}
+ rotation: {x: -2.1854539e-10, y: 0.000000014433847, z: 0.015139439, w: 0.99988544}
+ scale: {x: 0.99999994, y: 1.0000001, z: 1}
+ - name: Bip001 L Finger4Nub
+ parentName:
+ position: {x: -0.027051697, y: 0.00000015258789, z: 0}
+ rotation: {x: 1.7347235e-18, y: -4.656613e-10, z: 0.0000000037252903, w: 1}
+ scale: {x: 1, y: 1.0000001, z: 1}
+ - name: LeftRing1
+ parentName:
+ position: {x: -0.09988792, y: -0.0011738586, z: 0.025785293}
+ rotation: {x: -0.122048944, y: 0.035391387, z: -0.04585502, w: 0.9908324}
+ scale: {x: 1.0000001, y: 1, z: 1}
+ - name: LeftRing2
+ parentName:
+ position: {x: -0.035035703, y: 0, z: 0}
+ rotation: {x: -0.000000014865624, y: -0.0000000029772547, z: 0.012314411, w: 0.9999242}
+ scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+ - name: LeftRing3
+ parentName:
+ position: {x: -0.024122009, y: -0.00000015258789, z: 0}
+ rotation: {x: 0.000000007512988, y: -0.0000000026215328, z: 0.023044284, w: 0.99973446}
+ scale: {x: 0.99999994, y: 1, z: 1}
+ - name: Bip001 L Finger3Nub
+ parentName:
+ position: {x: -0.031096954, y: 0, z: 0}
+ rotation: {x: 0, y: -0.0000000030267986, z: -0, w: 1}
+ scale: {x: 0.99999994, y: 1, z: 0.99999994}
+ - name: Joint
+ parentName:
+ position: {x: -0, y: 0, z: 0}
+ rotation: {x: 0.00000008146034, y: 0, z: -0, w: 1}
+ scale: {x: 1.0774, y: 1.0774, z: 1.0774}
+ - name: Sword_Hold
+ parentName:
+ position: {x: -0.19077304, y: 1.036624, z: 0.012532081}
+ rotation: {x: -0.7020021, y: -0.026424231, z: -0.03709117, w: 0.71071726}
+ scale: {x: 1.0000001, y: 1.0000001, z: 0.9999998}
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 0
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ animationType: 3
+ humanoidOversampling: 1
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/AnimContros/AnimContro_Saionji.controller b/Assets/Art/AnimContros/AnimContro_Saionji.controller
index 59cec77c..e69c85f7 100644
--- a/Assets/Art/AnimContros/AnimContro_Saionji.controller
+++ b/Assets/Art/AnimContros/AnimContro_Saionji.controller
@@ -115,7 +115,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101181697872839646
+--- !u!1101 &1101182044862233588
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -124,7 +124,29 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102770181445560630}
+ m_DstState: {fileID: 1102872285651053042}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.37500006
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101192275494127052
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102567933174567384}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
@@ -137,7 +159,73 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101558082199233960
+--- !u!1101 &1101340073863295320
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102996636091956636}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101349535569249302
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102770181445560630}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.64285713
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101482523402386996
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102261251114294676}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.5833334
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101493030511974042
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -153,7 +241,51 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.7222222
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101521310115202102
+AnimatorStateTransition:
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102761707914586822}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.67391306
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101544514882599230
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102601833441348450}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -247,6 +379,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1101 &1101993916064920168
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102688814672285896}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.7222222
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &1102194493929398020
AnimatorState:
serializedVersion: 5
@@ -258,7 +412,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 1101558082199233960}
+ - {fileID: 1101993916064920168}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -300,6 +454,33 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102261251114294676
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Run Attk 1
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101340073863295320}
+ 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: 45aad031a5b7aee49a08e7d578d4681e, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102398723425775606
AnimatorState:
serializedVersion: 5
@@ -327,6 +508,33 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102567933174567384
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Run
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101482523402386996}
+ 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: a81e204ada873294ab12486662763672, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102601833441348450
AnimatorState:
serializedVersion: 5
@@ -337,7 +545,8 @@ AnimatorState:
m_Name: Turn 180 With sword
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 1101182044862233588}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -407,6 +616,33 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102688814672285896
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: New State 3
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101493030511974042}
+ 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: 81167ecefe17ad8488efca1275d0934b, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102691091957107174
AnimatorState:
serializedVersion: 5
@@ -499,7 +735,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 1101181697872839646}
+ - {fileID: 1101192275494127052}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -515,6 +751,33 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102872285651053042
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Idle Fight 0
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101544514882599230}
+ 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: 685fd959aa061e04c8f85b67efd58313, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter: IKLeftFootWeight
--- !u!1102 &1102942507140310624
AnimatorState:
serializedVersion: 5
@@ -541,6 +804,52 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102996636091956636
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Run Attk 2
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101349535569249302}
+ 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: 63d6801e13e7cbd458997999f1659cbd, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &1107237454281687962
+AnimatorStateMachine:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: New StateMachine
+ 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}
--- !u!1107 &1107626854114715334
AnimatorStateMachine:
serializedVersion: 5
@@ -552,7 +861,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102942507140310624}
- m_Position: {x: 300, y: 264, z: 0}
+ m_Position: {x: 336, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102214765397106386}
m_Position: {x: 36, y: 240, z: 0}
@@ -573,16 +882,31 @@ AnimatorStateMachine:
m_Position: {x: 1296, y: 168, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102675898855556462}
- m_Position: {x: 1008, y: 336, z: 0}
+ m_Position: {x: 1032, y: 408, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102778898719444126}
- m_Position: {x: 720, y: 336, z: 0}
+ m_Position: {x: 288, y: 624, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102194493929398020}
m_Position: {x: 1536, y: 168, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102601833441348450}
- m_Position: {x: 377.6229, y: -11.596985, z: 0}
+ m_Position: {x: 180, y: -96, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102872285651053042}
+ m_Position: {x: 312, y: 0, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102567933174567384}
+ m_Position: {x: 24, y: 492, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102261251114294676}
+ m_Position: {x: 252, y: 396, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102996636091956636}
+ m_Position: {x: 504, y: 396, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102688814672285896}
+ m_Position: {x: 1464, y: 420, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -592,4 +916,4 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 612, y: 96, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: 1102770181445560630}
+ m_DefaultState: {fileID: 1102567933174567384}
diff --git a/Assets/Scenes/Demo/SaionjiShowOff.unity b/Assets/Scenes/Demo/SaionjiShowOff.unity
index 82af0279..5499b27f 100644
--- a/Assets/Scenes/Demo/SaionjiShowOff.unity
+++ b/Assets/Scenes/Demo/SaionjiShowOff.unity
@@ -160,6 +160,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2788004f7d291b40a1ac1c11c3bdc3d, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &164475685
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 164475681}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 78c38f462ec6a5b43a2e1e8194924c93, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ DrawGizmo: 1
+ m_IsActive: 1
+ m_TopLeft: {x: -0.28, y: 1.75, z: 0.3}
+ m_RightBottom: {x: 0, y: 0, z: 0}
--- !u!114 &164475690
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5285,7 +5301,7 @@ Camera:
height: 1
near clip plane: 0.1
far clip plane: 100
- field of view: 33.456554
+ field of view: 45
orthographic: 0
orthographic size: 5
m_Depth: -1
@@ -5310,7 +5326,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 534669902}
- m_LocalRotation: {x: 0.085535154, y: -0.0000061685737, z: 0.0000005295706, w: 0.99633515}
+ m_LocalRotation: {x: 0.085535154, y: -0.00000000428587, z: 3.6794093e-10, w: 0.9963352}
m_LocalPosition: {x: 2.0533898, y: -1.1962571, z: -4.1157675}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@@ -5390,7 +5406,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ShowDebugText: 1
+ m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 0}
@@ -5737,7 +5753,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801756637}
- m_LocalRotation: {x: 0.085535154, y: -0.0000061685737, z: 0.0000005295706, w: 0.99633515}
+ m_LocalRotation: {x: 0.085535154, y: -0.00000000428587, z: 3.6794093e-10, w: 0.9963352}
m_LocalPosition: {x: 2.0533898, y: -1.1962571, z: -4.1157675}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@@ -6310,6 +6326,11 @@ PrefabInstance:
propertyPath: m_Name
value: Saionji (1)
objectReference: {fileID: 0}
+ - target: {fileID: 6037765074797436038, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6803618248623764736, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
type: 3}
propertyPath: m_Enabled
@@ -7226,7 +7247,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!114 &1737075741
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/AbilitySystem.meta b/Assets/Scripts/AbilitySystem.meta
new file mode 100644
index 00000000..11b04f5f
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 10a2e913d181351499510c4c95e3eaae
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities.meta b/Assets/Scripts/AbilitySystem/Abilities.meta
new file mode 100644
index 00000000..4b958769
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 962b8b798c2077c4db88f3828ba14d55
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs
new file mode 100644
index 00000000..330850e2
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs
@@ -0,0 +1,61 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 同一个角色同一个时间只能有一个ability
+/// </summary>
+public abstract class AbilityBase
+{
+ protected int m_AbilityID;
+ public int ID
+ {
+ get
+ {
+ return m_AbilityID;
+ }
+ }
+
+ public AbilityBase()
+ {
+ m_AbilityID = UIDManager.Acquire();
+ }
+
+ public virtual void OnInit() { }
+
+ /// <summary>
+ /// 进入当前ability的回调
+ /// </summary>
+ public virtual void OnEnter() { }
+
+ /// <summary>
+ /// 退出当前ability的回调
+ /// </summary>
+ public virtual void OnExit() { }
+
+ /// <summary>
+ /// 当前ability的update函数
+ /// </summary>
+ public virtual void OnUpdate() { }
+
+ /// <summary>
+ /// 过渡到下一个ability的回调
+ /// </summary>
+ /// <param name="to"></param>
+ public virtual void OnTranslate(AbilityBase to) { }
+
+ /// <summary>
+ /// 检测到hitbox碰撞时的回调
+ /// </summary>
+ public virtual void OnHit() { }
+
+ /// <summary>
+ /// 检测到hurtbox碰撞时的回调
+ /// </summary>
+ public virtual void OnHurt() { }
+
+ /// <summary>
+ /// 检测到defendbox碰撞时的回调
+ /// </summary>
+ public virtual void OnDefend() { }
+}
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta
new file mode 100644
index 00000000..79a6b7eb
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a3b3cfab4bd1dd74bb539687535b58f1
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs
new file mode 100644
index 00000000..39298b6f
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 攻击ability
+/// </summary>
+public class AttackAbilityBase : AbilityBase
+{
+ // 攻击ability默认都会回到idle
+
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta
new file mode 100644
index 00000000..4159d2bc
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eefcc728a2660c0459b0d79230cc4dec
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs
new file mode 100644
index 00000000..b9a479b5
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DashAbility : 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/Abilities/DashAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta
new file mode 100644
index 00000000..c246c665
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6d5a31f4a65fbba429d0a2ff3b3a49a4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs
new file mode 100644
index 00000000..79e8fc61
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+/// <summary>
+/// Dodge ability
+/// </summary>
+public class DodgeAbility : AbilityBase
+{
+ public DodgeAbility()
+ {
+
+ }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta
new file mode 100644
index 00000000..e7297a88
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 838e30895704e13479bfb0f5c06229e5
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs
new file mode 100644
index 00000000..7a5c00df
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HurtAbility : 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/Abilities/HurtAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta
new file mode 100644
index 00000000..0e70d0be
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6984a899f4c7f574a8dbffe0372c6c2e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs
new file mode 100644
index 00000000..c323d99e
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+public class IdleAbility : AbilityBase
+{
+ /// <summary>
+ /// idle的动画
+ /// </summary>
+ int m_AnimHash;
+
+ /// <summary>
+ /// 在Idle状态时可以切换的ability
+ /// </summary>
+ private List<AbilityTrigger> m_AbilityTriggers;
+
+ public IdleAbility(int hash)
+ : base()
+ {
+ m_AnimHash = hash;
+ }
+
+ public override void OnInit()
+ {
+ base.OnInit();
+ }
+
+ public override void OnUpdate()
+ {
+ foreach(var trigger in m_AbilityTriggers)
+ {
+ if (trigger.Update())
+ break;
+ }
+
+ base.OnUpdate();
+ }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta
new file mode 100644
index 00000000..07d0c292
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 367ca0f7efe3fe14baf88eb3ce60a78b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs
new file mode 100644
index 00000000..b2d7356b
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs
@@ -0,0 +1,54 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MoveAbility : AbilityBase
+{
+
+ /// <summary>
+ /// 在跑动状态时可以切换的ability
+ /// </summary>
+ private List<AbilityTrigger> m_AbilityTriggers;
+
+ public override void OnInit()
+ {
+
+ }
+
+ public override void OnDefend()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override void OnEnter()
+ {
+
+ }
+
+ public override void OnExit()
+ {
+ }
+
+ public override void OnHit()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override void OnHurt()
+ {
+ }
+
+ public override void OnTranslate(AbilityBase to)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override void OnUpdate()
+ {
+ foreach (var trigger in m_AbilityTriggers)
+ {
+ if (trigger.Update())
+ break;
+ }
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta
new file mode 100644
index 00000000..08b2954c
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4581355020e27084f869d6001787e11e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions.meta b/Assets/Scripts/AbilitySystem/Conditions.meta
new file mode 100644
index 00000000..0bfa1b8d
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2d3b745adf374e14b9f4e095c52ef3d6
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs
new file mode 100644
index 00000000..b55cacb8
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 记录之前的ability序列满足某个序列
+/// combo的时候根据当前序列决定combo
+/// </summary>
+public class ConditionAbilitySeq : ConditionBase
+{
+ List<int> m_TargetAbilitySeq = new List<int>();
+
+ public ConditionAbilitySeq(List<int> commandSeq)
+ : base()
+ {
+ m_TargetAbilitySeq = commandSeq;
+ }
+
+ public override bool Evaluate()
+ {
+ // 验证记录的abilitySeq是否满足
+
+
+ throw new System.NotImplementedException();
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta
new file mode 100644
index 00000000..5070f1cc
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7bbf0480c45c29843b8ba41229bb29b1
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs
new file mode 100644
index 00000000..019c16a9
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs
@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 动画已经播放完毕
+/// </summary>
+public class ConditionAnimAtEnd : ConditionBase
+{
+ Animator m_Animator;
+ int m_AnimationHash;
+
+ public ConditionAnimAtEnd(Animator animator, int animationHash)
+ : base()
+ {
+ m_Animator = animator;
+ m_AnimationHash = animationHash;
+ }
+
+ public override bool Evaluate()
+ {
+ AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0);
+ if(info.fullPathHash == m_AnimationHash)
+ {
+ float t = info.normalizedTime;
+ if (t >= 0.99f)
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta
new file mode 100644
index 00000000..1688dd68
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f5cbdf2ebe12b5d46afa21a62609d15c
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
new file mode 100644
index 00000000..c41e17e1
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 某个动画是否播放到了某个时间(归一化了的)范围内
+/// </summary>
+public sealed class ConditionAnimRange : ConditionBase
+{
+ Vector2 m_TimeRange = new Vector2();
+
+ public ConditionAnimRange(float start, float end)
+ {
+ m_TimeRange.Set(start, end);
+
+ }
+
+ public override bool Evaluate()
+ {
+ return false;
+ }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta
new file mode 100644
index 00000000..926a8560
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 56b6b5bfaf0d4e147a2f0f1809e7739b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
new file mode 100644
index 00000000..c14624ad
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs
@@ -0,0 +1,105 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 触发条件基类
+/// </summary>
+public abstract class ConditionBase
+{
+
+ public ConditionBase()
+ {
+ }
+
+ public abstract bool Evaluate();
+
+}
+
+
+/// <summary>
+/// 总是满足
+/// </summary>
+public sealed class ConditionAlways : ConditionBase
+{
+ public override bool Evaluate()
+ {
+ return true;
+ }
+}
+
+/// <summary>
+/// 总是不满足
+/// </summary>
+public sealed class ConditionAlwaysNot : ConditionBase
+{
+ public override bool Evaluate()
+ {
+ return false;
+ }
+}
+
+/// <summary>
+/// 两个condition都达成才会返回真
+/// </summary>
+public sealed class ConditionAnd : ConditionBase
+{
+ ConditionBase m_FirstCondition, m_LastCondition;
+
+
+ public ConditionAnd(ConditionBase first, ConditionBase last)
+ : base()
+ {
+ m_FirstCondition = first;
+ m_LastCondition = last;
+ }
+
+ public override bool Evaluate()
+ {
+ return m_FirstCondition.Evaluate() && m_LastCondition.Evaluate();
+ }
+}
+
+/// <summary>
+/// 两个condition至少一个达成才会返回真
+/// </summary>
+public sealed class ConditionOr : ConditionBase
+{
+ ConditionBase m_FirstCondition, m_LastCondition;
+
+
+ public ConditionOr(ConditionBase first, ConditionBase last)
+ : base()
+ {
+ m_FirstCondition = first;
+ m_LastCondition = last;
+ }
+
+ public override bool Evaluate()
+ {
+ return m_FirstCondition.Evaluate() || m_LastCondition.Evaluate();
+ }
+}
+
+
+/// <summary>
+/// 两个condition都不达成才会返回真
+/// </summary>
+public sealed class ConditionNone : ConditionBase
+{
+ ConditionBase m_FirstCondition, m_LastCondition;
+
+ public ConditionNone(ConditionBase first, ConditionBase last)
+ : base()
+ {
+ m_FirstCondition = first;
+ m_LastCondition = last;
+ }
+
+ public override bool Evaluate()
+ {
+ return !m_FirstCondition.Evaluate() && !m_LastCondition.Evaluate();
+ }
+}
+
+
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta
new file mode 100644
index 00000000..4c321ffd
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 21029775aaf8cdd4a868a45725313c3a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs
new file mode 100644
index 00000000..7664a891
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 连击操作,综合ConditionAnimRange和ConditionCommand
+/// </summary>
+public class ConditionCombo : ConditionBase
+{
+ public override bool Evaluate()
+ {
+ throw new System.NotImplementedException();
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta
new file mode 100644
index 00000000..45582943
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 015528a2fbc923f45b1e25c11a6ade2b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
new file mode 100644
index 00000000..420fecc5
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 按下某个command
+/// </summary>
+public class ConditionCommand : ConditionBase
+{
+ Command m_TargetCommand;
+
+ public ConditionCommand(Command command)
+ {
+ m_TargetCommand = command;
+ }
+
+ public override bool Evaluate()
+ {
+ return false;
+ }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta
new file mode 100644
index 00000000..100638e6
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6334908b568b7c046bbeb3f526f95841
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
new file mode 100644
index 00000000..69570487
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 一个command序列,一般用来触发连击
+/// </summary>
+public class ConditionCommandSeq : ConditionBase
+{
+
+
+ public ConditionCommandSeq()
+ {
+
+ }
+
+ public override bool Evaluate()
+ {
+ throw new System.NotImplementedException();
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta
new file mode 100644
index 00000000..fc77bd3c
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7316354e3f99412419c866e0fc3906c6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs
new file mode 100644
index 00000000..c047b50c
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 某个角色是否浮空
+/// </summary>
+public class ConditionInair : ConditionBase
+{
+ public override bool Evaluate()
+ {
+ return false;
+ }
+}
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta
new file mode 100644
index 00000000..8bbf610f
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8855eebdb67a2cc4baeb2a21e5b40ed4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Triggers.meta b/Assets/Scripts/AbilitySystem/Triggers.meta
new file mode 100644
index 00000000..e21c195a
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Triggers.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 12ea28314544c614e915aa9b791d8611
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs
new file mode 100644
index 00000000..34dda3b2
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs
@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 在ability的某一帧切换到某个ability的trigger
+/// </summary>
+public class AbilityTrigger : Trigger
+{
+ AbilityBase m_TargetAbility;
+
+ public AbilityTrigger(ConditionBase condition, AbilityBase target)
+ : base(condition)
+ {
+ m_TargetAbility = target;
+ }
+
+ public override bool Update()
+ {
+ // 如果满足条件,切换到下一个ability
+ if (IsFulfilled())
+ {
+
+ return true;
+ }
+ return base.Update();
+ }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta
new file mode 100644
index 00000000..826e50cf
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e69d951b4141e5646984e501aae2cbff
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs
new file mode 100644
index 00000000..178932fd
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 不同效果的trigger基础这个基类
+/// </summary>
+
+public abstract class Trigger
+{
+ protected ConditionBase m_Condition;
+
+ public Trigger(ConditionBase condition)
+ {
+ m_Condition = condition;
+ }
+
+ protected bool IsFulfilled()
+ {
+ return m_Condition.Evaluate();
+ }
+
+ /// <summary>
+ /// 如果触发执行了,返回true,否则返回false
+ /// </summary>
+ /// <returns></returns>
+ public virtual bool Update()
+ {
+ return false;
+ }
+
+}
diff --git a/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta
new file mode 100644
index 00000000..91d7d1b8
--- /dev/null
+++ b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8c2bda4ac997ddc4e8e9e38c7c718882
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Input.meta b/Assets/Scripts/Input.meta
new file mode 100644
index 00000000..a2be21ee
--- /dev/null
+++ b/Assets/Scripts/Input.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb96fc16498194f4193cd4430c82574e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Input/CommandType.cs b/Assets/Scripts/Input/CommandType.cs
new file mode 100644
index 00000000..3c537383
--- /dev/null
+++ b/Assets/Scripts/Input/CommandType.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+public enum Command
+{
+ // 方向键
+ Left,
+ Right,
+ Top,
+ Bottom,
+
+ // 操作键
+ Triangle, // △
+ Cross, // ×
+ Square, // □
+ Circle, // ○
+}
+
+
diff --git a/Assets/Scripts/Input/CommandType.cs.meta b/Assets/Scripts/Input/CommandType.cs.meta
new file mode 100644
index 00000000..f2802802
--- /dev/null
+++ b/Assets/Scripts/Input/CommandType.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e105d6d96dd08e8499e6a4254d289e99
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Input/InputManager.cs b/Assets/Scripts/Input/InputManager.cs
new file mode 100644
index 00000000..098190bc
--- /dev/null
+++ b/Assets/Scripts/Input/InputManager.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InputManager : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Input/InputManager.cs.meta b/Assets/Scripts/Input/InputManager.cs.meta
new file mode 100644
index 00000000..234b6d17
--- /dev/null
+++ b/Assets/Scripts/Input/InputManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 26195ae7cb9459e498256c387da7273e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics.meta b/Assets/Scripts/Physics.meta
new file mode 100644
index 00000000..2296b3f8
--- /dev/null
+++ b/Assets/Scripts/Physics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 603d4624aaedd794cb89497954a83f4a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics/Box.cs b/Assets/Scripts/Physics/Box.cs
new file mode 100644
index 00000000..1f022f51
--- /dev/null
+++ b/Assets/Scripts/Physics/Box.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class NewBehaviourScript : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/Box.cs.meta b/Assets/Scripts/Physics/Box.cs.meta
new file mode 100644
index 00000000..528c7474
--- /dev/null
+++ b/Assets/Scripts/Physics/Box.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 637138a0ba30abc498c5c9dcf6bb5d78
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics/DefendBox.cs b/Assets/Scripts/Physics/DefendBox.cs
new file mode 100644
index 00000000..730fe640
--- /dev/null
+++ b/Assets/Scripts/Physics/DefendBox.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DefendBox : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/DefendBox.cs.meta b/Assets/Scripts/Physics/DefendBox.cs.meta
new file mode 100644
index 00000000..bc2f10ad
--- /dev/null
+++ b/Assets/Scripts/Physics/DefendBox.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cb44b541bd6b6f747bb9079c7249d23f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics/HitBox.cs b/Assets/Scripts/Physics/HitBox.cs
new file mode 100644
index 00000000..09e1f90a
--- /dev/null
+++ b/Assets/Scripts/Physics/HitBox.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AttackBox : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/HitBox.cs.meta b/Assets/Scripts/Physics/HitBox.cs.meta
new file mode 100644
index 00000000..f220b38f
--- /dev/null
+++ b/Assets/Scripts/Physics/HitBox.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 73d73d5d2dc8d324b8b75ccd818af01d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics/HurtBox.cs b/Assets/Scripts/Physics/HurtBox.cs
new file mode 100644
index 00000000..c7fd97bd
--- /dev/null
+++ b/Assets/Scripts/Physics/HurtBox.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HurtBox : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/HurtBox.cs.meta b/Assets/Scripts/Physics/HurtBox.cs.meta
new file mode 100644
index 00000000..c74284f1
--- /dev/null
+++ b/Assets/Scripts/Physics/HurtBox.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fdb3c8999ca3f954e81886171ce9517f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Physics/PhysicsUtils.cs b/Assets/Scripts/Physics/PhysicsUtils.cs
new file mode 100644
index 00000000..752e15a5
--- /dev/null
+++ b/Assets/Scripts/Physics/PhysicsUtils.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PhysicsUtils : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/PhysicsUtils.cs.meta b/Assets/Scripts/Physics/PhysicsUtils.cs.meta
new file mode 100644
index 00000000..b47b63fc
--- /dev/null
+++ b/Assets/Scripts/Physics/PhysicsUtils.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d859c78cbe7a7db4881bfd4d0274a16e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Test/PhysicsWorldTest.cs b/Assets/Scripts/Test/PhysicsWorldTest.cs
index 7c177213..d1c240a5 100644
--- a/Assets/Scripts/Test/PhysicsWorldTest.cs
+++ b/Assets/Scripts/Test/PhysicsWorldTest.cs
@@ -4,6 +4,8 @@ using UnityEngine;
public class PhysicsWorldTest : MonoBehaviour
{
+
+
// Start is called before the first frame update
void Start()
{
diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs
index 67a042bd..84e658de 100644
--- a/Assets/Scripts/Test/SaionjiScript.cs
+++ b/Assets/Scripts/Test/SaionjiScript.cs
@@ -2,14 +2,19 @@
using System.Collections.Generic;
using UnityEngine;
-public class SaionjiScript : MonoBehaviour
+public partial class SaionjiScript : MonoBehaviour
{
HitBoxTest hitbox;
+ Animator animator;
+
+ int IdleHash;
// Start is called before the first frame update
void Start()
{
-
+ animator = GetComponent<Animator>();
+ // SetupAbilities();
+ IdleHash = Animator.StringToHash("Idle Fight 0");
}
private void OnCollisionEnter(Collision collision)
@@ -22,4 +27,16 @@ public class SaionjiScript : MonoBehaviour
Debug.Log("OnTriggerEnter()");
}
+ private void Update()
+ {
+ if(m_CurrentAblity != null)
+ m_CurrentAblity.OnUpdate();
+
+ //AnimatorStateInfo info = animator.GetCurrentAnimatorStateInfo(0);
+ //if(info.normalizedTime > 0.8)
+ //{
+ // animator.CrossFade(IdleHash, 0.11f);
+ //}
+ }
+
}
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs
new file mode 100644
index 00000000..81c74fad
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public partial class SaionjiScript : MonoBehaviour
+{
+ /// <summary>
+ /// 当前的ability
+ /// </summary>
+ AbilityBase m_CurrentAblity;
+
+ /// <summary>
+ /// 设置abilities
+ /// </summary>
+ void SetupAbilities()
+ {
+ // 基础ability
+
+
+ }
+
+
+}
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs.meta b/Assets/Scripts/Test/SaionjiScript_Ability.cs.meta
new file mode 100644
index 00000000..10e51e09
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1421bbd1c6a776d4b9dd2340b37d9a8b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Utils/UIDManager.cs b/Assets/Scripts/Utils/UIDManager.cs
new file mode 100644
index 00000000..3283de4e
--- /dev/null
+++ b/Assets/Scripts/Utils/UIDManager.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UIDManager
+{
+ static int id = 0;
+
+ /// <summary>
+ /// 拿一个id
+ /// </summary>
+ /// <returns></returns>
+ public static int Acquire()
+ {
+ return ++id;
+ }
+
+}
diff --git a/Assets/Scripts/Utils/UIDManager.cs.meta b/Assets/Scripts/Utils/UIDManager.cs.meta
new file mode 100644
index 00000000..4a2a8ee0
--- /dev/null
+++ b/Assets/Scripts/Utils/UIDManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 67355920ae292904288feb5dc3f089bc
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: