mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-22 01:25:12 +00:00
kman uses anim layers now
add animation repathing utility tweak animation speed for some kman animations add jump combo
This commit is contained in:
minenice55
parent
7a9f1a8738
commit
3f06f4c60f
26 changed files with 17519 additions and 250 deletions
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 4149267612586432800, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: 4149267612586432800, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 4149267612586432800, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 4149267612586432800, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 3060967690338004721, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: 3060967690338004721, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 3060967690338004721, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 3060967690338004721, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -18,15 +18,6 @@ AnimationClip:
|
|||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
|
|
@ -35,7 +26,16 @@ AnimationClip:
|
|||
- time: 0.5
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -46,25 +46,25 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 4866608027561499029, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -467025217388406215, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: -467025217388406215, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: -467025217388406215, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: -467025217388406215, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 2844288917660902187, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: 2844288917660902187, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 2844288917660902187, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 2844288917660902187, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -4811965814584269873, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: -4811965814584269873, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: -4811965814584269873, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: -4811965814584269873, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -3340168359885296488, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: -3340168359885296488, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: -3340168359885296488, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: -3340168359885296488, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 3379959602278205485, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: 3379959602278205485, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 3379959602278205485, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 3379959602278205485, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ AnimationClip:
|
|||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
path: Head/HeadAttatch
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
value: {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: HeadAttatch
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
|
|
@ -40,22 +40,22 @@ AnimationClip:
|
|||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
path: 2464725343
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 2352827173
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,32 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-8024383257327122652
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face05
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: b83ce49d55d63e64f8acbf84321f3263, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-7840309356215755865
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -131,6 +157,52 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1107 &-7345790019432505531
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Head
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -5712744141240326422}
|
||||
m_Position: {x: 330, y: 70, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -6201663271509553146}
|
||||
m_Position: {x: 330, y: 120, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -101166267724667848}
|
||||
m_Position: {x: 330, y: 170, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 9064948925179682201}
|
||||
m_Position: {x: 330, y: 220, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -1015631593780859834}
|
||||
m_Position: {x: 330, y: 270, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -8024383257327122652}
|
||||
m_Position: {x: 330, y: 320, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 3310428959351769114}
|
||||
m_Position: {x: 330, y: 370, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -4401488272683554375}
|
||||
m_Position: {x: 330, y: 420, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -2853690283723917268}
|
||||
m_Position: {x: 330, y: 470, z: 0}
|
||||
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: -5712744141240326422}
|
||||
--- !u!1101 &-6495875897269842745
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -153,6 +225,84 @@ AnimatorStateTransition:
|
|||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!1102 &-6201663271509553146
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face01
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: e5bf7322815d2454da8ca957e3dd70b2, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-5712744141240326422
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face00
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: 230da584b9289f64683dd1f969b27a4f, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-4401488272683554375
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face07
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: 7077e7dd164d92f419da5882d72a1c4b, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-3699598731561684078
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -205,6 +355,32 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-2853690283723917268
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face08
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: ca47d71738d91fc488b661f9b8bf564b, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-1913727402751922135
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -257,6 +433,32 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-1015631593780859834
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face04
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: ec64f94d6a166c34c82a1593854dc795, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-842243592876171120
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -283,6 +485,32 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-101166267724667848
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face02
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: 5c56dbada33ffd94a9cec6d1bc0ea8f3, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -305,6 +533,18 @@ AnimatorController:
|
|||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
- serializedVersion: 5
|
||||
m_Name: Head
|
||||
m_StateMachine: {fileID: -7345790019432505531}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 1
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
--- !u!1102 &2153695472368412942
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -331,6 +571,58 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &2482950406301300158
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UpperCutJump
|
||||
m_Speed: 0.5
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: 7b69c2ea9e3cd40419da2dbff96869ac, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &3310428959351769114
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face06
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: 47d331203e3b1f741a1c792b23a562d5, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1107 &3535355717301820939
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 6
|
||||
|
|
@ -345,54 +637,57 @@ AnimatorStateMachine:
|
|||
m_Position: {x: 200, y: 0, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -1169864635434763919}
|
||||
m_Position: {x: 235, y: 65, z: 0}
|
||||
m_Position: {x: 200, y: 50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -9210054495791318801}
|
||||
m_Position: {x: 270, y: 130, z: 0}
|
||||
m_Position: {x: 420, y: 50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 7782746142416989687}
|
||||
m_Position: {x: 305, y: 195, z: 0}
|
||||
m_Position: {x: 630, y: 50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -7544869267666469615}
|
||||
m_Position: {x: 340, y: 260, z: 0}
|
||||
m_Position: {x: 860, y: 50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 5583572781368014849}
|
||||
m_Position: {x: 375, y: 325, z: 0}
|
||||
m_Position: {x: 420, y: 100, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -1913727402751922135}
|
||||
m_Position: {x: 410, y: 390, z: 0}
|
||||
m_Position: {x: 420, y: 150, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -7840309356215755865}
|
||||
m_Position: {x: 445, y: 455, z: 0}
|
||||
m_Position: {x: 420, y: 200, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -3225122229659163749}
|
||||
m_Position: {x: 480, y: 520, z: 0}
|
||||
m_Position: {x: 630, y: 200, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 5344696757423606487}
|
||||
m_Position: {x: 515, y: 585, z: 0}
|
||||
m_Position: {x: 420, y: 250, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 4946513776586294822}
|
||||
m_Position: {x: 550, y: 650, z: 0}
|
||||
m_Position: {x: 420, y: 0, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -9171775684717427265}
|
||||
m_Position: {x: 585, y: 715, z: 0}
|
||||
m_Position: {x: 1070, y: 100, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -3699598731561684078}
|
||||
m_Position: {x: 620, y: 780, z: 0}
|
||||
m_Position: {x: 860, y: 150, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 2153695472368412942}
|
||||
m_Position: {x: 550, y: 260, z: 0}
|
||||
m_Position: {x: 1070, y: 50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -8598915556387655082}
|
||||
m_Position: {x: 585, y: 325, z: 0}
|
||||
m_Position: {x: 860, y: 100, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 2482950406301300158}
|
||||
m_Position: {x: 630, y: 0, z: 0}
|
||||
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_AnyStatePosition: {x: 40, y: -60, z: 0}
|
||||
m_EntryPosition: {x: 40, y: 120, z: 0}
|
||||
m_ExitPosition: {x: 860, y: 0, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: -842243592876171120}
|
||||
--- !u!1102 &4946513776586294822
|
||||
|
|
@ -403,7 +698,7 @@ AnimatorState:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UpperCut
|
||||
m_Speed: 1
|
||||
m_Speed: 0.5
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
|
|
@ -429,7 +724,7 @@ AnimatorState:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: BackHand
|
||||
m_Speed: 1
|
||||
m_Speed: 0.5
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
|
|
@ -499,3 +794,29 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &9064948925179682201
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Face03
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
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: 3975a0b02bfaadf4683f37b9a7d1b712, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
|
|
|
|||
|
|
@ -4399,6 +4399,15 @@ AnimationClip:
|
|||
path: ManShadowM2
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- time: 0.95
|
||||
value: {fileID: 4149267612586432800, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
|
|
@ -5099,6 +5108,13 @@ AnimationClip:
|
|||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 5131679410369794127, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 917280813823694816, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
|
|
@ -5169,6 +5185,8 @@ AnimationClip:
|
|||
- {fileID: 0}
|
||||
- {fileID: -3151023100055821189, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 4149267612586432800, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -2352,9 +2352,9 @@ AnimationClip:
|
|||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 6.5555553
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -2371,9 +2371,9 @@ AnimationClip:
|
|||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 3
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -3086,6 +3086,20 @@ AnimationClip:
|
|||
typeID: 1
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1806956327
|
||||
attribute: 4197328169
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1806956327
|
||||
attribute: 2368279999
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 2073732236
|
||||
attribute: 3305885265
|
||||
|
|
@ -3177,20 +3191,6 @@ AnimationClip:
|
|||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 1806956327
|
||||
attribute: 4197328169
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1806956327
|
||||
attribute: 2368279999
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping:
|
||||
- {fileID: 1681862903528507946, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
- {fileID: 8746368967394852260, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
|
||||
|
|
@ -8186,9 +8186,9 @@ AnimationClip:
|
|||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 6.5555553
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -8205,9 +8205,9 @@ AnimationClip:
|
|||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 3
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -8245,7 +8245,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: ManShadowL
|
||||
path: LeftLeg/LeftLegAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8255,7 +8255,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: ManShadowL
|
||||
path: LeftLeg/LeftLegAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8265,7 +8265,37 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: ManShadowL
|
||||
path: LeftLeg/LeftLegAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: ManShadowM
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: ManShadowM
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: ManShadowM
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8335,7 +8365,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: RightArm/RightArmAttatch
|
||||
path: ManShadowL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8345,7 +8375,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: RightArm/RightArmAttatch
|
||||
path: ManShadowL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8355,7 +8385,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: RightArm/RightArmAttatch
|
||||
path: ManShadowL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8365,7 +8395,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: ManShadowM
|
||||
path: RightLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8375,7 +8405,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: ManShadowM
|
||||
path: RightLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8385,7 +8415,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: ManShadowM
|
||||
path: RightLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8515,7 +8545,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: LeftLeg
|
||||
path: RightArm/RightArmAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8525,7 +8555,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: LeftLeg
|
||||
path: RightArm/RightArmAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8535,7 +8565,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: LeftLeg
|
||||
path: RightArm/RightArmAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8545,7 +8575,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: RightLeg
|
||||
path: LeftLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8555,7 +8585,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: RightLeg
|
||||
path: LeftLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
@ -8565,37 +8595,7 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: RightLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: LeftLeg/LeftLegAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: LeftLeg/LeftLegAttatch
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.x
|
||||
path: LeftLeg/LeftLegAttatch
|
||||
path: LeftLeg
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
|
|
|
|||
16885
Assets/Bundled/Games/KarateMan/Sprites/anime/karateman/UpperCutJump.anim
Normal file
16885
Assets/Bundled/Games/KarateMan/Sprites/anime/karateman/UpperCutJump.anim
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7b69c2ea9e3cd40419da2dbff96869ac
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -2090,6 +2090,48 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: karateman_main_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 3416
|
||||
y: 2950
|
||||
width: 300
|
||||
height: 614
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 723ab42b9319dc4419f455de6fc8d422
|
||||
internalID: -517717703
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: karateman_main_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 2955
|
||||
y: 2982
|
||||
width: 387
|
||||
height: 532
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 97f1148cf90ce2b448dd00e8c9546e5e
|
||||
internalID: 290006370
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
|
|
@ -2168,6 +2210,8 @@ TextureImporter:
|
|||
karateman_leftleg_crouch: 4620539621551708755
|
||||
karateman_legleft: 2707178694875014872
|
||||
karateman_legright: -873041338737308662
|
||||
karateman_main_0: -517717703
|
||||
karateman_main_1: 290006370
|
||||
karateman_object_shadow: -270761472599659251
|
||||
karateman_pot: 8050164209934277894
|
||||
karateman_rainy_0: -1722264585180191320
|
||||
|
|
|
|||
|
|
@ -5228,7 +5228,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
anim: {fileID: 3234329793564267697}
|
||||
FaceAnim: {fileID: 5536880711032662789}
|
||||
Shadows:
|
||||
- {fileID: 6959523891618734576}
|
||||
- {fileID: 7256772822833254697}
|
||||
|
|
@ -25353,7 +25352,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 632063457541129794}
|
||||
- component: {fileID: 9065825703577906459}
|
||||
- component: {fileID: 5536880711032662789}
|
||||
m_Layer: 0
|
||||
m_Name: Head
|
||||
m_TagString: Untagged
|
||||
|
|
@ -25429,27 +25427,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!95 &5536880711032662789
|
||||
Animator:
|
||||
serializedVersion: 5
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1588002223575483339}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 42f59a0269f309549baa9ac01ce6812a, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!1 &1684620099579289651
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -71453,7 +71430,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 4.3333335, y: 3.8888888}
|
||||
m_Size: {x: 6.111111, y: 9.222222}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
|||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1249
|
||||
m_Height: 703
|
||||
m_Width: 2238
|
||||
m_Height: 1258
|
||||
m_AntiAliasing: 2
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 92
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
|||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1873
|
||||
m_Height: 1054
|
||||
m_Width: 3357
|
||||
m_Height: 1887
|
||||
m_AntiAliasing: 1
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 92
|
||||
|
|
|
|||
|
|
@ -1,5 +1,24 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1107 &-8869700881810436437
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Head
|
||||
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!1102 &-8389282425817426375
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -282,6 +301,18 @@ AnimatorController:
|
|||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
- serializedVersion: 5
|
||||
m_Name: Head
|
||||
m_StateMachine: {fileID: -8869700881810436437}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 0
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
--- !u!1102 &1430253757373945861
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
|
|||
|
|
@ -16,6 +16,23 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
public static Minigame AddGame(EventCaller eventCaller)
|
||||
{
|
||||
RiqEntity GameModsUpdater(string datamodel, RiqEntity e)
|
||||
{
|
||||
if (datamodel == "karateman/set gameplay modifiers" && e.version < 1)
|
||||
{
|
||||
if (e["toggle"] == null) return null;
|
||||
|
||||
bool comboEnable = (bool)e["toggle"];
|
||||
e.CreateProperty("combo", (int)(comboEnable ? KarateMan.ComboMode.Normal : KarateMan.ComboMode.Disabled));
|
||||
e.dynamicData.Remove("toggle");
|
||||
e.version = 1;
|
||||
|
||||
return e;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
RiqBeatmap.OnUpdateEntity += GameModsUpdater;
|
||||
|
||||
RiqEntity WarningUpdater(string datamodel, RiqEntity e)
|
||||
{
|
||||
if (datamodel == "karateman/hitX")
|
||||
|
|
@ -73,31 +90,6 @@ namespace HeavenStudio.Games.Loaders
|
|||
}
|
||||
RiqBeatmap.OnUpdateEntity += BackgroundUpdater;
|
||||
|
||||
// RiqEntity GameCapitalizer(string datamodel, RiqEntity entity)
|
||||
// {
|
||||
// if (datamodel.Split('/')[0] == "karateman")
|
||||
// {
|
||||
// string name = datamodel.Split('/')[1];
|
||||
// entity.datamodel = "karateman/" + name;
|
||||
// var tempData = entity.dynamicData.ToDictionary(x => x.Key);
|
||||
// foreach ((string key, dynamic item) in tempData)
|
||||
// {
|
||||
// if (item.GetType() == typeof(Newtonsoft.Json.Linq.JObject)) {
|
||||
// entity.dynamicData[key] = new Color((float)item["r"], (float)item["g"], (float)item["b"]);
|
||||
// }
|
||||
// Debug.Log(key + ", " + item);
|
||||
// }
|
||||
// entity.version = 1;
|
||||
|
||||
// return entity;
|
||||
// } else if (datamodel == "gameManager/switchGame/karateman") {
|
||||
// entity.datamodel = "gameManager/switchGame/karateman";
|
||||
// return entity;
|
||||
// }
|
||||
// return null;
|
||||
// }
|
||||
// RiqBeatmap.OnUpdateEntity += GameCapitalizer;
|
||||
|
||||
return new Minigame("karateman", "Karate Man", "fbca3e", false, false, new List<GameAction>()
|
||||
{
|
||||
new GameAction("bop", "Bop")
|
||||
|
|
@ -253,17 +245,17 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
function = delegate {
|
||||
var e = eventCaller.currentEntity;
|
||||
KarateMan.instance.SetGameplayMods(e.beat, e["fxType"], e["type"], e["toggle"]);
|
||||
KarateMan.instance.SetGameplayMods(e.beat, e["fxType"], e["type"], e["combo"]);
|
||||
},
|
||||
defaultLength = 0.5f,
|
||||
parameters = new List<Param>()
|
||||
{
|
||||
new Param("fxType", KarateMan.BackgroundFXType.None, "FX Type", "Set the background effect to be displayed."),
|
||||
new Param("type", KarateMan.NoriMode.None, "Flow Bar", "Set the type of Flow bar to use."),
|
||||
// new Param("hitsPerHeart", new EntityTypes.Float(0f, 20f, 0f), "Hits Per Heart", "How many hits it will take for each heart to light up (0 will do it automatically.)"),
|
||||
new Param("toggle", true, "Enable Combos", "Toggle if Karate Joe will be able to perform combos. This will not affect Touch Style controls."),
|
||||
new Param("combo", KarateMan.ComboMode.Normal, "Enable Combos", "Toggle if Karate Joe will be able to perform combos, and the type of combo used."),
|
||||
// new Param("toggle2", true, "Enable Kicks", "Allow the player to kick? (Contextual kicks will still be allowed even when off)"),
|
||||
},
|
||||
defaultVersion = 1,
|
||||
},
|
||||
new GameAction("background appearance", "Background Appearance")
|
||||
{
|
||||
|
|
@ -308,28 +300,6 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("endTexture", new Color(), "End Texture Color", "Set the color at the end of the event."),
|
||||
},
|
||||
},
|
||||
// new GameAction("set background effects", "Background Appearance (OLD)")
|
||||
// {
|
||||
// function = delegate {
|
||||
// var e = eventCaller.currentEntity;
|
||||
// KarateMan.instance.SetBgAndShadowCol(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], e["type3"]);
|
||||
// KarateMan.instance.SetBgFx(e["type4"], e["type5"], e["colorC"], e["colorD"]);
|
||||
// },
|
||||
// defaultLength = 0.5f,
|
||||
// resizable = true,
|
||||
// parameters = new List<Param>()
|
||||
// {
|
||||
// new Param("type", KarateMan.BackgroundType.Yellow, "Background Type", "The preset background type"),
|
||||
// new Param("type2", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom"),
|
||||
// new Param("colorA", new Color(), "Custom Background Color", "The background color to use when background type is set to Custom"),
|
||||
// new Param("colorB", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom. When fading the background colour shadows fade to this color"),
|
||||
// new Param("type3", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed. Fade uses the entity length to determine colour fading speed"),
|
||||
// new Param("type4", KarateMan.BackgroundTextureType.Plain, "Texture", "The type of background texture to use"),
|
||||
// new Param("type5", KarateMan.ShadowType.Tinted, "Color Filter Type", "The method used to apply colour to the texture"),
|
||||
// new Param("colorC", new Color(), "Custom Filter Color", "The filter color to use when color filter type is set to Custom"),
|
||||
// new Param("colorD", new Color(), "Fading Filter Color", "When using the Fade background effect, make filter colour fade to this colour"),
|
||||
// },
|
||||
// },
|
||||
new GameAction("set object colors", "Object Appearance")
|
||||
{
|
||||
function = delegate {
|
||||
|
|
@ -521,11 +491,16 @@ namespace HeavenStudio.Games
|
|||
Mania,
|
||||
ManiaHorizontal,
|
||||
}
|
||||
|
||||
public enum ComboMode
|
||||
{
|
||||
Disabled,
|
||||
Normal,
|
||||
Jump,
|
||||
}
|
||||
#endregion
|
||||
|
||||
// static List<RiqEntity> queuedCues = new();
|
||||
public static bool IsComboEnable = true; //only stops Out combo inputs, this basically makes combo contextual
|
||||
// public static bool IsKickEnable = true; //same as above, except with kick inputs
|
||||
public static ComboMode IsComboEnable = ComboMode.Normal; //only stops Out combo inputs, this basically makes combo contextual
|
||||
public bool IsNoriActive { get { return Nori.MaxNori > 0; } }
|
||||
public float NoriPerformance { get { if (IsNoriActive) return Nori.Nori / Nori.MaxNori; else return 1f; } }
|
||||
|
||||
|
|
@ -1113,12 +1088,12 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
}
|
||||
|
||||
public void SetGameplayMods(double beat, int fxType, int mode, bool combo)
|
||||
public void SetGameplayMods(double beat, int fxType, int mode, int combo)
|
||||
{
|
||||
NoriGO.SetActive(true);
|
||||
Nori.SetNoriMode(beat, mode);
|
||||
currentBgEffect = fxType;
|
||||
IsComboEnable = combo;
|
||||
IsComboEnable = (ComboMode)combo;
|
||||
// IsKickEnable = kick;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
public class KarateManJoe : MonoBehaviour
|
||||
{
|
||||
public Animator anim;
|
||||
public Animator FaceAnim;
|
||||
public GameEvent bop = new GameEvent();
|
||||
public SpriteRenderer[] Shadows;
|
||||
|
||||
|
|
@ -158,7 +157,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
}
|
||||
}
|
||||
|
||||
if (PlayerInput.GetIsAction(KarateMan.InputAction_AltDown) && KarateMan.IsComboEnable && !inSpecial)
|
||||
if (PlayerInput.GetIsAction(KarateMan.InputAction_AltDown) && (KarateMan.IsComboEnable != KarateMan.ComboMode.Disabled) && !inSpecial)
|
||||
{
|
||||
if (!KarateMan.instance.IsExpectingInputNow(KarateMan.InputAction_AltDown))
|
||||
{
|
||||
|
|
@ -292,7 +291,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
comboWaiting = true;
|
||||
break;
|
||||
case 3:
|
||||
anim.DoScaledAnimationAsync("UpperCut", 0.5f);
|
||||
anim.DoScaledAnimationAsync(KarateMan.IsComboEnable == KarateMan.ComboMode.Jump ? "UpperCutJump" : "UpperCut", 0.5f);
|
||||
lockedInCombo = false;
|
||||
comboWaiting = false;
|
||||
break;
|
||||
|
|
@ -412,14 +411,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
|
||||
public void SetFaceExpressionForced(int face)
|
||||
{
|
||||
FaceAnim.DoScaledAnimationAsync("Face" + face.ToString("D2"));
|
||||
anim.DoScaledAnimationAsync("Head.Face" + face.ToString("D2"));
|
||||
}
|
||||
|
||||
public void SetFaceExpression(int face, bool ignoreCheck = false)
|
||||
{
|
||||
wantFace = face;
|
||||
if (canEmote || ignoreCheck)
|
||||
FaceAnim.DoScaledAnimationAsync("Face" + face.ToString("D2"));
|
||||
anim.DoScaledAnimationAsync("Head.Face" + face.ToString("D2"));
|
||||
}
|
||||
|
||||
public void ApplyBombGlow()
|
||||
|
|
|
|||
|
|
@ -809,7 +809,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
public void ItemWrongAction(PlayerActionEvent caller, float state)
|
||||
{
|
||||
if (GameManager.instance.currentGame != "karateman") return;
|
||||
if (!KarateMan.IsComboEnable) return;
|
||||
if (KarateMan.IsComboEnable == KarateMan.ComboMode.Disabled) return;
|
||||
//hitting a normal object with the alt input
|
||||
//WHEN SCORING THIS IS A MISS
|
||||
var joe = KarateMan.instance.Joe;
|
||||
|
|
|
|||
|
|
@ -806,6 +806,7 @@ namespace HeavenStudio.Editor.Track
|
|||
if (entity == null)
|
||||
{
|
||||
RiqEntity en = GameManager.instance.Beatmap.AddNewEntity(eventName, 0, action.defaultLength);
|
||||
en.version = action.defaultVersion;
|
||||
|
||||
tempEntity = en;
|
||||
|
||||
|
|
|
|||
|
|
@ -662,6 +662,7 @@ namespace HeavenStudio
|
|||
public string tabName;
|
||||
public EventCallback function = delegate { };
|
||||
public float defaultLength = 1;
|
||||
public int defaultVersion = 0;
|
||||
public bool resizable = false;
|
||||
public List<Param> parameters = null;
|
||||
public bool hidden = false;
|
||||
|
|
@ -685,7 +686,7 @@ namespace HeavenStudio
|
|||
/// <param name="preFunction">What the block does when the GameManager seeks to this cue for pre-scheduling.</param>
|
||||
/// <param name="hidden">Prevents the block from being shown in the game list. Block will still function normally if it is in the timeline.</param>
|
||||
/// <param name="priority">Priority of this event. Higher priority events will be run first.</param>
|
||||
public GameAction(string actionName, string displayName, string tabName, float defaultLength = 1, bool resizable = false, List<Param> parameters = null, EventCallback function = null, EventCallback inactiveFunction = null, EventCallback preFunction = null, bool hidden = false, int priority = 0, float preFunctionLength = 2.0f)
|
||||
public GameAction(string actionName, string displayName, string tabName, float defaultLength = 1, bool resizable = false, List<Param> parameters = null, EventCallback function = null, EventCallback inactiveFunction = null, EventCallback preFunction = null, bool hidden = false, int priority = 0, float preFunctionLength = 2.0f, int defaultVersion = 0)
|
||||
{
|
||||
this.actionName = actionName;
|
||||
this.displayName = string.IsNullOrEmpty(displayName) ? actionName : displayName;
|
||||
|
|
@ -701,6 +702,7 @@ namespace HeavenStudio
|
|||
this.preFunction = preFunction ?? delegate { };
|
||||
this.priority = priority;
|
||||
this.preFunctionLength = preFunctionLength;
|
||||
this.defaultVersion = defaultVersion;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
"com.annulusgames.burst-linq": "https://github.com/AnnulusGames/BurstLinq.git?path=/Assets/BurstLinq",
|
||||
"com.coffee.softmask-for-ugui": "https://github.com/mob-sakai/SoftMaskForUGUI.git",
|
||||
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
|
||||
"com.hfcred.animationrepathing": "https://github.com/hfcRed/Animation-Repathing.git",
|
||||
"com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git",
|
||||
"com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox",
|
||||
"com.sator-imaging.alt-source-generator": "https://github.com/sator-imaging/Unity-AltSourceGenerator.git",
|
||||
|
|
|
|||
|
|
@ -21,6 +21,13 @@
|
|||
"dependencies": {},
|
||||
"hash": "cfe509a55602ba5be6df7fa0468b10298b8a053d"
|
||||
},
|
||||
"com.hfcred.animationrepathing": {
|
||||
"version": "https://github.com/hfcRed/Animation-Repathing.git",
|
||||
"depth": 0,
|
||||
"source": "git",
|
||||
"dependencies": {},
|
||||
"hash": "1a83fe03039401941aa2560dd42917cd4e569d71"
|
||||
},
|
||||
"com.nobi.roundedcorners": {
|
||||
"version": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git",
|
||||
"depth": 0,
|
||||
|
|
|
|||
Loading…
Reference in a new issue