This commit is contained in:
minenice55 2024-01-19 21:46:21 -05:00
parent e57eda7af6
commit db6fd6c9fa
2 changed files with 32 additions and 25 deletions

View File

@ -267,11 +267,15 @@ namespace HeavenStudio.Games
} }
} }
public override void OnPlay(double beat)
{
if (queuedPoses.Count > 0) queuedPoses.Clear();
if (queuedCrouches.Count > 0) queuedCrouches.Clear();
}
void Update() void Update()
{ {
var cond = Conductor.instance; if (conductor.isPlaying && !conductor.isPaused)
if (cond.isPlaying && !cond.isPaused)
{ {
if (queuedPoses.Count > 0) if (queuedPoses.Count > 0)
{ {
@ -319,12 +323,17 @@ namespace HeavenStudio.Games
} }
shouldHold = false; shouldHold = false;
} }
if (PlayerInput.GetIsAction(InputAction_TouchRelease) && !GameManager.instance.autoplay) if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch)
{
if (PlayerInput.GetIsAction(InputAction_TouchRelease) && !gameManager.autoplay)
{ {
player.UnPrepare(); player.UnPrepare();
shouldHold = false; shouldHold = false;
} }
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && shouldHold && !GameManager.instance.autoplay) }
else
{
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && shouldHold && (!gameManager.autoplay) && !IsExpectingInputNow(InputAction_FlickRelease))
{ {
if (doingPoses) if (doingPoses)
{ {
@ -342,10 +351,6 @@ namespace HeavenStudio.Games
shouldHold = false; shouldHold = false;
} }
} }
else if (!cond.isPlaying && !cond.isPaused)
{
if (queuedPoses.Count > 0) queuedPoses.Clear();
if (queuedCrouches.Count > 0) queuedCrouches.Clear();
} }
} }

View File

@ -24,5 +24,7 @@ MonoBehaviour:
- Assets/Scripts/Games/FanClub/FanClub.cs - Assets/Scripts/Games/FanClub/FanClub.cs
- Assets/Scripts/GameManager.cs - Assets/Scripts/GameManager.cs
- Assets/Editor/SpritesheetScaler.cs - Assets/Editor/SpritesheetScaler.cs
- Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
- Assets/Scripts/Games/TheDazzles/TheDazzles.cs
PathsToSkipImportEvent: [] PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: [] PathsToIgnoreOverwriteSettingOnAttribute: []