From 891158d1dfd69a6c162c244f9997800b96ab8816 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Thu, 28 Aug 2014 14:48:46 +0100 Subject: [PATCH] Added continue image hiding back. --- Assets/Fungus/Dialog/Scripts/SayDialog.cs | 14 +++++++++++++- Assets/Shuttle/ShuttleGame.unity | Bin 110340 -> 110476 bytes 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Assets/Fungus/Dialog/Scripts/SayDialog.cs b/Assets/Fungus/Dialog/Scripts/SayDialog.cs index 206ad85d..71fad117 100644 --- a/Assets/Fungus/Dialog/Scripts/SayDialog.cs +++ b/Assets/Fungus/Dialog/Scripts/SayDialog.cs @@ -8,6 +8,8 @@ namespace Fungus.Script public class SayDialog : Dialog { + public Image continueImage; + public void Say(string text, Action onComplete) { Clear(); @@ -18,7 +20,8 @@ namespace Fungus.Script } StartCoroutine(WriteText(text, delegate { - + ShowContinueImage(true); + StartCoroutine(WaitForInput(delegate { Clear(); @@ -34,6 +37,15 @@ namespace Fungus.Script protected override void Clear() { base.Clear(); + ShowContinueImage(false); + } + + void ShowContinueImage(bool visible) + { + if (continueImage != null) + { + continueImage.enabled = visible; + } } IEnumerator WaitForInput(Action onInput) diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 9e65e008c0f06f61bb302144e9748c4b08145d51..be6755e7116173d1d3c5a73d42531ae3712ea3b2 100644 GIT binary patch delta 1962 zcmZA1Uu;ul7{~GV2pQdl^C*}!ptB|tr>L11#-b>@@S!VBIA^Y0+#rR9(-+i=wx_hU!XeFUL#bWU=zp1x>*^_G!Vn6@a%W>_+m3{t3Al?18kKSVo$2zh%tRRH|{iShOA$z6HiWd-8obc?Fxpg4kcu z3Yghk%Ka&A)t-wDkz1427^w)~!$O#|=m-{wmgYK(G1n}AI1RQd!Kc^!VY5YuQ&?V( zXRs;k9j=$;*oYOd54iqM7XGGkK3si3FFcBkVD{#m!l{8oByZ;|&{^Rb(BG;DuauvR zjA80du3`mOZhGc^q~@TWo550;S~xy@z3HBkv+UwsV4zJ88ka?L8tZ&Qh}CtavG?xo zX7i9t{DNMaz8WTtKTxjycxK$6T!CElm3jUGVk?{2Dxdp5VQy19qWMATv zE7ypbeR^)NvZ5!3QP+ChY73lm1=|ZXJ>GsH&eJ95ksQLZm|D04^Bole7OS$=omdK^ z5uzY1j+q0h(f=-R1hjAHe7U-@JZ3*nXL14y9^;L`R^$zPusN57ierbXIe|UooJH4S zQ3~I zb&i8$pj!BJTR54)=;Gs@q_FCfLin*;vI}Rh7-sKoS=tX+4%>mVXjtR57jmnVCDyoYM;TdW^b&qBr4TX`*7Isyz)QfJlAFb delta 1928 zcmZA1OGs2v9LMo$cDRnqX&f8&$H3V zXm6K}?#nC`;vUbMZ11o^tcv&VvhRB=Cm=)~HYx1`)+NmxZv+#;WR3AeLjPCzBNzmY z&Oc=5QLGQk!9GiiV~(O^?vu1Jqc7G-ZbDjNAk81ge3&`u0G1s}_BAKtoX|b~2zW#Z z&YJM}9mPUi#bUC}#yYW0ybsGZ2a91_dH*8|UrrzJyAN6mw_pvJu{g7Eq%Is7G;%s< z&hR>zdB_@koq8eAjHxSmgT-vQo+m#7p2ODM6RZ_e3s*F~3&xe4ZWKQTW|vrl+AC2M z!OEuyF_w~S1z&d-IgVP3?8AbXTEx3@PpHq9+lD#IthoiZ+VoHbz+mYoUdbhg`RWD8q5W|FtzZ@?yRt= zw&tQ(KBndl%%}->+j51NqsE%6Pfx21VoXr~ztuX}XA2&QXIDCFg}BcynMZOI>&Mi> zWti)<5U?1NTV0N|Vk}z3rBz^#I@Q?!V_*Yl3~2u6I*tuu#(A2Z!U zZ01X}o^W#mE6JIY&c!-0^?vNeoccNIZOsE)G4;0AWcaGOG4*2BVxD^I#XODmW9o&g z!<;Nqy{u<2*ZJgRbo0|W3pRsl;r0@LRTsuC{$EK1b6*g`gME~{a2*R`#_C3--N2$) z7WP5fP0V@Ga&)?Ad$6v$6jX2PHLTwn6fLhhs$G1CYVHaa#?-rzwrsHaxh*#n%V7J| z+}y8wYigS|TL+v6Ms30Ihwtm%m#n!jSVM1QnYKKo_nBK;pW6Oyg*Lr?e~UJ^*R@tF M&FgKxq)lD%7rL3tS^xk5