studio dance inkling shuffle test

This commit is contained in:
minenice55 2023-12-10 00:58:54 -05:00
parent 1670ee29ad
commit 803f756584
13 changed files with 10830 additions and 17 deletions

View file

@ -7,7 +7,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: PoseL m_Name: MakerPoseL
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions: []
@ -33,7 +33,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: DanceL m_Name: MakerL
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions: []
@ -100,6 +100,32 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1102 &3033663514174944207
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShuffleTest
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: 1448ab72147172d45807482f543ed065, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4458562493945474950 --- !u!1102 &4458562493945474950
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -133,7 +159,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: DanceR m_Name: MakerR
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions: []
@ -163,22 +189,25 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -1776475060856592369} m_State: {fileID: -1776475060856592369}
m_Position: {x: 200, y: 0, z: 0} m_Position: {x: 270, y: 10, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -2547331504343513316} m_State: {fileID: -2547331504343513316}
m_Position: {x: 235, y: 65, z: 0} m_Position: {x: 270, y: 80, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 5646467201381534092} m_State: {fileID: 5646467201381534092}
m_Position: {x: 270, y: 130, z: 0} m_Position: {x: 270, y: 130, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -7358310358408031479} m_State: {fileID: -7358310358408031479}
m_Position: {x: 305, y: 195, z: 0} m_Position: {x: 270, y: 180, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 4458562493945474950} m_State: {fileID: 4458562493945474950}
m_Position: {x: 340, y: 260, z: 0} m_Position: {x: 500, y: 10, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7185868682324471420} m_State: {fileID: 7185868682324471420}
m_Position: {x: 375, y: 325, z: 0} m_Position: {x: 270, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: 3033663514174944207}
m_Position: {x: 305, y: 295, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -196,7 +225,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: PoseR m_Name: MakerPoseR
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e2a6686ab02c85d4ab9ef17c5427c96a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: DanceL m_Name: MakerL
serializedVersion: 6 serializedVersion: 6
m_Legacy: 0 m_Legacy: 0
m_Compressed: 0 m_Compressed: 0

View file

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: PoseL m_Name: MakerPoseL
serializedVersion: 6 serializedVersion: 6
m_Legacy: 0 m_Legacy: 0
m_Compressed: 0 m_Compressed: 0

View file

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: PoseR m_Name: MakerPoseR
serializedVersion: 6 serializedVersion: 6
m_Legacy: 0 m_Legacy: 0
m_Compressed: 0 m_Compressed: 0

View file

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: DanceR m_Name: MakerR
serializedVersion: 6 serializedVersion: 6
m_Legacy: 0 m_Legacy: 0
m_Compressed: 0 m_Compressed: 0

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1448ab72147172d45807482f543ed065
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -24,11 +24,11 @@ namespace HeavenStudio.StudioDance
if (!isDance) return; if (!isDance) return;
if (currentBeat % 2 != 0) if (currentBeat % 2 != 0)
{ {
animator.DoScaledAnimationAsync("PoseL"); animator.DoScaledAnimationAsync("MakerPoseL");
} }
else else
{ {
animator.DoScaledAnimationAsync("PoseR"); animator.DoScaledAnimationAsync("MakerPoseR");
} }
isDance = false; isDance = false;
return; return;
@ -46,11 +46,11 @@ namespace HeavenStudio.StudioDance
if (currentBeat % 2 != 0) if (currentBeat % 2 != 0)
{ {
animator.DoScaledAnimation("DanceL", currentBeat); animator.DoScaledAnimation("MakerL", currentBeat);
} }
else else
{ {
animator.DoScaledAnimation("DanceR", currentBeat); animator.DoScaledAnimation("MakerR", currentBeat);
} }
} }
} }