TEXT SCROLLING IS (almost) PERFECT!!!! now we gotta wait for the animations

Assets/Resources/Fonts/WarioWareV2 SDF 1.mat

@@ -105,7 +105,7 @@ Material:
     - _WeightBold: 0.75
     - _WeightNormal: 0
     m_Colors:
-    - _ClipRect: {r: -10, g: -10, b: -7.73, a: 10}
+    - _ClipRect: {r: -10, g: -10, b: -10, a: 10}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Fonts/WarioWareV2 SDF 2.mat

@@ -105,7 +105,7 @@ Material:
     - _WeightBold: 0.75
     - _WeightNormal: 0
     m_Colors:
-    - _ClipRect: {r: -10, g: -10, b: -7.73, a: 10}
+    - _ClipRect: {r: -10, g: -10, b: -7, a: 10}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Fonts/WarioWareV2 SDF 3.mat

@@ -112,7 +112,7 @@ Material:
     - _WeightBold: 0.75
     - _WeightNormal: 0
     m_Colors:
-    - _ClipRect: {r: -10, g: -10, b: -7.73, a: 10}
+    - _ClipRect: {r: -10, g: -10, b: -7, a: 10}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Fonts/WarioWareV2 SDF 4.mat

@@ -105,7 +105,7 @@ Material:
     - _WeightBold: 0.75
     - _WeightNormal: 0
     m_Colors:
-    - _ClipRect: {r: -10, g: -10, b: -7.73, a: 10}
+    - _ClipRect: {r: -10, g: -10, b: -7.540926, a: 10}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Fonts/WarioWareV2 SDF.mat

@@ -1,109 +0,0 @@
-%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: WarioWareV2 SDF
-  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ValidKeywords: []
-  m_InvalidKeywords:
-  - MASK_SOFT
-  - RATIOS_OFF
-  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}
-    - _Cube:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _FaceTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OutlineTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _Ambient: 0.5
-    - _Bevel: 0.5
-    - _BevelClamp: 0
-    - _BevelOffset: 0
-    - _BevelRoundness: 0
-    - _BevelWidth: 0
-    - _BumpFace: 0
-    - _BumpOutline: 0
-    - _ColorMask: 15
-    - _CullMode: 0
-    - _Diffuse: 0.5
-    - _FaceDilate: 0
-    - _FaceUVSpeedX: 0
-    - _FaceUVSpeedY: 0
-    - _GlowInner: 0.05
-    - _GlowOffset: 0
-    - _GlowOuter: 0.05
-    - _GlowPower: 0.75
-    - _GradientScale: 10
-    - _LightAngle: 3.1416
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _OutlineSoftness: 0
-    - _OutlineUVSpeedX: 0
-    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.366
-    - _PerspectiveFilter: 0.875
-    - _Reflectivity: 10
-    - _ScaleRatioA: 1
-    - _ScaleRatioB: 1
-    - _ScaleRatioC: 1
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _SpecularPower: 2
-    - _Stencil: 5
-    - _StencilComp: 0
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 1024
-    - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
-    - _UnderlaySoftness: 0
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 0, b: 0, a: 1}
-    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
-    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0.059347868, b: 1, a: 1}
-    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_BuildTextureStacks: []

Assets/Resources/Games/bonOdori.prefab

@@ -2516,7 +2516,7 @@ Transform:
   m_GameObject: {fileID: 2694330240751802104}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 1.9099998, z: 0}
-  m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+  m_LocalScale: {x: 0.3333333, y: 0.3333333, z: 0.33333334}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 218327822426191064}
@@ -2527,7 +2527,7 @@ Transform:
   - {fileID: 8498522789000248656}
   - {fileID: 4149122258595339136}
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 14
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1488502930672050118
 SpriteRenderer:
@@ -2642,7 +2642,7 @@ Transform:
   - {fileID: 728648227757501950}
   - {fileID: 1010951526018178842}
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 13
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6358609534666224376
 SpriteRenderer:
@@ -2706,7 +2706,7 @@ Animator:
   m_GameObject: {fileID: 2745495389713643033}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 27aaffa52fe573c44bb798a06252f11d, type: 2}
+  m_Controller: {fileID: 9100000, guid: f54af529de929834681451e49dc2d922, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -3336,7 +3336,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 6
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5321,7 +5321,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 9
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5821,7 +5821,7 @@ Transform:
   - {fileID: 3684883812708883783}
   - {fileID: 1736186089157390354}
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 12
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &3197049386973504900
 SpriteRenderer:
@@ -5885,7 +5885,7 @@ Animator:
   m_GameObject: {fileID: 5550935553751512418}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 27aaffa52fe573c44bb798a06252f11d, type: 2}
