Games fixes/reworks patch (#501)

* ghosts are scaled now

* Lockstep fully reworked

* mr. bach has been implemented

* Space dance fixes

* oops

* Tap trial rework part 1

* tap trial rework part 2

* oopsie

* Gramps Talk Update

* Space Dance Voice Offsets

* Giraffe done! (Except miss anim)

* bg is not showing up for some reason

* bg not rendering fixed + giraffe fixed

* scrolling done

* fixed space dance and space soccer bg scrolls

* fixed rockers bugs

* adjustment

* fixed el inaccuracies

* particle fix

* changed pitch and volume of monkey tap

* miss anim

* megamix face for girl

* Proper miss anim implementation

* Added force stepping event

* miss anim fix

---------

Co-authored-by: saladplainzone <chocolate2890mail@gmail.com>
Co-authored-by: ev <85412919+evdial@users.noreply.github.com>

Assets/Resources/Games/lockstep.prefab

@@ -980,6 +980,7 @@ Transform:
   - {fileID: 5822623106182197534}
   - {fileID: 8741503478682748471}
   - {fileID: 5830852029726441606}
+  - {fileID: 7054522558614666336}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1004,6 +1005,7 @@ MonoBehaviour:
   stepswitcherPlayer: {fileID: 5548089329135658778}
   stepswitcherLeft: {fileID: 4345424095870309896}
   stepswitcherRight: {fileID: 1812067692118211880}
+  bach: {fileID: 4503733643126543576}
   masterStepperAnim: {fileID: 3631086194869090727}
   masterStepperSprite: {fileID: 8050626680266531175}
   slaveSteppers:
@@ -1289,6 +1291,90 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &4172290321176370281
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2880036267901204128}
+  - component: {fileID: 1011405754616745552}
+  m_Layer: 0
+  m_Name: OnbeatPortrait
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &2880036267901204128
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4172290321176370281}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7054522558614666336}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1011405754616745552
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4172290321176370281}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 1000
+  m_Sprite: {fileID: 21300000, guid: e7cdf4af68c99d54397759f6122e9e6e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 38.6, y: 21.6}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &4346017363568625719
 GameObject:
   m_ObjectHideFlags: 0
@@ -2195,6 +2281,60 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &6717430194562386115
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7054522558614666336}
+  - component: {fileID: 4503733643126543576}
+  m_Layer: 0
+  m_Name: Bach
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7054522558614666336
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717430194562386115}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -3.5, y: 0, z: 0}
+  m_LocalScale: {x: 3.41, y: 3.41, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2880036267901204128}
+  m_Father: {fileID: 931641041398444854}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &4503733643126543576
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717430194562386115}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: e329403cfc5867042884e77dd4796d34, 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 &6841444080171222974
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/Sfx/games/lockstep/GROUP_NTR_BACKBEAT_EN_00000000.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 5b1b83324fb299a4e84e1792fc0396eb
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/drumOff.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 432d91ac343eb7249aa719c1cc69dca1
+guid: abeea8b51d3347142bcee41de843007d
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: agbtap/common
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/drumOn.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e0132f2666fa2454394dfdfc46d1fbec
+guid: a033ad6eb5d9fd14d8515ccb877d071f
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: ntrbackbeat/common
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/foot1.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5afed25733a9b0479eace77e519daaf
+guid: 40d0f924967405e45a124048ec25395f
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: ntrbackbeat/common
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/foot2.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2f1086614d79e3d428c0a9315a3d6730
+guid: 009922469a7a1854eb1397be6e2fc17f
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: ntrbackbeat/common
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/hahai1.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bc48c491afbab8544b8578aa88b78a0e
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/hahai2.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3c6ed85ee8cda9846870adb97ca027dd
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/hai.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 87c3cb9e705b601428fa836317fd68b4
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/ho.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 4302ca3754758ae4c80b9630c6d0ce96
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/marchOnbeat2.ogg.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: d3438bf921e005a42970bde1188200fb
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/miss.ogg.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 2b4c8e147b3faec469cc83bbe3d0fc9c
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/nha1.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 72194ee2dce1f294a938613b61f97f65
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/nha2.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f9e6e8ea976dae84e96fab3f5bcaf76f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/switch1.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 8fe0d56d22d777d45891f11525ed4d64
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/switch2.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 9fb8d518d7c37e847b8899f6e6ba092b
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/switch3.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 7c0617538d76fc14aa48a11ec3428f3d
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/switch4.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 63bd6f66ec33a1e44ba721b4bf2a0aba
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/switch5.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 175fad69be2962842b29d1b830f142d0
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/switch6.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 4209c1efa358fd94281e8fe92a2c8c92
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/tink.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 85fbd14dbd82a0e45899dbf4d018c3ae
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: ntrbackbeat/common
-  assetBundleVariant: 

Assets/Resources/Sfx/games/lockstep/wayOff.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ab81af84865ceb54c894b6a08809da87
+guid: 9215156d1ccb1104e9b0d7fe245d560b
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: ntrbackbeat/common
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sprites/Games/Lockstep/Animations/Bach.controller

@@ -0,0 +1,130 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-8841203839749875597
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BachOff
+  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: 4a6d09aabba7e5149b3b31037218732e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-3964775129993990880
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BachIdle
+  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: 7655c561d2bb3b9458595a949445d317, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Bach
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 7750420637532355797}
+    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 &5670572787227363765
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BachOn
+  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: 5acbcc5c33f877e4ea6663a7f70dfd7c, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &7750420637532355797
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -3964775129993990880}
+    m_Position: {x: 200, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5670572787227363765}
+    m_Position: {x: 235, y: 65, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8841203839749875597}
+    m_Position: {x: 270, y: 130, 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: -3964775129993990880}

Assets/Resources/Sprites/Games/Lockstep/Animations/Bach.controller.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: acc8c8f9a2f31104eba7cfaa45ae50f2
+guid: e329403cfc5867042884e77dd4796d34
-folderAsset: yes
+NativeFormatImporter:
-DefaultImporter:
   externalObjects: {}
+  mainObjectFileID: 9100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sprites/Games/Lockstep/Animations/BachIdle.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BachIdle
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Resources/Sprites/Games/Lockstep/Animations/BachIdle.anim.meta

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

Assets/Resources/Sprites/Games/Lockstep/Animations/BachOff.anim

@@ -0,0 +1,131 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BachOff
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.21666667
+        value: 0
+        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: OnbeatPortrait
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: c83ead9dcb4419e4db7a2688db66abb0, type: 3}
+    attribute: m_Sprite
+    path: OnbeatPortrait
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1293373584
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1293373584
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: c83ead9dcb4419e4db7a2688db66abb0, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.21666667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.21666667
+        value: 0
+        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: OnbeatPortrait
+    classID: 1
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Resources/Sprites/Games/Lockstep/Animations/BachOff.anim.meta

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

Assets/Resources/Sprites/Games/Lockstep/Animations/BachOn.anim

@@ -0,0 +1,131 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BachOn
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.21666667
+        value: 0
+        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: OnbeatPortrait
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: e7cdf4af68c99d54397759f6122e9e6e, type: 3}
+    attribute: m_Sprite
+    path: OnbeatPortrait
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1293373584
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1293373584
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: e7cdf4af68c99d54397759f6122e9e6e, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.21666667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.21666667
+        value: 0
+        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: OnbeatPortrait
+    classID: 1
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Resources/Sprites/Games/Lockstep/Animations/BachOn.anim.meta

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

Assets/Resources/Sprites/Games/Lockstep/Bach.mat

@@ -0,0 +1,93 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Bach
+  m_Shader: {fileID: 4800000, guid: 0ae724cf80d801b43b140517e4bbb12f, type: 3}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _BlendDst: 10
+    - _BlendSrc: 5
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _InvFade: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Tint1: {r: 1, g: 1, b: 1, a: 0}
+    - _Tint2: {r: 1, g: 1, b: 1, a: 0}
+  m_BuildTextureStacks: []

Assets/Resources/Sprites/Games/Lockstep/Bach.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b7e66e2d993ab004c987363cc64eee3a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG.meta

@@ -67,7 +67,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG.meta

@@ -67,7 +67,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/Resources/Sprites/Games/SpaceDance/Animations/GrampsTalk.anim

@@ -20,7 +20,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0.017, y: -0.021, z: 0}
+        value: {x: 0.004, y: -0.012, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -102,7 +102,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.017
+        value: 0.004
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -130,7 +130,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.021
+        value: -0.012
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103

Assets/Resources/Sprites/Games/SpaceDance/spacegramps.png.meta

@@ -1113,10 +1113,10 @@ TextureImporter:
       name: spacegramps_41
       rect:
         serializedVersion: 2
-        x: 1953
+        x: 1952
-        y: 80
+        y: 81
-        width: 414
+        width: 412
-        height: 602
+        height: 601
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}

Assets/Resources/Sprites/Games/TapTrial/Animations/DoubleTap.anim

