From e6d17dee320dddc97e1b6f7f23c0fb6522d02cbb Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 11 Mar 2014 18:52:38 +0000 Subject: [PATCH] More button improvements - Auto Buttons stay hidden while executing wait commands - Added WaitForInput() command to wait for a click/tap/keypress - Replaced click sound with a quieter version --- Assets/Fungus/Audio.meta | 5 +++ Assets/Fungus/Audio/Click.wav | Bin 0 -> 96044 bytes .../Audio/Click.wav.meta} | 6 ++-- Assets/Fungus/Prefabs/Game.prefab | Bin 7304 -> 7336 bytes Assets/Fungus/Scripts/ButtonController.cs | 3 +- Assets/Fungus/Scripts/Commands.cs | 32 ++++++++++++++++++ Assets/Fungus/Scripts/Game.cs | 6 ++++ Assets/Fungus/Scripts/GameController.cs | 12 ++++++- Assets/FungusExample/Audio/click.wav | Bin 13428 -> 0 bytes Assets/FungusExample/Scenes/Example.unity | Bin 51288 -> 51320 bytes Assets/FungusExample/Scripts/ButtonRoom.cs | 3 ++ 11 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 Assets/Fungus/Audio.meta create mode 100644 Assets/Fungus/Audio/Click.wav rename Assets/{FungusExample/Audio/click.wav.meta => Fungus/Audio/Click.wav.meta} (65%) delete mode 100644 Assets/FungusExample/Audio/click.wav diff --git a/Assets/Fungus/Audio.meta b/Assets/Fungus/Audio.meta new file mode 100644 index 00000000..e8e429c6 --- /dev/null +++ b/Assets/Fungus/Audio.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: d9780867e1f2c456a9bd67af4ed5e2e4 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Audio/Click.wav b/Assets/Fungus/Audio/Click.wav new file mode 100644 index 0000000000000000000000000000000000000000..c20f06b1e8963f229c588d02bb4de9e4a63c3841 GIT binary patch literal 96044 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 delta 68 zcmV-K0K5OFIfywB000{A0010_00009000{hkq|!t7_m^t39~&4Zx8{TldT$N5l~{r atK~pV8>8Fd2K|NXngf$z93Qhi8*2fF8x{)y diff --git a/Assets/Fungus/Scripts/ButtonController.cs b/Assets/Fungus/Scripts/ButtonController.cs index 1d566487..3e8553f4 100644 --- a/Assets/Fungus/Scripts/ButtonController.cs +++ b/Assets/Fungus/Scripts/ButtonController.cs @@ -13,7 +13,8 @@ namespace Fungus bool showAutoButtons = false; Page page = Game.GetInstance().activePage; if (page != null && - page.mode == Page.Mode.Idle) + page.mode == Page.Mode.Idle && + !Game.GetInstance().waiting) { showAutoButtons = true; } diff --git a/Assets/Fungus/Scripts/Commands.cs b/Assets/Fungus/Scripts/Commands.cs index 32cd945d..a022124e 100644 --- a/Assets/Fungus/Scripts/Commands.cs +++ b/Assets/Fungus/Scripts/Commands.cs @@ -55,6 +55,7 @@ namespace Fungus public override void Execute(CommandQueue commandQueue, Action onComplete) { + Game.GetInstance().waiting = true; commandQueue.StartCoroutine(WaitCoroutine(duration, onComplete)); } @@ -63,6 +64,37 @@ namespace Fungus yield return new WaitForSeconds(duration); if (onComplete != null) { + Game.GetInstance().waiting = false; + onComplete(); + } + } + } + + /** + * Wait for a player tap/click/key press + */ + public class WaitForInputCommand : CommandQueue.Command + { + public override void Execute(CommandQueue commandQueue, Action onComplete) + { + Game.GetInstance().waiting = true; + commandQueue.StartCoroutine(WaitCoroutine(onComplete)); + } + + IEnumerator WaitCoroutine(Action onComplete) + { + while (true) + { + if (Input.GetMouseButtonDown(0) || Input.anyKeyDown) + { + break; + } + yield return null; + } + + if (onComplete != null) + { + Game.GetInstance().waiting = false; onComplete(); } } diff --git a/Assets/Fungus/Scripts/Game.cs b/Assets/Fungus/Scripts/Game.cs index 91302f60..203310ac 100644 --- a/Assets/Fungus/Scripts/Game.cs +++ b/Assets/Fungus/Scripts/Game.cs @@ -93,6 +93,12 @@ namespace Fungus [HideInInspector] public ButtonController buttonController; + /** + * True when executing a Wait() or WaitForTap() command + */ + [HideInInspector] + public bool waiting; + static Game instance; public static Game GetInstance() diff --git a/Assets/Fungus/Scripts/GameController.cs b/Assets/Fungus/Scripts/GameController.cs index 056f30bd..79ac104c 100644 --- a/Assets/Fungus/Scripts/GameController.cs +++ b/Assets/Fungus/Scripts/GameController.cs @@ -32,7 +32,17 @@ namespace Fungus CommandQueue commandQueue = Game.GetInstance().commandQueue; commandQueue.AddCommand(new Command.WaitCommand(duration)); } - + + /** + * Wait until player taps, clicks or presses a key before executing the next command. + * This method returns immediately but it queues an asynchronous command for later execution. + */ + public void WaitForInput() + { + CommandQueue commandQueue = Game.GetInstance().commandQueue; + commandQueue.AddCommand(new Command.WaitForInputCommand()); + } + /** * Call a delegate method provided by the client. * Used to queue the execution of arbitrary code as part of a command sequeunce. diff --git a/Assets/FungusExample/Audio/click.wav b/Assets/FungusExample/Audio/click.wav deleted file mode 100644 index 1b056a99b96b2bbae815f6a6aca2261cb9e726ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13428 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 diff --git a/Assets/FungusExample/Scenes/Example.unity b/Assets/FungusExample/Scenes/Example.unity index ec136c770424b166bb407b4f84cb4aacd0c68e04..4a15969e1c17b66c2f79db5648987b280b2a75ce 100644 GIT binary patch delta 116 zcmcaHf%(S-W&s9<&Q}Z!Cn^{i7&sXix)?SJERbQ8+`LidIH!83XI_Z~LwRCmNoHO; z10zt04G@C>h|S;$A{ZEcPd><{wRy4H>=?!co9&zTvI@wo(2HT#am(sZNQ>pGGAy3V M)A?ZYr_MAx01KEQ2><{9 delta 82 zcmV-Y0ImP{kOSC|0}ucJiNpW^$XEaX00{s9iQusipd0}hv#}h<2?6_)!3rv~$tIgz o0i3gCgS`b1P-4cbjvqub#I{e|qBlQN0mlYoi_vl5DCKK0fi)Bpeg diff --git a/Assets/FungusExample/Scripts/ButtonRoom.cs b/Assets/FungusExample/Scripts/ButtonRoom.cs index 4054ff9e..1c376965 100644 --- a/Assets/FungusExample/Scripts/ButtonRoom.cs +++ b/Assets/FungusExample/Scripts/ButtonRoom.cs @@ -26,6 +26,9 @@ public class ButtonRoom : Room Say("The Mushroom read his book with great interest."); Say("After turning the last page, he considered his options."); + // Uncomment this line to make the player tap the screen before showing the buttons + // WaitForInput(); + // Once the last Say command executes the page will dissappear because there's no more content to show. // At that point, the game will automatically fade in all Auto Buttons in the room }