From b08f4b27104258ae4ba32fbd101cc29c01cf46c9 Mon Sep 17 00:00:00 2001
From: blank3times <105398129+blank3times@users.noreply.github.com>
Date: Sun, 4 Feb 2024 01:44:16 -0800
Subject: [PATCH] fix caller beat in multisound

---
 Assets/Scripts/Games/HoleInOne/HoleInOne.cs   |  8 ++---
 ...Generator.Editor.ProjectSettingsData.asset | 30 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs
index f82fe33d8..91d0f06bd 100644
--- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs
+++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs
@@ -137,7 +137,7 @@ namespace HeavenStudio.Games
         {
             if (state >= 1f || state <= -1f)
             {
-                double beat = caller.timer;
+                double beat = caller.startBeat + caller.timer;
 
                 MultiSound.Play(new MultiSound.Sound[] {
                     new MultiSound.Sound("holeInOne/mandrill1", beat),// temp should be miss
@@ -147,7 +147,7 @@ namespace HeavenStudio.Games
             }
             else
             {
-                double beat = caller.timer;
+                double beat = caller.startBeat + caller.timer;
                 int randomSuccess = UnityEngine.Random.Range(1,5);
 
                 MultiSound.Play(new MultiSound.Sound[] {
@@ -169,7 +169,7 @@ namespace HeavenStudio.Games
         {
             if (state >= 1f || state <= -1f)
             {
-                double beat = caller.timer;
+                double beat = caller.startBeat + caller.timer;
 
                 MultiSound.Play(new MultiSound.Sound[] {
                     new MultiSound.Sound("holeInOne/mandrill1", beat),// temp should be miss
@@ -179,7 +179,7 @@ namespace HeavenStudio.Games
             }
             else
             {
-                double beat = caller.timer;
+                double beat = caller.startBeat + caller.timer;
                 int randomSuccess = UnityEngine.Random.Range(1,5);
 
                 MultiSound.Play(new MultiSound.Sound[] {
diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
index edc1baf9f..24c1c729d 100644
--- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
+++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
@@ -17,7 +17,13 @@ MonoBehaviour:
   DenseViewWidthThreshold: 512
   _disableAutoReloadInBackground: 0
   ImportedScriptPaths:
-  - Assets/Scripts/Games/HoleInOne/HoleInOne.cs
+  - Assets/Scripts/Minigames.cs
+  - Assets/Editor/CreateAssetBundles.cs
+  - Assets/Editor/CreateMinigameScriptTemplate.cs
+  - Assets/Scripts/Games/Minigame.cs
+  - Assets/Scripts/Games/FanClub/FanClub.cs
+  - Assets/Scripts/GameManager.cs
+  - Assets/Editor/SpritesheetScaler.cs
   - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
   - Assets/Scripts/Games/TheDazzles/TheDazzles.cs
   - Assets/Scripts/Games/FirstContact/FirstContact.cs
@@ -42,18 +48,16 @@ MonoBehaviour:
   - 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/AppInfo.cs
   - Assets/Scripts/Games/DJSchool/DJSchool.cs
-  - Assets/Scripts/Games/Minigame.cs
-  - Assets/Scripts/GameManager.cs
-  - Assets/Scripts/Minigames.cs
+  - Assets/Scripts/GameInitializer.cs
+  - Assets/Scripts/EventCaller.cs
+  - Assets/Scripts/Games/KarateMan/KarateManPot.cs
+  - Assets/Scripts/Games/TrickClass/TrickClass.cs
+  - Assets/Scripts/Conductor.cs
+  - Assets/Scripts/Util/Sound.cs
+  - Assets/Scripts/LevelEditor/Timeline/Timeline.cs
+  - Assets/Scripts/Games/HoleInOne/HoleInOne.cs
+  - Assets/Scripts/Games/PlayerActionEvent.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []