From 047abd2c811882bb464a51684a908fc9c5f3a282 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 18 Feb 2024 22:00:32 -0500 Subject: [PATCH] tunnel bg changer --- Assets/Resources/Games/tunnel.prefab | 74 +-- .../Backgrounds/Animation/BG.controller | 422 ------------------ .../Backgrounds/Animation/BeachBG.controller | 132 ++++++ ...ontroller.meta => BeachBG.controller.meta} | 0 .../Animation/CityBG.overrideController | 15 + .../Animation/CityBG.overrideController.meta | 8 + .../Animation/CropBG.overrideController | 15 + .../Animation/CropBG.overrideController.meta | 8 + .../Animation/DesertBG.overrideController | 13 + .../DesertBG.overrideController.meta | 8 + .../Animation/FieldBG.overrideController | 15 + .../Animation/FieldBG.overrideController.meta | 8 + .../Animation/MoaiBG.overrideController | 13 + .../Animation/MoaiBG.overrideController.meta | 8 + .../Animation/NightBG.overrideController | 15 + .../Animation/NightBG.overrideController.meta | 8 + Assets/Scripts/Games/Tunnel/Tunnel.cs | 68 ++- ...Generator.Editor.ProjectSettingsData.asset | 263 ----------- 18 files changed, 336 insertions(+), 757 deletions(-) delete mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachBG.controller rename Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/{BG.controller.meta => BeachBG.controller.meta} (100%) create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController.meta create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController.meta create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController.meta create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController.meta create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController.meta create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController.meta diff --git a/Assets/Resources/Games/tunnel.prefab b/Assets/Resources/Games/tunnel.prefab index 7764690d2..9f006e35d 100644 --- a/Assets/Resources/Games/tunnel.prefab +++ b/Assets/Resources/Games/tunnel.prefab @@ -114,7 +114,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8034898466080482128} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &695466435713197560 SpriteRenderer: @@ -2626,7 +2626,7 @@ Transform: - {fileID: 2722915103499353439} - {fileID: 8715895528402896500} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &6259080944944028087 SortingGroup: @@ -2649,7 +2649,7 @@ Animator: m_GameObject: {fileID: 1108723831839973617} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Controller: {fileID: 22100000, guid: 7ad5e9fe60b9360428e64ede59ef56c9, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -3600,7 +3600,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4895754031794878509 Transform: m_ObjectHideFlags: 0 @@ -4326,7 +4326,6 @@ Transform: - {fileID: 4765218968776603078} - {fileID: 4219682866485472785} - {fileID: 4895754031794878509} - - {fileID: 1875766407715100784} - {fileID: 5133642571578142394} - {fileID: 3538292895231490712} - {fileID: 6135126729405423715} @@ -4352,8 +4351,14 @@ MonoBehaviour: m_EditorClassIdentifier: SoundSequences: [] scheduledInputs: [] - bg: {fileID: 0} - bgScrollTime: 30 + bg: + - {fileID: 6725178218746906490} + - {fileID: 2853492968281423778} + - {fileID: 4186210772051280794} + - {fileID: 6495275936167742583} + - {fileID: 1960706264427049111} + - {fileID: 1108723831839973617} + - {fileID: 6224550809558334735} tunnelLightMaterial: {fileID: 2100000, guid: 4cba047f96191b44b8704748da03c5f2, type: 2} tunnelTint: {r: 1, g: 0.89411765, b: 0.7921569, a: 1} tunnelScreen: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 1} @@ -5072,7 +5077,7 @@ Transform: - {fileID: 9202448714056361934} - {fileID: 933976900174353682} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &2832269096582757322 SortingGroup: @@ -5095,7 +5100,7 @@ Animator: m_GameObject: {fileID: 1960706264427049111} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Controller: {fileID: 22100000, guid: 4da4205e71d98294ea90b3f6ae8ddccb, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -7346,7 +7351,7 @@ Transform: - {fileID: 3975640405436440702} - {fileID: 364157810981342936} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &2621114075240639068 SortingGroup: @@ -7369,7 +7374,7 @@ Animator: m_GameObject: {fileID: 2853492968281423778} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Controller: {fileID: 22100000, guid: 67d5e91a025868c4d87e8b491f001693, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -10341,7 +10346,7 @@ Transform: - {fileID: 8065087840011806041} - {fileID: 8580699075090822222} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &4624434840611019376 SortingGroup: @@ -10364,7 +10369,7 @@ Animator: m_GameObject: {fileID: 4186210772051280794} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Controller: {fileID: 22100000, guid: b28dfcb8b13af8d4b9bb981cd74c5b26, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -13901,7 +13906,7 @@ Transform: - {fileID: 4863155842494512772} - {fileID: 6971402431272627843} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &7146186834357252671 SortingGroup: @@ -13924,7 +13929,7 @@ Animator: m_GameObject: {fileID: 6224550809558334735} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Controller: {fileID: 22100000, guid: badbcf636758e684c882ed969813a77b, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -14221,7 +14226,7 @@ Transform: - {fileID: 2085728903073869610} - {fileID: 9988230017326144} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &8574146252579933770 SortingGroup: @@ -14244,7 +14249,7 @@ Animator: m_GameObject: {fileID: 6495275936167742583} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Controller: {fileID: 22100000, guid: 39019d9405d4f354ea004ae459c4f146, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -14692,7 +14697,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3538292895231490712 Transform: m_ObjectHideFlags: 0 @@ -14712,7 +14717,7 @@ Transform: - {fileID: 5536934976388888783} - {fileID: 1116925177385483315} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &1154286664300815188 SortingGroup: @@ -18153,37 +18158,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8525275631245940862 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1875766407715100784} - m_Layer: 0 - m_Name: temp_letterbox - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1875766407715100784 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8525275631245940862} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.6171894, y: -1.5044733, z: 1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8034898466080482128} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8543036921154343870 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller deleted file mode 100644 index b3e971d3a..000000000 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller +++ /dev/null @@ -1,422 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-6780010693242169189 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NightFar - 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: a2122116dc2ccd94fb6c7d49b8829c30, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-5903316962742713396 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: City - 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: fbbb91fc49abf58499073f941653104d, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-5120088483425356502 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Beach - 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: 531f769877a28714591385d06d0c6234, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-3575233688390517248 -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: -5120088483425356502} - m_Position: {x: 320, y: 110, z: 0} - - serializedVersion: 1 - m_State: {fileID: -1724872381104339887} - m_Position: {x: 325, y: 175, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3963540827786562218} - m_Position: {x: 330, y: 240, z: 0} - - serializedVersion: 1 - m_State: {fileID: -5903316962742713396} - m_Position: {x: 330, y: 300, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1547086117299953147} - m_Position: {x: 330, y: 370, z: 0} - - serializedVersion: 1 - m_State: {fileID: 29850891515401804} - m_Position: {x: 330, y: 430, z: 0} - - serializedVersion: 1 - m_State: {fileID: 992168630348120083} - m_Position: {x: 330, y: 490, 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: 200, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -5120088483425356502} ---- !u!1107 &-3323763866307688487 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ScrollFar - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 2807062561093871685} - m_Position: {x: 330, y: 110, z: 0} - - serializedVersion: 1 - m_State: {fileID: 5409363969638915670} - m_Position: {x: 330, y: 190, z: 0} - - serializedVersion: 1 - m_State: {fileID: 8350482799016235801} - m_Position: {x: 330, y: 280, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6780010693242169189} - m_Position: {x: 330, y: 350, z: 0} - - serializedVersion: 1 - m_State: {fileID: 852594026425906572} - m_Position: {x: 330, y: 410, 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: 2807062561093871685} ---- !u!1102 &-1724872381104339887 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Desert - 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: 45e5b140d18819d41a4749b992d75987, 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: BG - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3575233688390517248} - 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} - - serializedVersion: 5 - m_Name: ScrollFar - m_StateMachine: {fileID: -3323763866307688487} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &29850891515401804 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Moai - 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: d8ea0af80b920034dbc2c50e6ba7297f, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &852594026425906572 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CropStompFar - 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: f0e53e7e19c424c4d96314d3c81be070, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &992168630348120083 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CropStomp - 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: 0507912520469324a9a3920f19db7380, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1547086117299953147 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Night - 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: 44a848643c5c4ab4a947fae26f97b18e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &2807062561093871685 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BeachFar - 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: 92de5972c3d6d0e4ba49d6c105e04b49, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &3963540827786562218 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Field - 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: cc1ed6ad2464e3a4491b86eae1748276, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &5409363969638915670 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FieldFar - 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: 40b0dcb4bd89e634eae9b5acc4b9dbdb, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &8350482799016235801 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CityFar - 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: 546a4e2514763b549b004d5549430f13, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachBG.controller b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachBG.controller new file mode 100644 index 000000000..6f04f5458 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachBG.controller @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5120088483425356502 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Near + 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: 531f769877a28714591385d06d0c6234, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3575233688390517248 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ScrollNear + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5120088483425356502} + m_Position: {x: 320, y: 110, 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: 200, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5120088483425356502} +--- !u!1107 &-3323763866307688487 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ScrollFar + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2807062561093871685} + m_Position: {x: 330, y: 110, 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: 2807062561093871685} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BeachBG + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: ScrollNear + m_StateMachine: {fileID: -3575233688390517248} + 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} + - serializedVersion: 5 + m_Name: ScrollFar + m_StateMachine: {fileID: -3323763866307688487} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2807062561093871685 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Far + 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: 92de5972c3d6d0e4ba49d6c105e04b49, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachBG.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller.meta rename to Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachBG.controller.meta diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController new file mode 100644 index 000000000..4b3f1b78d --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CityBG + m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 531f769877a28714591385d06d0c6234, type: 2} + m_OverrideClip: {fileID: 7400000, guid: fbbb91fc49abf58499073f941653104d, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 92de5972c3d6d0e4ba49d6c105e04b49, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 546a4e2514763b549b004d5549430f13, type: 2} diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController.meta new file mode 100644 index 000000000..79603c3f7 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CityBG.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39019d9405d4f354ea004ae459c4f146 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController new file mode 100644 index 000000000..ec36089bb --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CropBG + m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 531f769877a28714591385d06d0c6234, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 0507912520469324a9a3920f19db7380, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 92de5972c3d6d0e4ba49d6c105e04b49, type: 2} + m_OverrideClip: {fileID: 7400000, guid: f0e53e7e19c424c4d96314d3c81be070, type: 2} diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController.meta new file mode 100644 index 000000000..18a7088dd --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/CropBG.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: badbcf636758e684c882ed969813a77b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController new file mode 100644 index 000000000..d4e1697d0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController @@ -0,0 +1,13 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DesertBG + m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 531f769877a28714591385d06d0c6234, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 45e5b140d18819d41a4749b992d75987, type: 2} diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController.meta new file mode 100644 index 000000000..043f46238 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/DesertBG.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67d5e91a025868c4d87e8b491f001693 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController new file mode 100644 index 000000000..7a62e7ac7 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FieldBG + m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 531f769877a28714591385d06d0c6234, type: 2} + m_OverrideClip: {fileID: 7400000, guid: cc1ed6ad2464e3a4491b86eae1748276, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 92de5972c3d6d0e4ba49d6c105e04b49, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 40b0dcb4bd89e634eae9b5acc4b9dbdb, type: 2} diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController.meta new file mode 100644 index 000000000..39798c21d --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/FieldBG.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b28dfcb8b13af8d4b9bb981cd74c5b26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController new file mode 100644 index 000000000..5738fc125 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController @@ -0,0 +1,13 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MoaiBG + m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 531f769877a28714591385d06d0c6234, type: 2} + m_OverrideClip: {fileID: 7400000, guid: d8ea0af80b920034dbc2c50e6ba7297f, type: 2} diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController.meta new file mode 100644 index 000000000..434f80f92 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/MoaiBG.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ad5e9fe60b9360428e64ede59ef56c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController new file mode 100644 index 000000000..fde28f698 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NightBG + m_Controller: {fileID: 9100000, guid: d876d4d4b27405043bdc50e7efd9d818, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 531f769877a28714591385d06d0c6234, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 44a848643c5c4ab4a947fae26f97b18e, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 92de5972c3d6d0e4ba49d6c105e04b49, type: 2} + m_OverrideClip: {fileID: 7400000, guid: a2122116dc2ccd94fb6c7d49b8829c30, type: 2} diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController.meta new file mode 100644 index 000000000..551cd52b9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/NightBG.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4da4205e71d98294ea90b3f6ae8ddccb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/Tunnel/Tunnel.cs b/Assets/Scripts/Games/Tunnel/Tunnel.cs index f5e68e629..5ea1f12e6 100644 --- a/Assets/Scripts/Games/Tunnel/Tunnel.cs +++ b/Assets/Scripts/Games/Tunnel/Tunnel.cs @@ -40,6 +40,16 @@ namespace HeavenStudio.Games.Loaders preFunction = delegate { Tunnel.CountIn(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, defaultLength = 4f, resizable = true, + }, + new GameAction("bg", "Change Background") + { + function = delegate { Tunnel.instance?.SetBg(eventCaller.currentEntity["type"]); }, + defaultLength = 1f, + resizable = false, + parameters = new List() + { + new Param("type", Tunnel.BgOption.Beach, "Background", "Set the background to change to."), + } } }, new List() { "ntr", "keep" }, @@ -58,8 +68,7 @@ namespace HeavenStudio.Games public static Tunnel instance { get; set; } [Header("Backgrounds")] - [SerializeField] Transform bg; - [SerializeField] float bgScrollTime; + [SerializeField] GameObject[] bg; [SerializeField] Material tunnelLightMaterial; [SerializeField] Color tunnelTint; @@ -82,9 +91,17 @@ namespace HeavenStudio.Games [Header("Curves")] [SerializeField] BezierCurve3D handCurve; - GameEvent cowbell = new GameEvent(); + public enum BgOption + { + Beach, + Desert, + Field, + City, + Night, + Moai, + Crop + } - float bgStartX; float fadeDuration = 2f; double tunnelStartTime = double.MinValue; double tunnelEndTime = double.MinValue; @@ -114,9 +131,9 @@ namespace HeavenStudio.Games { evt.Disable(); } - if (Conductor.instance != null && !(Conductor.instance.isPlaying || Conductor.instance.isPaused)) + if (conductor != null && !(conductor.isPlaying || conductor.isPaused)) { - Conductor.instance.FadeMinigameVolume(Conductor.instance.songPositionInBeatsAsDouble, 0, 1); + conductor.FadeMinigameVolume(conductor.songPositionInBeatsAsDouble, 0, 1); tunnelLightMaterial.SetColor("_Color", Color.white); tunnelLightMaterial.SetColor("_AddColor", Color.black); @@ -139,12 +156,11 @@ namespace HeavenStudio.Games private void Update() { - var cond = Conductor.instance; //update hand position - handProgress = Math.Min(Conductor.instance.songPositionInBeats - handStart, 1); + handProgress = Math.Min(base.conductor.songPositionInBeats - handStart, 1); frontHand.transform.position = handCurve.GetPoint(EasingFunction.EaseOutQuad(0, 1, handProgress)); - if (!cond.isPlaying || cond.isPaused) + if (!conductor.isPlaying || conductor.isPaused) { return; } @@ -163,7 +179,7 @@ namespace HeavenStudio.Games queuedInputs.Clear(); } - if (lastCowbell + 1 <= cond.songPositionInBeatsAsDouble) + if (lastCowbell + 1 <= conductor.songPositionInBeatsAsDouble) { lastCowbell++; ScheduleInput(lastCowbell, 1, InputAction_BasicPress, CowbellSuccess, CowbellMiss, CowbellEmpty); @@ -172,11 +188,11 @@ namespace HeavenStudio.Games // bg.localPosition = new Vector3(bgStartX - (2 * bgStartX * (((float)Time.realtimeSinceStartupAsDouble % bgScrollTime) / bgScrollTime)), 0, 0); if (tunnelWall.activeSelf) { - tunnelWall.transform.localPosition = tunnelStartPos - new Vector3(tunnelChunksPerSec * tunnelWallChunkSize * (float)(cond.songPositionAsDouble - tunnelStartTime), 0, 0); + tunnelWall.transform.localPosition = tunnelStartPos - new Vector3(tunnelChunksPerSec * tunnelWallChunkSize * (float)(conductor.songPositionAsDouble - tunnelStartTime), 0, 0); } - if (inTunnel && cond.songPositionAsDouble >= tunnelEndTime + PostTunnelScrnTime) + if (inTunnel && conductor.songPositionAsDouble >= tunnelEndTime + PostTunnelScrnTime) { - cond.FadeMinigameVolume(cond.GetBeatFromSongPos(tunnelEndTime + PostTunnelScrnTime), fadeDuration, 1); + conductor.FadeMinigameVolume(conductor.GetBeatFromSongPos(tunnelEndTime + PostTunnelScrnTime), fadeDuration, 1); tunnelLightMaterial.SetColor("_Color", Color.white); tunnelLightMaterial.SetColor("_AddColor", Color.black); inTunnel = false; @@ -187,7 +203,7 @@ namespace HeavenStudio.Games { SoundByte.PlayOneShot("count-ins/cowbell"); - handStart = Conductor.instance.songPositionInBeats; + handStart = conductor.songPositionInBeats; cowbellAnimator.Play("Shake", -1, 0); } @@ -257,14 +273,13 @@ namespace HeavenStudio.Games public void StartTunnel(double beat, double length, float volume = 0.1f, float fadeDuration = 2f) { - Conductor cond = Conductor.instance; - if (cond.songPositionAsDouble < tunnelEndTime + PostTunnelScrnTime) + if (conductor.songPositionAsDouble < tunnelEndTime + PostTunnelScrnTime) { return; } double targetBeat = beat + length; - tunnelStartTime = cond.GetSongPosFromBeat(beat); - tunnelEndTime = cond.GetSongPosFromBeat(targetBeat); + tunnelStartTime = conductor.GetSongPosFromBeat(beat); + tunnelEndTime = conductor.GetSongPosFromBeat(targetBeat); // tunnel chunks can be divided into quarters double durationSec = Math.Ceiling((tunnelEndTime - tunnelStartTime) * 4 * tunnelChunksPerSec) * 0.25 / tunnelChunksPerSec; @@ -272,7 +287,7 @@ namespace HeavenStudio.Games tunnelWall.transform.localPosition = tunnelStartPos; tunnelWall.SetActive(true); this.fadeDuration = fadeDuration; - cond.FadeMinigameVolume(beat, fadeDuration, volume); + conductor.FadeMinigameVolume(beat, fadeDuration, volume); tunnelSoundRight?.Stop(); tunnelSoundMiddle?.Stop(); @@ -282,19 +297,28 @@ namespace HeavenStudio.Games tunnelSoundMiddle = SoundByte.PlayOneShotGame("tunnel/tunnelMiddle", beat + (6 / 48f), looping: true); tunnelSoundLeft = SoundByte.PlayOneShotGame("tunnel/tunnelLeft", beat + (12 / 48f), looping: true); - double tunnelEnd = cond.GetBeatFromSongPos(tunnelEndTime + PostTunnelScrnTime); + double tunnelEnd = conductor.GetBeatFromSongPos(tunnelEndTime + PostTunnelScrnTime); tunnelSoundRight.SetLoopParams(tunnelEnd, 0.1); tunnelSoundMiddle.SetLoopParams(tunnelEnd + (6 / 48f), 0.1); tunnelSoundLeft.SetLoopParams(tunnelEnd + (12 / 48f), 0.25); - BeatAction.New(instance, new List() + BeatAction.New(this, new List() { - new BeatAction.Action(cond.GetBeatFromSongPos(tunnelStartTime + 0.25), delegate { + new BeatAction.Action(conductor.GetBeatFromSongPos(tunnelStartTime + 0.25), delegate { tunnelLightMaterial.SetColor("_Color", tunnelTint); tunnelLightMaterial.SetColor("_AddColor", tunnelScreen); }), }); inTunnel = true; } + + public void SetBg(int type) + { + foreach (var b in bg) + { + b.SetActive(false); + } + bg[type].SetActive(true); + } } } diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 3ff4c2bf0..ead3389e6 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -17,269 +17,6 @@ MonoBehaviour: DenseViewWidthThreshold: 512 _disableAutoReloadInBackground: 0 ImportedScriptPaths: - - Assets/Scripts/GlobalGameManager.cs - - Assets/Scripts/Util/StringUtils.cs - - Assets/Scripts/Games/KarateMan/KarateMan.cs - - Assets/Scripts/Games/KarateMan/KarateManJoe.cs - - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs - - Assets/Scripts/Util/BeatAction.cs - - Assets/Scripts/Games/TossBoys/TossBoys.cs - - Assets/Scripts/Games/DoubleDate/DoubleDate.cs - - Assets/Scripts/Games/AirRally/AirRally.cs - - Assets/Scripts/LevelEditor/Editor.cs - - Assets/Scripts/Common/MemRenderer.cs - - Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs - - Assets/Scripts/PersistentDataManager.cs - - Assets/Scripts/UI/Overlays/OverlaysManager.cs - - Assets/Scripts/TitleManager.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs - - Assets/Scripts/Games/DJSchool/Student.cs - - Assets/Scripts/UI/PauseMenu.cs - - Assets/Scripts/Util/Sound.cs - - Assets/Scripts/Conductor.cs - - Assets/Scripts/EventCaller.cs - - Assets/Scripts/Games/TrickClass/TrickClass.cs - - Assets/Scripts/GameInitializer.cs - - Assets/Scripts/LevelEditor/Timeline/Timeline.cs - - Assets/Scripts/Games/PlayerActionEvent.cs - - Assets/Scripts/Games/KarateMan/KarateManPot.cs - - Assets/Scripts/Games/DJSchool/DJSchool.cs - - Assets/Scripts/LevelEditor/Commands/TestCommand.cs - - Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs - - Assets/Scripts/Games/GleeClub/GleeClub.cs - - Assets/Scripts/Games/DoubleDate/Basketball.cs - - Assets/Scripts/Games/TotemClimb/TCBackgroundManager.cs - - Assets/Scripts/Games/Spaceball/SpaceballBall.cs - - Assets/Scripts/Games/QuizShow/QuizShow.cs - - Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs - - Assets/Scripts/Games/TotemClimb/TCEndTotem.cs - - Assets/Editor/BuildScript.cs - - Assets/Scripts/LevelEditor/Selections.cs - - Assets/Scripts/Games/NightWalkRvl/RvlNightWalk.cs - - Assets/Plugins/Starpelly/Math.cs - - Assets/Scripts/Games/GleeClub/ChorusKid.cs - - Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs - - Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs - - Assets/Scripts/Games/CheerReaders/RvlCharacter.cs - - Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs - - Assets/Scripts/Games/CatchyTune/CatchyTune.cs - - Assets/GUIWindows/Scripts/GUIWindow.cs - - Assets/Scripts/Games/AirRally/CloudsManager.cs - - Assets/Scripts/Games/DogNinja/ThrowObject.cs - - Assets/Scripts/Games/RhythmTweezers/Hair.cs - - Assets/Scripts/Games/Rockers/RockersInput.cs - - Assets/Scripts/UI/Overlays/GoForAPerfect.cs - - Assets/Scripts/Games/SpaceSoccer/Ball.cs - - Assets/Scripts/Games/TossBoys/TossKid.cs - - Assets/Scripts/Games/CropStomp/Farmer.cs - - Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs - - Assets/Scripts/UI/LeftClickTMP_Dropdown.cs - - Assets/Scripts/Games/RhythmTweezers/NoPeekingSign.cs - - Assets/Scripts/Games/Fireworks/FireworksBomb.cs - - Assets/Scripts/Transform/ScaleByVelocity.cs - - Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs - - Assets/Scripts/Games/Global/Textbox.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/ImageChartResourcePrefab.cs - - Assets/Scripts/Games/CropStomp/Veggie.cs - - Assets/Scripts/OpeningManager.cs - - Assets/Scripts/Games/BlueBear/BlueBear.cs - - Assets/Scripts/Games/DoubleDate/Football.cs - - Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs - - Assets/Scripts/StretchCameraVFX.cs - - Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs - - Assets/Scripts/Games/TapTrial/TapTrial.cs - - Assets/Scripts/Games/AirRally/RvlIsland.cs - - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs - - Assets/Scripts/Games/DoubleDate/DoubleDateWeasels.cs - - Assets/Scripts/Games/Rockers/RockersRocker.cs - - Assets/Scripts/Games/TapTroupe/TapTroupe.cs - - Assets/Scripts/Games/TotemClimb/TCTotem.cs - - Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs - - Assets/Scripts/UI/Overlays/SectionMedalsManager.cs - - Assets/Scripts/Games/AirRally/IslandsManager.cs - - Assets/Scripts/Games/CallAndResponseHandler.cs - - Assets/Scripts/Games/RhythmTweezers/LongHair.cs - - Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs - - Assets/Scripts/Games/ForkLifter/Pea.cs - - Assets/Scripts/LevelEditor/WaveformVisual.cs - - Assets/Scripts/Games/CatchyTune/Fruit.cs - - Assets/Scripts/Games/FanClub/NtrIdolFan.cs - - Assets/Scripts/Games/PajamaParty/PajamaParty.cs - - Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs - - Assets/Scripts/LevelEditor/Commands/Block.cs - - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs - - Assets/Scripts/Games/LaunchParty/LaunchParty.cs - - Assets/Scripts/Games/Rockers/Rockers.cs - - Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs - - Assets/Scripts/Games/ForkLifter/ForkLifterHand.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/EnumChartPropertyPrefab.cs - - Assets/Scripts/Games/Global/Filter.cs - - Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs - - Assets/Scripts/Games/PajamaParty/CtrPillowMonkey.cs - - Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs - - Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs - - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs - - Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs - - Assets/Scripts/ScreenTiling.cs - - Assets/Scripts/Games/AirRally/Shuttlecock.cs - - Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs - - Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs - - Assets/Scripts/Games/CoinToss/CoinToss.cs - - Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs - - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/EnumPropertyPrefab.cs - - Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/NumberChartPropertyPrefab.cs - - Assets/Plugins/Starpelly/Colors.cs - - Assets/Scripts/Games/AirRally/RvlBirds.cs - - Assets/Scripts/Games/GleeClub/GleeClubSingInput.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs - - Assets/Scripts/Games/Splashdown/NtrSplash.cs - - Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs - - Assets/Scripts/Games/FlipperFlop/FlipperFlopFlipper.cs - - Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs - - Assets/Scripts/Games/TramAndPauline/AgbAnimalKid.cs - - Assets/Scripts/AppInfo.cs - - Assets/Scripts/Games/SeeSaw/SeeSaw.cs - - Assets/Scripts/Util/AnimationHelpers.cs - - Assets/Scripts/Games/TossBoys/TossBoysBall.cs - - Assets/Scripts/LevelEditor/BPMText.cs - - Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs - - Assets/Scripts/Games/CheerReaders/CheerReaders.cs - - Assets/Scripts/Games/SpaceSoccer/Kicker.cs - - Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs - - Assets/Scripts/Games/DogNinja/DogNinja.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs - - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs - - Assets/Scripts/Games/TotemClimb/TCDragon.cs - - Assets/Scripts/LevelEditor/BoxSelection.cs - - Assets/Scripts/Games/ForkLifter/ForkLifter.cs - - Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs - - Assets/Scripts/LevelEditor/DisableSelectOnHover.cs - - Assets/Scripts/LevelEditor/Theme.cs - - Assets/Scripts/Games/BoardMeeting/BMExecutive.cs - - Assets/Scripts/Common/CanvasScroll.cs - - Assets/Scripts/GameCamera.cs - - Assets/Scripts/Games/TotemClimb/TCJumper.cs - - Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs - - Assets/Scripts/UI/RightClickDropdownObject.cs - - Assets/Scripts/StaticCamera.cs - - Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs - - Assets/Scripts/Util/SoundByte.cs - - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs - - Assets/Scripts/Games/Splashdown/NtrSynchrette.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/VolumeTimelineObj.cs - - Assets/Scripts/LevelEditor/DialogHelpers/Dialog.cs - - Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs - - Assets/Scripts/StudioDance/ChoreographyInfo.cs - - Assets/Scripts/Games/CropStomp/CropStomp.cs - - Assets/Scripts/Games/Global/Flash.cs - - Assets/Scripts/LevelEditor/Commands/ICommand.cs - - Assets/Scripts/StudioDance/StudioDanceManager.cs - - Assets/Scripts/Games/SeeSaw/SeeSawGuy.cs - - Assets/Scripts/Games/DrummingPractice/Drummer.cs - - Assets/Scripts/Games/RhythmRally/Paddlers.cs - - Assets/Scripts/UI/SettingsDialog/Tabs/DispAudioSettings.cs - - Assets/Scripts/Util/SavWav.cs - - Assets/Scripts/Util/EntityTypes.cs - - Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs - - Assets/Scripts/Games/Ringside/Ringside.cs - - Assets/Scripts/Games/LaunchParty/LaunchPartyRocket.cs - - Assets/Scripts/Games/Spaceball/Spaceball.cs - - Assets/Scripts/Games/TotemClimb/TCGroundManager.cs - - Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs - - Assets/Scripts/Games/BlueBear/Treat.cs - - Assets/Scripts/PostProcessingVFX.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs - - Assets/Scripts/SourceGenerators/MinigameLoaderGenerator.cs - - Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs - - Assets/Scripts/LevelEditor/EditorTheme.cs - - Assets/Scripts/Games/TrickClass/MobTrickObj.cs - - Assets/Scripts/Games/OctopusMachine/Octopus.cs - - Assets/Scripts/Games/WizardsWaltz/Plant.cs - - Assets/Scripts/UI/SettingsDialog/Tabs/CreditsLegalSettings.cs - - Assets/Scripts/Games/TapTroupe/TapTroupeZoomOut.cs - - Assets/Scripts/Games/MeatGrinder/Meat.cs - - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowser.cs - - Assets/Scripts/Games/TheDazzles/TheDazzlesGirl.cs - - Assets/Scripts/LevelEditor/Commands/SpecialMarker.cs - - Assets/Scripts/UI/SettingsDialog/SettingsDialog.cs - - Assets/Scripts/UI/Overlays/ChartSectionDisplay.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/ColorChartPropertyPrefab.cs - - Assets/GUIWindows/Scripts/GUIWindowHandle.cs - - Assets/Scripts/Games/Kitties/Kitties.cs - - Assets/Scripts/Games/QuizShow/QSTimer.cs - - Assets/Scripts/CircleCursor.cs - - Assets/Scripts/Games/TotemClimb/TCBirdManager.cs - - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SpecialTimelineObj.cs - - Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs - - Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs - - Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs - - Assets/Scripts/Games/Rockers/RockerBendInput.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/Tabs/ChartInfoProperties.cs - - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs - - Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/TempoTimelineObj.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs - - Assets/Scripts/Games/Splashdown/Splashdown.cs - - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs - - Assets/Scripts/Games/AirRally/Cloud.cs - - Assets/Scripts/InputSystem/InputController.cs - - Assets/Scripts/UI/Overlays/SkillStarManager.cs - - Assets/Scripts/LevelEditor/BeatGrid.cs - - Assets/Scripts/Games/RhythmRally/RhythmRally.cs - - Assets/Scripts/Games/SamuraiSliceNtr/NtrSamurai.cs - - Assets/Scripts/Games/TapTroupe/TapTroupeCorner.cs - - Assets/Scripts/Games/FanClub/NtrIdolAmie.cs - - Assets/GUIWindows/Scripts/GUIWindowUtils.cs - - Assets/Scripts/Games/Tambourine/Tambourine.cs - - Assets/Scripts/Util/MultiSound.cs - - Assets/Scripts/Games/Fireworks/Rocket.cs - - Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs - Assets/Scripts/Games/Tunnel/Tunnel.cs - - Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs - - Assets/Scripts/Games/TotemClimb/TotemClimb.cs - - Assets/Plugins/StandaloneFileBrowser/IStandaloneFileBrowser.cs - - Assets/Scripts/LevelEditor/Commands/CommandManager.cs - - Assets/Scripts/Games/FirstContact/Translator.cs - - Assets/Scripts/LevelEditor/TooltipGiver.cs - - Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs - - Assets/Scripts/Games/DrummingPractice/DrummerHit.cs - - Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs - - Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs - - Assets/Scripts/StudioDance/Dancer.cs - - Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs - - Assets/Scripts/Games/Lockstep/Lockstep.cs - - Assets/Scripts/Games/TotemClimb/TCTotemManager.cs - - Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs - - Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs - - Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs - - Assets/Scripts/Games/DoubleDate/SoccerBall.cs - - Assets/Scripts/Games/RhythmTweezers/Tweezers.cs - - Assets/Scripts/Games/WorkingDough/WorkingDough.cs - - Assets/Scripts/Games/TotemClimb/TCFrog.cs - - Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs - - Assets/Scripts/Games/SpaceDance/SpaceDance.cs - - Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs - - Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs - - Assets/Scripts/Games/TotemClimb/TCPillarManager.cs - - Assets/Scripts/Games/Fireworks/Fireworks.cs - - Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs - - Assets/Scripts/Games/WizardsWaltz/Wizard.cs - - Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs - - Assets/Scripts/Games/MonkeyWatch/WatchMonkeyHandler.cs - - Assets/Scripts/Games/MonkeyWatch/WatchBackgroundHandler.cs - - Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs - - Assets/Scripts/Games/MonkeyWatch/BalloonHandler.cs - - Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs - - Assets/Scripts/Games/Manzai/Manzai.cs - - Assets/Scripts/Games/NightWalkAgb/AgbStarHandler.cs - - Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs - - Assets/Scripts/Games/NightWalkAgb/AgbStar.cs - - Assets/Scripts/Games/MannequinFactory/MannequinHead.cs - - Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs - - Assets/Scripts/InputSystem/ControllerTypes/InputJoyconPair.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []