optic blast

chrono sorting takes mobile into account

Assets/Resources/Games/trickClass.prefab

@@ -460,7 +460,7 @@ SpriteRenderer:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
-  m_DrawMode: 0
+  m_DrawMode: 1
   m_Size: {x: 1.8879944, y: 5.444597}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
@@ -852,6 +852,7 @@ Transform:
   - {fileID: 24862018656983321}
   - {fileID: 3964360223496080127}
   - {fileID: 648591920108876250}
+  - {fileID: 434145137985242435}
   m_Father: {fileID: 2712533505047173825}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1141,7 +1142,7 @@ MonoBehaviour:
   dodgeBeats: 1
   gravity: 0
   hitLayer: 0
-  type: 3
+  type: 2
   justSound: player_dodge_success
   missSound: shock_impact
   spriteRenderer: {fileID: 0}
@@ -1379,7 +1380,7 @@ MonoBehaviour:
   dodgeBeats: 1
   gravity: 36
   hitLayer: -1
-  type: 4
+  type: 3
   justSound: player_dodge_success_alt
   missSound: chair_impact
   spriteRenderer: {fileID: 1306713223359501463}
@@ -2454,7 +2455,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -3.99, y: 8.39, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9050201431690794528}
   m_RootOrder: 4
@@ -2605,7 +2606,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 4.23, y: 1.19, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1961949143142789026}
   m_RootOrder: 4
@@ -2764,7 +2765,7 @@ MonoBehaviour:
   dodgeBeats: 2
   gravity: 0
   hitLayer: 0
-  type: 1
+  type: 4
   justSound: player_dodge_success
   missSound: ball_impact
   spriteRenderer: {fileID: 0}
@@ -3096,7 +3097,7 @@ MonoBehaviour:
         looping: 0
         offset: 0
         parameters: []
-      - clip: trickClass/girl_toss_phone
+      - clip: trickClass/girl_charge_2
         beat: 2
         pitch: 1
         volume: 1
@@ -3109,33 +3110,33 @@ MonoBehaviour:
   warnAnim: {fileID: 3154933179428504539}
   objPrefab:
   - {fileID: 7208854294000353610}
-  - {fileID: 6092229326248261130}
   - {fileID: 8803031136113842806}
   - {fileID: 1807062578198146157}
   - {fileID: 2309287867142528446}
+  - {fileID: 6092229326248261130}
   objPrefabVariant:
   - {fileID: 7208854294000353610}
-  - {fileID: 6092229326248261130}
   - {fileID: 8803031136113842806}
   - {fileID: 1807062578198146157}
   - {fileID: 9080813741446468681}
+  - {fileID: 6092229326248261130}
   objWarnAnim:
   - WarnBall
-  - WarnPlane
   - WarnChair
   - WarnShock
   - WarnPhone
+  - WarnPlane
   objWarnAnimVariant:
   - WarnBall
-  - WarnPlane
   - WarnChair
   - WarnShock
   - WarnNx
+  - WarnPlane
   objThrowAnim:
   - Throw
+  - ThrowAlt
+  - ThrowAlt
   - Throw
-  - ThrowAlt
-  - ThrowAlt
   - Throw
   objHolder: {fileID: 6646177278795284587}
   ballTossCurve: {fileID: 2490850543769942420}
@@ -3144,6 +3145,90 @@ MonoBehaviour:
   planeMissCurve: {fileID: 6309335202182677863}
   shockTossCurve: {fileID: 6743229856556330732}
   playerCanDodge: -3.4028235e+38
+--- !u!1 &7056553614102283846
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 434145137985242435}
+  - component: {fileID: 7251207837487378232}
+  m_Layer: 0
+  m_Name: effect3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &434145137985242435
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7056553614102283846}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 4.23, y: 1.19, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 1961949143142789026}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7251207837487378232
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7056553614102283846}
+  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: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.8879944, y: 5.444597}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &7073120453417206326
 GameObject:
   m_ObjectHideFlags: 0
@@ -4028,7 +4113,7 @@ MonoBehaviour:
   dodgeBeats: 1
   gravity: 0
   hitLayer: 0
-  type: 2
+  type: 1
   justSound: player_dodge_success
   missSound: chair_impact
   spriteRenderer: {fileID: 0}
@@ -4200,7 +4285,7 @@ MonoBehaviour:
   dodgeBeats: 1
   gravity: 36
   hitLayer: -1
-  type: 4
+  type: 3
   justSound: player_dodge_success_alt
   missSound: chair_impact
   spriteRenderer: {fileID: 1291136543557456624}

Assets/Resources/Sfx/games/trickClass/blast_dodge.wav.meta

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

Assets/Resources/Sfx/games/trickClass/blast_dodge_return.wav.meta

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

Assets/Resources/Sfx/games/trickClass/blast_miss.wav.meta

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

Assets/Resources/Sfx/games/trickClass/girl_charge_2.wav.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/BlastDodged.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/BlastNg.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/Charge0.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/Charge1.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/girl.controller

@@ -47,6 +47,18 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 9164054501690875898}
     m_Position: {x: 240, y: 270, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3614521715096152578}
+    m_Position: {x: 275, y: 335, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1683814594974535240}
+    m_Position: {x: 310, y: 400, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3688430570973861587}
+    m_Position: {x: 345, y: 465, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2107012691116880678}
+    m_Position: {x: 380, y: 530, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -57,6 +69,58 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 4673474409635209322}
+--- !u!1102 &-3614521715096152578
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Charge0
+  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: a8aa069252b991b428e8e8e37b54e8e9, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-2107012691116880678
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BlastNg
+  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: 8a97142be58c9a1478c795fb91e3efd1, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -79,6 +143,58 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &1683814594974535240
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Charge1
+  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: 8444f5421a6fac34e90dd29f0a158a6d, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &3688430570973861587
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BlastDodged
+  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: eba145acf3d6cbd4987d6949aae1bc4b, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &4440819358770172556
 AnimatorState:
   serializedVersion: 6

Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeBlast0.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeBlast1.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller

@@ -26,6 +26,84 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-3455455386993811032
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DodgeBlast1
+  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: 09b82a1f5d7c272449a7f2284e51a239, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-2416107700260665494
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ThroughBlast
+  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: ed573d6228b35774cbf61a55b63ac419, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-2383741878387557530
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DodgeBlast0
+  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: cc8bef0ccb784c242a258f16b3ba71f1, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-1826418598434636915
 AnimatorState:
   serializedVersion: 6
@@ -217,6 +295,15 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -906070713377663971}
     m_Position: {x: 605, y: 435, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2416107700260665494}
+    m_Position: {x: 640, y: 500, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2383741878387557530}
+    m_Position: {x: 675, y: 565, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3455455386993811032}
+    m_Position: {x: 710, y: 630, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Resources/Sprites/Games/TrickClass/Anime/Player/ThroughBlast.anim.meta

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

Assets/Resources/Sprites/Games/TrickClass/mobTrick_parts00.png.meta

@@ -101,12 +101,12 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 2
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 73.1
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -963,12 +963,12 @@ TextureImporter:
       name: mobTrick_parts00_19
       rect:
         serializedVersion: 2
-        x: 5930
+        x: 5931
         y: 2343
-        width: 200
+        width: 199
         height: 352
-      alignment: 0
+      alignment: 4
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0.5}
       border: {x: 0, y: 0, z: 42, w: 0}
       outline: []
       physicsShape: []

Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs

@@ -123,11 +123,10 @@ namespace HeavenStudio.Games.Loaders
                         new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "What ease will the gears speed up/slow down with?"),
                     }
                 },
-            }
+            },
-            // ,
+            new List<string>() { "pco", "normal", "repeat" },
-            // new List<string>() { "pco", "normal", "repeat" },
+            "pcomeat", "en",
-            // "pcomeat", "en",
+            new List<string>() { }
-            // new List<string>() { }
             );
         }
     }

Assets/Scripts/Games/TrickClass/TrickClass.cs

