From 7d2d71f258429a213943f05e25247c85842a2c82 Mon Sep 17 00:00:00 2001 From: Gary Chen Date: Sun, 12 Dec 2021 00:07:45 +0800 Subject: [PATCH] polish --- Portal2d/Assets/Level Prefabs/Player.prefab | Bin 18092 -> 18092 bytes .../UI Level Prefabs/Find Memory UI.prefab | Bin 9428 -> 8156 bytes .../Player Control/Scripts/BasicMove.cs | 2 +- Portal2d/Assets/Scenes/Levels/00_Start.unity | Bin 83352 -> 83512 bytes .../Assets/Scenes/Levels/01_BasicTut.unity | Bin 86324 -> 86340 bytes .../Assets/Scenes/Levels/10_trigger_tut.unity | Bin 87792 -> 87968 bytes .../Assets/Scenes/Levels/21_gravity2.unity | Bin 100460 -> 100460 bytes .../Assets/Scenes/Levels/Level-Bonus.unity | Bin 81584 -> 83568 bytes Portal2d/Assets/Scenes/Levels/Menu.unity | Bin 136080 -> 136080 bytes .../Level Ending/LevelEndingFakeEndTrigger.cs | 8 ++++---- Portal2d/Assets/Scripts/LevelManager.cs | 5 +++-- .../ProjectSettings/EditorBuildSettings.asset | Bin 5072 -> 5136 bytes 12 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Portal2d/Assets/Level Prefabs/Player.prefab b/Portal2d/Assets/Level Prefabs/Player.prefab index daef0ee6397dd52ea5476890528460e2ef956a14..1acb4facdf6dd2daa8e76f228736c1c03fc0c23b 100644 GIT binary patch delta 18 ZcmZ3}%ebbOaYKb0%bP$8yU8_f1^`G;2Oj_c delta 18 acmZ3}%ebbOaYKb0%guA&Z70{b82|uJmk37y diff --git a/Portal2d/Assets/Level Prefabs/UI Level Prefabs/Find Memory UI.prefab b/Portal2d/Assets/Level Prefabs/UI Level Prefabs/Find Memory UI.prefab index 939a90c2b80ada61250d2fa33d5bd7ece24d48fc..57c25a375dd4221362f5d7f7de81a612132ba3d3 100644 GIT binary patch delta 171 zcmccOdB>VAuc^tzcweI0F=82I7rSF%KpNh8Q3pWcy~Qm;+FqDUc780%IVT;X&nk zAPM2a*dTKlzN!mIU5fngGr{F%r2b)hWw0QF@tT^cJZvZ5yUvn5s=8kHXvpM9*-S>3 z$tPvi!4BOx`K4_B<`_90Mn>kzo$|qxC(7wgwv-oE0NDvMA7nfPd~jr7_}~O$0|11= BT)F@N diff --git a/Portal2d/Assets/Player Control/Scripts/BasicMove.cs b/Portal2d/Assets/Player Control/Scripts/BasicMove.cs index b24ad02..751d292 100644 --- a/Portal2d/Assets/Player Control/Scripts/BasicMove.cs +++ b/Portal2d/Assets/Player Control/Scripts/BasicMove.cs @@ -177,7 +177,7 @@ private void Update() // jump input - if ((Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.UpArrow)) && isgrounded) { // jump when on the ground + if ((Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown(KeyCode.Space)) && isgrounded) { // jump when on the ground shouldJump = true; } } diff --git a/Portal2d/Assets/Scenes/Levels/00_Start.unity b/Portal2d/Assets/Scenes/Levels/00_Start.unity index db142d3a10e7d962a5c05df57f8592483e484990..7ee46a9918aea09b23cc197cec390946b584be30 100644 GIT binary patch delta 298 zcmbQy&AOw9m4kud;Z+7kH;auNJMIdGure^PFfcIeQd(UHq!>O-zIa#IRw9alK?TT@ z2jWx5dg?(k4nVP~KpLol;WSk222iX9$mas$Gf=UJ$%^-cZ4X2FLv{h}G8^7cJuj1yR< z-?3)onC>9XC^G$s8KcN{A8W=l%#8fgCG8pAIaaR8DFm4Xl2@62!I6<=dxAaV3?@kt yphcg$EQMYt^ha?5*}3tqd5K9msVS2MpNdaD@SBAfS%t{tzt7~iOE@t$FarSLBUHBl delta 222 zcmdnd!#bmzm4kud;Z+7k*BKi*cH9+IVP#-oVPIg`rL?*ZNHH9keDSWZ?TbhT1{EMr z9*9pJ>!}CH2t+Y3Oa;}RH9$TW5TAjHX-rnUCu}<*nt@>kP?QIV&%tD3 z7#Q9F`Mf}UsDEKdkm#H+iC7?q8RCZG`y1UeOfSbsY%aW~9>FL+{h}G8^7cJuj1yS4 m*H|;2VP@o=?rG2HzWsnb;|wN{I~YVJ|9vLCeTNfc12X`Gv^q`z diff --git a/Portal2d/Assets/Scenes/Levels/01_BasicTut.unity b/Portal2d/Assets/Scenes/Levels/01_BasicTut.unity index 16979200a5b69bbeaa82d84690aa9389c2a5511c..89d8632160486ad40171bdea24706ae9510cd959 100644 GIT binary patch delta 226 zcmdn8i1o-KRt^S+d(I4ufi4?4L~aY3ure@kF)%O`-{0t-VR|`c$7bEzlk+Bj_$)I0 zfF2{y^aq}d64Mi;84+BO=?@fuVj$V=0bYzIj2tXL{kleG#?uu*igUaf#W^aOfntVc zM$_Yc80DpdGpkZvQgccY^(uhEoFFL+V?85tGZV|{6MYyJr;GV8^6`SijV$$y%`MF> z4ME}>OqqGp<$W1dr$6vv%Rt^S+d(I4ufhHR{L~aYJure@kF)%O`-{0t-VR|`c#b({xlk+D3`7bhk zjwhqSR0Bqd={#PHDpPY9AtI9(yq1`LK#!4UdWRR|A9iM-UK0a@>GGb8lGAg%8O1p& zK|)4Grqlm>Giq{I068E5Lo)-AfG#@|kYjAXFg@RgQIoM^^1)Z)5Ys;RF!Hiw=IK?U W2nnDm5t)4Cl?YhFb`@Vn1r`9cra?~t diff --git a/Portal2d/Assets/Scenes/Levels/10_trigger_tut.unity b/Portal2d/Assets/Scenes/Levels/10_trigger_tut.unity index 890acd0ed3125c77983c6c9d76ef6c90285f4ca7..11b5826d4ea44ae90410f1e9359d847c3c86db6e 100644 GIT binary patch delta 2280 zcmYk6e@xVM7{{Lzs3ZB=7Yh^#LQ50z@VpDsD_jZ~P7ZYgL*Yn%IdmOAEG*p757*&p z(|vQ`){kq`d0UwfE69{!L0qdpa1fGdovQ{oHEgb&)7ks^-t*np+dkjtp4aF3JfG*s z=ku988R0t>VJ5n~k4z=LZnJ+peoYurI1we^O^$$|Np)~saZn`DUT6+ zLOzJmeDlM2X1BoJgJgrf!n|ty&x*q`mndK&c0{l0)=@-$=nrAE2=he~*`ULm2Jg;1 z41pLb;h`^%Xc06HtK&=OJe~=HwL|iLox zPjf;!{}nf;u|D|Lcea0)gNB;Xb(u+glxRpY`&+k$A3d{KVP3U( zLh%g1+kUL(h`(}truojDPvnKpmFyK30NV~d2IHOKKcEpUSzyE!HFg{tkrUr+=~=We zZ;D}eZ)9yU+jW7N!{CmayTbi(D#JeY29gS<8O^;o|H$J!Q;M%1(t_)!)0qXq-j%KX zOxes8BDcEsyy7_Y6wv`_oK$Suxy3w_xXdV3oUj3~Gi-wqFRV>H3=e%7Xc#)n(Jk9? zXDI{)vO;N~$CM##7R&{mPus|i+gODXsF%+xp1?{Y;;koKu)~biXl`x9rKg#t+R=1r zc%3kFj#03)$46JQodry9RKKt;FuncX3M+j^%c)#TYCvEjTvXe&9Xi2uho^<{ zR#lkeWB!e>>@`LrFZA1<<+TIqxk=n1_<0{1pOb4-v$+ry0NV(uV7MA?=R!~-*66pe zQkY*&`$ch>p9|dpzC1f+#tT*f9Y>q0giV88h0fkD( ze4cTx!})?_>n34@HGF;(Fq(zA)IoR%Vn*L@Q=w7-1Io=ano=Ze$p)h-PGL?p{(|E0 zVJ2J-qV@2Ph3vtPA}oT$8KNii7H(!XdLL`7UsuZPmRfm1@wlBt4bV7?l6mX3nQ1T| zbgpiD%Lm&a$XiS_E{A1fS>ub$Tw96sS8~(AI!=;&CHP20MLL7E9?{6bxh}Q~fbAvn zXd4Fv=9Uq`C*d8TAB1&+EyAP1!7R@|?t-8JY^6IqS@iEq%%;JPLUJOX3-j(Es)LR< zh)xNc1?z;Kgwa*BBDC0B9_sRZz-}>YL2Fu}^TuBYyQO~etKuneg|_GG7-lW2g&?=E zWc>fGZEz2>POt-z9MX`m)Jo&x3=0c@`C-Ga|M$Y&NJ_sqRSEqsV~YG>NIOPrZGX&u z?i-D&YcDDu=T00lRB0i|fXsAN83`=DGSGepp>rRGRHPtxBlB4>jGJ4wXCYsdb znLBE5W??M+aj2F|o84lwuIz|&no`y9{}Ot#uXqcwGQ4-lW@??YZFg4iY>cdtIpgP+Azyv&$8xNJF@I1r6V`n VRM0WH#T2eurdIWy$u_M@`5%-up6>tv delta 2158 zcmYk7e@xVM7{{M4Kk7)pqc7HhNDx|@n5T?7(<@jCXE-^WvmYWIb?Gfu0YaS%ch?Ws z;cA0@W8l`0Ym>!RCd3M|q+>~3t3Pm%UZxeR#_7<`=9+Uddp}>E@4o)=e4l$>pXd90 zo*$pj_rgb06Gu`lMAQ37*^wBq^i5?^GEoW<<;~@#LQ#)4I;A=zaB78h3uMIy*{sNs zM$`s|M;vil;+nmLbfQ zZ~EOBFVADYMlee&Qcp51!zI3dJSs3hX+3K(S zZJY_&wer)d(|sS&0a#qr!oriwcqImAw8|NQA6$|SJ^T6iQHh%dU-a-qs>CJ1$rzuw2t>qtY^Ojm@%jkVU6p|n!Xigdq}UTPA@7VFa~Ix;;)J#u zVI5#ztno4bTG&-EqxFxCls?Sw2DOth+@TFb@5179a&ab621Oyn-U6*cJWbcipeP1r z+`@WcKCSQ<)fq*!HhA#mc~(|jj}Sc#8^@Tu!ur5wVOt={br&~5;TAR_g8xyXE?7M3 z=6gyidBwVss2`fW_X>-E)xyq(vph$_sXR11q^#TbfPm{rR< zqdGmCaZuzSmURAD#Q}V1g5iB{#gc8zI&Nak4I7_eHmud3Q3G~2Q4=h#;_*eB^p!ra zFl_E_yZ^l>p~zK3G$n^+%g*Mfm=$a%nh>`2ppT2B#11?pqiTa8f|1eq!37@nvmrt& zQ9$1~DzF0(G3ido55nSLOYu?RWL8!7dZ5UPt&D(2s{eb2nFH()G#B!juo##RwheMr zSlKQN5Oxlvzk2oj%P~NnaxP>*9HVvSH}Z2~F72aV)j$u1#@q9COfK2E2Z|!X^6>k+ z;OGm?;$R1$Ii(ZA8a?L4853r!H@}hJ3yXjm_r{w&@)APORWR(Eso&0#%>6t!D$vT$ zs(~U`t0g1>8-={X%+__~JCR?B=2*#Px0Ypr?3$jqya&*Z^Ca8G*dO)yF{NVn)CaeteIt<$ad0ki> zYy!pcKjs_4hMzZk_NLM>AJEfaHm&-T`}e`0dcg3x*T1JV?Yngre$nj0jeo~<7QKnB zPg@n>cN1VPd3W#c1C_qg$y&$Y@pG@Hb-9&d%{$Yav}Uaqo+%!T%-Iwz@BH=d3AbYH iwr^0ZgZ>Mls_sO#k}{O?fYO%KJ?l_hLymQdFaLi{AA7g} diff --git a/Portal2d/Assets/Scenes/Levels/21_gravity2.unity b/Portal2d/Assets/Scenes/Levels/21_gravity2.unity index fff70fcc7d72ddd21c6598d126e43f468ef6aff4..57d4b0f2e4551bdce6ed28f798a218b91c8ed877 100644 GIT binary patch delta 233 zcmaDef$hx%whg~uGg+8VpXkkae{#SVf$0rCj2hE7=rZbTc6j@Rh1=I4&K`<4+kd*s zk1ViVo{2G8meFGRX*ov8?Q`TA|FCkiGcYjd8ta)En;LC@U&rXixc#LXqbei2nUR6H ziJ{5l!hiCU1734XSIA{#+3ujhD6Y(CG+n@&(O~+8SVk6BT_ZgMi|s(i>{DejG~6Co z$Y{-jV&(K&MqkG14>TCrnN2NCx4)}nOkzSJvZ+}7kG4^65CL|y!%o2JmMtp@c=TWw2iHBD>+G=gYi>;LSY>+X{J*km$ies|8y zIWu$bj{T{c?+=O~`q4~mYX=eOu(n6&Skm~q@<}#3arL!PHqkj*63hA~9N%6Did=?M zD5SDXQwl}rrQ!3Md}k(6GORU_YVqU-SUGGhWH@DDI~3(SNTdpcVBMB|{1MIyr3FN2 z$tG%n6$8n%pDp80X26uFyL2UWoGpWOLI*)=1?!NuT+rmJbBTTk@WeJRm(_Fcc_Yyw z;k`#NYaY=E7{A3{!IC69BDnI2vOvQjrw@mipoj{Ho`d4~T!LA_cEXN@oDpnBx{3%x z4-vg3yqnLIKZPab6cRN+>mX*q2Ekr{t%vLpELzIAsL8i(AsPear~9yK$sJ++!$j}E z=4Ut|m8>mJCcUnMUBl>M068$HDp{onJo6?TLt!!U^yk|73?^O>b?)2fucSz zHPZ0@1PL~XF7YnJLskjq6f7F-^Y9mWL+A!r50TA%%r69NK_eR&Q34#Cg1Imi{PO%T zW4~tc>QZTix2@xXIl=mbU+CqgZns~hx1nKz&43-j!$e5{a z;$GHl#Um<33GC3kwg&~91sj3Qd+?HAeUD-uaS^;M^s-=eJBW_K4uiZR7}+oxSpa;9 z?%bL}MKA(jyoCJqIQ7}w0nSWdZ$R_JQ-aNdDT${A8?3?LiNvRsy|v!NF2REFdhon9 zp7{F5ozFv2At0|WPx6yslVC~}eikfew|8c~obI>rz3c0}vwT)CCz!JLoM45IdnfU$ z>HZ@3=3{_^2oenWT5)XfCOJ7Uyz?>LySofe5E;Y=;n^$W+gh@|YcQE4{iXL<;>0JH zssq&fPHxyX*mbk&{pniW_urW7r8`#+O}sk0*&vsvvS9g?nw6^fsJ=O;m7Qv)lH(&; zj-xJ;jcKEsJO3!e0VoO*136LifkZ$E2&NO7C z^AYg<-NoCM-h+x$#^zjKN52B`iMBNEXgy#qHt*|dO1HxH>@ocBJw5OYfMoh_p_q6; zr4yb+TiTv(Y2RPb+LmsW?6;#5d=I_Sqvzi}nymj710L=eHs37#V`*uuZtZUG`unnm z6~+7~e|}M3oV)ptiizXjI!j|^lf~@$GHh*aTi2XaVYamI?@6k0|2M)z{CFZ|qud+C zw9?2mwKV&?DvduG7a{q2Xzy>l@qWGIHvgVW_F1jgHlV z!tM{2=Qpti`CJ+cc9d^qBY`a5v9O7S1iW3qRG((Cxewn`_fjVzfZ%2`I13e{v}8=>q*mhDk%CDXOl z@`90R6#K~SXwOnF9bddxEalhpn6j4QmXxJz)Vpy)zB_D1J~LtiREj*OXF6q_8s%QI U0{0m<6u7-wp+fn;iBjIb0O;ck8vpZBwmfo0PZ&D^#l&sFD}(IeOQ$4lT?JbX6w?Vk%~57 zi#bY^gCU(<_MaTC5^H3_OLx0Jz9NUM2mDZ0LpC>zm4 zs9IKrz$y?=f_i71Tn$5xMMUN?5d0mv7uP73r}ZL(E0@TPXfm|0^KrRa34$3}Ypu>Y z#YVw)!p1?Hgt@iv$dIsv=#43wdt11?UhV!|K-4O`w+m}7BsvSGzM@H3y0(14QWPj6 z$^lJ*9vn|}!B7}%H>|1`6xO_yXanL5=%KKn)`<*V%ZN_N?#71|Ti}wTn5Y33J*92J zI=~JhPJ^}!8?U`bhUVo&>IKy8E>-=GWU!YIokpzga9LOYO!X@sx*}|*w&0D$6DTG6 z0y+-z$%=PHwBA^-tHK;kycOb1=vK-h)l_N$+Xt&E-4;eGaepS70u~VFS{2LZ{h6a0 zL_=Um;)xvg39Q4Av|&*dPI|X_Ph=xlD;!lMS(qE+(Sg_or3edyH6or0r3!OlWK`o+ zz7}rW3qwO-ovWz^cOcg|&IAVukw!I?(5!6n63hP-HEBxWw&I78* zOE6;qM}$?ck9Farun?Gfc8_}ZNB!*{bvS@AHRkcLu)2-0!%u|01ao7*nx?11iff6w z5GO#-jD29nY~4NCyJ4NRyEeE9mo!EHyIq66_*L$l=M6penrZM1+xmJ3t4&(`u&3|X zaGpcATR1_#H<8QqbPJbh%@@pmmxaBPw4P6Py<;wS>*Hs$+3%Rg_5{xG*DU6EvtGTJ z8}#m6PW0c-=X0#r<#UR@Kbh0~ZH1gShLikvma*TYhe|k`ZThbgo&%Fr%JX4rN;x-b zrfIH`ak{UREfSyV;Pj}Qrd|A#C9Xa&g$-ZJ3>&UqZj0czD@~ diff --git a/Portal2d/Assets/Scenes/Levels/Menu.unity b/Portal2d/Assets/Scenes/Levels/Menu.unity index 022ae9f11e5fab7af77cedd5f884d76417310733..5718b3a47719e5b6f62a6007ae709e3c12963c60 100644 GIT binary patch delta 93 zcmbQRoMXarj)pCaXI67G32xf;>3_ZbGy_Jd>F-uEN-31@li$a{z+jJxgPa){o;cO` n9dn*O!H3ai`kvK{9Mf~wFa}KLdC4d;-9?j8Z2Pk{jH}WB0WBYv delta 106 zcmbQRoMXarj)pCaXI69YU6kMV>Q0UQGy_Jd>F-uEN-6wV*?*9Mfx#XXTRSr_TyU!K uJLWunf)At3^gXK?Ii}~VVGIxy0V-q!Vh~^gVvXsJnv9a$pRHkBl?DJzlpc%# diff --git a/Portal2d/Assets/Scripts/Level Specific Scripts/Level Ending/LevelEndingFakeEndTrigger.cs b/Portal2d/Assets/Scripts/Level Specific Scripts/Level Ending/LevelEndingFakeEndTrigger.cs index 4d42e2b..eed75bb 100644 --- a/Portal2d/Assets/Scripts/Level Specific Scripts/Level Ending/LevelEndingFakeEndTrigger.cs +++ b/Portal2d/Assets/Scripts/Level Specific Scripts/Level Ending/LevelEndingFakeEndTrigger.cs @@ -33,7 +33,7 @@ IEnumerator TellFakeEndStory() BlackPanel.SetActive(true); storyText.text = ""; - yield return new WaitForSeconds(2.5f); + yield return new WaitForSeconds(2f); storyText.text = "Finally... Finally... I get out of the house..."; yield return new WaitForSeconds(3f); storyText.text = "YEAH!!! I see the sea!"; @@ -43,13 +43,13 @@ IEnumerator TellFakeEndStory() storyText.text = "Wait... Why... Why I can't feel the water?"; yield return new WaitForSeconds(3f); storyText.text = "... Is it real?"; - yield return new WaitForSeconds(1.5f); + yield return new WaitForSeconds(2f); storyText.text = "Why..."; - yield return new WaitForSeconds(1.5f); + yield return new WaitForSeconds(2f); storyText.text = "*Suddenly, I feel so tired and fall asleep*"; yield return new WaitForSeconds(3f); storyText.text = "*Right before I lose consciousness, I felt that... this seems to have happened before...*"; - yield return new WaitForSeconds(3f); + yield return new WaitForSeconds(4f); LevelManager._instance.loadLevel(0); //go back to level 0 again } diff --git a/Portal2d/Assets/Scripts/LevelManager.cs b/Portal2d/Assets/Scripts/LevelManager.cs index 879d60e..4622028 100644 --- a/Portal2d/Assets/Scripts/LevelManager.cs +++ b/Portal2d/Assets/Scripts/LevelManager.cs @@ -28,8 +28,9 @@ public class LevelManager : MonoBehaviour {9, "12_trigger3" }, {10, "13_trigger4" }, {11, "20_gravity_tut" }, - {12, "Level-Ending" }, - {13, "Level-Bonus" } + {12, "21_gravity2" }, + {13, "Level-Ending" }, + {14, "Level-Bonus" } }; private void Awake() diff --git a/Portal2d/ProjectSettings/EditorBuildSettings.asset b/Portal2d/ProjectSettings/EditorBuildSettings.asset index fa6a36c5f46a181e4ba373816ca4a10ad89e2a4a..51026b1f7a4afd6b08df0816ee482b1d8792a8d6 100644 GIT binary patch delta 92 zcmcbhK0$+nfq})8fk8xIBZm$PlK{(RN0!6flLJ_|IRzLP7#M+AesZIL#Aa0iZRW`h u0+Px`hVkh|iDj83l}37{c|eMR;oan=fA_`ccx-2jx45%l+1ANE!Yu%~TpDQr delta 52 zcmbQBaY3Dffq})8fkF7fMh+borVGrQ9a#=@PYz(==HzE!U|8w3#PQ H5N-efGj0ot