@@ -844,6 +844,49 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: tap_splash
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.085, z: 0}
+        inSlope: {x: Infinity, y: Infinity, z: Infinity}
+        outSlope: {x: Infinity, y: Infinity, z: Infinity}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0, z: 0}
+        outWeight: {x: 0, y: 0, z: 0}
+      - serializedVersion: 3
+        time: 0.2
+        value: {x: 0.002, y: -0.102, 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.23333333
+        value: {x: 0.002, y: -0.086, 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.25
+        value: {x: 0.002, y: -0.101, 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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -982,7 +1025,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -991,7 +1034,16 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.1
-        value: 3
+        value: 4
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.11666667
+        value: 6
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -1045,6 +1097,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
+      - serializedVersion: 3
+        time: 0.1
+        value: 3
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       - serializedVersion: 3
         time: 0.11666667
         value: 4
@@ -1073,6 +1134,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
+      - serializedVersion: 3
+        time: 0.1
+        value: 3
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       - serializedVersion: 3
         time: 0.11666667
         value: 4
@@ -1287,43 +1357,6 @@ AnimationClip:
     classID: 212
     script: {fileID: 0}
   m_PPtrCurves:
-  - curve:
-    - time: 0
-      value: {fileID: 0}
-    - time: 0.016666668
-      value: {fileID: 0}
-    - time: 0.033333335
-      value: {fileID: 0}
-    - time: 0.05
-      value: {fileID: 0}
-    - time: 0.06666667
-      value: {fileID: 0}
-    - time: 0.083333336
-      value: {fileID: 0}
-    - time: 0.1
-      value: {fileID: 0}
-    - time: 0.11666667
-      value: {fileID: 0}
-    - time: 0.13333334
-      value: {fileID: 0}
-    - time: 0.15
-      value: {fileID: 0}
-    - time: 0.16666667
-      value: {fileID: 0}
-    - time: 0.18333334
-      value: {fileID: 0}
-    - time: 0.2
-      value: {fileID: 0}
-    - time: 0.21666667
-      value: {fileID: 0}
-    - time: 0.23333333
-      value: {fileID: 0}
-    - time: 0.25
-      value: {fileID: 0}
-    attribute: m_Sprite
-    path: root_body/ref (1)
-    classID: 212
-    script: {fileID: 0}
   - curve:
     - time: 0
       value: {fileID: 1090177971791568880, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
@@ -1450,6 +1483,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 4030795737
       attribute: 4
@@ -1604,13 +1644,6 @@ AnimationClip:
       typeID: 212
       customType: 0
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 2170803833
-      attribute: 0
-      script: {fileID: 0}
-      typeID: 212
-      customType: 23
-      isPPtrCurve: 1
     - serializedVersion: 2
       path: 3921307443
       attribute: 0
@@ -1647,22 +1680,6 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 0}
     - {fileID: 1090177971791568880, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 2690457177157338859, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 2690457177157338859, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
@@ -4110,7 +4127,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -4119,7 +4136,16 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.1
-        value: 3
+        value: 4
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.11666667
+        value: 6
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -4173,6 +4199,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
+      - serializedVersion: 3
+        time: 0.1
+        value: 3
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       - serializedVersion: 3
         time: 0.11666667
         value: 4
@@ -4201,6 +4236,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
+      - serializedVersion: 3
+        time: 0.1
+        value: 3
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       - serializedVersion: 3
         time: 0.11666667
         value: 4
@@ -4747,67 +4791,145 @@ AnimationClip:
     path: tap_splash
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.2
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.085
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.2
+        value: -0.102
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: -0.086
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: -0.101
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.2
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: root_body/girl_torso_0
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/girl_torso_0
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/girl_torso_0
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: root_body/girl_arm_r
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/girl_arm_r
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/girl_arm_r
-    classID: 4
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []
@@ -4868,6 +4990,66 @@ AnimationClip:
     path: root_body/girl_arm_l
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: root_body/girl_arm_r
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: root_body/girl_arm_r
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: root_body/girl_arm_r
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: root_body/girl_torso_0
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: root_body/girl_torso_0
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: root_body/girl_torso_0
+    classID: 4
+    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []

Assets/Resources/Sprites/Games/TapTrial/Animations/DoubleTapPrepare.anim

@@ -506,6 +506,40 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/girl_leg_0
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.077, 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.083333336
+        value: {x: 0.002, y: -0.094, 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.11666667
+        value: {x: 0.002, y: -0.08, 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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -598,7 +632,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -891,217 +925,224 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
-      path: root_body/3520933299
+      path: 1751662333
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2332501354
+      path: 450559214
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/596002991
+      path: 4030795737
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/3649664460
+      path: 172896954
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/798535960
+      path: 291318287
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/1230684625
+      path: 3921307443
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2039642929
+      path: 2857712711
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2332501354
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 450559214
       attribute: 4
       script: {fileID: 0}
       typeID: 4
       customType: 4
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/596002991
+      path: 4030795737
       attribute: 4
       script: {fileID: 0}
       typeID: 4
       customType: 4
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/3649664460
+      path: 172896954
       attribute: 4
       script: {fileID: 0}
       typeID: 4
       customType: 4
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2039642929
+      path: 2857712711
       attribute: 4
       script: {fileID: 0}
       typeID: 4
       customType: 4
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/3649664460
+      path: 172896954
       attribute: 555744692
       script: {fileID: 0}
       typeID: 212
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/1230684625
+      path: 3921307443
       attribute: 555744692
       script: {fileID: 0}
       typeID: 212
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2039642929
+      path: 2857712711
       attribute: 555744692
       script: {fileID: 0}
       typeID: 212
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/3520933299
+      path: 1751662333
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/3061558118
+      path: 2294165617
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/1891672657
+      path: 1792996287
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/130519751
+      path: 500810537
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/798535960
+      path: 291318287
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2332501354
+      path: 450559214
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2039642929
+      path: 2857712711
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/1230684625
+      path: 3921307443
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/596002991
+      path: 4030795737
       attribute: 3762991556
       script: {fileID: 0}
       typeID: 212
       customType: 26
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/596002991
+      path: 4030795737
       attribute: 555744692
       script: {fileID: 0}
       typeID: 212
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/2332501354
+      path: 450559214
       attribute: 555744692
       script: {fileID: 0}
       typeID: 212
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: root_body/3126011328
+      path: 2170803833
       attribute: 0
       script: {fileID: 0}
       typeID: 212
       customType: 23
       isPPtrCurve: 1
     - serializedVersion: 2
-      path: root_body/2332501354
+      path: 450559214
       attribute: 0
       script: {fileID: 0}
       typeID: 212
       customType: 23
       isPPtrCurve: 1
     - serializedVersion: 2
-      path: root_body/596002991
+      path: 4030795737
       attribute: 0
       script: {fileID: 0}
       typeID: 212
       customType: 23
       isPPtrCurve: 1
     - serializedVersion: 2
-      path: root_body/3649664460
+      path: 172896954
       attribute: 0
       script: {fileID: 0}
       typeID: 212
       customType: 23
       isPPtrCurve: 1
     - serializedVersion: 2
-      path: root_body/1230684625
+      path: 3921307443
       attribute: 0
       script: {fileID: 0}
       typeID: 212
       customType: 23
       isPPtrCurve: 1
     - serializedVersion: 2
-      path: root_body/2039642929
+      path: 2857712711
       attribute: 0
       script: {fileID: 0}
       typeID: 212
@@ -2674,7 +2715,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -3024,6 +3065,117 @@ AnimationClip:
     path: root_body/girl_torso_0
     classID: 212
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.11666667
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.077
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: -0.094
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.11666667
+        value: -0.08
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.11666667
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
@@ -3032,7 +3184,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: root_body/girl_torso_0
+    path: root_body/girl_leg_0
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3042,7 +3194,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: root_body/girl_torso_0
+    path: root_body/girl_leg_0
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3052,7 +3204,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: root_body/girl_torso_0
+    path: root_body/girl_leg_0
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3062,7 +3214,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: root_body/girl_leg_0
+    path: root_body/girl_arm_r
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3072,7 +3224,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: root_body/girl_leg_0
+    path: root_body/girl_arm_r
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3082,7 +3234,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: root_body/girl_leg_0
+    path: root_body/girl_arm_r
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3122,7 +3274,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: root_body/girl_arm_r
+    path: root_body/girl_torso_0
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3132,7 +3284,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: root_body/girl_arm_r
+    path: root_body/girl_torso_0
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -3142,7 +3294,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: root_body/girl_arm_r
+    path: root_body/girl_torso_0
     classID: 4
     script: {fileID: 0}
   m_HasGenericRootTransform: 0

Assets/Resources/Sprites/Games/TapTrial/Animations/Giraffe/Blink.anim.meta

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

Assets/Resources/Sprites/Games/TapTrial/Animations/Giraffe/Giraffe.controller

@@ -26,6 +26,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-7488452240166636176
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Miss
+  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: 21927690505206a4cb70d6502b7f572e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-4583857039119973829
 AnimatorState:
   serializedVersion: 6
@@ -52,6 +78,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-1100663083952105790
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blink
+  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: 026f3e90c9fe45d4c97c0a2f68e27f4d, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &-264880002355323244
 AnimatorStateMachine:
   serializedVersion: 6
@@ -70,6 +122,12 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -8628334122636638247}
     m_Position: {x: 270, y: 130, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1100663083952105790}
+    m_Position: {x: 309.29782, y: 243.37569, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -7488452240166636176}
+    m_Position: {x: 310, y: 190, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -79,7 +137,7 @@ AnimatorStateMachine:
   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: -4583857039119973829}
+  m_DefaultState: {fileID: -8628334122636638247}
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -102,6 +160,32 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &599762308765712800
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blink
+  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: 026f3e90c9fe45d4c97c0a2f68e27f4d, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1779178251371668107
 AnimatorState:
   serializedVersion: 6
@@ -128,3 +212,29 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &3210416668696982061
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Miss
+  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: 21927690505206a4cb70d6502b7f572e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Resources/Sprites/Games/TapTrial/Animations/Giraffe/Miss.anim.meta

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

Assets/Resources/Sprites/Games/TapTrial/Animations/Idle.anim

@@ -275,7 +275,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

Assets/Resources/Sprites/Games/TapTrial/Animations/Monkey/DoubleTap.anim

@@ -168,22 +168,6 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/monkey_head
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: -45, y: -90, z: 90}
-        inSlope: {x: Infinity, y: 0, z: 0}
-        outSlope: {x: Infinity, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: root_body/tap_effect
   m_PositionCurves:
   - curve:
       serializedVersion: 2
@@ -706,13 +690,6 @@ AnimationClip:
       typeID: 4
       customType: 4
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 4204308378
-      attribute: 4
-      script: {fileID: 0}
-      typeID: 4
-      customType: 4
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 0
       attribute: 3
@@ -2419,63 +2396,6 @@ AnimationClip:
     path: root_body/monkey_head
     classID: 212
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -45
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -90
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 90
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
@@ -2597,36 +2517,6 @@ AnimationClip:
     path: root_body/monkey_arm_l
     classID: 4
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Resources/Sprites/Games/TapTrial/Animations/Monkey/monkey_triple_tap/tap/PostTap_2.anim

@@ -80,22 +80,6 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/monkey_body
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: -45, y: -90, z: 90}
-        inSlope: {x: Infinity, y: 0, z: 0}
-        outSlope: {x: Infinity, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: root_body/tap_effect
   m_PositionCurves:
   - curve:
       serializedVersion: 2
@@ -666,13 +650,6 @@ AnimationClip:
       typeID: 4
       customType: 4
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 4204308378
-      attribute: 4
-      script: {fileID: 0}
-      typeID: 4
-      customType: 4
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 0
       attribute: 3
@@ -2094,63 +2071,6 @@ AnimationClip:
     path: root_body/monkey_head/monkey_mouth
     classID: 1
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -45
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -90
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 90
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
@@ -2219,36 +2139,6 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
     path: root_body/monkey_body
     classID: 4
     script: {fileID: 0}
@@ -2268,7 +2158,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
+    attribute: m_LocalEulerAngles.x
     path: root_body/monkey_body
     classID: 4
     script: {fileID: 0}

Assets/Resources/Sprites/Games/TapTrial/Animations/PosePrepare_2.anim

@@ -20,15 +20,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: -0.0028, y: -0.29, 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.033333335
         value: {x: -0.0028, y: -0.3409091, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -37,7 +28,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: {x: -0.0028, y: -0.41727272, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -46,7 +37,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: {x: -0.0028, y: -0.49363637, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -55,7 +46,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: {x: -0.0028, y: -0.53181815, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -64,7 +55,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: {x: -0.0028, y: -0.57, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -81,15 +72,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0.58, y: -0.15, 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.033333335
         value: {x: 0.58, y: -0.17727274, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -98,7 +80,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: {x: 0.58, y: -0.21818183, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -107,7 +89,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: {x: 0.58, y: -0.25909093, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -116,7 +98,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: {x: 0.58, y: -0.27954546, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -125,7 +107,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: {x: 0.58, y: -0.3, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -142,15 +124,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: -0.58, y: -0.15, 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.033333335
         value: {x: -0.58, y: -0.17727274, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -159,7 +132,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: {x: -0.58, y: -0.21818183, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -168,7 +141,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: {x: -0.58, y: -0.25909093, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -177,7 +150,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: {x: -0.58, y: -0.27954546, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -186,7 +159,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: {x: -0.58, y: -0.3, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -203,15 +176,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: -1.89, 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.033333335
         value: {x: 0, y: -1.9245454, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -220,7 +184,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: {x: 0, y: -1.9763635, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -229,7 +193,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: {x: 0, y: -2.0281818, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -238,7 +202,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: {x: 0, y: -2.0540907, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -247,7 +211,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: {x: 0, y: -2.08, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -264,15 +228,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0.0041, y: -0.0814, 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.033333335
         value: {x: 0.0041, y: -0.08296364, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -281,7 +236,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: {x: 0.0041, y: -0.085309096, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -290,7 +245,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: {x: 0.0041, y: -0.08765455, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -299,7 +254,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: {x: 0.0041, y: -0.088827275, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -308,8 +263,8 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
-        value: {x: 0.0041, y: -0.09, z: 0}
+        value: {x: 0.0041, y: -0.106, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -370,15 +325,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -434,15 +380,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -498,15 +435,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 11
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -562,15 +490,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 10
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -626,15 +545,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -690,15 +600,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -709,19 +610,17 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: -2272842664331572570, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
+      value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.033333335
       value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.06666667
+    - time: 0.05
       value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.083333336
+    - time: 0.06666667
       value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.1
       value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.13333334
       value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.16666667
-      value: {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     attribute: m_Sprite
     path: root_body/girl_head_0/girl_face
     classID: 212
@@ -737,8 +636,6 @@ AnimationClip:
       value: {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.13333334
       value: {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.16666667
-      value: {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     attribute: m_Sprite
     path: root_body/girl_arm_l
     classID: 212
@@ -754,8 +651,6 @@ AnimationClip:
       value: {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.13333334
       value: {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.16666667
-      value: {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     attribute: m_Sprite
     path: root_body/girl_arm_r
     classID: 212
@@ -771,8 +666,6 @@ AnimationClip:
       value: {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.13333334
       value: {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.16666667
-      value: {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     attribute: m_Sprite
     path: root_body/girl_leg_0
     classID: 212
@@ -788,8 +681,6 @@ AnimationClip:
       value: {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - time: 0.13333334
       value: {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - time: 0.16666667
-      value: {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     attribute: m_Sprite
     path: root_body/girl_leg_0 (1)
     classID: 212
@@ -914,7 +805,6 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: -2272842664331572570, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: -1682560553822806952, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
@@ -931,10 +821,6 @@ AnimationClip:
     - {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - {fileID: 8743285277506368957, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
-    - {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
@@ -950,7 +836,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.18333334
+    m_StopTime: 0.15
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -1014,15 +900,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: -0.0028
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1035,15 +912,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.29
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.033333335
         value: -0.3409091
         inSlope: Infinity
         outSlope: Infinity
@@ -1052,7 +920,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: -0.41727272
         inSlope: Infinity
         outSlope: Infinity
@@ -1061,7 +929,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: -0.49363637
         inSlope: Infinity
         outSlope: Infinity
@@ -1070,7 +938,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: -0.53181815
         inSlope: Infinity
         outSlope: Infinity
@@ -1079,7 +947,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: -0.57
         inSlope: Infinity
         outSlope: Infinity
@@ -1142,15 +1010,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1206,15 +1065,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1270,15 +1120,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1334,15 +1175,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0.58
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1355,15 +1187,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.15
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.033333335
         value: -0.17727274
         inSlope: Infinity
         outSlope: Infinity
@@ -1372,7 +1195,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: -0.21818183
         inSlope: Infinity
         outSlope: Infinity
@@ -1381,7 +1204,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: -0.25909093
         inSlope: Infinity
         outSlope: Infinity
@@ -1390,7 +1213,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: -0.27954546
         inSlope: Infinity
         outSlope: Infinity
@@ -1399,7 +1222,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: -0.3
         inSlope: Infinity
         outSlope: Infinity
@@ -1462,15 +1285,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1526,15 +1340,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: -0.58
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1547,15 +1352,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.15
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.033333335
         value: -0.17727274
         inSlope: Infinity
         outSlope: Infinity
@@ -1564,7 +1360,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: -0.21818183
         inSlope: Infinity
         outSlope: Infinity
@@ -1573,7 +1369,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: -0.25909093
         inSlope: Infinity
         outSlope: Infinity
@@ -1582,7 +1378,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: -0.27954546
         inSlope: Infinity
         outSlope: Infinity
@@ -1591,7 +1387,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: -0.3
         inSlope: Infinity
         outSlope: Infinity
@@ -1654,15 +1450,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1718,15 +1505,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1739,15 +1517,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -1.89
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.033333335
         value: -1.9245454
         inSlope: Infinity
         outSlope: Infinity
@@ -1756,7 +1525,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: -1.9763635
         inSlope: Infinity
         outSlope: Infinity
@@ -1765,7 +1534,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: -2.0281818
         inSlope: Infinity
         outSlope: Infinity
@@ -1774,7 +1543,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: -2.0540907
         inSlope: Infinity
         outSlope: Infinity
@@ -1783,7 +1552,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
         value: -2.08
         inSlope: Infinity
         outSlope: Infinity
@@ -1846,15 +1615,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1910,15 +1670,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 11
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1974,15 +1725,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 10
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -2038,15 +1780,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -2102,15 +1835,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0
         outWeight: 0
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -2166,15 +1890,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0.0041
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -2187,15 +1902,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.0814
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.033333335
         value: -0.08296364
         inSlope: Infinity
         outSlope: Infinity
@@ -2204,7 +1910,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.033333335
         value: -0.085309096
         inSlope: Infinity
         outSlope: Infinity
@@ -2213,7 +1919,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.06666667
         value: -0.08765455
         inSlope: Infinity
         outSlope: Infinity
@@ -2222,7 +1928,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.1
         value: -0.088827275
         inSlope: Infinity
         outSlope: Infinity
@@ -2231,8 +1937,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.13333334
-        value: -0.09
+        value: -0.106
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -2294,15 +2000,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.16666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4

Assets/Resources/Sprites/Games/TapTrial/Animations/PoseTap_L.anim

@@ -479,11 +479,29 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.0041, y: -0.1, 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.1
+        value: {x: 0.0041, y: -0.09, 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.16666667
         value: {x: 0.0041, y: -0.0814, z: 0}
-        inSlope: {x: Infinity, y: 0, z: 0}
+        inSlope: {x: Infinity, y: Infinity, z: Infinity}
-        outSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -2759,6 +2777,24 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.0041
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.1
+        value: 0.0041
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0.0041
@@ -2778,6 +2814,24 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.1
+        value: -0.09
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: -0.0814
@@ -2797,6 +2851,24 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.1
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0

Assets/Resources/Sprites/Games/TapTrial/Animations/PoseTap_R.anim

@@ -170,22 +170,6 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/girl_torso_0
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: -32.992, y: -90, z: 90}
-        inSlope: {x: Infinity, y: 0, z: 0}
-        outSlope: {x: Infinity, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: root_body/tap_effect
   m_PositionCurves:
   - curve:
       serializedVersion: 2
@@ -373,11 +357,29 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.0041, y: -0.105, 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.13333334
+        value: {x: 0.0041, y: -0.092, 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.16666667
         value: {x: 0.0041, y: -0.0814, z: 0}
-        inSlope: {x: Infinity, y: 0, z: 0}
+        inSlope: {x: Infinity, y: Infinity, z: Infinity}
-        outSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -508,22 +510,6 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/girl_torso_0
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: -1.0999999, y: -4.94, z: 0}
-        inSlope: {x: Infinity, y: 0, z: 0}
-        outSlope: {x: Infinity, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: root_body/tap_effect
   m_ScaleCurves:
   - curve:
       serializedVersion: 2
@@ -1002,13 +988,6 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 4204308378
-      attribute: 1
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 4030795737
       attribute: 4
@@ -1030,13 +1009,6 @@ AnimationClip:
       typeID: 4
       customType: 4
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 4204308378
-      attribute: 4
-      script: {fileID: 0}
-      typeID: 4
-      customType: 4
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 0
       attribute: 3
@@ -2049,6 +2021,24 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.0041
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0.0041
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0.0041
@@ -2068,6 +2058,24 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.105
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: -0.092
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: -0.0814
@@ -2087,6 +2095,24 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0
@@ -3163,120 +3189,6 @@ AnimationClip:
     path: root_body/girl_head_0
     classID: 4
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -1.0999999
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -4.94
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -32.992
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -90
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 90
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
@@ -3368,36 +3280,6 @@ AnimationClip:
     path: root_body/girl_leg_0 (1)
     classID: 4
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: root_body/tap_effect
-    classID: 4
-    script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Resources/Sprites/Games/TapTrial/Animations/Tap.anim

@@ -704,15 +704,6 @@ AnimationClip:
         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.26666668
-        value: {x: -0.94, y: -1.409, 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}
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -837,6 +828,49 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: tap_splash
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.0831, 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.2
+        value: {x: 0.002, y: -0.095, 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.23333333
+        value: {x: 0.002, y: -0.093, 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.25
+        value: {x: 0.002, y: -0.105, 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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -975,7 +1009,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -1209,39 +1243,37 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 4d31c920bf605844ab5be88c0c91d404, type: 3}
+      value: {fileID: 0}
     - time: 0.016666668
-      value: {fileID: 21300000, guid: 3cc14408e75a9e34f8ea315ed0a5c83e, type: 3}
+      value: {fileID: 0}
     - time: 0.033333335
-      value: {fileID: 21300000, guid: cc28a285b9aacf9409add95f84433264, type: 3}
+      value: {fileID: 0}
     - time: 0.05
-      value: {fileID: 21300000, guid: d2c4af2a965babc4fba6ea7d62ae59a5, type: 3}
+      value: {fileID: 0}
     - time: 0.06666667
-      value: {fileID: 21300000, guid: 5f21047914b25674e852acf17bd89fce, type: 3}
+      value: {fileID: 0}
     - time: 0.083333336
-      value: {fileID: 21300000, guid: 897fa7560ee298744a8f16923167d16a, type: 3}
+      value: {fileID: 0}
     - time: 0.1
-      value: {fileID: 21300000, guid: 498434bae2722a64b8a5a87e16774822, type: 3}
+      value: {fileID: 0}
     - time: 0.11666667
-      value: {fileID: 21300000, guid: 1866a190e54570f47b9954edb93d99ba, type: 3}
+      value: {fileID: 0}
     - time: 0.13333334
-      value: {fileID: 21300000, guid: fb4c15797cf968f48a160f75d6cba342, type: 3}
+      value: {fileID: 0}
     - time: 0.15
-      value: {fileID: 21300000, guid: b3e57658ddd1d7745b744519dbd9fb7e, type: 3}
+      value: {fileID: 0}
     - time: 0.16666667
-      value: {fileID: 21300000, guid: d2d8c591152a33d4baa1590066b8c13f, type: 3}
+      value: {fileID: 0}
     - time: 0.18333334
-      value: {fileID: 21300000, guid: bd42cfe67508a2d4cbb6b3c95be52a43, type: 3}
+      value: {fileID: 0}
     - time: 0.2
-      value: {fileID: 21300000, guid: bcc3ba3e06ff1f64aaf603659f1328fa, type: 3}
+      value: {fileID: 0}
     - time: 0.21666667
-      value: {fileID: 21300000, guid: 0add56a8776723940bf09956b3112725, type: 3}
+      value: {fileID: 0}
     - time: 0.23333333
-      value: {fileID: 21300000, guid: e90eb1228a637374e9604fef255a984f, type: 3}
+      value: {fileID: 0}
     - time: 0.25
-      value: {fileID: 21300000, guid: 98ab678da06298249a992c5681e03701, type: 3}
+      value: {fileID: 0}
-    - time: 0.26666668
-      value: {fileID: 21300000, guid: 7e32e8556f3a841439688a3b2a1b9ebd, type: 3}
     attribute: m_Sprite
     path: root_body/ref (1)
     classID: 212
@@ -1372,6 +1404,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 3921307443
       attribute: 4
@@ -1555,23 +1594,22 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 4d31c920bf605844ab5be88c0c91d404, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 3cc14408e75a9e34f8ea315ed0a5c83e, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: cc28a285b9aacf9409add95f84433264, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: d2c4af2a965babc4fba6ea7d62ae59a5, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 5f21047914b25674e852acf17bd89fce, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 897fa7560ee298744a8f16923167d16a, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 498434bae2722a64b8a5a87e16774822, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 1866a190e54570f47b9954edb93d99ba, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: fb4c15797cf968f48a160f75d6cba342, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: b3e57658ddd1d7745b744519dbd9fb7e, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: d2d8c591152a33d4baa1590066b8c13f, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: bd42cfe67508a2d4cbb6b3c95be52a43, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: bcc3ba3e06ff1f64aaf603659f1328fa, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 0add56a8776723940bf09956b3112725, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: e90eb1228a637374e9604fef255a984f, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 98ab678da06298249a992c5681e03701, type: 3}
+    - {fileID: 0}
-    - {fileID: 21300000, guid: 7e32e8556f3a841439688a3b2a1b9ebd, type: 3}
     - {fileID: -7867131878843523510, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 8685857731747134815, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
     - {fileID: 2568926833969660165, guid: a5b8236ec11cfcb40b4c7cd67f38c11f, type: 3}
@@ -1596,7 +1634,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.28333336
+    m_StopTime: 0.26666668
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -3246,15 +3284,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.26666668
-        value: -0.94
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -3346,15 +3375,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.26666668
-        value: -1.409
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -3446,15 +3466,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.26666668
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -4265,7 +4276,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -4553,37 +4564,145 @@ AnimationClip:
     path: tap_splash
     classID: 212
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.2
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.0831
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.2
+        value: -0.095
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: -0.093
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: -0.105
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.2
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: root_body/girl_arm_l
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/girl_arm_l
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/girl_arm_l
-    classID: 4
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []
@@ -4644,6 +4763,36 @@ AnimationClip:
     path: root_body/girl_arm_r
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: root_body/girl_arm_l
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: root_body/girl_arm_l
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: root_body/girl_arm_l
+    classID: 4
+    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []

Assets/Resources/Sprites/Games/TapTrial/Animations/TapPrepare.anim

@@ -506,6 +506,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/girl_leg_0
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.0831, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -598,7 +614,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -1037,6 +1053,13 @@ AnimationClip:
       typeID: 212
       customType: 23
       isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping:
     - {fileID: 21300000, guid: d6f29a9305693da40b0ad3153dea96d5, type: 3}
     - {fileID: 21300000, guid: b11e1949ac3abab419f3e866e9c9888d, type: 3}
@@ -2742,7 +2765,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 2
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -2898,6 +2921,63 @@ AnimationClip:
     path: root_body/girl_arm_l
     classID: 212
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.0831
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    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
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2

Assets/Resources/Sprites/Games/TapTrial/Animations/girl_jump_tap/ready/JumpPrepare.anim

@@ -465,6 +465,40 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: root_body/girl_torso_0
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.105, 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.033333335
+        value: {x: 0.002, y: -0.087, 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.16666667
+        value: {x: 0.002, y: -0.105, 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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -566,17 +600,17 @@ AnimationClip:
         time: 0.033333335
         value: -5
         inSlope: Infinity
-        outSlope: 0
+        outSlope: Infinity
-        tangentMode: 71
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
         time: 0.16666667
         value: -5
-        inSlope: -0
+        inSlope: Infinity
-        outSlope: 0
+        outSlope: Infinity
-        tangentMode: 69
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
@@ -877,7 +911,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 8
+        value: 10
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -886,7 +920,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.033333335
-        value: 8
+        value: 10
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -904,7 +938,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.16666667
-        value: 11
+        value: 23
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -1115,6 +1149,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 4030795737
       attribute: 4
@@ -2063,17 +2104,17 @@ AnimationClip:
         time: 0.033333335
         value: -5
         inSlope: Infinity
-        outSlope: 0
+        outSlope: Infinity
-        tangentMode: 71
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
         time: 0.16666667
         value: -5
-        inSlope: -0
+        inSlope: Infinity
-        outSlope: 0
+        outSlope: Infinity
-        tangentMode: 69
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
@@ -3118,7 +3159,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 8
+        value: 10
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -3127,7 +3168,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.033333335
-        value: 8
+        value: 10
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -3145,7 +3186,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.16666667
-        value: 11
+        value: 23
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -3251,6 +3292,117 @@ AnimationClip:
     path: root_body/girl_head_0/girl_face/makeup_1
     classID: 212
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.033333335
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.105
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.033333335
+        value: -0.087
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: -0.105
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.033333335
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2

Assets/Resources/Sprites/Games/TapTrial/Animations/girl_jump_tap/tap/JumpTap_Success.anim

@@ -258,6 +258,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: tap_splash
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.08, z: 0}
+        inSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves:
   - curve:
       serializedVersion: 2
@@ -702,6 +718,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 4030795737
       attribute: 4
@@ -2124,6 +2147,63 @@ AnimationClip:
     path: root_body/girl_torso_0
     classID: 212
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.08
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2

Assets/Resources/Sprites/Games/TapTrial/Animations/girl_jump_tap/tap/final/FinalJump_Tap.anim

@@ -549,6 +549,31 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: tap_splash
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.002, y: -0.105, 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.13333334
+        value: {x: 0.002, y: -0.079, 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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: root_body/girl_head_0/girl_face
   m_ScaleCurves:
   - curve:
       serializedVersion: 2
@@ -782,6 +807,25 @@ AnimationClip:
     path: tap_splash (1)
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 11
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SortingOrder
+    path: root_body/girl_head_0/girl_face
+    classID: 212
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0
@@ -884,6 +928,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 4030795737
       attribute: 4
@@ -982,6 +1033,13 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2294165617
+      attribute: 3762991556
+      script: {fileID: 0}
+      typeID: 212
+      customType: 26
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 2294165617
       attribute: 0
@@ -3031,37 +3089,110 @@ AnimationClip:
     path: tap_splash (1)
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 11
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SortingOrder
+    path: root_body/girl_head_0/girl_face
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0.002
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.105
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: -0.079
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: root_body/girl_head_0/girl_face
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: root_body/girl_arm_r
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: root_body/girl_arm_r
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: root_body/girl_arm_r
-    classID: 4
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []
@@ -3152,6 +3283,36 @@ AnimationClip:
     path: root_body/girl_leg_0
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: root_body/girl_arm_r
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: root_body/girl_arm_r
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: root_body/girl_arm_r
+    classID: 4
+    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []

Assets/Resources/Sprites/Games/TapTrial/taptrial_bgScroll.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: d6ee2ad92f3bdc347a06bf210323e83d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: agbtap/common
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/TapTrial/taptrial_main.png.meta

@@ -1571,7 +1571,7 @@ TextureImporter:
         width: 216
         height: 248
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1592,7 +1592,7 @@ TextureImporter:
         width: 184
         height: 216
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1604,6 +1604,132 @@ TextureImporter:
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: taptrial_main_0
+      rect:
+        serializedVersion: 2
+        x: 1060
+        y: 681
+        width: 220
+        height: 293
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2a4eca041ab3c0e49bc5f37c9ba798f5
+      internalID: -796690921
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: taptrial_main_1
+      rect:
+        serializedVersion: 2
+        x: 1311
+        y: 682
+        width: 213
+        height: 294
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 45e8e1b6da0cd6c49a7c3eabcf424320
+      internalID: 1850945584
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: taptrial_main_2
+      rect:
+        serializedVersion: 2
+        x: 1538
+        y: 684
+        width: 195
+        height: 292
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6ed3763615853e2438a84e7ea8e23ca1
+      internalID: -1887236934
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: taptrial_main_3
+      rect:
+        serializedVersion: 2
+        x: 785
+        y: 745
+        width: 194
+        height: 186
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8235ca5b15fbfa14691d5e92cfd1d184
+      internalID: -1431682805
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: taptrial_main_4
+      rect:
+        serializedVersion: 2
+        x: 773
+        y: 990
+        width: 205
+        height: 170
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 46356e4670d54ac44b526c65fe68d90f
+      internalID: -1412322936
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: taptrial_main_5
+      rect:
+        serializedVersion: 2
+        x: 1105
+        y: 1070
+        width: 151
+        height: 160
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c213ebc8d3849d04899c172ca30d0adc
+      internalID: -1981152341
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []
@@ -1677,6 +1803,12 @@ TextureImporter:
       monkey_mouth_1: 5275794459429879604
       tap_effect: -465010420825850716
       tap_effect_star: 7599070281986493235
+      taptrial_main_0: -796690921
+      taptrial_main_1: 1850945584
+      taptrial_main_2: -1887236934
+      taptrial_main_3: -1431682805
+      taptrial_main_4: -1412322936
+      taptrial_main_5: -1981152341
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0

Assets/Scripts/Common/CanvasScroll.cs

@@ -21,7 +21,7 @@ namespace HeavenStudio.Common
         {
             foreach (var img in _imgs)
             {
-                img.uvRect = new Rect(new Vector2(NormalizedX, NormalizedY) * Tile, img.uvRect.size);
+                img.uvRect = new Rect(Normalized * Tile, img.uvRect.size);
             }
         }
     }

Assets/Scripts/Games/Lockstep/Lockstep.cs

@@ -4,8 +4,10 @@ borrowed from other games */
 //Don't worry Raffy everyone starts somewhere - Rasmus
 
 using HeavenStudio.Util;
+using Jukebox;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace HeavenStudio.Games.Loaders
@@ -15,7 +17,7 @@ namespace HeavenStudio.Games.Loaders
     {
         public static Minigame AddGame(EventCaller eventCaller)
         {
-            return new Minigame("lockstep", "Lockstep \n<color=#eb5454>[WIP]</color>", "f0338d", false, false, new List<GameAction>()
+            return new Minigame("lockstep", "Lockstep", "f0338d", false, false, new List<GameAction>()
             {
                 new GameAction("bop", "Bop")
                 {
@@ -27,33 +29,38 @@ namespace HeavenStudio.Games.Loaders
                         new Param("toggle2", false, "Bop (Auto)", "Should the stepswitchers auto bop?"),
                     },
                 },
-                new GameAction("marching", "Stepping")
+                new GameAction("stepping", "Stepping")
                 {
-                    preFunction = delegate {var e = eventCaller.currentEntity; Lockstep.Marching(e.beat, e.length);},
+                    preFunction = delegate {var e = eventCaller.currentEntity; Lockstep.Marching(e.beat, e["sound"], e["amount"], e["visual"]);},
-                    defaultLength = 4f,
+                    parameters = new List<Param>()
-                    resizable = true
+                    {
+                        new Param("sound", false, "Sound", "Hai if onbeat, ho if offbeat."),
+                        new Param("amount", new EntityTypes.Integer(1, 50, 1), "Sound Amount", "How many sounds will play consecutively?"),
+                        new Param("visual", true, "Background Visual")
+                    },
+                    preFunctionLength = 1
                 },
                 new GameAction("offbeatSwitch", "Switch to Offbeat")
                 {
-                    preFunction = delegate { var e = eventCaller.currentEntity; Lockstep.OffbeatSwitch(e.beat); },
+                    preFunction = delegate { var e = eventCaller.currentEntity; Lockstep.OffbeatSwitchSound(e.beat, e["ho"], e["sound"]); },
-                    defaultLength = 3.5f
+                    defaultLength = 4.5f,
+                    parameters = new List<Param>()
+                    {
+                        new Param("sound", true, "Sound Cue"),
+                        new Param("ho", true, "Ho Sounds", "Will the <ho, ho, ho, ho> sound be present?"),
+                        new Param("visual", true, "Background Visual")
+                    }
                 },
                 new GameAction("onbeatSwitch", "Switch to Onbeat")
                 {
-                    preFunction = delegate { var e = eventCaller.currentEntity; Lockstep.OnbeatSwitch(e.beat); },
+                    preFunction = delegate { var e = eventCaller.currentEntity; Lockstep.OnbeatSwitchSound(e.beat, e["hai"], e["sound"]); },
-                    defaultLength = 2f
+                    defaultLength = 3f,
-                },
+                    parameters = new List<Param>()
-                new GameAction("hai", "Hai!")
                     {
-                    function = delegate { var e = eventCaller.currentEntity; Lockstep.instance.Hai(e.beat); },
+                        new Param("sound", true, "Sound Cue"),
-                    defaultLength = 1f,
+                        new Param("hai", new EntityTypes.Integer(0, 100, 1), "Hai Amount"),
-                    inactiveFunction = delegate { var e = eventCaller.currentEntity; Lockstep.instance.Hai(e.beat);}
+                        new Param("visual", true, "Background Visual")
-                },
+                    }
-                new GameAction("ho", "Ho!")
-                {
-                    function = delegate { var e = eventCaller.currentEntity; Lockstep.instance.Ho(e.beat); },
-                    defaultLength = 1f,
-                    inactiveFunction = delegate { var e = eventCaller.currentEntity; Lockstep.instance.Ho(e.beat);}
                 },
                 new GameAction("set colours", "Set Colours")
                 {
@@ -67,6 +74,32 @@ namespace HeavenStudio.Games.Loaders
                         new Param("objColC", Lockstep.stepperLight, "Stepper Light", "Select the color that appears for the light side of the stepwitchers."),
                     },
                     defaultLength = 0.5f,
+                },
+                new GameAction("zoom", "Preset Zooms")
+                {
+                    function = delegate { Lockstep.instance.SetZoom(eventCaller.currentEntity["zoom"]); },
+                    parameters = new List<Param>()
+                    {
+                        new Param("zoom", Lockstep.ZoomPresets.Regular, "Zoom Level")
+                    }
+                },
+                new GameAction("bach", "Show Bach")
+                {
+                    defaultLength = 4,
+                    resizable = true,
+                },
+                new GameAction("marching", "Force Stepping")
+                {
+                    preFunction = delegate {var e = eventCaller.currentEntity; Lockstep.Marching(e.beat, e["sound"], e["amount"], e["visual"], true, e.length);},
+                    parameters = new List<Param>()
+                    {
+                        new Param("sound", false, "Sound", "Hai if onbeat, ho if offbeat."),
+                        new Param("amount", new EntityTypes.Integer(1, 50, 1), "Sound Amount", "How many sounds will play consecutively?"),
+                        new Param("visual", true, "Background Visual")
+                    },
+                    preFunctionLength = 1,
+                    resizable = true,
+                    defaultLength = 4
                 }
             },
             new List<string>() {"ntr", "keep"},
@@ -140,6 +173,7 @@ namespace HeavenStudio.Games
         [SerializeField] Animator stepswitcherPlayer;
         [SerializeField] Animator stepswitcherLeft;
         [SerializeField] Animator stepswitcherRight;
+        [SerializeField] Animator bach;
         
         // master stepper dictates what sprite the slave steppers use
         [SerializeField] Animator masterStepperAnim;
@@ -155,7 +189,7 @@ namespace HeavenStudio.Games
         [SerializeField] Material stepperMaterial;
 
         [Header("Properties")]
-        static List<double> queuedInputs = new();
+        static List<QueuedMarch> queuedInputs = new();
         Sprite masterSprite;
         HowMissed currentMissStage;
         bool lessSteppers = false;
@@ -168,14 +202,71 @@ namespace HeavenStudio.Games
         bool offColorActive;
         bool goBop;
         public GameEvent bop = new GameEvent();
+        List<double> switches = new();
+        private List<RiqEntity> bachEvents = new();
 
         public static Lockstep instance;
 
+        public enum ZoomPresets
+        {
+            Regular,
+            NotThatFar,
+            Far,
+            VeryFar,
+            ExtremelyFar
+        }
+
         void Awake()
         {
             instance = this;
             currentBGOnColor = defaultBGColorOn;
             currentBGOffColor = defaultBGColorOff;
+            var switchEvents = EventCaller.GetAllInGameManagerList("lockstep", new string[] { "onbeatSwitch", "offbeatSwitch" });
+
+            foreach (var switchEvent in switchEvents)
+            {
+                switches.Add(switchEvent.beat + switchEvent.length - 1);
+            }
+
+            bachEvents = EventCaller.GetAllInGameManagerList("lockstep", new string[] { "bach" });
+        }
+
+        private bool BachOnBeat(double beat)
+        {
+            return bachEvents.Find(x => beat >= x.beat && beat < x.beat + x.length) != null;
+        }
+        public override void OnGameSwitch(double beat)
+        {
+            QueueSwitchBGs(beat);
+        }
+
+        public override void OnPlay(double beat)
+        {
+            QueueSwitchBGs(beat);
+        }
+
+        private void QueueSwitchBGs(double beat)
+        {
+            double nextGameSwitchBeat = double.MaxValue;
+            List<RiqEntity> allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" }).FindAll(x => x.beat > beat);
+            if (allEnds.Count > 0)
+            {
+                nextGameSwitchBeat = allEnds[0].beat;
+            }
+
+            var switchEventsOn = EventCaller.GetAllInGameManagerList("lockstep", new string[] { "onbeatSwitch" });
+            foreach (var on in switchEventsOn)
+            {
+                if (on.beat >= nextGameSwitchBeat || !on["visual"]) return;
+                OnbeatSwitch(on.beat, beat);
+            }
+
+            var switchEventsOff = EventCaller.GetAllInGameManagerList("lockstep", new string[] { "offbeatSwitch" });
+            foreach (var off in switchEventsOff)
+            {
+                if (off.beat >= nextGameSwitchBeat || !off["visual"]) return;
+                OffbeatSwitch(off.beat, beat);
+            }
         }
 
         void Start() {
@@ -191,15 +282,6 @@ namespace HeavenStudio.Games
             UpdateAndRenderSlaves();
         }
 
-        void OnDestroy()
-        {
-            if (queuedInputs.Count > 0) queuedInputs.Clear();
-            foreach (var evt in scheduledInputs)
-            {
-                evt.Disable();
-            }
-        }
-
         void UpdateAndRenderSlaves()
         {
             foreach (var stepper in slaveSteppers)
@@ -222,7 +304,7 @@ namespace HeavenStudio.Games
             }
         }
 
-        public void Update()
+        private void Update()
         {
             var cond = Conductor.instance;
             if (cond.isPlaying && !cond.isPaused)
@@ -238,11 +320,14 @@ namespace HeavenStudio.Games
                 {
                     foreach (var input in queuedInputs)
                     {
-                        ScheduleInput(cond.songPositionInBeatsAsDouble, input - cond.songPositionInBeats, InputType.STANDARD_DOWN, Just, Miss, Nothing);
+                        if (input.force)
-                        BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
                         {
-                            new BeatAction.Action(input, delegate { EvaluateMarch(); }),
+                            ForceMarching(input.beat, input.length, input.sound, input.amount, input.visual);
-                        });
+                        }
+                        else
+                        {
+                            StartMarching(input.beat, input.sound, input.amount, input.visual);
+                        }
                     }
                     queuedInputs.Clear();
                 }
@@ -258,10 +343,14 @@ namespace HeavenStudio.Games
                     {
                         stepswitcherPlayer.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
                     }
-                    SoundByte.PlayOneShotGame("lockstep/miss");
+                    SoundByte.PlayOneShot("miss");
                     ScoreMiss();
                 }
             }
+        }
+
+        private void LateUpdate()
+        {
             if (masterSprite != masterStepperSprite.sprite)
             {
                 masterSprite = masterStepperSprite.sprite;
@@ -269,6 +358,19 @@ namespace HeavenStudio.Games
             }
         }
 
+        public void SetZoom(int zoom)
+        {
+            GameCamera.additionalPosition = new Vector3(0, 0, (ZoomPresets)zoom switch
+            {
+                ZoomPresets.Regular => 0,
+                ZoomPresets.NotThatFar => -4.5f,
+                ZoomPresets.Far => -11,
+                ZoomPresets.VeryFar => -26,
+                ZoomPresets.ExtremelyFar => -63,
+                _ => throw new System.NotImplementedException()
+            });
+        }
+
         public void Bop(double beat, float length, bool shouldBop, bool autoBop)
         {
             goBop = autoBop;
@@ -287,83 +389,255 @@ namespace HeavenStudio.Games
             }
         }
 
-        public void Hai(double beat)
+        public static void OnbeatSwitchSound(double beat, int hais, bool sound)
         {
-            SoundByte.PlayOneShotGame("lockstep/switch1", beat);
+            if (sound)
-        }
-
-        public void Ho(double beat)
-        {
-            SoundByte.PlayOneShotGame("lockstep/switch4", beat);
-        }
-
-        public static void OnbeatSwitch(double beat)
             {
                 MultiSound.Play(new MultiSound.Sound[]
                 {
-                new MultiSound.Sound("lockstep/switch5", beat),
+                new MultiSound.Sound("lockstep/nha1", beat, 1, 1, false, 0.03086419753),
-                new MultiSound.Sound("lockstep/switch6", beat + 0.5f),
+                new MultiSound.Sound("lockstep/nha2", beat + 0.5f, 1, 1, false, 0.04629629629),
-                new MultiSound.Sound("lockstep/switch5", beat + 1f),
+                new MultiSound.Sound("lockstep/nha1", beat + 1f, 1, 1, false, 0.03086419753),
-                new MultiSound.Sound("lockstep/switch6", beat + 1.5f)
+                new MultiSound.Sound("lockstep/nha2", beat + 1.5f, 1, 1, false, 0.04629629629)
                 }, forcePlay: true);
-
-            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(false); }),
-                new BeatAction.Action(beat + 0.5f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(true); }),
-                new BeatAction.Action(beat + 1f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(false); }),
-                new BeatAction.Action(beat + 1.5f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(true); }),
-                new BeatAction.Action(beat + 2f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(false); }),
-            });
             }
 
-        public static void OffbeatSwitch(double beat)
+            if (hais > 0)
+            {
+                List<MultiSound.Sound> haisList = new();
+
+                for (int i = 0; i < hais; i++)
+                {
+                    haisList.Add(new MultiSound.Sound("lockstep/hai", beat + 2 + i, 1, 1, false, 0.02314814814));
+                }
+
+                double nextOffBeat = double.MaxValue;
+                var switchEventsOn = EventCaller.GetAllInGameManagerList("lockstep", new string[] { "offbeatSwitch" });
+                switchEventsOn.Sort((x, y) => x.beat.CompareTo(y.beat));
+                for (int i = 0; i < switchEventsOn.Count; i++)
+                {
+                    if (switchEventsOn[i].beat > beat)
+                    {
+                        nextOffBeat = switchEventsOn[i].beat;
+                        break;
+                    }
+                }
+
+                var haisActual = haisList.FindAll(x => x.beat < nextOffBeat);
+
+                MultiSound.Play(haisActual.ToArray(), true, true);
+            }
+        }
+
+        private void OnbeatSwitch(double beat, double gameswitchBeat)
+        {
+            List<BeatAction.Action> allActions = new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate { ChangeBeatBackGroundColour(false); }),
+                new BeatAction.Action(beat + 0.5f, delegate { ChangeBeatBackGroundColour(true); }),
+                new BeatAction.Action(beat + 1f, delegate
+                {
+                    ChangeBeatBackGroundColour(false);
+                }),
+                new BeatAction.Action(beat + 1.5f, delegate 
+                { 
+                    ChangeBeatBackGroundColour(true);
+                }),
+                new BeatAction.Action(beat + 1.75f, delegate { if (!marchRecursing) MarchRecursive(beat + 2f); }),
+                new BeatAction.Action(beat + 2f, delegate { ChangeBeatBackGroundColour(false); }),
+            };
+            List<BeatAction.Action> actions = new();
+            foreach (var action in allActions)
+            {
+                if (action.beat >= gameswitchBeat) actions.Add(action);
+            }
+            if (actions.Count > 0) BeatAction.New(instance.gameObject, actions);
+        }
+
+        public static void OffbeatSwitchSound(double beat, bool hoSound, bool sound)
+        {
+            if (sound)
             {
                 MultiSound.Play(new MultiSound.Sound[]
                 {
-                new MultiSound.Sound("lockstep/switch1", beat),
+                    new MultiSound.Sound("lockstep/hai", beat, 1, 1, false, 0.02314814814),
-                new MultiSound.Sound("lockstep/switch1", beat + 1f),
+                    new MultiSound.Sound("lockstep/hai", beat + 1f, 1, 1, false, 0.02314814814),
-                new MultiSound.Sound("lockstep/switch1", beat + 2f),
+                    new MultiSound.Sound("lockstep/hai", beat + 2f, 1, 1, false, 0.02314814814),
-                new MultiSound.Sound("lockstep/switch2", beat + 3f),
+                    new MultiSound.Sound("lockstep/hahai1", beat + 3f, 1, 1, false, 0.03086419753),
-                new MultiSound.Sound("lockstep/switch3", beat + 3.5f),
+                    new MultiSound.Sound("lockstep/hahai2", beat + 3.5f, 1, 1, false, 0.03086419753),
                 }, forcePlay: true);
-
+            }
-            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+            if (hoSound)
             {
-                new BeatAction.Action(beat, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(true); }),
+                List<MultiSound.Sound> hos = new List<MultiSound.Sound>
-                new BeatAction.Action(beat + 1f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(false); }),
+                {
-                new BeatAction.Action(beat + 2f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(true); }),
+                    new MultiSound.Sound("lockstep/ho", beat + 4.5f, 1, 1, false, 0.03086419753),
-                new BeatAction.Action(beat + 3f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(false); }),
+                    new MultiSound.Sound("lockstep/ho", beat + 5.5f, 1, 0.6835514f, false, 0.03086419753),
-                new BeatAction.Action(beat + 3.5f, delegate { if (GameManager.instance.currentGame == "lockstep") Lockstep.instance.ChangeBeatBackGroundColour(true); }),
+                    new MultiSound.Sound("lockstep/ho", beat + 6.5f, 1, 0.3395127f, false, 0.03086419753),
-            });
+                    new MultiSound.Sound("lockstep/ho", beat + 7.5f, 1, 0.1200322f, false, 0.03086419753),
+                };
+
+                double nextOnBeat = double.MaxValue;
+                var switchEventsOn = EventCaller.GetAllInGameManagerList("lockstep", new string[] { "onbeatSwitch" });
+                switchEventsOn.Sort((x, y) => x.beat.CompareTo(y.beat));
+                for (int i = 0; i < switchEventsOn.Count; i++)
+                {
+                    if (switchEventsOn[i].beat > beat)
+                    {
+                        nextOnBeat = switchEventsOn[i].beat;
+                        break;
+                    }
                 }
 
-        public static void Marching(double beat, float length)
+                var hosActual = hos.FindAll(x => x.beat < nextOnBeat);
+
+                MultiSound.Play(hosActual.ToArray(), true, true);
+            }
+        }
+
+        private void OffbeatSwitch(double beat, double gameswitchBeat)
+        {
+            List<BeatAction.Action> allActions = new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate { ChangeBeatBackGroundColour(true); }),
+                new BeatAction.Action(beat + 1f, delegate { ChangeBeatBackGroundColour(false); }),
+                new BeatAction.Action(beat + 2f, delegate { ChangeBeatBackGroundColour(true); }),
+                new BeatAction.Action(beat + 3f, delegate
+                {
+                    ChangeBeatBackGroundColour(false);
+                }),
+                new BeatAction.Action(beat + 3.25f, delegate { if (!marchRecursing) MarchRecursive(beat + 3.5f); }),
+                new BeatAction.Action(beat + 3.5f, delegate { ChangeBeatBackGroundColour(true); }),
+            };
+            List<BeatAction.Action> actions = new();
+            foreach (var action in allActions)
+            {
+                if (action.beat >= gameswitchBeat) actions.Add(action);
+            }
+            if (actions.Count > 0) BeatAction.New(instance.gameObject, actions);
+        }
+
+        private struct QueuedMarch
+        {
+            public double beat;
+            public float length;
+            public bool sound;
+            public int amount;
+            public bool visual;
+            public bool force;
+        }
+        public static void Marching(double beat, bool sound, int amount, bool visual, bool force = false, float length = 0)
         {
             if (GameManager.instance.currentGame == "lockstep")
             {
-                List<BeatAction.Action> actions = new List<BeatAction.Action>();
+                if (force)
-                for (int i = 0; i < length; i++)
                 {
-                    Lockstep.instance.ScheduleInput(beat - 1, 1 + i, InputType.STANDARD_DOWN, Lockstep.instance.Just, Lockstep.instance.Miss, Lockstep.instance.Nothing);
+                    instance.ForceMarching(beat, length, sound, amount, visual);
-                    actions.Add(new BeatAction.Action(beat + i, delegate { Lockstep.instance.EvaluateMarch(); }));
-                }
-                BeatAction.New(instance.gameObject, actions);
                 }
                 else
                 {
-                for (int i = 0; i < length; i++)
+                    instance.StartMarching(beat, sound, amount, visual);
-                {
-                    queuedInputs.Add(beat + i);
                 }
             }
+            else
+            {
+                queuedInputs.Add(new QueuedMarch
+                {
+                    amount = amount,
+                    beat = beat,
+                    sound = sound,
+                    visual = visual,
+                    length = length,
+                    force = force
+                });
+            }
         }
 
-        public void EvaluateMarch()
+        private void ForceMarching(double beat, float length, bool sound, int amount, bool visual)
         {
-            var cond = Conductor.instance;
+            bool offBeat = beat % 1 != 0;
-            var beatAnimCheck = Math.Round(cond.songPositionInBeatsAsDouble * 2);
+            if (sound)
-            if (beatAnimCheck % 2 != 0)
+            {
+                MultiSound.Sound[] sounds = new MultiSound.Sound[amount];
+                for (int i = 0; i < amount; i++)
+                {
+                    sounds[i] = new MultiSound.Sound($"lockstep/" + (offBeat ? "ho" : "hai"), beat + i, 1, 1, false, offBeat ? 0.03086419753 : 0.02314814814);
+                }
+                MultiSound.Play(sounds, true, true);
+            }
+            List<BeatAction.Action> steps = new()
+            {
+                new BeatAction.Action(beat, delegate
+                {
+                    if (visual) ChangeBeatBackGroundColour(offBeat);
+                    if (BachOnBeat(beat)) bach.DoScaledAnimationAsync(offBeat ? "BachOff" : "BachOn", 0.5f);
+                    EvaluateMarch(offBeat);
+                })
+            };
+            ScheduleInput(beat - 1, 1, InputType.STANDARD_DOWN, offBeat ? JustOff : JustOn, offBeat ? MissOff : MissOn, Nothing);
+            for (int i = 1; i < length; i++)
+            {
+                double stepBeat = beat + i;
+                steps.Add(new BeatAction.Action(stepBeat, delegate
+                {
+                    if (BachOnBeat(stepBeat)) bach.DoScaledAnimationAsync(offBeat ? "BachOff" : "BachOn", 0.5f);
+                    EvaluateMarch(offBeat);
+                }));
+                ScheduleInput(stepBeat - 1, 1, InputType.STANDARD_DOWN, offBeat ? JustOff : JustOn, offBeat ? MissOff : MissOn, Nothing);
+            }
+            BeatAction.New(gameObject, steps);
+        }
+
+        private void StartMarching(double beat, bool sound, int amount, bool visual)
+        {
+            if (marchRecursing) return;
+            bool offBeat = beat % 1 != 0;
+            if (visual)
+            {
+                BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+                {
+                    new BeatAction.Action(beat, delegate { ChangeBeatBackGroundColour(offBeat); })
+                });
+            }
+            if (sound)
+            {
+                MultiSound.Sound[] sounds = new MultiSound.Sound[amount];
+                for (int i = 0; i < amount; i++)
+                {
+                    sounds[i] = new MultiSound.Sound($"lockstep/" + (offBeat ? "ho" : "hai"), beat + i, 1, 1, false, offBeat ? 0.03086419753 : 0.02314814814);
+                }
+                MultiSound.Play(sounds, true, true);
+            }
+            MarchRecursive(beat);
+        }
+
+        private bool marchRecursing;
+        private void MarchRecursive(double beat)
+        {
+            marchRecursing = true;
+            if (NextStepIsSwitch(beat)) beat -= 0.5;
+            bool offBeat = beat % 1 != 0;
+            bool bachOnBeat = BachOnBeat(beat);
+            ScheduleInput(beat - 1, 1, InputType.STANDARD_DOWN, offBeat ? JustOff : JustOn, offBeat ? MissOff : MissOn, Nothing);
+            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate 
+                { 
+                    EvaluateMarch(offBeat); 
+                    MarchRecursive(beat + 1);
+                    if (bachOnBeat) bach.DoScaledAnimationAsync(offBeat ? "BachOff" : "BachOn", 0.5f);
+                }),
+            });
+        }
+
+        private bool NextStepIsSwitch(double beat)
+        {
+            return switches.Contains(beat - 0.5);
+        }
+
+        public void EvaluateMarch(bool offBeat)
+        {
+            if (offBeat)
             {
                 PlayStepperAnim("OffbeatMarch", false, 0.5f);
             }
@@ -373,59 +647,46 @@ namespace HeavenStudio.Games
             }
         }
 
-        public void Just(PlayerActionEvent caller, float state)
+        private void JustOn(PlayerActionEvent caller, float state)
         {
             currentMissStage = HowMissed.NotMissed;
-            var cond = Conductor.instance;
+            stepswitcherPlayer.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
             if (state >= 1f || state <= -1f)
             {
-                double beatAnimCheck = cond.songPositionInBeatsAsDouble - 0.25;
+                SoundByte.PlayOneShot("nearMiss");
-                if (beatAnimCheck % 1.0 >= 0.5)
-                {
-                    SoundByte.PlayOneShotGame("lockstep/tink");
-                    stepswitcherPlayer.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
-                }
-                else
-                {
-                    SoundByte.PlayOneShotGame("lockstep/tink");
-                    stepswitcherPlayer.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
-                }
                 return;
             }
-            Success(cond.songPositionInBeatsAsDouble);
+            SoundByte.PlayOneShotGame($"lockstep/foot{UnityEngine.Random.Range(1, 3)}");
+            SoundByte.PlayOneShotGame("lockstep/drumOn");
         }
 
-        public void Success(double beat)
+        private void JustOff(PlayerActionEvent caller, float state)
         {
-            double beatAnimCheck = beat - 0.25;
+            currentMissStage = HowMissed.NotMissed;
-            if (beatAnimCheck % 1.0 >= 0.5)
-            {
-                SoundByte.PlayOneShotGame($"lockstep/marchOnbeat{UnityEngine.Random.Range(1, 3)}");
-                stepswitcherPlayer.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
-            }
-            else
-            {
-                SoundByte.PlayOneShotGame($"lockstep/marchOffbeat{UnityEngine.Random.Range(1, 3)}");
             stepswitcherPlayer.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
+            if (state >= 1f || state <= -1f)
+            {
+                SoundByte.PlayOneShot("nearMiss");
+                return;
             }
+            SoundByte.PlayOneShotGame($"lockstep/foot{UnityEngine.Random.Range(1, 3)}");
+            SoundByte.PlayOneShotGame("lockstep/drumOff");
         }
 
-        public void Miss(PlayerActionEvent caller)
+        private void MissOn(PlayerActionEvent caller)
-        {
-            var beatAnimCheck = Math.Round(caller.startBeat * 2);
-            
-            if (beatAnimCheck % 2 != 0 && currentMissStage != HowMissed.MissedOff)
-            {
-                stepswitcherPlayer.Play("OffbeatMiss", 0, 0);
-                SoundByte.PlayOneShotGame("lockstep/wayOff");
-                currentMissStage = HowMissed.MissedOff;
-            }
-            else if (beatAnimCheck % 2 == 0 && currentMissStage != HowMissed.MissedOn)
         {
+            if (currentMissStage == HowMissed.MissedOn) return;
             stepswitcherPlayer.Play("OnbeatMiss", 0, 0);
             SoundByte.PlayOneShotGame("lockstep/wayOff");
             currentMissStage = HowMissed.MissedOn;
         }
+
+        private void MissOff(PlayerActionEvent caller)
+        {
+            if (currentMissStage == HowMissed.MissedOff) return;
+            stepswitcherPlayer.Play("OffbeatMiss", 0, 0);
+            SoundByte.PlayOneShotGame("lockstep/wayOff");
+            currentMissStage = HowMissed.MissedOff;
         }
 
         public void ChangeBeatBackGroundColour(bool off)

Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs

@@ -18,10 +18,11 @@ namespace HeavenStudio.Games.Scripts_SneakySpirits
 
         public void Init(double spawnBeat, float length)
         {
+            if (length == 0) length = 1;
             BeatAction.New(game.gameObject, new List<BeatAction.Action>()
             {
-                new BeatAction.Action(spawnBeat + 0.001f, delegate { anim.DoScaledAnimationAsync("Move", 1f); }),
+                new BeatAction.Action(spawnBeat, delegate { anim.DoScaledAnimationAsync("Move", (1 / length) * Conductor.instance.SongPitch); }),
-                new BeatAction.Action(spawnBeat + length - 0.5f, delegate { anim.DoScaledAnimationAsync("MoveDown", 1f); }),
+                new BeatAction.Action(spawnBeat + (length * 0.5f), delegate { anim.DoScaledAnimationAsync("MoveDown", (1 / length) * Conductor.instance.SongPitch); }),
                 new BeatAction.Action(spawnBeat + length, delegate { Destroy(gameObject); }),
             });
         }

Assets/Scripts/Games/SpaceDance/SpaceDance.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 using DG.Tweening;
-using static HeavenStudio.Games.SpaceDance;
 using HeavenStudio.Common;
 
 namespace HeavenStudio.Games.Loaders
@@ -16,7 +15,8 @@ namespace HeavenStudio.Games.Loaders
             {
                 new GameAction("turn right", "Turn Right")
                 {
-                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.DoTurnRight(e.beat, e["whoSpeaks"], e["gramps"]); },
+                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.DoTurnRight(e.beat, e["gramps"]); },
+                    preFunction = delegate { var e = eventCaller.currentEntity; SpaceDance.TurnRightSfx(e.beat, e["whoSpeaks"]); },
                     defaultLength = 2.0f,
                     parameters = new List<Param>()
                     {
@@ -26,7 +26,8 @@ namespace HeavenStudio.Games.Loaders
                 },
                 new GameAction("sit down", "Sit Down")
                 {
-                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.DoSitDown(e.beat, e["whoSpeaks"], e["gramps"]); },
+                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.DoSitDown(e.beat, e["gramps"]); },
+                    preFunction = delegate { var e = eventCaller.currentEntity; SpaceDance.SitDownSfx(e.beat, e["whoSpeaks"]); },
                     defaultLength = 2.0f,
                     parameters = new List<Param>()
                     {
@@ -36,7 +37,8 @@ namespace HeavenStudio.Games.Loaders
                 },
                 new GameAction("punch", "Punch")
                 {
-                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.DoPunch(e.beat, e["whoSpeaks"], e["gramps"]); },
+                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.DoPunch(e.beat, e["gramps"]); },
+                    preFunction = delegate { var e = eventCaller.currentEntity; SpaceDance.PunchSfx(e.beat, e["whoSpeaks"]); },
                     defaultLength = 2.0f,
                     parameters = new List<Param>()
                     {
@@ -46,7 +48,7 @@ namespace HeavenStudio.Games.Loaders
                 },
                 new GameAction("shootingStar", "Shooting Star")
                 {
-                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.UpdateShootingStar(e.beat, e.length, e["ease"]); },
+                    function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.UpdateShootingStar(e.beat, e.length, (EasingFunction.Ease)e["ease"]); },
                     defaultLength = 2f,
                     resizable = true,
                     parameters = new List<Param>()
@@ -94,8 +96,8 @@ namespace HeavenStudio.Games.Loaders
                     function = delegate { var e = eventCaller.currentEntity; SpaceDance.instance.UpdateScrollSpeed(e["x"], e["y"]); },
                     defaultLength = 1f,
                     parameters = new List<Param>() {
-                        new Param("x", new EntityTypes.Float(-5f, 5f, 0), "Horizontal", "How fast does the background move horizontally?"),
+                        new Param("x", new EntityTypes.Float(-10f, 10f, 0), "Horizontal", "How fast does the background move horizontally?"),
-                        new Param("y", new EntityTypes.Float(-5f, 5f, 0), "Vertical", "How fast does the background move vertically?"),
+                        new Param("y", new EntityTypes.Float(-10f, 10f, 0), "Vertical", "How fast does the background move vertically?"),
                     }
                 },
             },
@@ -155,11 +157,10 @@ namespace HeavenStudio.Games
         bool grampsSniffing;
 
         [SerializeField] CanvasScroll scroll;
-        float scrollBeat;
+        float xScrollMultiplier = 0;
-        float scrollOffsetX;
+        float yScrollMultiplier = 0;
-        float scrollOffsetY;
+        [SerializeField] private float xBaseSpeed = 1;
-        float currentScrollLengthX;
+        [SerializeField] private float yBaseSpeed = 1;
-        float currentScrollLengthY;
 
         public GameEvent bop = new GameEvent();
 
@@ -177,10 +178,8 @@ namespace HeavenStudio.Games
             var cond = Conductor.instance;
             if (cond.isPlaying && !cond.isPaused)
             {
-                float normalizedX = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthX;
+                scroll.NormalizedX -= xBaseSpeed * xScrollMultiplier * Time.deltaTime;
-                float normalizedY = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthY;
+                scroll.NormalizedY -= yBaseSpeed * yScrollMultiplier * Time.deltaTime;
-                scroll.NormalizedX = -scrollOffsetX - normalizedX;
-                scroll.NormalizedY = -scrollOffsetY - normalizedY;
                 if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
                 {
                     if (shouldBop)
@@ -216,7 +215,6 @@ namespace HeavenStudio.Games
                         SoundByte.PlayOneShotGame("spaceDance/inputBad");
                         DancerP.DoScaledAnimationAsync("PunchDo", 0.5f);
                         Gramps.Play("GrampsOhFuck", 0, 0);
-                        // Look at this later, sound effect has some weird clipping on it sometimes?? popping. like. fucking popopop idk why its doing that its fine theres no sample weirdness ughh
                     }
                     if (PlayerInput.GetSpecificDirectionDown(1) && !IsExpectingInputNow(InputType.DIRECTION_RIGHT_DOWN))
                     {
@@ -236,11 +234,8 @@ namespace HeavenStudio.Games
 
         public void UpdateScrollSpeed(float scrollSpeedX, float scrollSpeedY)
         {
-            scrollOffsetX = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthX;
+            xScrollMultiplier = scrollSpeedX;
-            scrollOffsetY = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthY;
+            yScrollMultiplier = scrollSpeedY;
-            currentScrollLengthX = scrollSpeedX;
-            currentScrollLengthY = scrollSpeedY;
-            scrollBeat = Time.realtimeSinceStartup;
         }
 
         public void GrampsAnimations(double beat, int type, bool looping)
@@ -373,12 +368,8 @@ namespace HeavenStudio.Games
             isShootingStar = true;
         }
 
-        public void DoTurnRight(double beat, int whoSpeaks, bool grampsTurns)
+        public static void TurnRightSfx(double beat, int whoSpeaks)
         {
-            canBop = false;
-            if (grampsTurns) grampsCanBop = false;
-            ScheduleInput(beat, 1f, InputType.DIRECTION_RIGHT_DOWN, JustRight, RightMiss, Empty);
-
             List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
             {
                 new MultiSound.Sound("spaceDance/voicelessTurn", beat),
@@ -390,43 +381,50 @@ namespace HeavenStudio.Games
                     soundsToPlay.AddRange(new List<MultiSound.Sound>()
                     {
                         new MultiSound.Sound("spaceDance/dancerTurn", beat),
-                        new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f, 1, 1, false, 0.007f),
+                        new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f, 1, 1, false, 0.012f),
                     });
                     break;
                 case (int)WhoSpeaks.Gramps:
                     soundsToPlay.AddRange(new List<MultiSound.Sound>()
                     {
                         new MultiSound.Sound("spaceDance/otherTurn", beat),
-                        new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f, 1, 1, false, 0.007f),
+                        new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f, 1, 1, false, 0.005f),
                     });
                     break;
                 case (int)WhoSpeaks.Both:
                     soundsToPlay.AddRange(new List<MultiSound.Sound>()
                     {
                         new MultiSound.Sound("spaceDance/dancerTurn", beat),
-                        new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f, 1, 1, false, 0.007f),
+                        new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f, 1, 1, false, 0.012f),
                         new MultiSound.Sound("spaceDance/otherTurn", beat),
-                        new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f, 1, 1, false, 0.007f),
+                        new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f, 1, 1, false, 0.005f),
                     });
                     break;
             }
 
             MultiSound.Play(soundsToPlay.ToArray());
+        }
+
+        public void DoTurnRight(double beat, bool grampsTurns)
+        {
+            canBop = false;
+            if (grampsTurns) grampsCanBop = false;
+            ScheduleInput(beat, 1f, InputType.DIRECTION_RIGHT_DOWN, JustRight, RightMiss, Empty);
 
             BeatAction.New(Player, new List<BeatAction.Action>() 
             {
-                new BeatAction.Action(beat,     delegate { DancerP.DoScaledAnimationAsync("TurnRightStart", 0.5f);}),
-                new BeatAction.Action(beat,     delegate { Dancer1.DoScaledAnimationAsync("TurnRightStart", 0.5f);}),
-                new BeatAction.Action(beat,     delegate { Dancer2.DoScaledAnimationAsync("TurnRightStart", 0.5f);}),
                 new BeatAction.Action(beat,     delegate 
                 {
+                    DancerP.DoScaledAnimationAsync("TurnRightStart", 0.5f);
+                    Dancer1.DoScaledAnimationAsync("TurnRightStart", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("TurnRightStart", 0.5f);
                     Dancer3.DoScaledAnimationAsync("TurnRightStart", 0.5f);
                     if (grampsTurns) Gramps.DoScaledAnimationAsync("GrampsTurnRightStart", 0.5f);
                 }),
-                new BeatAction.Action(beat + 1f,     delegate { Dancer1.DoScaledAnimationAsync("TurnRightDo", 0.5f);}),
-                new BeatAction.Action(beat + 1f,     delegate { Dancer2.DoScaledAnimationAsync("TurnRightDo", 0.5f);}),
                 new BeatAction.Action(beat + 1f,     delegate 
                 {
+                    Dancer1.DoScaledAnimationAsync("TurnRightDo", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("TurnRightDo", 0.5f);
                     Dancer3.DoScaledAnimationAsync("TurnRightDo", 0.5f);
                     if (grampsTurns) Gramps.DoScaledAnimationAsync("GrampsTurnRightDo", 0.5f);
                 }),
@@ -435,11 +433,8 @@ namespace HeavenStudio.Games
 
         }
 
-        public void DoSitDown(double beat, int whoSpeaks, bool grampsSits)
+        public static void SitDownSfx(double beat, int whoSpeaks)
         {
-            canBop = false;
-            if (grampsSits) grampsCanBop = false;
-            ScheduleInput(beat, 1f, InputType.DIRECTION_DOWN_DOWN, JustSit, SitMiss, Empty);
             List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
             {
                 new MultiSound.Sound("spaceDance/voicelessSit", beat),
@@ -450,48 +445,55 @@ namespace HeavenStudio.Games
                 case (int)WhoSpeaks.Dancers:
                     soundsToPlay.AddRange(new List<MultiSound.Sound>()
                     {
-                        new MultiSound.Sound("spaceDance/dancerLets", beat, 1, 1, false, 0.07f),
+                        new MultiSound.Sound("spaceDance/dancerLets", beat, 1, 1, false, 0.055f),
-                        new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f, 1, 1, false, 0.02f),
+                        new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f, 1, 1, false, 0.05f),
-                        new MultiSound.Sound("spaceDance/dancerDown", beat + 1f, 1, 1, false, 0.006f),
+                        new MultiSound.Sound("spaceDance/dancerDown", beat + 1f, 1, 1, false, 0.004f),
                     });
                     break;
                 case (int)WhoSpeaks.Gramps:
                     soundsToPlay.AddRange(new List<MultiSound.Sound>()
                     {
-                        new MultiSound.Sound("spaceDance/otherLets", beat, 1, 1, false, 0.024f),
+                        new MultiSound.Sound("spaceDance/otherLets", beat, 1, 1, false, 0.02f),
-                        new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.04f),
+                        new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.064f),
                         new MultiSound.Sound("spaceDance/otherDown", beat + 1f, 1, 1, false, 0.01f),
                     });
                     break;
                 case (int)WhoSpeaks.Both:
                     soundsToPlay.AddRange(new List<MultiSound.Sound>()
                     {
-                        new MultiSound.Sound("spaceDance/dancerLets", beat, 1, 1, false, 0.07f),
+                        new MultiSound.Sound("spaceDance/dancerLets", beat, 1, 1, false, 0.055f),
-                        new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f, 1, 1, false, 0.02f),
+                        new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f, 1, 1, false, 0.05f),
-                        new MultiSound.Sound("spaceDance/dancerDown", beat + 1f, 1, 1, false, 0.006f),
+                        new MultiSound.Sound("spaceDance/dancerDown", beat + 1f, 1, 1, false, 0.004f),
-                        new MultiSound.Sound("spaceDance/otherLets", beat, 1, 1, false, 0.024f),
+                        new MultiSound.Sound("spaceDance/otherLets", beat, 1, 1, false, 0.02f),
-                        new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.04f),
+                        new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.064f),
                         new MultiSound.Sound("spaceDance/otherDown", beat + 1f, 1, 1, false, 0.01f),
                     });
                     break;
             }
 
             MultiSound.Play(soundsToPlay.ToArray());
+        }
+
+        public void DoSitDown(double beat, bool grampsSits)
+        {
+            canBop = false;
+            if (grampsSits) grampsCanBop = false;
+            ScheduleInput(beat, 1f, InputType.DIRECTION_DOWN_DOWN, JustSit, SitMiss, Empty);
 
             BeatAction.New(Player, new List<BeatAction.Action>() 
             {
-                new BeatAction.Action(beat,     delegate { DancerP.DoScaledAnimationAsync("SitDownStart", 0.5f);}),
-                new BeatAction.Action(beat,     delegate { Dancer1.DoScaledAnimationAsync("SitDownStart", 0.5f);}),
-                new BeatAction.Action(beat,     delegate { Dancer2.DoScaledAnimationAsync("SitDownStart", 0.5f);}),
                 new BeatAction.Action(beat,     delegate 
                 {
+                    DancerP.DoScaledAnimationAsync("SitDownStart", 0.5f);
+                    Dancer1.DoScaledAnimationAsync("SitDownStart", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("SitDownStart", 0.5f);
                     Dancer3.DoScaledAnimationAsync("SitDownStart", 0.5f);
                     if (grampsSits) Gramps.DoScaledAnimationAsync("GrampsSitDownStart", 0.5f);
                 }),
-                new BeatAction.Action(beat + 1f,     delegate { Dancer1.DoScaledAnimationAsync("SitDownDo", 0.5f);}),
-                new BeatAction.Action(beat + 1f,     delegate { Dancer2.DoScaledAnimationAsync("SitDownDo", 0.5f);}),
                 new BeatAction.Action(beat + 1f,     delegate 
                 {
+                    Dancer1.DoScaledAnimationAsync("SitDownDo", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("SitDownDo", 0.5f);
                     Dancer3.DoScaledAnimationAsync("SitDownDo", 0.5f);
                     if (grampsSits) Gramps.DoScaledAnimationAsync("GrampsSitDownDo", 0.5f);
                 }),
@@ -500,11 +502,8 @@ namespace HeavenStudio.Games
 
         }
 
-        public void DoPunch(double beat, int whoSpeaks, bool grampsPunches)
+        public static void PunchSfx(double beat, int whoSpeaks)
         {
-            canBop = false;
-            if (grampsPunches) grampsCanBop = false;
-            ScheduleInput(beat, 1.5f, InputType.STANDARD_DOWN, JustPunch, PunchMiss, Empty);
             List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
             {
                 new MultiSound.Sound("spaceDance/voicelessPunch", beat),
@@ -548,40 +547,51 @@ namespace HeavenStudio.Games
             }
 
             MultiSound.Play(soundsToPlay.ToArray());
+        }
+
+        public void DoPunch(double beat, bool grampsPunches)
+        {
+            canBop = false;
+            if (grampsPunches) grampsCanBop = false;
+            ScheduleInput(beat, 1.5f, InputType.STANDARD_DOWN, JustPunch, PunchMiss, Empty);
 
             BeatAction.New(Player, new List<BeatAction.Action>() 
                 {
-                new BeatAction.Action(beat,     delegate { DancerP.DoScaledAnimationAsync("PunchStartInner", 0.5f);}),
-                new BeatAction.Action(beat,     delegate { Dancer1.DoScaledAnimationAsync("PunchStartInner", 0.5f);}),
-                new BeatAction.Action(beat,     delegate { Dancer2.DoScaledAnimationAsync("PunchStartInner", 0.5f);}),
                 new BeatAction.Action(beat, delegate 
                 {
+                    DancerP.DoScaledAnimationAsync("PunchStartInner", 0.5f);
+                    Dancer1.DoScaledAnimationAsync("PunchStartInner", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("PunchStartInner", 0.5f);
                     Dancer3.DoScaledAnimationAsync("PunchStartInner", 0.5f);
                     if (grampsPunches) Gramps.DoScaledAnimationAsync("GrampsPunchStartOdd", 0.5f);
                 }),
-                new BeatAction.Action(beat + 0.5f,     delegate { DancerP.DoScaledAnimationAsync("PunchStartOuter", 0.5f);}),
-                new BeatAction.Action(beat + 0.5f,     delegate { Dancer1.DoScaledAnimationAsync("PunchStartOuter", 0.5f);}),
-                new BeatAction.Action(beat + 0.5f,     delegate { Dancer2.DoScaledAnimationAsync("PunchStartOuter", 0.5f);}),
                 new BeatAction.Action(beat + 0.5f,  delegate 
                 {
+                    DancerP.DoScaledAnimationAsync("PunchStartOuter", 0.5f);
+                    Dancer1.DoScaledAnimationAsync("PunchStartOuter", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("PunchStartOuter", 0.5f);
                     Dancer3.DoScaledAnimationAsync("PunchStartOuter", 0.5f);
                     if (grampsPunches) Gramps.DoScaledAnimationAsync("GrampsPunchStartEven", 0.5f);
                 }),
-                new BeatAction.Action(beat + 1f,     delegate { DancerP.DoScaledAnimationAsync("PunchStartInner", 0.5f);}),
-                new BeatAction.Action(beat + 1f,     delegate { Dancer1.DoScaledAnimationAsync("PunchStartInner", 0.5f);}),
-                new BeatAction.Action(beat + 1f,     delegate { Dancer2.DoScaledAnimationAsync("PunchStartInner", 0.5f);}),
                 new BeatAction.Action(beat + 1f, delegate 
                 {
+                    DancerP.DoScaledAnimationAsync("PunchStartInner", 0.5f);
+                    Dancer1.DoScaledAnimationAsync("PunchStartInner", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("PunchStartInner", 0.5f);
                     Dancer3.DoScaledAnimationAsync("PunchStartInner", 0.5f);
                     if (grampsPunches) Gramps.DoScaledAnimationAsync("GrampsPunchStartOdd", 0.5f);
                 }),
-                new BeatAction.Action(beat + 1.5f,     delegate { Dancer1.DoScaledAnimationAsync("PunchDo", 0.5f);}),
-                new BeatAction.Action(beat + 1.5f,     delegate { Dancer2.DoScaledAnimationAsync("PunchDo", 0.5f);}),
                 new BeatAction.Action(beat + 1.5f, delegate 
                 {
+                    Dancer1.DoScaledAnimationAsync("PunchDo", 0.5f);
+                    Dancer2.DoScaledAnimationAsync("PunchDo", 0.5f);
                     Dancer3.DoScaledAnimationAsync("PunchDo", 0.5f);
                     if (grampsPunches) Gramps.DoScaledAnimationAsync("GrampsPunchDo", 0.5f);
                 }),
+                new BeatAction.Action(beat + 2.5, delegate
+                {
+                    canBop = true; grampsCanBop = true;
+                })
                 });
 
         }

Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs

@@ -98,8 +98,8 @@ namespace HeavenStudio.Games.Loaders
                     function = delegate { var e = eventCaller.currentEntity; SpaceSoccer.instance.UpdateScrollSpeed(e["x"], e["y"]); },
                     defaultLength = 1f,
                     parameters = new List<Param>() {
-                        new Param("x", new EntityTypes.Float(-5f, 5f, 0.09f), "Horizontal", "How fast does the background move horizontally?"),
+                        new Param("x", new EntityTypes.Float(-10f, 10, 0.1f), "Horizontal", "How fast does the background move horizontally?"),
-                        new Param("y", new EntityTypes.Float(-5f, 5f, 0.32f), "Vertical", "How fast does the background move vertically?"),
+                        new Param("y", new EntityTypes.Float(-10, 10f, 0.3f), "Vertical", "How fast does the background move vertically?"),
                     }
                 },
                 new GameAction("stopBall", "Stop Ball")
@@ -202,11 +202,10 @@ namespace HeavenStudio.Games
         [SerializeField] SuperCurveObject.Path[] ballPaths;
         public bool ballDispensed;
         double lastDispensedBeat;
-        float scrollBeat;
+        float xScrollMultiplier = 0.1f;
-        float scrollOffsetX;
+        float yScrollMultiplier = 0.3f;
-        float scrollOffsetY;
+        [SerializeField] private float xBaseSpeed = 1;
-        float currentScrollLengthX = 0.09f;
+        [SerializeField] private float yBaseSpeed = 1;
-        float currentScrollLengthY = 0.32f;
         Tween bgColorTween;
         Tween dotColorTween;
         #region Space Kicker Position Easing
@@ -244,10 +243,8 @@ namespace HeavenStudio.Games
         private void Update()
         {
             var cond = Conductor.instance;
-            float normalizedX = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthX;
+            backgroundSprite.NormalizedX -= xBaseSpeed * xScrollMultiplier * Time.deltaTime;
-            float normalizedY = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthY;
+            backgroundSprite.NormalizedY += yBaseSpeed * yScrollMultiplier * Time.deltaTime;
-            backgroundSprite.NormalizedX = -scrollOffsetX - normalizedX;
-            backgroundSprite.NormalizedY = scrollOffsetY + normalizedY;
 
             float normalizedEaseBeat = cond.GetPositionFromBeat(easeBeat, easeLength);
             if (normalizedEaseBeat <= 1 && normalizedEaseBeat > 0)
@@ -341,11 +338,8 @@ namespace HeavenStudio.Games
 
         public void UpdateScrollSpeed(float scrollSpeedX, float scrollSpeedY) 
         {
-            scrollOffsetX = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthX;
+            xScrollMultiplier = scrollSpeedX;
-            scrollOffsetY = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthY;
+            yScrollMultiplier = scrollSpeedY;
-            currentScrollLengthX = scrollSpeedX;
-            currentScrollLengthY = scrollSpeedY;
-            scrollBeat = Time.realtimeSinceStartup;
         }
 
         public void EaseSpaceKickersPositions(double beat, float length, int ease, float xDistance, float yDistance, float zDistance)

Assets/Scripts/Games/TapTrial/ScrollForTap.cs

@@ -1,31 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ScrollForTap : MonoBehaviour
-{
-    public float scrollSpeedX;
-    public float scrollSpeedY;
-    Vector3 startPos;
-
-    public float lengthX;
-    public float lengthY = 43.20976f;
-
-    private void Start()
-    {
-        startPos = transform.localPosition;
-        UpdatePos();
-    }
-
-    private void Update()
-    {
-        UpdatePos();
-    }
-
-    private void UpdatePos()
-    {
-        float newPosX = Mathf.Repeat(Time.time * scrollSpeedX, lengthX);
-        float newPosY = Mathf.Repeat(Time.time * scrollSpeedY, lengthY);
-        transform.localPosition = startPos + new Vector3(1 * newPosX, 1 * newPosY);
-    }
-}

Assets/Scripts/Games/TapTrial/ScrollForTap.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d04c124402523b64abce470b1c6ced10
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Games/TapTrial/TapTrial.cs

@@ -2,8 +2,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using DG.Tweening;
-
 using HeavenStudio.Util;
 
 namespace HeavenStudio.Games.Loaders
@@ -26,62 +24,61 @@ namespace HeavenStudio.Games.Loaders
                 },
                 new GameAction("tap", "Tap")
                 {
-
                     function = delegate { TapTrial.instance.Tap(eventCaller.currentEntity.beat); }, 
                     defaultLength = 2.0f
                 },
                 new GameAction("double tap", "Double Tap")
                 {
-
                     function = delegate { TapTrial.instance.DoubleTap(eventCaller.currentEntity.beat); }, 
                     defaultLength = 2.0f
                 },
                 new GameAction("triple tap", "Triple Tap")
                 {
-
                     function = delegate { TapTrial.instance.TripleTap(eventCaller.currentEntity.beat); }, 
                     defaultLength = 4.0f
                 },
                 new GameAction("jump tap prep", "Prepare Stance")
                 {
-
+                    function = delegate { TapTrial.instance.JumpPrepare(); }, 
-                    function = delegate { TapTrial.instance.JumpTapPrep(eventCaller.currentEntity.beat); }, 
                 },
                 new GameAction("jump tap", "Jump Tap")
                 {
-
+                    function = delegate { var e = eventCaller.currentEntity; TapTrial.instance.JumpTap(e.beat, e["final"]); }, 
-                    function = delegate { TapTrial.instance.JumpTap(eventCaller.currentEntity.beat); }, 
+                    defaultLength = 2.0f,
-                    defaultLength = 2.0f
+                    parameters = new List<Param>()
-                },
-                new GameAction("final jump tap", "Final Jump Tap")
                     {
-
+                        new Param("final", false, "Final")
-                    function = delegate { TapTrial.instance.FinalJumpTap(eventCaller.currentEntity.beat); }, 
+                    }
-                    defaultLength = 2.0f
                 },
                 new GameAction("scroll event", "Scroll Background")
                 {
-
+                    function = delegate { var e = eventCaller.currentEntity; TapTrial.instance.Scroll(e["toggle"], e["flash"], e["m"]); }, 
-                    function = delegate { TapTrial.instance.scrollEvent(eventCaller.currentEntity["toggle"], eventCaller.currentEntity["flash"]); }, 
+                    defaultLength = 1f,
-                    defaultLength = .5f,
                     parameters = new List<Param>()
                     {
                         new Param("toggle", true, "Scroll FX", "Will scroll"),
-                        new Param("flash", false, "Flash FX", "Will flash to white"),
+                        new Param("flash", true, "Flash FX", "Will flash to white"),
+                        new Param("m", new EntityTypes.Float(0, 10, 1), "Speed Multiplier")
                     }
                 },
                 new GameAction("giraffe events", "Giraffe Animations")
                 {
-
+                    function = delegate { var e = eventCaller.currentEntity; TapTrial.instance.GiraffeAnims(e.beat, e.length, e["toggle"], e["instant"]); }, 
-                    function = delegate { TapTrial.instance.giraffeEvent(eventCaller.currentEntity["instant"]); }, 
+                    resizable = true,
-                    defaultLength = .5f,
                     parameters = new List<Param>()
                     {
-                        new Param("toggle", true, "Enter?", "Giraffe will enter the scene"),
+                        new Param("toggle", TapTrial.GiraffeAnimation.Enter, "Animation", "Which animation?"),
-                        new Param("instant", false, "Instant", "Will the giraffe enter/exit instantly?")
+                        new Param("instant", EasingFunction.Ease.Linear, "Ease", "Which ease will be used?")
-                    }
                     }
                 },
+                // backwards-compatibility
+                new GameAction("final jump tap", "Final Jump Tap")
+                {
+                    function = delegate { var e = eventCaller.currentEntity; TapTrial.instance.JumpTap(e.beat, true); },
+                    defaultLength = 2.0f,
+                    hidden = true
+                },
+            },
             new List<string>() {"agb", "normal"},
             "agbtap", "en",
             new List<string>() {}
@@ -92,35 +89,30 @@ namespace HeavenStudio.Games.Loaders
 
 namespace HeavenStudio.Games
 {
-    using Scripts_TapTrial;
     using HeavenStudio.Common;
+    using Scripts_TapTrial;
 
     public class TapTrial : Minigame
     {
-        [Header("References")]
+        [Header("Components")]
-        public TapTrialPlayer player;
+        [SerializeField] private TapTrialPlayer player;
-        //public GameObject tap;
+        [SerializeField] private Animator monkeyL, monkeyR, giraffe;
-        [SerializeField] List<Animator> monkeys;
+        [SerializeField] private ParticleSystem monkeyTapLL, monkeyTapLR, monkeyTapRL, monkeyTapRR;
-        [SerializeField] List<GameObject> monkey_roots;
+        [SerializeField] private Transform rootPlayer, rootMonkeyL, rootMonkeyR;
-        [SerializeField] GameObject player_root;
+        [SerializeField] private CanvasScroll bgScroll;
-        //temporary
+        [SerializeField] private SpriteRenderer flash;
-        [SerializeField] List<GameObject> monkey_effects;
+        [Header("Values")]
-        [SerializeField] List<GameObject> player_effects;
+        [SerializeField] private float jumpHeight = 4f;
-        [SerializeField] Scroll scrollBG;
+        [SerializeField] private float monkeyJumpHeight = 3f;
-        [SerializeField] SpriteRenderer flash;
+        [SerializeField] private float maxFlashOpacity = 0.8f;
-        [SerializeField] ScrollForTap scroll;
-        [SerializeField] GameObject giraffe;
-        bool goBop = true, isPrep;
-        bool hasJumped, isFinalJump;
-        public double jumpStartTime = double.MinValue;
-        float jumpPos;
-        public bool crIsRunning;
-        [SerializeField] GameObject bg;
-        bool giraffeIsIn;
 
-        public GameEvent bop = new GameEvent();
+        private GameEvent bop = new();
+        private bool canBop = true;
+        private bool shouldBop = true;
 
-        public static TapTrial instance { get; set; }
+        private double jumpStartBeat = double.MinValue;
+
+        public static TapTrial instance;
 
         private void Awake()
         {
@@ -129,387 +121,365 @@ namespace HeavenStudio.Games
 
         private void Update()
         {
-            if (Conductor.instance.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
+            var cond = Conductor.instance;
+            if (cond.isPlaying && !cond.isPaused)
             {
-                if (goBop) SingleBop();
+                if (shouldBop && cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
+                {
+                    SingleBop();
+                }
+                GiraffeUpdate(cond);
+                JumpUpdate(cond);
+                ScrollUpdate(cond);
+            }
         }
 
-            jumpPos = Conductor.instance.GetPositionFromBeat(jumpStartTime, 1f);
+        public void Scroll(bool scroll, bool flash, float multiplier)
-            if (Conductor.instance.songPositionInBeatsAsDouble >= jumpStartTime && Conductor.instance.songPositionInBeatsAsDouble < jumpStartTime + 1f)
         {
-                float yMul = jumpPos * 2f - 1f;
+            scrolling = scroll;
-                float yWeight = -(yMul * yMul) + 1f;
+            flashing = flash;
-                monkey_roots[0].transform.localPosition = new Vector3(0, 1.5f * yWeight);
+            scrollMultiplier = multiplier;
-                monkey_roots[1].transform.localPosition = new Vector3(0, 1.5f * yWeight);
+            ResetScroll();
-                if (!isFinalJump)
+        }
+
+        public void ResetScroll()
         {
-                    player_root.transform.localPosition = new Vector3(0f, 2.5f * yWeight);
+            currentScrollSpeed = 0;
+            currentNormalizedY = 0;
+            flash.color = new Color(1, 1, 1, 0);
+        }
+        
+        private bool scrolling;
+        private bool flashing;
+        [SerializeField] private float maxScrollSpeed = 0.25f;
+        [SerializeField] private float accelerationSpeed = 0.01f;
+        private float currentScrollSpeed = 0;
+        private float currentNormalizedY = 0;
+        private float scrollMultiplier = 1;
+        private void ScrollUpdate(Conductor cond)
+        {
+            if (!scrolling)
+            {
+                bgScroll.Normalized = Vector2.zero;
+                ResetScroll();
+                return;
+            }
+            currentNormalizedY += currentScrollSpeed * Time.deltaTime;
+            bgScroll.NormalizedY = currentNormalizedY * scrollMultiplier;
+            if (flashing) flash.color = new Color(1, 1, 1, Mathf.Lerp(0, maxFlashOpacity, currentNormalizedY));
+            currentScrollSpeed += accelerationSpeed * Time.deltaTime;
+            currentScrollSpeed = Mathf.Min(maxScrollSpeed, currentScrollSpeed);
+        }
+
+        private void GiraffeUpdate(Conductor cond)
+        {
+            float normalizedGiraffeBeat = cond.GetPositionFromBeat(animStartBeat, animLength);
+            EasingFunction.Function func = EasingFunction.GetEasingFunction(currentEase);
+
+            if (normalizedGiraffeBeat <= 1f && normalizedGiraffeBeat >= 0f)
+            {
+                switch (currentAnim)
+                {
+                    case GiraffeAnimation.Enter:
+                        giraffe.DoNormalizedAnimation("Enter", func(0, 1, normalizedGiraffeBeat));
+                        break;
+                    case GiraffeAnimation.Exit:
+                        giraffe.DoNormalizedAnimation("Exit", func(0, 1, normalizedGiraffeBeat));
+                        break;
+                    default: break;
+                }
+            }
+        }
+
+        private void JumpUpdate(Conductor cond)
+        {
+            float normalizedJumpBeat = cond.GetPositionFromBeat(jumpStartBeat, 1);
+
+            if (normalizedJumpBeat >= 0 && normalizedJumpBeat <= 1)
+            {
+                if (normalizedJumpBeat >= 0.5f)
+                {
+                    float normalizedUp = cond.GetPositionFromBeat(jumpStartBeat, 0.5);
+                    EasingFunction.Function func = EasingFunction.GetEasingFunction(EasingFunction.Ease.EaseOutQuad);
+                    float newPlayerY = func(0, jumpHeight, normalizedUp);
+                    float newMonkeyY = func(0, monkeyJumpHeight, normalizedUp);
+                    rootPlayer.localPosition = new Vector3(0, newPlayerY);
+                    rootMonkeyL.localPosition = new Vector3(0, newMonkeyY);
+                    rootMonkeyR.localPosition = new Vector3(0, newMonkeyY);
                 }
                 else
                 {
-                    player_root.transform.localPosition = new Vector3(0f, 3.5f * yWeight);
+                    float normalizedDown = cond.GetPositionFromBeat(jumpStartBeat + 0.5, 0.5);
+                    EasingFunction.Function func = EasingFunction.GetEasingFunction(EasingFunction.Ease.EaseInQuad);
+                    float newPlayerY = func(jumpHeight, 0, normalizedDown);
+                    float newMonkeyY = func(monkeyJumpHeight, 0, normalizedDown);
+                    rootPlayer.localPosition = new Vector3(0, newPlayerY);
+                    rootMonkeyL.localPosition = new Vector3(0, newMonkeyY);
+                    rootMonkeyR.localPosition = new Vector3(0, newMonkeyY);
                 }
-
             }
             else
             {
-                monkey_roots[0].transform.localPosition = new Vector3(0, 0);
+                rootPlayer.localPosition = Vector3.zero;
-                monkey_roots[1].transform.localPosition = new Vector3(0, 0);
+                rootMonkeyL.localPosition = Vector3.zero;
-                player_root.transform.localPosition = new Vector3(0, 0);
+                rootMonkeyR.localPosition = Vector3.zero;
-                if (hasJumped)
-                {
-                    //Jukebox.PlayOneShotGame("fanClub/landing_impact", pitch: UnityEngine.Random.Range(0.95f, 1f), volume: 1f / 4);
-                }
-                hasJumped = false;
-                if (PlayerInput.Pressed() && !IsExpectingInputNow())
-                {
-                    player.anim.Play("Tap", 0, 0);
-                    SoundByte.PlayOneShotGame("tapTrial/tonk");
-                }
-            }
-        }
-
-        void SingleBop()
-        {
-            if (!isPrep)
-            {
-                if (monkeys[0].GetCurrentAnimatorStateInfo(0).IsName("Idle")) monkeys[0].DoScaledAnimationAsync("Bop", 0.5f);
-                if (monkeys[1].GetCurrentAnimatorStateInfo(0).IsName("Idle")) monkeys[1].DoScaledAnimationAsync("Bop", 0.5f);
-                if (player.anim.GetCurrentAnimatorStateInfo(0).IsName("Idle")) player.anim.DoScaledAnimationAsync("Bop", 0.5f);
             }
         }
 
-        public void Bop(double beat, float length, bool isBopping, bool autoBop)
+        public enum GiraffeAnimation
         {
-            goBop = autoBop;
+            Enter,
-            if (isBopping)
+            Exit,
+            Blink
+        }
+        private GiraffeAnimation currentAnim = GiraffeAnimation.Enter;
+        private double animStartBeat = -1;
+        private float animLength = 0;
+        private EasingFunction.Ease currentEase = EasingFunction.Ease.Linear;
+
+        public void GiraffeAnims(double beat, float length, int type, int ease)
         {
+            animStartBeat = beat;
+            animLength = length;
+            currentAnim = (GiraffeAnimation)type;
+            currentEase = (EasingFunction.Ease)ease;
+            if (currentAnim == GiraffeAnimation.Blink) giraffe.DoScaledAnimationAsync("Blink", 0.5f);
+        }
+
+        public void Bop(double beat, float length, bool bop, bool autoBop)
+        {
+            shouldBop = autoBop;
+            if (bop)
+            {
+                List<BeatAction.Action> actions = new();
                 for (int i = 0; i  < length; i++)
                 {
-                    BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+                    actions.Add(new BeatAction.Action(beat + i, delegate { SingleBop(); }));
+                }
+                BeatAction.New(gameObject, actions);
+            }
+        }
+
+        private void SingleBop()
         {
-                        new BeatAction.Action(beat + i, delegate { SingleBop(); })
+            if (!canBop) return;
-                    });
+            PlayMonkeyAnimationScaledAsync("Bop", 0.5f);
-                }
+            player.Bop();
-            }
         }
 
         public void Tap(double beat)
         {
-            isPrep = true;
+            canBop = false;
-            SoundByte.PlayOneShotGame("tapTrial/ook");
+            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
-            player.anim.DoScaledAnimationAsync("TapPrepare", 0.5f);
-
-            //Monkey Tap Prepare Anim
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
             {
-                new BeatAction.Action(beat, delegate { monkeys[0].DoScaledAnimationAsync("TapPrepare", 0.5f); }),
+                new BeatAction.Action(beat, delegate
-                new BeatAction.Action(beat, delegate { monkeys[1].DoScaledAnimationAsync("TapPrepare", 0.5f); }),
-                new BeatAction.Action(beat + 1f, delegate { monkeys[0].DoScaledAnimationAsync("Tap", 0.6f); particleEffectMonkeys(); }),
-                new BeatAction.Action(beat + 1f, delegate { monkeys[1].DoScaledAnimationAsync("Tap", 0.6f); }),
-            });
-            //CreateTap(beat);
-            ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, OnTap, OnTapMiss, OnEmpty);
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
                 {
-                new BeatAction.Action(beat + 1.5f, delegate { isPrep = false; })
+                    PlayMonkeyAnimationScaledAsync("TapPrepare", 0.5f);
+                    player.PrepareTap();
+                }),
+                new BeatAction.Action(beat + 1, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("Tap", 0.5f);
+                    MonkeyParticles(true);
+                }),
+                new BeatAction.Action(beat + 1.5, delegate
+                {
+                    canBop = true;
+                })
             });
+
+            MultiSound.Play(new MultiSound.Sound[]
+            {
+                new MultiSound.Sound("tapTrial/ook", beat),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 1, 1.4f, 0.5f),
+            });
+
+            ScheduleInput(beat, 1, InputType.STANDARD_DOWN, JustTap, Miss, Empty);
         }
 
         public void DoubleTap(double beat)
         {
-            isPrep = true;
+            canBop = false;
+            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("DoubleTapPrepare", 0.5f);
+                    player.PrepareTap(true);
+                }),
+                new BeatAction.Action(beat + 0.5, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("DoubleTapPrepare_2", 0.5f);
+                }),
+                new BeatAction.Action(beat + 1, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("DoubleTap", 0.5f);
+                    MonkeyParticles(false);
+                }),
+                new BeatAction.Action(beat + 1.5, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("DoubleTap", 0.5f);
+                    MonkeyParticles(false);
+                    canBop = true;
+                }),
+            });
+
             MultiSound.Play(new MultiSound.Sound[]
             {
                 new MultiSound.Sound("tapTrial/ookook", beat),
-                new MultiSound.Sound("tapTrial/ookook",   beat + 0.5f)
+                new MultiSound.Sound("tapTrial/ookook", beat + 0.5),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 1, 1.4f, 0.5f),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 1.5, 1.4f, 0.5f),
             });
 