+  m_Controller: {fileID: 9100000, guid: f54af529de929834681451e49dc2d922, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -5927,7 +5927,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 7
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -7036,15 +7036,15 @@ Transform:
   - {fileID: 4389590328865582082}
   - {fileID: 3859919625309255425}
   - {fileID: 7025149057808423635}
-  - {fileID: 3070629536816959270}
-  - {fileID: 8895179119127956590}
-  - {fileID: 6419318073471297395}
-  - {fileID: 392734652595288100}
   - {fileID: 8387568492357112863}
   - {fileID: 298275253940792191}
   - {fileID: 8867001238483373209}
   - {fileID: 2258391813358905482}
   - {fileID: 825448749115441003}
+  - {fileID: 3070629536816959270}
+  - {fileID: 8895179119127956590}
+  - {fileID: 6419318073471297395}
+  - {fileID: 392734652595288100}
   - {fileID: 7792706461787782859}
   - {fileID: 3749870086284794031}
   m_Father: {fileID: 0}
@@ -7085,8 +7085,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SoundSequences: []
   scheduledInputs: []
-  WW: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2}
-  RodinDB: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
   Text1: {fileID: 7215372884885324591}
   Text2: {fileID: 2481203004402812238}
   Text3: {fileID: 8350271461529654393}
@@ -7100,7 +7098,10 @@ MonoBehaviour:
   DarkPlane: {fileID: 8600589182512249935}
   Player: {fileID: 8728714290611780215}
   Judge: {fileID: 7587793407961933664}
-  CPU: {fileID: 9028841130226857946}
+  JudgeFace: {fileID: 0}
+  CPU1: {fileID: 9028841130226857946}
+  CPU2: {fileID: 395900234149378562}
+  CPU3: {fileID: 6515992849541950419}
   Face: {fileID: 4494948717307592003}
 --- !u!1 &6203707291212407458
 GameObject:
@@ -7418,7 +7419,7 @@ Transform:
   - {fileID: 2213005750114308325}
   - {fileID: 1960765599488996696}
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 11
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &3815436267245979119
 SpriteRenderer:
@@ -7482,7 +7483,7 @@ Animator:
   m_GameObject: {fileID: 6271474130555045365}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 27aaffa52fe573c44bb798a06252f11d, type: 2}
+  m_Controller: {fileID: 9100000, guid: f54af529de929834681451e49dc2d922, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -9187,7 +9188,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 8
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9576,7 +9577,7 @@ Transform:
   - {fileID: 8850645232796680541}
   - {fileID: 668698683872560763}
   m_Father: {fileID: 8473313144218655437}
-  m_RootOrder: 10
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &7826307452119399042
 SpriteRenderer:

Assets/Resources/Prefabs/GameView/GameTex.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 572
+  m_Width: 1214
-  m_Height: 322
+  m_Height: 683
   m_AntiAliasing: 2
   m_MipCount: -1
   m_DepthStencilFormat: 92

Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 858
+  m_Width: 1821
-  m_Height: 483
+  m_Height: 1024
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 92

Assets/Resources/Sprites/Games/BonOdori/Animations/Judge/Judge.controller

@@ -9,12 +9,12 @@ AnimatorStateMachine:
   m_PrefabAsset: {fileID: 0}
   m_Name: Base Layer
   m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 432220258103132604}
-    m_Position: {x: 200, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2033425628070848494}
     m_Position: {x: 235, y: 65, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1683302985860112673}
+    m_Position: {x: 240, y: 10, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -24,7 +24,29 @@ 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: 432220258103132604}
+  m_DefaultState: {fileID: 2033425628070848494}
+--- !u!1101 &-2210178923183245890
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 2033425628070848494}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.16666669
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -47,7 +69,7 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1102 &432220258103132604
+--- !u!1102 &1683302985860112673
 AnimatorState:
   serializedVersion: 6
   m_ObjectHideFlags: 1
@@ -57,7 +79,8 @@ AnimatorState:
   m_Name: Bop
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -2210178923183245890}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

Assets/Resources/Sprites/Games/BonOdori/Animations/Players/CPU.controller

@@ -1,5 +1,89 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-7808469465926129755
+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: -214786828639412855}
+    m_Position: {x: 240, y: -20, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 7128133287679330588}
+    m_Position: {x: 240, y: 70, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8528355832639613082}
+    m_Position: {x: 240, y: 150, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -4219596054545477433}
+    m_Position: {x: 240, y: 220, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 20, y: 150, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 8528355832639613082}
+--- !u!1102 &-4219596054545477433
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Bow
+  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: 627b4349af4b3f04588a59fb3ac37c53, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-214786828639412855
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Bop
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 3166095928943433521}
+  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: 72bf475db8a363a4d80b3be6f049659b, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -12,7 +96,7 @@ AnimatorController:
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
-    m_StateMachine: {fileID: 8201943865497532864}
+    m_StateMachine: {fileID: -7808469465926129755}
     m_Mask: {fileID: 0}
     m_Motions: []
     m_Behaviours: []
@@ -22,22 +106,99 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1107 &8201943865497532864
+--- !u!1101 &3166095928943433521
-AnimatorStateMachine:
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7128133287679330588}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.06250006
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &4167715651659278280
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7128133287679330588}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.06250006
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &7128133287679330588
+AnimatorState:
   serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
+  m_Name: NeutralUnbopped
-  m_ChildStates: []
+  m_Speed: 1
-  m_ChildStateMachines: []
+  m_CycleOffset: 0
-  m_AnyStateTransitions: []
+  m_Transitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_Position: {x: 50, y: 50, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_IKOnFeet: 0
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_WriteDefaultValues: 1
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_Mirror: 0
-  m_DefaultState: {fileID: 0}
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 4152d39bd0b2e86488af5c5c723f63e7, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &8528355832639613082
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: NeutralBopped
+  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: 5369b9cec00ca4c40a4860e5fe5b1033, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Resources/Sprites/Games/BonOdori/Animations/Players/CPU.controller.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 27aaffa52fe573c44bb798a06252f11d
+guid: f54af529de929834681451e49dc2d922
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000

Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Idle.anim.meta

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

Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Player.controller

@@ -11,16 +11,16 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -214786828639412855}
-    m_Position: {x: 240, y: -20, z: 0}
+    m_Position: {x: 240, y: 10, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 7128133287679330588}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 240, y: 90, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 8528355832639613082}
     m_Position: {x: 240, y: 150, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -4219596054545477433}
-    m_Position: {x: 275, y: 215, z: 0}
+    m_Position: {x: 240, y: 210, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -68,7 +68,7 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 2814739180218039302}
+  - {fileID: 3946888526468823106}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -106,7 +106,7 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1101 &2814739180218039302
+--- !u!1101 &3946888526468823106
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}

Assets/Resources/Sprites/Games/BonOdori/Sem título.png.meta

@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 798f2d2291954f14bafb18b5a2b6052e
-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: 1
-    wrapV: 1
-    wrapW: 1
-  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: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Games/BonOdori/Square.png.meta

@@ -1,176 +0,0 @@
-fileFormatVersion: 2
-guid: ed932e68b5088594fa0fc9b4ced03361
-TextureImporter:
-  internalIDToNameTable:
-  - first:
-      213: 7482667652216324306
-    second: Square
-  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: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 256
-  spriteBorder: {x: 4, y: 4, z: 4, w: 4}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: 0
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 1
-  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: iPhone
-    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: Android
-    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:
-    - serializedVersion: 2
-      name: Square
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 256
-        height: 256
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 2d009a6b596c7d760800000000000000
-      internalID: 7482667652216324306
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    physicsShape:
-    - - {x: -128, y: 128}
-      - {x: -128, y: -128}
-      - {x: 128, y: -128}
-      - {x: 128, y: 128}
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable:
-      Square: 7482667652216324306
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Editor.unity

@@ -26851,7 +26851,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1589389271}
   m_Direction: 2
   m_Value: 1
-  m_Size: 1
+  m_Size: 0.24080037
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -32707,7 +32707,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 44.36734}
+  m_AnchoredPosition: {x: 0, y: 44.075172}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1154875945

Assets/Scripts/Games/BonOdori/BonOdori.cs

@@ -25,8 +25,8 @@ namespace HeavenStudio.Games.Loaders
                         resizable = true,
                         parameters = new List<Param>()
                         {
-                            new Param("toggle", true, "Bop", "Toggle if the Donpans should bop for the duration of this event."),
+                            new Param("toggle", true, "Bop", "Toggle if the Donpans and Yagura-chan should bop for the duration of this event."),
-                            new Param("auto", false, "Bop (Auto)", "Toggle if the Donpans+ should automatically bop until another Bop event is reached."),
+                            new Param("auto", false, "Bop (Auto)", "Toggle if the Donpans and Yagura-chan should automatically bop until another Bop event is reached."),
                         },
 
                     },
@@ -34,58 +34,48 @@ namespace HeavenStudio.Games.Loaders
                 new GameAction("pan", "Pan")
                 {
                     
-                    function = delegate { BonOdori.instance.Clap(eventCaller.currentEntity.beat, 1,  "pan", eventCaller.currentEntity["type"]); },
+                   function = delegate {
-                    defaultLength = 0.5f,
+  var e = eventCaller.currentEntity;
+  string variation = "variation" + (new string[] { "Pan", "Pa", "Pa_n" })[e["type"]];
+  BonOdori.instance.Clap(e.beat, e[variation], e["type"], e["mute"]);
+},
+                    defaultLength = 1f,
                     parameters = new List<Param>()
                     {
-                        new Param("type", BonOdori.variationPan.regular, "Type", "Set the variation of the voice line."),
+                        new Param("mute", false, "Mute Sound", "Mute the voice line."),
+                        new Param("type",BonOdori.typePan.Pan, "Type", "Set the type of voice line.", new(){
+                        new((x, _) => (int)x == 0, new string[] { "variationPan"}),
+                        new((x, _) => (int)x == 1, new string[] { "variationPa"}),
+                        new((x, _) => (int)x == 2, new string[] { "variationPa_n"}),
+                     }),
+                        new Param("variationPan", BonOdori.variationPan.PanC, "Pan Type", "Set the variation of the voice line."),
+                        new Param("variationPa", BonOdori.variationPa.PaG, "Pa Type", "Set the variation of the voice line."),
+                        new Param("variationPa_n", BonOdori.variationPa_n.Pa_nA , "Pa-n Type", "Set the variation of the voice line."),
                     }
                 },