@@ -16,13 +16,22 @@ namespace HeavenStudio.Games.Loaders
         {
             return new Minigame("trickClass", "Trick on the Class", "ecede4", false, false, new List<GameAction>()
             {
-                new GameAction("toss", "Paper Ball")
+                new GameAction("toss", "Toss Object")
                 {
                     preFunction = delegate
                     {
-                        TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Ball);
+                        var e = eventCaller.currentEntity;
+                        TrickClass.PreTossObject(e.beat, (int)e["obj"], e["nx"]);
                     },
                     defaultLength = 2,
+                    parameters = new List<Param>()
+                    {
+                        new Param("obj", TrickClass.TrickObjTypeEditor.PaperBall, "Object", "Changes the object thrown at the player", new List<Param.CollapseParam>()
+                        {
+                            new Param.CollapseParam((x, _) => (int)x == (int)TrickClass.TrickObjTypeEditor.Phone, new string[] { "nx" }),
+                        }),
+                        new Param("nx", false, "Switch", "Replace the phone with a Switch"),
+                    }
                 },
                 new GameAction("plane", "Plane")
                 {
@@ -32,6 +41,24 @@ namespace HeavenStudio.Games.Loaders
                     },
                     defaultLength = 3,
                 },
+                new GameAction("blast", "Optic Blast")
+                {
+                    preFunction = delegate
+                    {
+                        TrickClass.PreBlast(eventCaller.currentEntity.beat);
+                    },
+                    defaultLength = 4,
+                },
+                new GameAction("bop", "Bop")
+                {
+                    function = delegate { var e = eventCaller.currentEntity; TrickClass.instance.Bop(e.beat, e.length, e["bop"], e["autoBop"]); },
+                    resizable = true,
+                    parameters = new List<Param>()
+                    {
+                        new Param("bop", true, "Bop", "Should the girl and boy bop?"),
+                        new Param("autoBop", false, "Bop (Auto)", "Should the girl and boy auto bop?")
+                    }
+                },
                 new GameAction("chair", "Chair")
                 {
                     preFunction = delegate
@@ -39,6 +66,7 @@ namespace HeavenStudio.Games.Loaders
                         TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Chair);
                     },
                     defaultLength = 2,
+                    hidden = true,
                 },
                 new GameAction("phone", "Phone")
                 {
@@ -47,6 +75,7 @@ namespace HeavenStudio.Games.Loaders
                         TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Phone, eventCaller.currentEntity["nx"]);
                     },
                     defaultLength = 2,
+                    hidden = true,
                     parameters = new List<Param>()
                     {
                         new Param("nx", false, "Switch", "Replace the phone with a Switch"),
@@ -59,24 +88,7 @@ namespace HeavenStudio.Games.Loaders
                         TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Shock);
                     },
                     defaultLength = 2,
-                },
+                    hidden = true,
-                new GameAction("blast", "Optic Blast")
-                {
-                    preFunction = delegate
-                    {
-                        TrickClass.PreBlast(eventCaller.currentEntity.beat);
-                    },
-                    defaultLength = 3,
-                },
-                new GameAction("bop", "Bop")
-                {
-                    function = delegate { var e = eventCaller.currentEntity; TrickClass.instance.Bop(e.beat, e.length, e["bop"], e["autoBop"]); },
-                    resizable = true,
-                    parameters = new List<Param>()
-                    {
-                        new Param("bop", true, "Bop", "Should the girl and boy bop?"),
-                        new Param("autoBop", false, "Bop (Auto)", "Should the girl and boy auto bop?")
-                    }
                 },
             },
             new List<string>() { "mob", "normal" },