-            player.anim.DoScaledAnimationAsync("DoubleTapPrepare", 0.5f);
+            ScheduleInput(beat, 1, InputType.STANDARD_DOWN, JustDoubleTap, Miss, Empty);
-
+            ScheduleInput(beat, 1.5, InputType.STANDARD_DOWN, JustDoubleTap, Miss, Empty);
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat, delegate { monkeys[0].DoScaledAnimationAsync("DoubleTapPrepare", 0.5f); }),
-                new BeatAction.Action(beat + .5f, delegate { monkeys[0].DoScaledAnimationAsync("DoubleTapPrepare_2", 0.5f); }),
-                new BeatAction.Action(beat + 1f, delegate { monkeys[0].DoScaledAnimationAsync("DoubleTap", 0.6f); particleEffectMonkeys(); }),
-                new BeatAction.Action(beat + 1.5f, delegate { monkeys[0].DoScaledAnimationAsync("DoubleTap", 0.6f); particleEffectMonkeys(); }),
-                new BeatAction.Action(beat + 1.99f, delegate {monkeys[0].Play("Idle", 0, 0); }),
-            });
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat, delegate { monkeys[1].DoScaledAnimationAsync("DoubleTapPrepare", 0.5f); }),
-                new BeatAction.Action(beat + .5f, delegate { monkeys[1].DoScaledAnimationAsync("DoubleTapPrepare_2", 0.5f); }),
-                new BeatAction.Action(beat + 1f, delegate { monkeys[1].DoScaledAnimationAsync("DoubleTap", 0.6f); }),
-                new BeatAction.Action(beat + 1.5f, delegate { monkeys[1].DoScaledAnimationAsync("DoubleTap", 0.6f); }),
-                new BeatAction.Action(beat + 1.99f, delegate {monkeys[1].Play("Idle", 0, 0); }),
-            });
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat + 1.5f, delegate { isPrep = false; })
-            });
-
-            ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, OnDoubleTap, OnTapMiss, OnEmpty);
-            ScheduleInput(beat, 1.5f, InputType.STANDARD_DOWN, OnDoubleTap, OnTapMiss, OnEmpty);
         }
 
         public void TripleTap(double beat)
         {
-            isPrep = true;
+            canBop = false;
+            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate
+                {
+                    player.PrepareTripleTap(beat);
+                    PlayMonkeyAnimationScaledAsync("PostPrepare_1", 0.5f);
+                }),
+                new BeatAction.Action(beat + 0.5, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("PostPrepare_2", 0.5f);
+                }),
+                new BeatAction.Action(beat + 2, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("PostTap", 0.5f);
+                    MonkeyParticles(true);
+                }),
+                new BeatAction.Action(beat + 2.5, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("PostTap_2", 0.5f);
+                    MonkeyParticles(false);
+                }),
+                new BeatAction.Action(beat + 3, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync("PostTap", 0.5f);
+                    MonkeyParticles(true);
+                }),
+            });
+
             MultiSound.Play(new MultiSound.Sound[]
             {
                 new MultiSound.Sound("tapTrial/ooki1", beat),
-                new MultiSound.Sound("tapTrial/ooki2",   beat + 0.5f)
+                new MultiSound.Sound("tapTrial/ooki2", beat + 0.5),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 2, 1.4f, 0.5f),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 2.5, 1.4f, 0.5f),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 3, 1.4f, 0.5f),
             });
 