-                new GameAction("pa-n", "Pa-n")
+               
-                {
-                    function = delegate { BonOdori.instance.Clap(eventCaller.currentEntity.beat, 1.5, "pa-n",  eventCaller.currentEntity["type"]); },
-                    defaultLength = 1f,
-                    parameters = new List<Param>()
-                    {
-                        new Param("type", BonOdori.variationPa_n.regular, "Type", "Set the variation of the voice line."),
-                    },
-                },
-                    new GameAction("pa", "Pa")
-                {
-                    function = delegate { BonOdori.instance.Clap(eventCaller.currentEntity.beat, 0.5,  "pa", eventCaller.currentEntity["type"]); },
-                    defaultLength = 0.5f,
-                    parameters = new List<Param>()
-                    {
-                        new Param("type", BonOdori.variationPa.regular, "Type", "Set the variation of the voice line."),
-                    },
-                },
                  new GameAction("don", "Don")
                 {
-                    function = delegate { BonOdori.instance.Sound(eventCaller.currentEntity.beat, 1,  "don",  eventCaller.currentEntity["type"]); },
+                    
-                    defaultLength = 0.5f,
+                   function = delegate {
-                    parameters = new List<Param>()
+  var e = eventCaller.currentEntity;
-                    {
+  string variation = "variation" + (new string[] { "Don", "Do", "Do_n" })[e["type"]];
-                        new Param("type", BonOdori.variationDon.regular, "Type", "Set the variation of the voice line."),
+  BonOdori.instance.Sound(e.beat, e[variation], e["type"]);
-                    },
+},
-                },
-                new GameAction("do-n", "Do-n")
-                {
-                    function = delegate { BonOdori.instance.Sound(eventCaller.currentEntity.beat, 1.5, "do-n",  eventCaller.currentEntity["type"]); },
                     defaultLength = 1f,
                     parameters = new List<Param>()
                     {
-                        new Param("type", BonOdori.variationDo_n.regular, "Type", "Set the variation of the voice line."),
+                        new Param("type",BonOdori.typeDon.Don, "Type", "Set the type of voiceline", new(){
-                    },
+                        new((x, _) => (int)x == 0, new string[] { "variationDon"}),
-                },
+                        new((x, _) => (int)x == 1, new string[] { "variationDo"}),
-                new GameAction("do", "Do")
+                        new((x, _) => (int)x == 2, new string[] { "variationDo_n"}),
-                {
+                     }),
-                    function = delegate { BonOdori.instance.Sound(eventCaller.currentEntity.beat, 0.5,  "do",  eventCaller.currentEntity["type"]); },
+                        new Param("variationDon", BonOdori.variationDon.DonA, "Don Type", "Set the variation of the voice line."),
-                    defaultLength = 0.5f,
+                        new Param("variationDo", BonOdori.variationDo.DoC, "Do Type", "Set the variation of the voice line."),
-                    parameters = new List<Param>()
+                        new Param("variationDo_n", BonOdori.variationDo_n.Do_nA, "Do-n Type", "Set the variation of the voice line."),
-                    {
+                    }
-                        new Param("type", BonOdori.variationDo.regular, "Type", "Set the variation of the voice line."),
-                    },
                 },
+                
                 new GameAction("show text", "Show Text")
                 {
                     function = delegate {BonOdori.instance.ShowText(eventCaller.currentEntity["line 1"], eventCaller.currentEntity["line 2"], eventCaller.currentEntity["line 3"], eventCaller.currentEntity["line 4"], eventCaller.currentEntity["line 5"]);},
@@ -126,7 +116,7 @@ namespace HeavenStudio.Games.Loaders
                 },
                     new GameAction("scroll text", "Scroll Text")
                 {
-                    function = delegate {BonOdori.instance.ScrollText(eventCaller.currentEntity["line 1"],eventCaller.currentEntity["line 2"],eventCaller.currentEntity["line 3"],eventCaller.currentEntity["line 4"],eventCaller.currentEntity["line 5"], eventCaller.currentEntity.length);},
+                    function = delegate {BonOdori.instance.ScrollText(eventCaller.currentEntity["line 1"],eventCaller.currentEntity["line 2"],eventCaller.currentEntity["line 3"],eventCaller.currentEntity["line 4"],eventCaller.currentEntity["line 5"], eventCaller.currentEntity.length, eventCaller.currentEntity.beat);},
                     defaultLength = 1f,
                     resizable = true,
                     parameters = new List<Param>()
@@ -141,11 +131,28 @@ namespace HeavenStudio.Games.Loaders
                 },
                     new GameAction("bow", "Bow")
                 {
-                    function = delegate {BonOdori.instance.Bow(eventCaller.currentEntity.beat);},
+                    function = delegate {BonOdori.instance.Bow(eventCaller.currentEntity.beat, eventCaller.currentEntity.length);},
                     defaultLength = 2f,
+                    resizable = true,
 
+                },
+                new GameAction("spin", "Spin")
+                {
+                    function = delegate {BonOdori.instance.Spin(eventCaller.currentEntity.beat, eventCaller.currentEntity.length);},
+                    defaultLength = 1f,
+
+                },
+                    new GameAction("toggle bg", "Toggle Darker Background")
+                {
+                    function = delegate {BonOdori.instance.DarkBG(eventCaller.currentEntity.beat, eventCaller.currentEntity["toggle"]);},
+                    defaultLength = 1f,
+                    parameters = new List<Param>()
+                    {
+                        new Param("toggle", true, "Darken Background", "Darkens the background"),
                     }
 
+                },
+ 
                     
           
 
@@ -163,7 +170,14 @@ namespace HeavenStudio.Games
     public class BonOdori : Minigame
     {
        string prefix;
+       double beatUniversal;
         string suffix;
+        bool goBop;
+        string originalText1;
+        string originalText2;
+        string originalText3;
+        string originalText4;
+        string originalText5;
         TextMeshProUGUI Text1_GUI;
         TextMeshProUGUI Text2_GUI;
         TextMeshProUGUI Text3_GUI;
@@ -176,8 +190,6 @@ namespace HeavenStudio.Games
         TextMeshProUGUI Text10_GUI;
 
 
-        [SerializeField] TMPro.TMP_FontAsset WW;
-        [SerializeField] TMPro.TMP_FontAsset RodinDB;
         [SerializeField] TMP_Text Text1;
         [SerializeField] TMP_Text Text2;
         [SerializeField] TMP_Text Text3;
@@ -192,61 +204,57 @@ namespace HeavenStudio.Games
         [SerializeField] Animator DarkPlane;
         [SerializeField] Animator Player;
         [SerializeField] Animator Judge;
-        [SerializeField] Animator CPU;
+
+        [SerializeField] Animator CPU1;
+        [SerializeField] Animator CPU2;
+        [SerializeField] Animator CPU3;
         [SerializeField] Animator Face;
 
+        public enum typePan
+        {
+            Pan = 0,
+            Pa = 1,
+            Pa_n = 2
+        }
+        public enum typeDon
+        {
+            Don = 0,
+            Do = 1,
+            Do_n = 2
+        }
 
-        public enum color
-        {
-            red = 0,
-            yellow = 1,
-            green = 2
-        }
-        public enum Tags
-        {
-            Tag1 = 1,
-            Tag2 = 2,
-            Tag3 = 3,
-            Tag4 = 4,
-            Tag5 = 5,
-            Tag6 = 6,
-            Tag7 = 7,
-            Tag8 = 8,
-            Tag9 = 9,
-            Tag10 = 10
-        }
         public enum variationPan
         {
-            regular = 0,
+            PanC = 0,
-            variation1 = 1,
+            PanE = 1,
-            variation2 = 2
+            PanA = 2
         }
         public enum variationPa_n
         {
-            regular = 0,
+            Pa_nA = 0,
-            variation1 = 1
+            Pa_nC = 1
         }
         public enum variationPa
         {   
-            regular = 0
+            PaG = 0
 
         }
         public enum variationDon
         {
-            regular = 0,
+            DonA = 0,
-            variation1 = 1,
+            DonD = 1,
-            variation2 = 2, 
+            DonC = 2, 
-            variation3 = 3
+            DonG = 3
         }
         public enum variationDo_n
         {
-            regular = 0,
+            Do_nA = 0,
-            variation1 = 1
+            Do_nG = 1
         }
         public enum variationDo
         {
-            regular = 0,
+            DoC = 0,
-            variation1 = 1
+            DoG = 1
         }
         public static BonOdori instance { get; set; }
         public void Awake()
@@ -281,97 +289,106 @@ namespace HeavenStudio.Games
 
         }
 
-        public void Clap(double beat, double type, string typeSpeak, int variation)
+        public void Clap(double beat, int variation, int typeSpeak, bool muted)
+        {  
+            if (muted)
+            {
+                ScheduleInput(beat, 0f, InputAction_BasicPress, Success, Miss, Empty);
+            } 
+            else
             {
 
             
+            
+            
                 switch (typeSpeak){
-                            case "pan":
+                            case 0:
-                            ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Empty);
+                            ScheduleInput(beat, 0f, InputAction_BasicPress, Success, Miss, Empty);
                             switch (variation){
-                                case (int) variationPan.regular:
+                                case 0:
                                 MultiSound.Play(new MultiSound.Sound[]{
-                                    new MultiSound.Sound("bonOdori/pan1", beat + 0.5, offset: 0.01f)});
+                                    new MultiSound.Sound("bonOdori/pan1", beat, offset: 0.01f)});
                             
                                 break;
-                                case (int) variationPan.variation1:
+                                case 1:
                                 MultiSound.Play(new MultiSound.Sound[]{
-                                    new MultiSound.Sound("bonOdori/pan2", beat + 0.5f, offset: 0.01f)});
+                                    new MultiSound.Sound("bonOdori/pan2", beat, offset: 0.01f)});
                                 break;
-                                case (int) variationPan.variation2:
+                                case 2:
                                 MultiSound.Play(new MultiSound.Sound[]{
-                                    new MultiSound.Sound("bonOdori/pan3", beat + 0.5f, offset: 0.01f)});
+                                    new MultiSound.Sound("bonOdori/pan3", beat, offset: 0.01f)});
                                 break;}
                                 break;
-                            case "pa-n":
+                            case 2:
-                            ScheduleInput(beat, 1f, InputAction_BasicPress, Success, Miss, Empty);
+                            ScheduleInput(beat,0f, InputAction_BasicPress, Success, Miss, Empty);
                             switch (variation){
-                                case (int) variationPa_n.regular:
+                                case 0:
                                 MultiSound.Play(new MultiSound.Sound[]{
-                                    new MultiSound.Sound("bonOdori/pa_n1", beat + 1f, offset: 0.01f)});
+                                    new MultiSound.Sound("bonOdori/pa_n1", beat, offset: 0.01f)});
                             
                                 break;
-                                case (int) variationPa_n.variation1:
+                                case 1:
                                 MultiSound.Play(new MultiSound.Sound[]{
-                                    new MultiSound.Sound("bonOdori/pa_n2", beat + 1f, offset: 0.01f)});
+                                    new MultiSound.Sound("bonOdori/pa_n2", beat, offset: 0.01f)});
                                 break;}
                                 break;
-                            case "pa":
+                            case 1:
-                            ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Empty);
+                            ScheduleInput(beat, 0f, InputAction_BasicPress, Success, Miss, Empty);
                             MultiSound.Play(new MultiSound.Sound[]{
-                                    new MultiSound.Sound("bonOdori/pa1", beat + 0.5f, offset: 0.01f)});
+                                    new MultiSound.Sound("bonOdori/pa1", beat, offset: 0.01f)});
                                 break;
+                beatUniversal = beat;
                             
  
-            }
+            
-        }
+        }}}
-        public void Sound(double beat, double type, string typeSpeak, int variation)
+            public void Sound(double beat, int variation, int typeSpeak )
         {  switch (typeSpeak){
-                            case "don":
+                            case 0:
                             switch (variation){
-                case (int)variationDon.regular:
+                case 0:
                         MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/don1", beat + 0.5, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/don1", beat, offset: 0.01f)});
                 break;
-                case (int)variationDon.variation1:
+                case 1:
                         MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/don2", beat + 0.5, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/don2", beat, offset: 0.01f)});
                 break;
-                case (int)variationDon.variation2:
+                case 2:
                         MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/don3", beat + 0.5, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/don3", beat, offset: 0.01f)});
                 break;   
-                case (int)variationDon.variation3:
+                case 3:
                         MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/don4", beat + 0.5, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/don4", beat, offset: 0.01f)});
                 break;                                  
                             }
                             
                             
                             break;
-                            case "do-n":
+                            case 2:
 
             switch (variation) {
-                case (int)variationDo_n.regular:
+                case 0:
                         MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/do_n1", beat + 1, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/do_n1", beat, offset: 0.01f)});
                 break;
-                case (int)variationDo_n.variation1:
+                case 1:
                         MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/do_n2", beat + 1, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/do_n2", beat, offset: 0.01f)});
                 break;
             }
             break;
                             
-                            case "do":
+                            case 1:
                             switch (variation){
-                                case (int) variationDo.regular:
+                                case 0:
                                 MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/do1", beat + 0.5, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/do1", beat, offset: 0.01f)});
                 break;
-                            case (int) variationDo.variation1:
+                            case 1:
                                 MultiSound.Play(new MultiSound.Sound[] {
-                        new MultiSound.Sound("bonOdori/do2", beat + 0.5, offset: 0.01f)});
+                        new MultiSound.Sound("bonOdori/do2", beat, offset: 0.01f)});
                 break;
                             }
                             
@@ -392,6 +409,12 @@ namespace HeavenStudio.Games
                         MultiSound.Play(new MultiSound.Sound[] {
                         new MultiSound.Sound("miss", 0f, offset: 0.01f),
                         });
