From acc544ba26f59e9ec71428265abb0469598104af Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 15 Jun 2020 02:25:41 +0200 Subject: [PATCH] update coroutine --- Media/Icon.png | Bin 0 -> 6062 bytes TouchyTickets/TouchyTickets.csproj | 2 +- TouchyTickets/Ui.cs | 24 ++++++++++++------------ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 Media/Icon.png diff --git a/Media/Icon.png b/Media/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7cfab5fde3f5df3b0700aa68ce547178fbe653e3 GIT binary patch literal 6062 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 literal 0 HcmV?d00001 diff --git a/TouchyTickets/TouchyTickets.csproj b/TouchyTickets/TouchyTickets.csproj index b31b08c..faa1d0b 100644 --- a/TouchyTickets/TouchyTickets.csproj +++ b/TouchyTickets/TouchyTickets.csproj @@ -5,7 +5,7 @@ - + all diff --git a/TouchyTickets/Ui.cs b/TouchyTickets/Ui.cs index 5984c09..ec6c430 100644 --- a/TouchyTickets/Ui.cs +++ b/TouchyTickets/Ui.cs @@ -385,7 +385,7 @@ namespace TouchyTickets { uiSystem.TextFormatter.AddImage(modifier.Name, modifier.Texture); } - public static IEnumerator DisplaySplash(Action loadGame) { + public static IEnumerator DisplaySplash(Action loadGame) { var splash = new Group(Anchor.TopLeft, Vector2.One, false) { OnDrawn = (e, time, batch, alpha) => batch.Draw(batch.GetBlankTexture(), e.DisplayArea, Color.Black * alpha) }; @@ -395,9 +395,9 @@ namespace TouchyTickets { GameImpl.Instance.UiSystem.Add("Splash", splash).Priority = 100000; while (center.DrawAlpha < 1) { center.DrawAlpha += 0.015F; - yield return new WaitEvent(CoroutineEvents.Update); + yield return new Wait(CoroutineEvents.Update); } - yield return new WaitSeconds(0.5); + yield return new Wait(0.5); var analyticsFlag = new FileInfo(Path.Combine(SaveHandler.GetGameDirectory(true).FullName, "_ReadGdpr")); if (!analyticsFlag.Exists) { @@ -413,25 +413,25 @@ namespace TouchyTickets { CoroutineHandler.RaiseEvent(evt); } }); - yield return new WaitEvent(evt); + yield return new Wait(evt); } - yield return new WaitSeconds(0.25); + yield return new Wait(0.25); loadGame(); - yield return new WaitSeconds(0.25); + yield return new Wait(0.25); while (center.DrawAlpha > 0) { center.DrawAlpha -= 0.015F; - yield return new WaitEvent(CoroutineEvents.Update); + yield return new Wait(CoroutineEvents.Update); } while (splash.DrawAlpha > 0) { splash.DrawAlpha -= 0.015F; - yield return new WaitEvent(CoroutineEvents.Update); + yield return new Wait(CoroutineEvents.Update); } splash.System.Remove(splash.Root.Name); } private void FadeUi(bool fadeOut, Action after = null) { - IEnumerator Impl() { + IEnumerator Impl() { // disable input handling during fade this.uiSystem.Controls.HandleTouch = false; GameImpl.Instance.DrawMap = true; @@ -440,7 +440,7 @@ namespace TouchyTickets { while (alpha > 0) { alpha -= 0.03F; this.currentUi.DrawAlpha = !fadeOut ? 1 - alpha : alpha; - yield return new WaitEvent(CoroutineEvents.Update); + yield return new Wait(CoroutineEvents.Update); } this.uiSystem.Controls.HandleTouch = true; GameImpl.Instance.DrawMap = fadeOut; @@ -519,12 +519,12 @@ namespace TouchyTickets { } } - private static IEnumerator WobbleElement(CustomDrawGroup element, float intensity = 0.02F) { + private static IEnumerator WobbleElement(CustomDrawGroup element, float intensity = 0.02F) { var sin = 0F; while (sin < MathHelper.Pi) { element.ScaleOrigin(1 + (float) Math.Sin(sin) * intensity); sin += 0.2F; - yield return new WaitEvent(CoroutineEvents.Update); + yield return new Wait(CoroutineEvents.Update); } element.Transform = Matrix.Identity; }