-            player.tripleOffset = 0;
+            ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustTripleTap, Miss, Empty);
+            ScheduleInput(beat, 2.5, InputType.STANDARD_DOWN, JustTripleTap, Miss, Empty);
+            ScheduleInput(beat, 3, InputType.STANDARD_DOWN, JustTripleTap, Miss, Empty);
+        }
 
+        public void JumpPrepare()
+        {
+            canBop = false;
+            player.PrepareJump();
+            PlayMonkeyAnimationScaledAsync("JumpPrepare", 0.5f);
+        }
+
+        public void JumpTap(double beat, bool final)
+        {
+            canBop = false;
+            jumpStartBeat = beat;
             BeatAction.New(gameObject, new List<BeatAction.Action>()
             {
-                new BeatAction.Action(beat, delegate { player.anim.Play("PosePrepare_1", 0, 0);}),
+                new BeatAction.Action(beat, delegate
-                new BeatAction.Action(beat + .5f, delegate { player.anim.Play("PosePrepare_2", 0, 0);}),
+                {
+                    player.Jump(final);
+                    PlayMonkeyAnimationScaledAsync(final ? "Jump" : "JumpTap", 0.5f);
+                }),
+                new BeatAction.Action(beat + 1, delegate
+                {
+                    PlayMonkeyAnimationScaledAsync(final ? "FinalJumpTap" : "Jumpactualtap", 0.5f);
+                    MonkeyParticles(true);
+                    MonkeyParticles(false);
+                }),
+                new BeatAction.Action(beat + 1.5, delegate
+                {
+                    canBop = final;
+                })
             });
 
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            MultiSound.Play(new MultiSound.Sound[]
             {
-                new BeatAction.Action(beat, delegate { monkeys[0].Play("PostPrepare_1", 0, 0); }),
+                new MultiSound.Sound(final ? "tapTrial/jumptap2" : "tapTrial/jumptap1", beat),
-                new BeatAction.Action(beat + .5f, delegate { monkeys[0].Play("PostPrepare_2", 0, 0); }),
+                new MultiSound.Sound("tapTrial/tapMonkey", beat + 1, 1.4f, 0.5f),
-                new BeatAction.Action(beat + 2f, delegate { monkeys[0].Play("PostTap", 0, 0); }),
-                new BeatAction.Action(beat + 2.5f, delegate { monkeys[0].Play("PostTap_2", 0, 0); }),
-                new BeatAction.Action(beat + 3f, delegate { monkeys[0].Play("PostTap", 0, 0);}),
             });
 
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            ScheduleInput(beat, 1, InputType.STANDARD_DOWN, final ? JustJumpTapFinal : JustJumpTap, final ? MissJumpFinal : MissJump, Empty);
-            {
-                new BeatAction.Action(beat, delegate { monkeys[1].Play("PostPrepare_1", 0, 0); }),
-                new BeatAction.Action(beat + .5f, delegate { monkeys[1].Play("PostPrepare_2", 0, 0); }),
-                new BeatAction.Action(beat + 2f, delegate { monkeys[1].Play("PostTap", 0, 0); }),
-                new BeatAction.Action(beat + 2.5f, delegate { monkeys[1].Play("PostTap_2", 0, 0);}),
-                new BeatAction.Action(beat + 3f, delegate { monkeys[1].Play("PostTap", 0, 0);}),
-            });
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat + 2f, delegate { particleEffectMonkeys(); }),
-                new BeatAction.Action(beat + 2.5f, delegate { particleEffectMonkeys(); }),
-                new BeatAction.Action(beat + 3f, delegate { particleEffectMonkeys(); }),
-            });
-
-            ScheduleInput(beat, 2f, InputType.STANDARD_DOWN, OnTripleTap, OnTapMiss, OnEmpty);
-            ScheduleInput(beat, 2.5f, InputType.STANDARD_DOWN, OnTripleTap, OnTapMiss, OnEmpty);
-            ScheduleInput(beat, 3f, InputType.STANDARD_DOWN, OnTripleTap, OnTapMiss, OnEmpty);
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat + 4f, delegate { isPrep = false; })
-            });
         }
 
-        public void JumpTap(double beat)
+        private void JustJumpTap(PlayerActionEvent caller, float state)
         {
-            isPrep = true;
+            player.JumpTap(state < 1f && state > -1f, false);
-            hasJumped = true;
-            SoundByte.PlayOneShotGame("tapTrial/jumptap1");
-
-            player.anim.Play("JumpTap", 0, 0);
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat, delegate {jumpStartTime = Conductor.instance.songPositionInBeatsAsDouble;}),
-                new BeatAction.Action(beat, delegate {monkeys[0].Play("JumpTap", 0, 0); }),
-                new BeatAction.Action(beat, delegate {monkeys[1].Play("JumpTap", 0, 0); }),
-                new BeatAction.Action(beat + 1f, delegate { particleEffectMonkeys(); monkeys[0].Play("Jumpactualtap", 0, 0); monkeys[1].Play("Jumpactualtap", 0, 0); }),
-                new BeatAction.Action(beat + 1f, delegate { particleEffectMonkeys_2(); }),
-            });
-
-            ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, OnJumpTap, OnJumpTapMiss, OnEmpty); //why would it be .95f? no idea, sounds fine w/ 1f
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat + 2f, delegate { isPrep = false; })
-            });
         }
 
-        public void JumpTapPrep(double beat)
+        private void JustJumpTapFinal(PlayerActionEvent caller, float state)
         {
-            isPrep = true;
+            player.JumpTap(state < 1f && state > -1f, true);
-            monkeys[0].Play("JumpPrepare", 0, 0);
-            monkeys[1].Play("JumpPrepare", 0, 0);
-            player.anim.Play("JumpPrepare", 0, 0);
         }
 