+                         BeatAction.New(instance, new List<BeatAction.Action>()
+                {
+                    new BeatAction.Action(beatUniversal + 1d, delegate { Face.Play("Sad");}),
+                    new BeatAction.Action(beatUniversal + 3d, delegate {Face.Play("Neutral");})
+                });
+                        
         }
         
         
@@ -404,14 +427,25 @@ namespace HeavenStudio.Games
 
 
         }
-    string ChangeColor(string text)
+    string ChangeColor(string text, bool isScroll)
     {
             if (text.Contains("r|") | text.Contains("y|") | text.Contains("g|")){
+            if (!isScroll){
+
+            
             return text.Replace("r|", "<color=#ff0000>")
                    .Replace("g|", "<color=#00ff00>")
                    .Replace("y|", "<color=#ffff00>")
                    + "</color>";
             }
+            else
+            {
+                            return text.Replace("r|", "<color=#ff00ff>")
+                   .Replace("g|", "<color=#00ffff>")
+                   .Replace("y|", "<color=#ffffff>")
+                   + "</color>";
+
+            }}
             return text;
 
     }
@@ -419,97 +453,97 @@ namespace HeavenStudio.Games
         public void ShowText(string text1, string text2, string text3, string text4, string text5)
         {
             
-                       
-                        
-
-
-        
-
-
-            
-            
-
-    
-
-                
             if (text1 is not "" && text1 is not "Type r| for red text, g| for green text and y| for yellow text. These can be used multiple times in a single line."){
                 Text6.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10f, -10f, -10f, 10));
-                text1 = ChangeColor(text1);
+                originalText1 = text1;
+                text1 = ChangeColor(text1, false);
 
                 Text1.text = text1;
                 
  ;              
-                Text6.text = text1;
+                Text6.text = ChangeColor(originalText1, true);
   
                 }
             if (text2 is not ""){
                 Text7.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10f, -10f, -10f, 10));
-                text2 = ChangeColor(text2);
+                originalText2 = text2;
+                text2 = ChangeColor(text2, false);
                 Text2.text = text2;
-                Text7.text = text2;
+                Text7.text = ChangeColor(originalText2, true);
    
                 }
             if (text3 is not ""){
-                  
+                originalText3 = text3;
                 Text8.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10f, -10f, -10f, 10));
                 
-                text3 = ChangeColor(text3);
+                text3 = ChangeColor(text3, false);
                 
                 Text3.text = text3;
-                Text8.text = text3; 
+                Text8.text = ChangeColor(originalText3, true);
  
                 }
             if (text4 is not ""){
                 Text9.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10f, -10f, -10f, 10));
-                text4 = ChangeColor(text4);
+                originalText4 = text4;
+                text4 = ChangeColor(text4, false);
                 Text4.text = text4;
 
                 Text9.text = text4; 
+                Text9.text = ChangeColor(originalText4, true);
 
                 }
             if (text5 is not ""){
                 Text10.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10f, -10f, -10f, 10));
-                text5 = ChangeColor(text5);
+                originalText5 = text5;
+                text5 = ChangeColor(text5, false);
                 Text5.text = text5;
-                Text10.text = text5;
+                Text10.text = ChangeColor(originalText5, true);
 
                 }
             
-            if (Text1.text != "" | Text2.text != "" | Text3.text != "" | Text4.text != "" | Text5.text != ""){
-                DarkPlane.Play("Appear");
-            }
 
         }
         public void DeleteText(bool text1, bool text2, bool text3, bool text4, bool text5){
             if (text1 == true){
+                Text6.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10, -10, -10, 10));
                 Text1.text = "";
+                Text6.text = "";
             }
             if (text2 == true){
+                Text7.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10, -10, -10, 10));
                 Text2.text = "";
+                Text7.text = "";
             }
             if (text3 == true){
+                Text8.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10, -10, -10, 10));
                 Text3.text = "";
+                Text8.text = "";
             }
             if (text4 == true){
+                Text9.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10, -10, -10, 10));
                 Text4.text = "";
+                Text9.text = "";
             }
             if (text5 == true){
+                Text10.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10, -10, -10, 10));
                 Text5.text = "";
-            }
+                Text10.text = "";
-            if (Text1.text == "" && Text2.text == "" && Text3.text == "" && Text4.text == "" && Text5.text == ""){
-                DarkPlane.Play("GoAway");
             }
 
+
         }