@@ -96,13 +108,21 @@ namespace HeavenStudio.Games
     using Scripts_TrickClass;
     public class TrickClass : Minigame
     {
-        public enum TrickObjType
+        public enum TrickObjTypeEditor : int
+        {
+            PaperBall,
+            Chair,
+            Lightning,
+            Phone,
+        }
+        public enum TrickObjType : int
         {
             Ball,
-            Plane,
             Chair,
             Shock,
-            Phone
+            Phone,
+            Plane,
+            Blast
         }
         public struct QueuedObject
         {
@@ -110,6 +130,7 @@ namespace HeavenStudio.Games
             public int type;
             public bool variant;
         }
+
         public static List<QueuedObject> queuedInputs = new List<QueuedObject>();
 
         [Header("Objects")]
@@ -140,7 +161,7 @@ namespace HeavenStudio.Games
         double playerBopStart = double.MinValue;
         double girlBopStart = double.MinValue;
         bool showBubble = true;
-        bool playerReady;
+        bool playerReady, girlBopEnable;
 
         public static PlayerInput.InputAction InputAction_TouchPressing =
             new("PcoTrickTouching", new int[] { IAEmptyCat, IAPressingCat, IAEmptyCat },
@@ -159,6 +180,7 @@ namespace HeavenStudio.Games
         {
             instance = this;
             SetupBopRegion("trickClass", "bop", "autoBop");
+            girlBopEnable = true;
         }
 
         public override void OnBeatPulse(double beat)
@@ -168,7 +190,7 @@ namespace HeavenStudio.Games
             if ((!playerReady) && cond.songPositionInBeatsAsDouble > playerBopStart)
                 playerAnim.DoScaledAnimationAsync("Bop");
 
-            if (cond.songPositionInBeatsAsDouble > girlBopStart)
+            if (cond.songPositionInBeatsAsDouble > girlBopStart && girlBopEnable)
                 girlAnim.DoScaledAnimationAsync("Bop");
         }
 
@@ -331,8 +353,104 @@ namespace HeavenStudio.Games
         public static void PreBlast(double beat)
         {
             PlaySoundSequence("trickClass", "girlCharge", beat);
+            if (GameManager.instance.currentGame == "trickClass")
+            {
+                BeatAction.New(instance, new List<BeatAction.Action>()
+                {
+                    new BeatAction.Action(beat, delegate
+                    {
+                        instance.DoBlast(beat);
+                    })
+                });
+            }
+            else
+            {
+                queuedInputs.Add(new QueuedObject
+                {
+                    beat = beat,
+                    type = (int)TrickObjType.Blast,
+                    variant = false
+                });
+            }
         }
 
+        public void DoBlast(double beat)
+        {
+            ScheduleInput(beat, 2, InputAction_FlickPress, BlastJustOrNg, BlastMiss, Through, CanDodge);
+            BeatAction.New(instance, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate
+                {
+                    girlBopEnable = false;
+                    girlAnim.DoScaledAnimationAsync("Charge0");
+                }),
+                new BeatAction.Action(beat + 0.75, delegate
+                {
+                    girlAnim.DoScaledAnimationAsync("Charge1");
+                }),
+                new BeatAction.Action(beat + 1.5, delegate
+                {
+                    girlAnim.DoScaledAnimationAsync("Charge1");
+                }),
+                new BeatAction.Action(beat + 2, delegate
+                {
+                    //test
+                    // girlAnim.DoScaledAnimationAsync("BlastDodged", 0.5f);
+                }),
+                new BeatAction.Action(beat + 4, delegate
+                {
+                   girlBopEnable = true;
+                }),
+            });
+        }
+
+        public bool CanDodge()
+        {
+            return playerCanDodge <= Conductor.instance.songPositionInBeatsAsDouble;
+        }
+
+        public void BlastJustOrNg(PlayerActionEvent caller, float state)
+        {
+            if (state <= -1f || state >= 1f)
+            {
+                SoundByte.PlayOneShotGame("trickClass/shock_impact");
+                girlAnim.DoScaledAnimationAsync("BlastNg", 0.5f);
+                PlayerDodgeNg(true);
+                return;
+            }
+            girlAnim.DoScaledAnimationAsync("BlastDodged", 0.5f);
+            if (playerCanDodge > Conductor.instance.songPositionInBeatsAsDouble) return;
+
+            SoundByte.PlayOneShotGame("trickClass/blast_dodge");
+            playerAnim.DoScaledAnimationAsync("DodgeBlast0", 1f);
+            playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 1.25;
+            playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 1;
+            playerReady = false;
+
+            SoundByte.PlayOneShotGame("trickClass/blast_dodge_return", caller.startBeat + caller.timer + 1f);
+            BeatAction.New(instance, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(caller.startBeat + caller.timer + 1, delegate
+                {
+                    playerAnim.DoScaledAnimationAsync("DodgeBlast1", 1f);
+                }),
+            });
+        }
+
+        public void BlastMiss(PlayerActionEvent caller)
+        {
+            girlAnim.DoScaledAnimationAsync("BlastNg", 0.5f);
+
+            SoundByte.PlayOneShotGame("trickClass/blast_miss");
+
+            playerAnim.DoScaledAnimationAsync("ThroughBlast");
+            playerReady = false;
+            playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 1.5f;
+            playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 0.5f;
+        }
+
+        public void Through(PlayerActionEvent caller) { }
+
         public void PlayerDodge(bool slow = false, bool type = false)
         {
             if (playerCanDodge > Conductor.instance.songPositionInBeatsAsDouble) return;

Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs

@@ -310,6 +310,7 @@ namespace HeavenStudio.Editor
                 new List<RectTransform>(),
                 new List<RectTransform>(),
                 new List<RectTransform>(),
+                new List<RectTransform>(),
             };
             for (int i = 0; i < mgs.Count; i++)
             {
@@ -321,10 +322,11 @@ namespace HeavenStudio.Editor
                         "ntr" => 1,
                         "rvl" => 2,
                         "ctr" => 3,
-                        _     => 4,
+                        "mob" => 4,
+                        _     => 5,
                     }].Add(mgs[i]);
                 } else if (mg.inferred) {
-                    systems[4].Add(mgs[i]);
+                    systems[^1].Add(mgs[i]);
                 } else {
                     Debug.LogWarning($"Chronological sorting has failed, does \"{mg.displayName}\" ({mg.name}) have an asset bundle assigned to it?");
                 }