-        public void FinalJumpTap(double beat)
+        private void MissJump(PlayerActionEvent caller)
         {
-            isPrep = true;
+            player.JumpTapMiss(false);
-            hasJumped = true;
+            if (giraffe.IsAnimationNotPlaying()) giraffe.DoScaledAnimationAsync("Miss", 0.5f);
-            isFinalJump = true;
+            ResetScroll();
-            SoundByte.PlayOneShotGame("tapTrial/jumptap2");
-
-            player.anim.Play("FinalJump");
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat, delegate {jumpStartTime = Conductor.instance.songPositionInBeatsAsDouble;}),
-                new BeatAction.Action(beat, delegate {monkeys[0].Play("Jump", 0, 0); }),
-                new BeatAction.Action(beat, delegate {monkeys[1].Play("Jump", 0, 0); }),
-                new BeatAction.Action(beat + 1f, delegate { monkeys[0].Play("FinalJumpTap", 0, 0); particleEffectMonkeys(); particleEffectMonkeys_2(); }),
-                new BeatAction.Action(beat + 1f, delegate { monkeys[1].Play("FinalJumpTap", 0, 0); }),
-            });
-
-            ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, OnJumpFinalTap, OnFinalJumpTapMiss, OnEmpty);
-
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
-            {
-                new BeatAction.Action(beat + 2f, delegate { isPrep = false; })
-            });
         }
 
