Sumo Prefab

some stuff went down yesterday when updating the fork that involved the sumo prefab randomly downgrading to an older version, so I'm hoping that this commit will make sure that the current prefab wont just vanish into oblivion

.vscode/settings.json

@@ -51,5 +51,5 @@
         "temp/": true,
         "Temp/": true
     },
-    "dotnet.defaultSolution": "HeavenStudio.sln"
+    "dotnet.defaultSolution": "HS.sln"
 }

Assets/Resources/Sprites/Games/SumoBrothers/Animations/SumoBrothers/sumoBrotherP.controller

@@ -122,6 +122,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -1199229422935602219}
     m_Position: {x: 280, y: 260, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 7429464260847317867}
+    m_Position: {x: 280, y: 320, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -158,6 +161,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &7429464260847317867
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SumoSlapFront
+  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: 0864bfcd28328cd49bc47b569eaa6519, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &8743538389376590067
 AnimatorStateTransition:
   m_ObjectHideFlags: 1

Assets/Scenes/Editor.unity

@@ -8906,7 +8906,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 14
+  m_fontSize: 0
   m_fontSizeBase: 14.3
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -14029,7 +14029,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 171581557}
   m_HandleRect: {fileID: 171581556}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -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: 146.61183}
+  m_AnchoredPosition: {x: 0, y: 58.857136}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1154875945
@@ -43455,8 +43455,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1220118245}
   m_HandleRect: {fileID: 1220118244}
   m_Direction: 2
-  m_Value: 1.000001
+  m_Value: 1.0000002
-  m_Size: 0.81650156
+  m_Size: 0.08938777
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs

@@ -266,6 +266,28 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrBackbeatLoader failed!");
             }
 
+            Debug.Log("Running game loader AgbMannequinFactoryLoader");
+            game = AgbMannequinFactoryLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader AgbMannequinFactoryLoader failed!");
+            }
+
+            Debug.Log("Running game loader RvlManzaiLoader");
+            game = RvlManzaiLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader RvlManzaiLoader failed!");
+            }
+
             Debug.Log("Running game loader AgbMarcherLoader");
             game = AgbMarcherLoader.AddGame(eventCaller);
             if (game != null)
@@ -288,6 +310,17 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader PcoMeatLoader failed!");
             }
 
+            Debug.Log("Running game loader RvlMonkeyWatchLoader");
+            game = RvlMonkeyWatchLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader RvlMonkeyWatchLoader failed!");
+            }
+
             Debug.Log("Running game loader AgbUpbeatLoader");
             game = AgbUpbeatLoader.AddGame(eventCaller);
             if (game != null)
@@ -310,6 +343,17 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader ntrMunchyMonkLoader failed!");
             }
 
+            Debug.Log("Running game loader AgbNightWalkLoader");
+            game = AgbNightWalkLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader AgbNightWalkLoader failed!");
+            }
+
             Debug.Log("Running game loader NtrOctopusMachineLoader");
             game = NtrOctopusMachineLoader.AddGame(eventCaller);
             if (game != null)
@@ -541,6 +585,17 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbTossBoysLoader failed!");
             }
 
+            Debug.Log("Running game loader TotemClimbLoader");
+            game = TotemClimbLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader TotemClimbLoader failed!");
+            }
+
             Debug.Log("Running game loader AgbTramLoader");
             game = AgbTramLoader.AddGame(eventCaller);
             if (game != null)

ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset

@@ -17,45 +17,63 @@ MonoBehaviour:
   DenseViewWidthThreshold: 512
   _disableAutoReloadInBackground: 0
   ImportedScriptPaths:
-  - Assets/Scripts/Minigames.cs
+  - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs
-  - Assets/Editor/CreateAssetBundles.cs
+  - Assets/Scripts/DiscordController.cs
-  - Assets/Editor/CreateMinigameScriptTemplate.cs
+  - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs
-  - Assets/Scripts/Games/Minigame.cs
-  - Assets/Scripts/Games/FanClub/FanClub.cs
-  - Assets/Scripts/GameManager.cs
-  - Assets/Editor/SpritesheetScaler.cs
-  - Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
-  - Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs
-  - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs
-  - Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs
-  - Assets/Scripts/SourceGenerators/MinigameLoaderGenerator.cs
-  - Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs
-  - Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs
-  - Assets/Scripts/Games/Lockstep/Lockstep.cs
-  - Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs
-  - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs
-  - Assets/Scripts/AppInfo.cs
-  - Assets/Scripts/GlobalGameManager.cs
-  - Assets/Scripts/Games/WorkingDough/WorkingDough.cs
-  - Assets/Scripts/InputSystem/InputController.cs
   - Assets/Scripts/Util/BeatAction.cs
-  - Assets/Scripts/Games/DogNinja/DogNinja.cs
+  - Assets/Scripts/GameInitializer.cs
+  - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowser.cs
+  - Assets/Scripts/Games/DoubleDate/DoubleDate.cs
+  - Assets/Scripts/Games/AirRally/AirRally.cs
+  - Assets/Scripts/Games/TossBoys/TossBoys.cs
+  - Assets/Scripts/UI/PauseMenu.cs
+  - Assets/Scripts/Util/Sound.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs
+  - Assets/Scripts/Games/SeeSaw/SeeSawGuy.cs
   - Assets/Scripts/TitleManager.cs
-  - Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs
+  - Assets/Scripts/Games/KarateMan/KarateManJoe.cs
-  - Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs
+  - Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs
+  - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs
+  - Assets/Scripts/Games/KarateMan/KarateManPot.cs
+  - Assets/Scripts/Games/DJSchool/Student.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs
+  - Assets/Scripts/Games/TrickClass/TrickClass.cs
   - Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
-  - Assets/Scripts/Games/Ringside/Ringside.cs
+  - Assets/Scripts/Common/MemRenderer.cs
+  - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs
+  - Assets/Scripts/LevelEditor/Timeline/Timeline.cs
   - Assets/Scripts/PersistentDataManager.cs
-  - Assets/Scripts/Games/RhythmTweezers/LongHair.cs
+  - Assets/Scripts/Minigames.cs
-  - Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs
+  - Assets/Scripts/LevelEditor/Editor.cs
-  - Assets/Scripts/InputSystem/PlayerInput.cs
+  - Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs
+  - Assets/Scripts/Games/DJSchool/DJSchool.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs
+  - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs
+  - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs
+  - Assets/Scripts/EventCaller.cs
+  - Assets/Scripts/Games/Minigame.cs
+  - Assets/Scripts/Games/TheDazzles/TheDazzles.cs
   - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
-  - Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs
+  - Assets/Scripts/InputSystem/InputType.cs
-  - Assets/Scripts/Games/Tunnel/Tunnel.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs
-  - Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs
+  - Assets/Scripts/Games/FirstContact/FirstContact.cs
+  - Assets/Scripts/Util/AnimationHelpers.cs
+  - Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs
+  - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs
+  - Assets/Scripts/UI/Overlays/OverlaysManager.cs
+  - Assets/Scripts/DiscordRPC.cs
+  - Assets/Scripts/Games/KarateMan/KarateMan.cs
+  - Assets/Scripts/LevelEditor/WaveformVisual.cs
+  - Assets/Scripts/GlobalGameManager.cs
+  - Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs
+  - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs
   - Assets/Scripts/Conductor.cs
-  - Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs
+  - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs
+  - Assets/Plugins/StandaloneFileBrowser/IStandaloneFileBrowser.cs
   - Assets/Scripts/JudgementManager.cs
-  - Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
+  - Assets/Scripts/GameManager.cs
+  - Assets/Scripts/Games/PlayerActionEvent.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []