fix PlayerActionEvent order of operations

- fixed remix loading trying to clear special timeline while it's writing to itself
This commit is contained in:
minenice55 2022-09-17 22:40:52 -04:00
parent 2a83ec3b75
commit ecd03a664a
6 changed files with 13 additions and 4 deletions

View file

@ -135,6 +135,7 @@ namespace HeavenStudio.Games.Scripts_FanClub
float yWeight = -(yMul*yMul) + 1f; float yWeight = -(yMul*yMul) + 1f;
motionRoot.transform.localPosition = new Vector3(0, 3f * yWeight); motionRoot.transform.localPosition = new Vector3(0, 3f * yWeight);
shadow.transform.localScale = new Vector3((1f-yWeight*0.8f) * 1.4f, (1f-yWeight*0.8f) * 1.4f, 1f); shadow.transform.localScale = new Vector3((1f-yWeight*0.8f) * 1.4f, (1f-yWeight*0.8f) * 1.4f, 1f);
animator.Play("FanJump", -1, 0);
} }
else else
{ {

View file

@ -130,9 +130,14 @@ 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();
} }

View file

@ -52,6 +52,8 @@ namespace HeavenStudio.Games
this.canHit = canHit; this.canHit = canHit;
} }
public static bool justHit = false;
public void Update() public void Update()
{ {
if(!Conductor.instance.NotStopped()){CleanUp();} // If the song is stopped entirely in the editor, destroy itself as we don't want duplicates if(!Conductor.instance.NotStopped()){CleanUp();} // If the song is stopped entirely in the editor, destroy itself as we don't want duplicates
@ -70,6 +72,7 @@ namespace HeavenStudio.Games
if (IsCorrectInput() && !autoplayOnly) if (IsCorrectInput() && !autoplayOnly)
{ {
justHit = true;
if (state.perfect) if (state.perfect)
{ {
Hit(stateProg); Hit(stateProg);

View file

@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: -43 executionOrder: -42
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:

View file

@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: -42 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:

View file

@ -109,7 +109,7 @@ namespace HeavenStudio.Editor.Track
{ {
foreach (SpecialTimelineObj obj in specialTimelineObjs) foreach (SpecialTimelineObj obj in specialTimelineObjs)
{ {
obj.DeleteObj(); Destroy(obj.gameObject);
} }
specialTimelineObjs.Clear(); specialTimelineObjs.Clear();
} }