-        public void giraffeEvent(bool instant)
+        private void MissJumpFinal(PlayerActionEvent caller)
         {
-            float animTime = 0;
+            player.JumpTapMiss(true);
-            if (instant) animTime = 1;
+            if (giraffe.IsAnimationNotPlaying()) giraffe.DoScaledAnimationAsync("Miss", 0.5f);
-            if (!giraffeIsIn)
+            ResetScroll();
-            {
-                giraffe.SetActive(true);
-                giraffe.GetComponent<Animator>().Play("Enter", 0, animTime);
-                giraffeIsIn = true;
-            }
-            else if (giraffeIsIn)
-            {
-                giraffe.GetComponent<Animator>().Play("Exit", 0, animTime);
-                giraffeIsIn = false;
-            }
         }
 
-        public void scrollEvent(bool isScrolling, bool flashToWhite)
+        private void JustTap(PlayerActionEvent caller, float state)
         {
-            if (isScrolling)
+            player.Tap(state < 1f && state > -1f);
-            {
-                if (!crIsRunning) // if coroutine is not running, play the following once
-                {
-                    if (flashToWhite)
-                    {
-                        Sequence sequence = DOTween.Sequence();
-                        sequence.Append(flash.DOColor(new Color(flash.color.r, flash.color.g, flash.color.b, .8f), 2f));
-                        //sequence.Kill();
-                    }
-                    StartCoroutine(timer());
-                }
-            }
-            else //should be the reverse of the code above
-            {
-                scrollBG.enabled = false;
-                scrollBG.scrollSpeedY = 0;
-            }
         }
 
