From 27fbb25d145a5bd511634573501d1b903b72aaa7 Mon Sep 17 00:00:00 2001 From: doingitraith Date: Sun, 22 Jan 2017 12:40:58 +0100 Subject: [PATCH] Intro Scene Tweak --- GGJ17/Assets/Prefab/Dialog/Dialog Left.prefab | Bin 12544 -> 12540 bytes .../Prefab/Dialog/Dialog Left.prefab.meta | 4 +-- .../Assets/Prefab/Dialog/Dialog Right.prefab | Bin 12544 -> 12544 bytes .../Prefab/Dialog/Dialog Right.prefab.meta | 2 +- GGJ17/Assets/Prefab/Dialog/Dialog.prefab | Bin 12304 -> 12304 bytes GGJ17/Assets/Prefab/Dialog/Dialog.prefab.meta | 2 +- GGJ17/Assets/Scene/IntroScene.unity | Bin 15552 -> 15552 bytes GGJ17/Assets/Script/Dialog/Dialog.cs | 15 +++++++- GGJ17/Assets/Script/IntroSequence.cs | 34 +++++++++++++++++- .../ProjectSettings/EditorBuildSettings.asset | Bin 4212 -> 4248 bytes 10 files changed, 51 insertions(+), 6 deletions(-) diff --git a/GGJ17/Assets/Prefab/Dialog/Dialog Left.prefab b/GGJ17/Assets/Prefab/Dialog/Dialog Left.prefab index bb981bc3742492b5ed5b1dd1bea95285d090fde3..2e0e0f928d33450980f2a386f485d3679a34cef2 100644 GIT binary patch delta 1005 zcmY+DT}TvB6vxl(xX!4RyXnSa$hwseu|hL~B9|z9kcc!W2uqak13Pz}tJ{UkJ@cFYy>rh0-0_`WbISlq zIY8#xs4U8Y5R~I?#|jV(n9jsRdw_;6xIS9x4H1rc|(R4j4Z4HgHy@EjpaDX^1Fx@2`^vv}N z1tNff7%foaGgREK@AC?-sBL)kT7H+dIifLlG?i_6U6{Ag`R1F=8=1I zgC>(W6~PudLQf`Z_lOG-Y`!7?$VO$9t$ zlf`<8!A+L)b<|k1o-F<)_CRASb1DFa$LppyXs~#Gwa7+GxY94zMpzh561+7hE#;j( z1Im)GWY?R^FW6>)!p?{LFPxaI@ONjK+isXUS~qb~-u#u{-};?H`t|9F(1Z(P6tAQ; z0=tz|ysOFYzid`D zxf{=7m8~rNW$qeNa;I6WwHuGAxj1f1G4m_IjA4Ttgl;7Xe>r0Dc*ZRZq?rW)pQlwC z`R&`1qcPnQm;L>1@tw&~ab4XE7N&nR^1HXKvSw@;`7PyChXb~JNz>v*n^n?I564U#`!buH_w6vdrun|-pR`I=Iq;zM8U@-vriAM?=L-Dht7FF0o zmqOx-gsF|+rdL&}VL_prg}@X7gPZps?LMsvSLwnrb$gF6UXvw8QmHKBkb=D6mil6I zwiwf4N2F7KgALi@lny%>ADttATqN3z^h5F^1z$=!+x$=LVt)eLodi|)-u_lguIM)b z^lHTO;Y{1`>s)b)uzn3=nNzMX(RQD{$?EPs+!voFVU>RRUFKqVD!yBqv!u4^MNw}3 zSoMXq&&Lft(M!x5VBx^Fbss8!_y^v8R(9MTJb`I)*rbgCugFE{aY~u|=gdKCDONcT zICw=2=M^(sYcZ~Om14x5fz7gneX?Z*ua8tVOOt^ zjxFvgD_^A<@+(h%Izao}$7K`m0~?5X5fzW$%J)!DoHl9h*yPGLX^e!ex_7+RL zIt<8}c*8r7W`}*=5*v?B$tg2O@!_N=$4meTpA2_3`-hSbv2uV|Ip%p~8?S~Ql$nzV zW3%(j^`rbBv`)^>PxOY|NMGMXnj}V=#b+4!@R+O6m~1+BFJHMpKV)5H1$fyl)h=-o`oI*z6Du`XaQ1#-Jnj(fCV*kOM+PDd znU&Z54lzfYEV!%S;)&Aai%na^n0bvjl|JK6M4V!UupExKTjk`@4(I;9!Kcb{YOnSE z%{MsbcF22zi?@C(3`fR{e?Cu_rlTk+Nr@{X;DELjx2qN}k3bo$rq6t?4J(VSL*4O< z=kcp@*vaEF78ilJx^h@ncHwW;)x?WrXIup4S3802o*-tldc3Mwa8#8y^7=Bg3RZk$(Q)30p8UbQTE#R9jvBtGw}kJnykz_P#5I1$m`mH3aq f$+E)6nSHhGtZe{Sm!faR{0d7NeK`*upoPk<>$IZb2{MAO<1! z2To2S$Q6bZ5+i%i9ww#ePzeHk()Fy^u?d<0;1(@`R;3iWxN$*(Q~`EvaWe7ry96o`ZWuf%@;rTHOM+p-ZW`F? zLbiOfYfw;%0PKWQ0JYT;pARL3CJ{g(i~_t5#Z4=B6MaIkcn7R~oIKM|GbFT|0D?rK zBS_zSSDKELi%G&%+EakmPY)O0q%2~l0Be8i_kC`x5dRclr|qt~jee_GA;I=A6yW3S z&FtKGm6)N;C^!HZ_|Nfb`K84s_Lu>NY0t3ih<(5`YZGOeFnr?hDIMMOhpMhFpY1<7 zw_5aK;y$i9tV;RR`D5#+eg~)4e#F|wK18rY?K2y0VTW3UI+`g|ggm0o$An zs5tE&-jkj2Az98HWW$pjIM>}9?G0a#;xF|CS~Yn;pOlevE}~z%gmq5Y#%E(k+)S3| z{uC}a{Wz>wn~k4|Lz;8<>*PxF?97z_qv4V^YT8AKih}b1KF~F@@jfP|^%B8sJRqFb zbzeTi862zk=EaV< oy>db4QvB)OM{gRp+&(Gi1Cm%JcNHLCJgkA;qIQJ+2bG%t?*IS* diff --git a/GGJ17/Assets/Prefab/Dialog/Dialog Right.prefab.meta b/GGJ17/Assets/Prefab/Dialog/Dialog Right.prefab.meta index bdd96b0..9041da8 100644 --- a/GGJ17/Assets/Prefab/Dialog/Dialog Right.prefab.meta +++ b/GGJ17/Assets/Prefab/Dialog/Dialog Right.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c43fa688a71d0cd4988e71c9075226a4 -timeCreated: 1485023976 +timeCreated: 1485079809 licenseType: Free NativeFormatImporter: userData: diff --git a/GGJ17/Assets/Prefab/Dialog/Dialog.prefab b/GGJ17/Assets/Prefab/Dialog/Dialog.prefab index 0cc49eb9a9908ece6c6a3bbe9dac7fb65a9363f5..13e08d4b6840b7171b961b7ac22db45c4dd84f19 100644 GIT binary patch delta 808 zcmbP`Fd<=s9}gqL<~R`-W=7`C{ygT)j4YdfOO>#&6)^w-vTV+m zZ{)1svR&c#o@Xo!7C`AtkP;vki#6mfUd76=0?4j}iY-~Qv-)TP8-oT=K_gU5MmSg?_6q^C$a{@8QOpqrZRIUe-o)A~R z{Ks?qKM;U?FkQ&p0Z4&;6EJ0>FN|%T&0Pj!1I=P!5NNHtJ7cXntHPhPL3Iypw0Ll_opAakHWGr3$lRvs2~ zAaR(lK}@J`Cx6zqo$R13V+?ixP#oqvkQ$ipL2Otkg4obtp3JUoIoUu*0q&OjIueuf zbtFZQ?Sz>(xlv1I@&-MY$pyMBlMm=futU?s`=!~p06hglNW@gAyBY_0OMps zJ!xSF|N85h{H);c`rve8vRfA0WPKe)L0C$Hsb-oSscVl#^rc?BAS@*!)K1iM$0E8? fx11en?qq*`PdIzNz9AKx&8mY z=l}m8&U7Jj2OtHO2$(X_7sfWv<}L%VK|Xs>xgNv>JCvb5AXMI^cgjMIuMG}-C(8~p zGfY<0k`gG8S;*ccAmO&AeEWKbfJ0vw*AS~U0LJtHOC-2m? z7lfq}gy==RazR*nf{8Lsj?|SFz7l%rQv5k)aCl~%-Z5?VW46iqI*M4#sMK@EVjrho cJUi4Cll}EQ;q3YPhMcgVVx0U?Ump~J09X{-ZU6uP diff --git a/GGJ17/Assets/Prefab/Dialog/Dialog.prefab.meta b/GGJ17/Assets/Prefab/Dialog/Dialog.prefab.meta index 30fb4f6..e87cecc 100644 --- a/GGJ17/Assets/Prefab/Dialog/Dialog.prefab.meta +++ b/GGJ17/Assets/Prefab/Dialog/Dialog.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a8148190d06b1484bac1b82675ada2e2 -timeCreated: 1485045754 +timeCreated: 1485082671 licenseType: Free NativeFormatImporter: userData: diff --git a/GGJ17/Assets/Scene/IntroScene.unity b/GGJ17/Assets/Scene/IntroScene.unity index ac47402292faaae772bbc3c1602e25432bb6d930..8227efc574bfda31483187426cc10a6c14e27a22 100644 GIT binary patch delta 303 zcmX?5d7yGbme6KVSs9kic|yy%HtQ-H3wmuhGo6nC2v#sMFgyTa79jhApEy5Atb>_> zArnZm0`Wzt*bkss0FciH#FwCA9zab643k$GX)&@+zG|c{$_|wD`C0D=q!;V6Pd{}mK>Y^nDQ`+fE=)8yTb21&p<2&22fB;b~I7gEMvKZ F835kKPDB6z delta 300 zcmX?5d7yGbmeA%VvDI9gvxH<=HXADH3wmAf6X$0Df)$Jm44FWh1&A*~#Uz**7y^KN zRv^9v70UpM6#)5cK>Y6SdvPGea04jzfN}CFBP~Xj$ybfkMM082KkNNKk_kZ0R3ObV zS(); d.text = speeches[i].text; @@ -64,6 +67,16 @@ public IEnumerator MoveDialogBox(RectTransform rect, Vector3 target) } } + public void Reset() + { + foreach(DialogBox d in FindObjectsOfType()) + { + Destroy(d.gameObject); + } + + speeches.Clear(); + } + internal void Clear() { speeches.Clear(); diff --git a/GGJ17/Assets/Script/IntroSequence.cs b/GGJ17/Assets/Script/IntroSequence.cs index b2bf181..c4e93a5 100644 --- a/GGJ17/Assets/Script/IntroSequence.cs +++ b/GGJ17/Assets/Script/IntroSequence.cs @@ -1,7 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - +using UnityEngine.SceneManagement; + public class IntroSequence : MonoBehaviour { @@ -50,5 +51,36 @@ public IEnumerator PlayIntro() d.speeches.Add(e); yield return StartCoroutine(d.Talk()); + + d.Reset(); + + e = new Dialog.DialogElement(); + e.dialogBox = d.dialogBoxes[1]; + e.text = "Mission control, we are now entering Psion's orbit."; + d.speeches.Add(e); + + e = new Dialog.DialogElement(); + e.dialogBox = d.dialogBoxes[1]; + e.text = "Mission control, please come in! We are just above Psion..... Do you copy?"; + d.speeches.Add(e); + + e = new Dialog.DialogElement(); + e.dialogBox = d.dialogBoxes[1]; + e.text = "They are not answering!"; + d.speeches.Add(e); + + e = new Dialog.DialogElement(); + e.dialogBox = d.dialogBoxes[1]; + e.text = "Check the main systems!"; + d.speeches.Add(e); + + e = new Dialog.DialogElement(); + e.dialogBox = d.dialogBoxes[1]; + e.text = "Whate the ...? Something has fried our computer! We are coming down hard. Brace for impact."; + d.speeches.Add(e); + + yield return StartCoroutine(d.Talk()); + + SceneManager.LoadScene(2, LoadSceneMode.Single); } } diff --git a/GGJ17/ProjectSettings/EditorBuildSettings.asset b/GGJ17/ProjectSettings/EditorBuildSettings.asset index be54585b765b45d3be2f06b37027173dd359a4cb..21b6bfe1a33c23b258a875812849a1c1c9aa3181 100644 GIT binary patch delta 54 zcmeyOFhh}pfq}7;fk9x#MvfLn#u=L@G8XeqUcku0$TFE#Ac5aEF*7eXIW;d;uQV^S Kq;hhAfC>PfI1lOo delta 38 ucmbQC_(g$(fq}7;fkB{TBS#A(W69=;jKzGD7cjCgGEZg|NSNFyzz+b!CJEdC