soldier of dance
add speed halving / doubling functionality to choreographies
This commit is contained in:
parent
24512f6d91
commit
f2b4d8ee3b
|
@ -78,6 +78,32 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-4203194248138824501
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: KazotskyPose
|
||||
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: a489eba9d04ad154aab8acbf34780d8e, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-3823298263883976421
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
@ -509,7 +535,13 @@ AnimatorStateMachine:
|
|||
m_Position: {x: 1450, y: 130, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 8049460133278642431}
|
||||
m_Position: {x: 1450, y: 230, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 7273876924300994975}
|
||||
m_Position: {x: 1450, y: 180, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -4203194248138824501}
|
||||
m_Position: {x: 1450, y: 280, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
|
@ -546,6 +578,32 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &7273876924300994975
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: KazotskyNormalToAlt
|
||||
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: 1c04971cb2d351a44979936934edcba6, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &7555830261063634073
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
|
@ -2400,6 +2400,74 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: Body/Hips/BelowHips
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: -0.324, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: {x: -0.298, y: -0.405, z: 0}
|
||||
inSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: {x: -0.324, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: Head/FacePoser/EyeL
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: 0.295, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: {x: 0.275, y: -0.399, z: 0}
|
||||
inSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: {x: 0.295, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: Head/FacePoser/EyeR
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves:
|
||||
- curve:
|
||||
|
@ -3170,6 +3238,25 @@ AnimationClip:
|
|||
path: Body/Hips/BelowHips
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_IsActive
|
||||
path: Head/FacePoser
|
||||
classID: 1
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
|
@ -3347,6 +3434,35 @@ AnimationClip:
|
|||
path: Body/Hips/BelowHips
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
|
@ -3431,6 +3547,20 @@ AnimationClip:
|
|||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 407980735
|
||||
attribute: 1
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3797841884
|
||||
attribute: 1
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3947676041
|
||||
attribute: 4
|
||||
|
@ -3564,6 +3694,13 @@ AnimationClip:
|
|||
typeID: 212
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 2783250321
|
||||
attribute: 2086281974
|
||||
script: {fileID: 0}
|
||||
typeID: 1
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 289668330
|
||||
attribute: 0
|
||||
|
@ -3620,6 +3757,27 @@ AnimationClip:
|
|||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 407980735
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 3797841884
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: -6009752245735603874, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -625885131761467319, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
|
@ -3689,6 +3847,13 @@ AnimationClip:
|
|||
- {fileID: -6875045102065924210, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: 0}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
@ -11795,6 +11960,247 @@ AnimationClip:
|
|||
path: Head/Hair
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -0.324
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: -0.298
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: -0.324
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.x
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: -0.405
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.y
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: 0
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.z
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.295
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: 0.275
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: 0.295
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.x
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: -0.399
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.y
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: 0
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.z
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_IsActive
|
||||
path: Head/FacePoser
|
||||
classID: 1
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -2344,6 +2344,74 @@ AnimationClip:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: LegR
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: -0.324, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: {x: -0.298, y: -0.405, z: 0}
|
||||
inSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: {x: -0.324, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: Head/FacePoser/EyeL
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: 0.295, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: {x: 0.275, y: -0.399, z: 0}
|
||||
inSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: {x: 0.295, y: -0.27, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: Head/FacePoser/EyeR
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves:
|
||||
- curve:
|
||||
|
@ -3096,6 +3164,25 @@ AnimationClip:
|
|||
path: LegR
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_IsActive
|
||||
path: Head/FacePoser
|
||||
classID: 1
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
|
@ -3273,6 +3360,35 @@ AnimationClip:
|
|||
path: LegR
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 0}
|
||||
attribute: m_Sprite
|
||||
path: Head
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 60
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
|
@ -3357,6 +3473,20 @@ AnimationClip:
|
|||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 407980735
|
||||
attribute: 1
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3797841884
|
||||
attribute: 1
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 4204807211
|
||||
attribute: 4
|
||||
|
@ -3497,6 +3627,13 @@ AnimationClip:
|
|||
typeID: 212
|
||||
customType: 26
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 2783250321
|
||||
attribute: 2086281974
|
||||
script: {fileID: 0}
|
||||
typeID: 1
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 4204807211
|
||||
attribute: 0
|
||||
|
@ -3553,6 +3690,27 @@ AnimationClip:
|
|||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 130111906
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 407980735
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
- serializedVersion: 2
|
||||
path: 3797841884
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: -1869205447439930541, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1869205447439930541, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
|
@ -3622,6 +3780,13 @@ AnimationClip:
|
|||
- {fileID: -581193985, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -6100571296275456381, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -6009752245735603874, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -553841512, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
- {fileID: -1154888724, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
|
@ -11551,6 +11716,247 @@ AnimationClip:
|
|||
path: Head/Hair
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_IsActive
|
||||
path: Head/FacePoser
|
||||
classID: 1
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -0.324
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: -0.298
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: -0.324
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.x
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: -0.405
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.y
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: 0
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.z
|
||||
path: Head/FacePoser/EyeL
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.295
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: 0.275
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: 0.295
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.x
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: -0.399
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: -0.27
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.y
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5833333
|
||||
value: 0
|
||||
inSlope: Infinity
|
||||
outSlope: Infinity
|
||||
tangentMode: 103
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.75
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.z
|
||||
path: Head/FacePoser/EyeR
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1c04971cb2d351a44979936934edcba6
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a489eba9d04ad154aab8acbf34780d8e
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -19,3 +19,5 @@ MonoBehaviour:
|
|||
beatLength: 2
|
||||
poseStateOdd: CaramelldansenPose
|
||||
poseStateEven: CaramelldansenPose
|
||||
halfSpeedBpm: 60
|
||||
doubleSpeedBpm: 240
|
||||
|
|
|
@ -16,10 +16,12 @@ MonoBehaviour:
|
|||
introState: GriddyPose
|
||||
choreographySteps:
|
||||
- stateName: RightFoot
|
||||
beatLength: 2
|
||||
- stateName: RightFoot
|
||||
beatLength: 2
|
||||
- stateName: LookAround
|
||||
beatLength: 4
|
||||
- stateName: RightFoot
|
||||
beatLength: 4
|
||||
- stateName: LookAround
|
||||
beatLength: 8
|
||||
poseStateOdd: GriddyPose
|
||||
poseStateEven: GriddyPose
|
||||
halfSpeedBpm: 100
|
||||
doubleSpeedBpm: 180
|
||||
|
|
|
@ -21,3 +21,5 @@ MonoBehaviour:
|
|||
beatLength: 1
|
||||
poseStateOdd: MakerPoseL
|
||||
poseStateEven: MakerPoseR
|
||||
halfSpeedBpm: 100
|
||||
doubleSpeedBpm: 160
|
||||
|
|
|
@ -13,7 +13,7 @@ MonoBehaviour:
|
|||
m_Name: Kazotsky
|
||||
m_EditorClassIdentifier:
|
||||
choreographyName: Kazotsky Kick
|
||||
introState: CaramelldansenPose
|
||||
introState: KazotskyPose
|
||||
choreographySteps:
|
||||
- stateName: Kazotsky
|
||||
beatLength: 2
|
||||
|
@ -23,29 +23,15 @@ MonoBehaviour:
|
|||
beatLength: 2
|
||||
- stateName: Kazotsky
|
||||
beatLength: 2
|
||||
- stateName: Kazotsky
|
||||
beatLength: 2
|
||||
- stateName: Kazotsky
|
||||
beatLength: 2
|
||||
- stateName: Kazotsky
|
||||
beatLength: 2
|
||||
- stateName: Kazotsky
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyNormalToAlt
|
||||
beatLength: 6
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAltToNormal
|
||||
beatLength: 2
|
||||
poseStateOdd: CaramelldansenPose
|
||||
poseStateEven: CaramelldansenPose
|
||||
poseStateOdd: KazotskyPose
|
||||
poseStateEven: KazotskyPose
|
||||
halfSpeedBpm: 100
|
||||
doubleSpeedBpm: 160
|
||||
|
|
|
@ -23,3 +23,5 @@ MonoBehaviour:
|
|||
beatLength: 4
|
||||
poseStateOdd: ShufflePoseR
|
||||
poseStateEven: ShufflePoseR
|
||||
halfSpeedBpm: 60
|
||||
doubleSpeedBpm: 180
|
||||
|
|
|
@ -21,3 +21,5 @@ MonoBehaviour:
|
|||
beatLength: 1
|
||||
poseStateOdd: SwayPoseL
|
||||
poseStateEven: SwayPoseR
|
||||
halfSpeedBpm: 60
|
||||
doubleSpeedBpm: 240
|
||||
|
|
|
@ -20,5 +20,7 @@ namespace HeavenStudio.StudioDance
|
|||
public List<ChoreographyStep> choreographySteps;
|
||||
public string poseStateOdd;
|
||||
public string poseStateEven;
|
||||
public double halfSpeedBpm;
|
||||
public double doubleSpeedBpm;
|
||||
}
|
||||
}
|
|
@ -8,6 +8,8 @@ namespace HeavenStudio.StudioDance
|
|||
{
|
||||
[SerializeField] ChoreographyInfo debugChoreography;
|
||||
[SerializeField] ChoreographyInfo[] choreographies;
|
||||
Conductor cond;
|
||||
GameManager gm;
|
||||
private Animator animator;
|
||||
private double currentBeat = 0f;
|
||||
|
||||
|
@ -40,7 +42,7 @@ namespace HeavenStudio.StudioDance
|
|||
totalChoreographyLength += step.beatLength;
|
||||
}
|
||||
|
||||
if (!Conductor.instance.isPlaying)
|
||||
if (!cond.isPlaying)
|
||||
{
|
||||
animator.Play(currentChoreography.introState);
|
||||
}
|
||||
|
@ -49,8 +51,9 @@ namespace HeavenStudio.StudioDance
|
|||
private void Start()
|
||||
{
|
||||
animator = GetComponent<Animator>();
|
||||
cond = Conductor.instance;
|
||||
gm = GameManager.instance;
|
||||
|
||||
var gm = GameManager.instance;
|
||||
if (gm != null)
|
||||
{
|
||||
gm.onBeatPulse += OnBeatPulse;
|
||||
|
@ -71,7 +74,6 @@ namespace HeavenStudio.StudioDance
|
|||
|
||||
private void Update()
|
||||
{
|
||||
var cond = Conductor.instance;
|
||||
if (currentChoreography == null || cond == null) return;
|
||||
if (!cond.isPlaying)
|
||||
{
|
||||
|
@ -89,21 +91,34 @@ namespace HeavenStudio.StudioDance
|
|||
}
|
||||
isDance = true;
|
||||
|
||||
double choreoBeat = cond.songPositionInBeatsAsDouble % totalChoreographyLength;
|
||||
double cycleStartBeat = Math.Floor(cond.songPositionInBeatsAsDouble / totalChoreographyLength) * totalChoreographyLength;
|
||||
float speed = 1f;
|
||||
if (currentChoreography.halfSpeedBpm != currentChoreography.doubleSpeedBpm)
|
||||
{
|
||||
if (cond.songBpm < currentChoreography.halfSpeedBpm)
|
||||
{
|
||||
speed = 0.5f;
|
||||
}
|
||||
else if (cond.songBpm > currentChoreography.doubleSpeedBpm)
|
||||
{
|
||||
speed = 2f;
|
||||
}
|
||||
}
|
||||
|
||||
double choreoBeat = cond.songPositionInBeatsAsDouble % (totalChoreographyLength * speed);
|
||||
double cycleStartBeat = Math.Floor(cond.songPositionInBeatsAsDouble / (totalChoreographyLength * speed)) * (totalChoreographyLength * speed);
|
||||
|
||||
double beatSum = 0.0;
|
||||
double stepLength = 0.0;
|
||||
string stepState = "";
|
||||
foreach (ChoreographyInfo.ChoreographyStep s in currentChoreography.choreographySteps)
|
||||
{
|
||||
if (choreoBeat > beatSum && choreoBeat < beatSum + s.beatLength)
|
||||
if (choreoBeat > beatSum && choreoBeat < beatSum + (s.beatLength * speed))
|
||||
{
|
||||
stepLength = s.beatLength;
|
||||
stepLength = s.beatLength * speed;
|
||||
stepState = s.stateName;
|
||||
break;
|
||||
}
|
||||
beatSum += s.beatLength;
|
||||
beatSum += s.beatLength * speed;
|
||||
}
|
||||
if (stepState is not null or "")
|
||||
{
|
||||
|
|
|
@ -200,5 +200,7 @@ MonoBehaviour:
|
|||
- Assets/Scripts/Games/ShootEmUp/Effect.cs
|
||||
- Assets/Scripts/Games/ShootEmUp/Enemy.cs
|
||||
- Assets/Scripts/Games/ShootEmUp/Ship.cs
|
||||
- Assets/Scripts/StudioDance/ChoreographyInfo.cs
|
||||
- Assets/Scripts/StudioDance/Dancer.cs
|
||||
PathsToSkipImportEvent: []
|
||||
PathsToIgnoreOverwriteSettingOnAttribute: []
|
||||
|
|
Loading…
Reference in a new issue