- IEnumerator SmoothText(TMP_Text text, float length)
+ IEnumerator SmoothText(TMP_Text text, float length, double beat)
     {
+        Conductor conductor = new Conductor();
         float startTime = Time.time;
         float endTime = startTime + length;
+        float duration = ((length / conductor.GetBpmAtBeat(beat)) * 60);
 
         while (Time.time < endTime)
         {
-            float t = ((Time.time - startTime) *3);
+            float t = ((Time.time - startTime) / duration);
-            float maskValue = Mathf.Lerp(-10f, -7.73f, t / length);
+        
+            float maskValue = Mathf.Lerp(-10f, -7f, t);
 
             text.GetComponent<TextMeshPro>().SetMask(0, new Vector4(-10, -10, maskValue, 10));
 
@@ -519,37 +553,87 @@ namespace HeavenStudio.Games
 
 
     }
-    public void ScrollText(bool text1, bool text2, bool text3, bool text4, bool text5, float length)
+    public void ScrollText(bool text1, bool text2, bool text3, bool text4, bool text5, float length, double beat)
     {
         if (text1){
-            StartCoroutine(SmoothText(Text6, length));}
+            StartCoroutine(SmoothText(Text6, length, beat));}
         if (text2){
-            StartCoroutine(SmoothText(Text7, length));}
+            StartCoroutine(SmoothText(Text7, length, beat));}
         if (text3){
-            StartCoroutine(SmoothText(Text8, length));}
+            StartCoroutine(SmoothText(Text8, length, beat));}
         if (text4){
-            StartCoroutine(SmoothText(Text9, length));}
+            StartCoroutine(SmoothText(Text9, length, beat));}
         if (text5){
-            StartCoroutine(SmoothText(Text10, length));}
+            StartCoroutine(SmoothText(Text10, length, beat));}
             
     }
 
-    public void Bop(double beat, double length, bool bop, bool auto)
+    public void Bop(double beat, float length, bool shouldBop, bool autoBop)
         {
-
+            if (!shouldBop) { goBop = false; return; }
-        }
+            goBop = autoBop;
-    public void Bow(double beat)
+            if (shouldBop)
+            {
+                for (int i = 0; i < length; i++)
                 {
-        Player.Play("Bow");
-        CPU.Play("Bow");
                     BeatAction.New(instance, new List<BeatAction.Action>()
                     {
-                    new BeatAction.Action(beat + 2, delegate { Player.Play("NeutralBopped"); })
+                        new BeatAction.Action(beat + i, delegate
+                        {
+                            Player.Play("Bop");
+                            CPU1.Play("Bop");
+                            CPU2.Play("Bop");
+                            CPU3.Play("Bop");
+                            Judge.Play("Bop");
+
+                        })
                     });
                 }
             
 
+        }
 
+        }
+    public void Bow(double beat, float length)
+    {
+        goBop = false;
+        Player.Play("Bow");
+        CPU1.Play("Bow");
+        CPU2.Play("Bow");
+        CPU3.Play("Bow");
+                        BeatAction.New(instance, new List<BeatAction.Action>()
+                {
+                    new BeatAction.Action(beat + length, delegate { Player.Play("NeutralBopped"); CPU1.Play("NeutralBopped");CPU2.Play("NeutralBopped"); CPU3.Play("NeutralBopped");})
+                });
+    }
+    public void Spin(double beat, float length)
+    {
+
+    }
+            
+        public override void OnBeatPulse(double beat)
+        {
+            if (goBop)
+            {
+                Player.Play("Bop");
+                CPU1.Play("Bop");
+                CPU2.Play("Bop");
+                CPU3.Play("Bop");
+                Judge.Play("Bop");
+
+            }
+        }
+public void DarkBG(double beat, bool toggle)
+{
+    if (toggle)
+    {
+        DarkPlane.Play("Appear");
+    }
+    else
+    {
+        DarkPlane.Play("GoAway");
+    }
+}
         
 
 

Assets/Shaders/BonOdoriText.shader

@@ -1,67 +0,0 @@
-Shader "Unlit/BonOdoriText"
-{
-    Properties
-    {
-        _MainTex ("Texture", 2D) = "white" {}
-    }
-    SubShader
-    {
-        Tags { "RenderType"="Opaque" }
-        LOD 100
-
-        Pass
-        {
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-            // make fog work
-            #pragma multi_compile_fog
-
-            #include "UnityCG.cginc"
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-            };
-
-            struct v2f
-            {
-                float2 uv : TEXCOORD0;
-                UNITY_FOG_COORDS(1)
-                float4 vertex : SV_POSITION;
-            };
-
-            sampler2D _MainTex;
-            float4 _MainTex_ST;
-
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                UNITY_TRANSFER_FOG(o,o.vertex);
-                return o;
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                // Calculate the horizontal gradient
-                float gradient = i.uv.x;
-
-                // Interpolate color from black to blue
-                fixed4 col = lerp(fixed4(0.0, 0.0, 0.0, 1.0), fixed4(0.0, 0.0, 1.0, 1.0), gradient);
-
-                // Sample the texture and multiply with the color gradient
-                fixed4 texCol = tex2D(_MainTex, i.uv);
-                col *= texCol;
-
-                // Apply fog
-                UNITY_APPLY_FOG(i.fogCoord, col);
-
-                return col;
-            }
-            ENDCG
-        }
-    }
-}

Assets/Shaders/BonOdoriText.shader.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 39227626640fc2b4f9ca4d31c4988df3
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  preprocessorOverride: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: