etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add files via upload

This commit is contained in:
Mytiaoga 2022-07-25 10:03:01 +08:00 committed by GitHub
parent bb81e24572
commit fb169868b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Scripts/Games/FirstContact/FirstContact.cs
View File

@ -98,7 +98,7 @@ namespace HeavenStudio.Games
instance = this; instance = this;
} }
public void SetIntervalStart(float beat, float interval = 4f) public void SetIntervalStart(float beat, float interval)
{ {
if (!intervalStarted) if (!intervalStarted)
{ {
@ -123,7 +123,7 @@ namespace HeavenStudio.Games
lastReportedBeat = Mathf.Round(Conductor.instance.songPositionInBeats); lastReportedBeat = Mathf.Round(Conductor.instance.songPositionInBeats);
} }
if (PlayerInput.Pressed() && !IsExpectingInputNow() && !noHitOnce && !isSpeaking) if (PlayerInput.Pressed() && !IsExpectingInputNow() && !noHitOnce && !isSpeaking && !missionControl.activeInHierarchy)
{ {
Jukebox.PlayOneShotGame("firstContact/" + randomizerLines()); Jukebox.PlayOneShotGame("firstContact/" + randomizerLines());
BeatAction.New(this.gameObject, new List<BeatAction.Action>() BeatAction.New(this.gameObject, new List<BeatAction.Action>()
@ -211,16 +211,8 @@ namespace HeavenStudio.Games
} }
public void alienTurnOver(float beat) public void alienTurnOver(float beat)
{
if (!intervalStarted)
{ {
SetIntervalStart(beat, beatInterval); SetIntervalStart(beat, beatInterval);
}
if (intervalStarted)
{
SetIntervalStart(beat, beatInterval);
}
Jukebox.PlayOneShotGame("firstContact/turnover"); Jukebox.PlayOneShotGame("firstContact/turnover");
BeatAction.New(alien, new List<BeatAction.Action>() BeatAction.New(alien, new List<BeatAction.Action>()
@ -281,6 +273,7 @@ namespace HeavenStudio.Games
alienSpeakCount = 0; alienSpeakCount = 0;
translatorSpeakCount = 0; translatorSpeakCount = 0;
intervalStarted = false;
isSpeaking = false; isSpeaking = false;
hasMissed = false; hasMissed = false;
noHitOnce = false; noHitOnce = false;
@ -312,7 +305,7 @@ namespace HeavenStudio.Games
{ {
BeatAction.New(missionControl, new List<BeatAction.Action>() BeatAction.New(missionControl, new List<BeatAction.Action>()
{ {
new BeatAction.Action(length, delegate { missionControl.SetActive(false); }), new BeatAction.Action(beat + length, delegate { missionControl.SetActive(false); }),
}); });
} }
else else