-
+        private void JustDoubleTap(PlayerActionEvent caller, float state)
-        #region Player Action Scripts
-        public void OnTap(PlayerActionEvent caller, float beat)
         {
-            SoundByte.PlayOneShotGame("tapTrial/tap");
+            player.Tap(state < 1f && state > -1f, true);
-            player.anim.DoScaledAnimationAsync("Tap", 0.6f);
-            player_effects[0].GetComponent<ParticleSystem>().Play();
-        }
-        public void OnDoubleTap(PlayerActionEvent caller, float beat)
-        {
-            SoundByte.PlayOneShotGame("tapTrial/tap");
-            player.anim.DoScaledAnimationAsync("DoubleTap", 0.6f);
-            player_effects[1].GetComponent<ParticleSystem>().Play();
         }
 
-        public void OnTapMiss(PlayerActionEvent caller)
+        private void JustTripleTap(PlayerActionEvent caller, float state)
         {
-            SoundByte.PlayOneShotGame("tapTrial/tapMonkey", pitch: 1.5f, volume: .3f);
+            player.TripleTap(state < 1f && state > -1f);
         }
 
-        public void OnJumpTapMiss(PlayerActionEvent caller)
+        private void Miss(PlayerActionEvent caller)
         {
-            SoundByte.PlayOneShotGame("tapTrial/tapMonkey", pitch: 1.5f, volume: .3f);
+            if (giraffe.IsAnimationNotPlaying() && currentAnim != GiraffeAnimation.Exit) giraffe.DoScaledAnimationAsync("Miss", 0.5f);
-            player.anim.Play("JumpTap_Miss", 0, 0);
+            ResetScroll();
         }
 
-        public void OnFinalJumpTapMiss(PlayerActionEvent caller)
+        private void Empty(PlayerActionEvent caller) { }
+
+        private void PlayMonkeyAnimationScaledAsync(string name, float timeScale)
         {
-            SoundByte.PlayOneShotGame("tapTrial/tapMonkey", pitch: 1.5f, volume: .3f);
+            monkeyL.DoScaledAnimationAsync(name, timeScale);
-            player.anim.Play("FinalJump_Miss", 0, 0);
+            monkeyR.DoScaledAnimationAsync(name, timeScale);
         }
 
-        public void OnEmpty(PlayerActionEvent caller)
+        private void MonkeyParticles(bool left)
         {
-            //empty
+            ParticleSystem spawnedEffectL = Instantiate(left ? monkeyTapLL : monkeyTapLR, transform);
-        }
+            spawnedEffectL.Play();
-        public void OnTripleTap(PlayerActionEvent caller, float beat)
-        {
-            if (player.tripleOffset % 2 == 0)
-            {
-                BeatAction.New(gameObject, new List<BeatAction.Action>()
-                {
-                    new BeatAction.Action(beat, delegate { player.anim.Play("PoseTap_L", 0, 0); })
-                });
-                player.tripleOffset += 1;
-            }
-            else
-            {
-                BeatAction.New(gameObject, new List<BeatAction.Action>()
-                {
-                    new BeatAction.Action(beat, delegate { player.anim.Play("PoseTap_R", 0, 0); })
-                });
-                player.tripleOffset += 1;
-            }
-            player_effects[0].GetComponent<ParticleSystem>().Play();
-            SoundByte.PlayOneShotGame("tapTrial/tap");
-        }
-        public void OnJumpTap(PlayerActionEvent caller, float beat)
-        {
-            SoundByte.PlayOneShotGame("tapTrial/tap");
-            player.anim.Play("JumpTap_Success", 0, 0);
-            player_effects[0].GetComponent<ParticleSystem>().Play();
-            player_effects[1].GetComponent<ParticleSystem>().Play();
-        }
-        public void OnJumpFinalTap(PlayerActionEvent caller, float beat)
-        {
-            SoundByte.PlayOneShotGame("tapTrial/tap");
-            player.anim.Play("FinalJump_Tap");
-            player_effects[0].GetComponent<ParticleSystem>().Play();
-            player_effects[1].GetComponent<ParticleSystem>().Play();
-            isFinalJump = false;
-        }
-        #endregion
 
-        #region Misc. Functions
+            ParticleSystem spawnedEffectR = Instantiate(left ? monkeyTapRL : monkeyTapRR, transform);
-        public void particleEffectMonkeys()
+            spawnedEffectR.Play();
-        {
-            monkey_effects[0].GetComponent<ParticleSystem>().Play();
-            monkey_effects[1].GetComponent<ParticleSystem>().Play();
         }
-
-        public void particleEffectMonkeys_2()
-        {
-            monkey_effects[2].GetComponent<ParticleSystem>().Play();
-            monkey_effects[3].GetComponent<ParticleSystem>().Play();
-        }
-
-        IEnumerator timer()
-        {
-            crIsRunning = true;
-            while (scroll.scrollSpeedY < 20)
-            {
-                scroll.scrollSpeedY += 5f;
-                yield return new WaitForSecondsRealtime(.5f);
-            }
-        }
-        #endregion
-
-        //this is the orig way for input handling
-        //public void CreateTap(float beat, int type = 0)
-        //{
-        //    GameObject _tap = Instantiate(tap);
-        //    _tap.transform.parent = tap.transform.parent;
-        //    _tap.SetActive(true);
-        //    Tap t = _tap.GetComponent<Tap>();
-        //    t.startBeat = beat;
-        //    t.type = type;
-        //}
     }
 }

Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs

@@ -1,53 +1,163 @@
 using UnityEngine;
-
+using System;
 using HeavenStudio.Util;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace HeavenStudio.Games.Scripts_TapTrial
 {
     public class TapTrialPlayer : MonoBehaviour
     {
-        [Header("References")]
+        private enum TapState
-        [System.NonSerialized] public Animator anim;
+        {
+            Tap,
+            DoubleTap,
+            TripleTap,
+            Jumping
+        }
+        private TapState state = TapState.Tap;
+        private int tripleTaps = 0;
+        private Animator anim;
+        [SerializeField] private ParticleSystem tapEffectLeft;
+        [SerializeField] private ParticleSystem tapEffectRight;
 
-        public int tripleOffset = 0;
+        private TapTrial game;
 
         private void Awake()
         {
             anim = GetComponent<Animator>();
+            game = TapTrial.instance;
         }
 
         private void Update()
         {
-            if (PlayerInput.Pressed())
+            if (PlayerInput.Pressed() && !game.IsExpectingInputNow(InputType.STANDARD_DOWN))
             {
-                Tap(false, 0);
+                WhiffTap();
             }
         }
 
-        public void Tap(bool hit, int type)
+        public void Bop()
+        {
+            anim.DoScaledAnimationAsync("Bop", 0.5f);
+        }
+
+        private void WhiffTap()
+        {
+            switch (state)
+            {
+                case TapState.Tap:
+                    game.ScoreMiss();
+                    game.ResetScroll();
+                    Tap(false, false);
+                    break;
+                case TapState.DoubleTap:
+                    game.ScoreMiss();
+                    game.ResetScroll();
+                    Tap(false, true);
+                    break;
+                case TapState.TripleTap:
+                    game.ScoreMiss();
+                    game.ResetScroll();
+                    break;
+                case TapState.Jumping:
+                    break;
+            }
+        }
+
+        public void PrepareJump()
+        {
+            anim.DoScaledAnimationAsync("JumpPrepare", 0.5f);
+            state = TapState.Jumping;
+        }
+
+        public void Jump(bool final)
+        {
+            anim.DoScaledAnimationAsync(final ? "FinalJump" : "JumpTap", 0.5f);
+            state = TapState.Jumping;
+        }
+
+        public void JumpTap(bool ace, bool final)
+        {
+            if (ace)
             {
-            if (hit)
                 SoundByte.PlayOneShotGame("tapTrial/tap");
-            else
+                SpawnTapEffect(true);
-                SoundByte.PlayOneShotGame("tapTrial/tonk");
+                SpawnTapEffect(false);
-
-
-            switch (type)
-            {
-                case 0:
-                    anim.Play("Tap", 0, 0);
-                    break;
-                case 1:
-                    anim.Play("DoubleTap", 0, 0);
-                    break;
-                case 2:
-                    if(tripleOffset % 2 == 0)
-                        anim.Play("DoubleTap", 0, 0);
-                    else
-                        anim.Play("Tap", 0, 0);
-                    tripleOffset++;
-                    break;
             }
+            else
+            {
+                SoundByte.PlayOneShot("nearMiss");
+                game.ResetScroll();
+            }
+            anim.DoScaledAnimationAsync(final ? "FinalJump_Tap" : "JumpTap_Success", 0.5f);
+        }
+
+        public void JumpTapMiss(bool final)
+        {
+            anim.DoScaledAnimationAsync(final ? "FinalJump_Miss" : "JumpTap_Miss", 0.5f);
+        }
+
+        public void PrepareTap(bool doubleTap = false)
+        {
+            anim.DoScaledAnimationAsync(doubleTap ? "DoubleTapPrepare" : "TapPrepare", 0.5f);
+            state = doubleTap ? TapState.DoubleTap : TapState.Tap;
+        }
+
+        public void Tap(bool ace, bool doubleTap = false)
+        {
+            if (ace)
+            {
+                SoundByte.PlayOneShotGame("tapTrial/tap");
+                SpawnTapEffect(!doubleTap);
+            }
+            else
+            {
+                SoundByte.PlayOneShot("nearMiss");
+                game.ResetScroll();
+            }
+            anim.DoScaledAnimationAsync(doubleTap ? "DoubleTap" : "Tap", 0.5f);
+        }
+
+        public void PrepareTripleTap(double beat)
+        {
+            anim.DoScaledAnimationAsync("PosePrepare_1", 0.5f);
+            state = TapState.TripleTap;
+            tripleTaps = 0;
+            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat + 0.5, delegate
+                {
+                    anim.DoScaledAnimationAsync("PosePrepare_2", 0.5f);
+                })
+            });
+        }
+
+        public void TripleTap(bool ace)
+        {
+            bool tapLeft = tripleTaps % 2 == 0;
+            tripleTaps++;
+
+            if (ace)
+            {
+                SoundByte.PlayOneShotGame("tapTrial/tap");
+                SpawnTapEffect(tapLeft);
+            }
+            else
+            {
+                SoundByte.PlayOneShot("nearMiss");
+                game.ResetScroll();
+            }
+
+            anim.DoScaledAnimationAsync(tapLeft ? "PoseTap_L" : "PoseTap_R", 0.5f);
+        }
+
+
+
+        private void SpawnTapEffect(bool left)
+        {
+            ParticleSystem spawnedTap = Instantiate(left ? tapEffectLeft : tapEffectRight, game.transform);
+            spawnedTap.Play();
         }
     }
 }