From e7dafa9b85d32d0cfa78132344cecb3be6a132b4 Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sun, 18 Sep 2022 12:36:48 -0400
Subject: [PATCH] more operation order fix

---
 Assets/Scripts/Games/Minigame.cs               | 8 +-------
 Assets/Scripts/Games/PlayerActionEvent.cs      | 2 --
 Assets/Scripts/Games/PlayerActionEvent.cs.meta | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs
index 035176b14..bd45f6bce 100644
--- a/Assets/Scripts/Games/Minigame.cs
+++ b/Assets/Scripts/Games/Minigame.cs
@@ -6,7 +6,7 @@ namespace HeavenStudio.Games
 {
     public class Minigame : MonoBehaviour
     {
-        public static float earlyTime = 0.12f, perfectTime = 0.09f, aceEarlyTime = 0.025f, aceLateTime = 0.025f, lateTime = 0.09f, endTime = 0.12f;
+        public static float earlyTime = 0.1f, perfectTime = 0.08f, aceEarlyTime = 0.025f, aceLateTime = 0.025f, lateTime = 0.08f, endTime = 0.1f;
         public List<Minigame.Eligible> EligibleHits = new List<Minigame.Eligible>();
 
         [System.Serializable]
@@ -130,14 +130,8 @@ namespace HeavenStudio.Games
         //Useful for strict call and responses games like Tambourine
         public bool IsExpectingInputNow()
         {
-            if (PlayerActionEvent.justHit) 
-            {
-                PlayerActionEvent.justHit = false;
-                return true;
-            }
             PlayerActionEvent input = GetClosestScheduledInput();
             if (input == null) return false;
-            // Debug.Log(input.IsExpectingInputNow());
             return input.IsExpectingInputNow();
         }
 
diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs
index 16a32c8e5..f9e48c265 100644
--- a/Assets/Scripts/Games/PlayerActionEvent.cs
+++ b/Assets/Scripts/Games/PlayerActionEvent.cs
@@ -52,7 +52,6 @@ namespace HeavenStudio.Games
             this.canHit = canHit;
         }
 
-        public static bool justHit = false;
 
         public void Update()
         {
@@ -139,7 +138,6 @@ namespace HeavenStudio.Games
             {
                 if(canHit)
                 {
-                    justHit = true;
                     OnHit(this, state);
                     CleanUp();
                 } else
diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs.meta b/Assets/Scripts/Games/PlayerActionEvent.cs.meta
index d49398c04..62a527341 100644
--- a/Assets/Scripts/Games/PlayerActionEvent.cs.meta
+++ b/Assets/Scripts/Games/PlayerActionEvent.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: -42
+  executionOrder: 5
   icon: {instanceID: 0}
   userData: 
   assetBundleName: