more operation order fix
This commit is contained in:
parent
d4deeaf5f7
commit
e7dafa9b85
|
@ -6,7 +6,7 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
public class Minigame : MonoBehaviour
|
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>();
|
public List<Minigame.Eligible> EligibleHits = new List<Minigame.Eligible>();
|
||||||
|
|
||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
|
@ -130,14 +130,8 @@ namespace HeavenStudio.Games
|
||||||
//Useful for strict call and responses games like Tambourine
|
//Useful for strict call and responses games like Tambourine
|
||||||
public bool IsExpectingInputNow()
|
public bool IsExpectingInputNow()
|
||||||
{
|
{
|
||||||
if (PlayerActionEvent.justHit)
|
|
||||||
{
|
|
||||||
PlayerActionEvent.justHit = false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
PlayerActionEvent input = GetClosestScheduledInput();
|
PlayerActionEvent input = GetClosestScheduledInput();
|
||||||
if (input == null) return false;
|
if (input == null) return false;
|
||||||
// Debug.Log(input.IsExpectingInputNow());
|
|
||||||
return input.IsExpectingInputNow();
|
return input.IsExpectingInputNow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,6 @@ namespace HeavenStudio.Games
|
||||||
this.canHit = canHit;
|
this.canHit = canHit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool justHit = false;
|
|
||||||
|
|
||||||
public void Update()
|
public void Update()
|
||||||
{
|
{
|
||||||
|
@ -139,7 +138,6 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
if(canHit)
|
if(canHit)
|
||||||
{
|
{
|
||||||
justHit = true;
|
|
||||||
OnHit(this, state);
|
OnHit(this, state);
|
||||||
CleanUp();
|
CleanUp();
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -4,7 +4,7 @@ MonoImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
defaultReferences: []
|
defaultReferences: []
|
||||||
executionOrder: -42
|
executionOrder: 5
|
||||||
icon: {instanceID: 0}
|
icon: {instanceID: 0}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
|
|
Loading…
Reference in a new issue