From c152545f94a0fbba4ac61672b697376afd82c661 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 11 Mar 2014 10:28:50 +0000 Subject: [PATCH] Fixes for page style - Made alternate box background green instead of transparent. - Renamed PageStyle prefabs and style assets to use a numbering scheme - --- .../{PageStyle.prefab => PageStyle1.prefab} | Bin 34328 -> 34328 bytes ...yle.prefab.meta => PageStyle1.prefab.meta} | 0 ...leTransparent.prefab => PageStyle2.prefab} | Bin 34320 -> 34328 bytes ...ent.prefab.meta => PageStyle2.prefab.meta} | 0 .../{OptionButton.psd => OptionButton1.psd} | Bin ...Button.psd.meta => OptionButton1.psd.meta} | 0 ...nButtonAlternate.psd => OptionButton2.psd} | Bin ...ernate.psd.meta => OptionButton2.psd.meta} | 0 .../Textures/{StoryBox.psd => StoryBox1.psd} | Bin .../{StoryBox.psd.meta => StoryBox1.psd.meta} | 0 .../{ContinueButton.psd => StoryBox2.psd} | Bin 27944 -> 27912 bytes ...inueButton.psd.meta => StoryBox2.psd.meta} | 2 +- 12 files changed, 1 insertion(+), 1 deletion(-) rename Assets/Fungus/Prefabs/{PageStyle.prefab => PageStyle1.prefab} (99%) rename Assets/Fungus/Prefabs/{PageStyle.prefab.meta => PageStyle1.prefab.meta} (100%) rename Assets/Fungus/Prefabs/{PageStyleTransparent.prefab => PageStyle2.prefab} (98%) rename Assets/Fungus/Prefabs/{PageStyleTransparent.prefab.meta => PageStyle2.prefab.meta} (100%) rename Assets/Fungus/Textures/{OptionButton.psd => OptionButton1.psd} (100%) rename Assets/Fungus/Textures/{OptionButton.psd.meta => OptionButton1.psd.meta} (100%) rename Assets/Fungus/Textures/{OptionButtonAlternate.psd => OptionButton2.psd} (100%) rename Assets/Fungus/Textures/{OptionButtonAlternate.psd.meta => OptionButton2.psd.meta} (100%) rename Assets/Fungus/Textures/{StoryBox.psd => StoryBox1.psd} (100%) rename Assets/Fungus/Textures/{StoryBox.psd.meta => StoryBox1.psd.meta} (100%) rename Assets/Fungus/Textures/{ContinueButton.psd => StoryBox2.psd} (80%) rename Assets/Fungus/Textures/{ContinueButton.psd.meta => StoryBox2.psd.meta} (95%) diff --git a/Assets/Fungus/Prefabs/PageStyle.prefab b/Assets/Fungus/Prefabs/PageStyle1.prefab similarity index 99% rename from Assets/Fungus/Prefabs/PageStyle.prefab rename to Assets/Fungus/Prefabs/PageStyle1.prefab index 1bae8f6bbf8c8659d783265cfa4def7c2091dbc4..dcf134aac2ad2b154da6f1bf8dda4095f85c38a9 100644 GIT binary patch delta 29 kcmbQy!!)CZX~UITJ}w3ZhJeKM)ZmiJoK(Zjk7~_00G!YYbpQYW delta 29 kcmbQy!!)CZX~UITK28P(hJeKM)ZmiJoK%L*k7~_00GpQzLjV8( diff --git a/Assets/Fungus/Prefabs/PageStyle.prefab.meta b/Assets/Fungus/Prefabs/PageStyle1.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/PageStyle.prefab.meta rename to Assets/Fungus/Prefabs/PageStyle1.prefab.meta diff --git a/Assets/Fungus/Prefabs/PageStyleTransparent.prefab b/Assets/Fungus/Prefabs/PageStyle2.prefab similarity index 98% rename from Assets/Fungus/Prefabs/PageStyleTransparent.prefab rename to Assets/Fungus/Prefabs/PageStyle2.prefab index d629923553eb96fe9ab2bdd905a51f39ce082308..3d1532f95b17cdd59be5411eafb91c2a46b8565b 100644 GIT binary patch delta 164 zcmbQx!!)CZNq~W&ww-~YO@e`effLAHuu-6|#xoJfV}#-cDK>@-AUgnvS)kbA^IC=- zK=u@N28RDYPy}QzNdL|nz`?+v0c5{qhG34#&uiuh-gsRwnIX@;cIxHRD|c8ve8oJu su~usGf?5>;E}+_g#PrnQlFFP^BL;@ecWSS&F>*|HY|`KSpv8a@0N5HYMF0Q* delta 152 zcmbQy!!)6XNq~W&wvd6L4M;O^0@)Kb3iQ=@W&(MPP~0HJ#!vuc2LLe(6gzxg%Wwe5 zp2E(+@E-_@fb0e7-&rF#7#K8w?3c_C%s%;f&AiEJ_0p3!)T&5`0A&Ia(^G>>Dsxgp diW2jR3lfV`^GY^9slCEBxu9Nb^SKr;MgU7wDi#0$ diff --git a/Assets/Fungus/Prefabs/PageStyleTransparent.prefab.meta b/Assets/Fungus/Prefabs/PageStyle2.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/PageStyleTransparent.prefab.meta rename to Assets/Fungus/Prefabs/PageStyle2.prefab.meta diff --git a/Assets/Fungus/Textures/OptionButton.psd b/Assets/Fungus/Textures/OptionButton1.psd similarity index 100% rename from Assets/Fungus/Textures/OptionButton.psd rename to Assets/Fungus/Textures/OptionButton1.psd diff --git a/Assets/Fungus/Textures/OptionButton.psd.meta b/Assets/Fungus/Textures/OptionButton1.psd.meta similarity index 100% rename from Assets/Fungus/Textures/OptionButton.psd.meta rename to Assets/Fungus/Textures/OptionButton1.psd.meta diff --git a/Assets/Fungus/Textures/OptionButtonAlternate.psd b/Assets/Fungus/Textures/OptionButton2.psd similarity index 100% rename from Assets/Fungus/Textures/OptionButtonAlternate.psd rename to Assets/Fungus/Textures/OptionButton2.psd diff --git a/Assets/Fungus/Textures/OptionButtonAlternate.psd.meta b/Assets/Fungus/Textures/OptionButton2.psd.meta similarity index 100% rename from Assets/Fungus/Textures/OptionButtonAlternate.psd.meta rename to Assets/Fungus/Textures/OptionButton2.psd.meta diff --git a/Assets/Fungus/Textures/StoryBox.psd b/Assets/Fungus/Textures/StoryBox1.psd similarity index 100% rename from Assets/Fungus/Textures/StoryBox.psd rename to Assets/Fungus/Textures/StoryBox1.psd diff --git a/Assets/Fungus/Textures/StoryBox.psd.meta b/Assets/Fungus/Textures/StoryBox1.psd.meta similarity index 100% rename from Assets/Fungus/Textures/StoryBox.psd.meta rename to Assets/Fungus/Textures/StoryBox1.psd.meta diff --git a/Assets/Fungus/Textures/ContinueButton.psd b/Assets/Fungus/Textures/StoryBox2.psd similarity index 80% rename from Assets/Fungus/Textures/ContinueButton.psd rename to Assets/Fungus/Textures/StoryBox2.psd index 5781385101f72de7e16813e94fa5634a6a3948ca..7636c5ce3ed64f1fdd5622d6dec6abbe3748de9c 100644 GIT binary patch delta 2994 zcmbtVYitx%6u$H5@{p%i@P~$mSRyK6r`>HALX=ml21Sif#UMsSi&1atL>ZMvn|LSak0d;RX6nVs1dHO5YN=iGDe zIrp6JyZ754+NCY+($Z@~)-nH|a&5e6c zu5CLk=I-Tl_3}?^u1L3O+6v7-UklBz*22%qHQsUL3wgg(;jaq$HLW(_udVXegfuNw ztJN=>wqbJVQ2;x5)C%ZvuAx%ajXmEt zq*gB3v~TF6m4)AXg1?+vu;a*)Wp`X_I&gK@<}EYGo*xG{e6{ntIhDJwSH(6>o7a@< z+Vk?|c~=7F%rm)N_c!l2{zC7~$KM&+c5-{iJ?j_#%37~2c=)9QpL{qgls|p8so{Yg zsZF!y%=mQw^<%O11Im8gTRM{Q6t_z5Zta%imgts^?Mr&%WsL57G&USN-2soo38nxn znItIrKcp~_VuBPVNMR_|9AwM{DZ;}T$S?=s$?KE}7h!|XM6Cvo>>}3SO zK*8*RB}nOj)geeRyWtZEb~sj=XT$0=lTAU&-&)}RRtrH2Qh*dUxox2cduz8Gw?y8l zRW`DYXbD)jecNpp^ikmCJ>Yprk?niH39@d4_2y&8=gxR7aZ^%sfHDKH8w2zPC5H7G zq&hLKVmJu)Q@9Dl=*34sZS=qrP}^3D<6(5;BapEz9>dFCa2(RP9hWVctwHR+{fpph;@8DUpo~K|NejR6Kh0*azBrsY6VpME?*QW>U7DD-Tzv0+nLvVU}lQeGrYf&?iQvXlI@k zn3|2l#RW>H(KK!hQ*-U`aE(%FtRD`hbRw)bQ-gtaEBbC#cfx1ikdfN_qtz>1YWaK&>;1ATMe_Hys;+?hupu6Y4O2 z9>N`s%XJ7y2@yh(N{KLqCY2Cj3Qh77VTudxB?9tP2AOe)fJUhp+C)Gs)Q%z%5D~?+ ziGW(cwuyiU3L-3_;zU>$Ct{R%6@8otCxR0pvT!1-eQ1&sVc8B5PCXV8#ab;Q+)gYa zyuDgPc=51_C_&93!i#Q^2opps)B8Oi4DijRsZ2Y4=R5gGRVa9e3{XBA-WM3E%VqXK81+{!IZygh1T66@mSb7AFWt-|#s39Dj; mBO0^&DBuW3NA#IzQfG7o9s=PJxCw-_;XfN^MJ~QkFZ~5!Y|-2R delta 3396 zcmeHIYitx%6ux)%VbM}sklG)_R%L$xL3X#>eN?sp#dJnlKOzZW0t#UB)v)$H;5H$GxEBlf#(IfoEe^eWOYn}+3Dl@~u-S-q#~ zz$c@t%8mwiX}lGTSMiiodj;QNFL}~oFD>zw7CS@FaBkyXKE$=*B7dOV;d7RI9e$_X z?R7ZH9Uf^M32lStYp4$S;n@TW(2)JHe0lWYmOF7O^mg!W{D*ufXyb$($78EHj-BZI z{kMq+s@4v>pO2~qdndkoBGvHM(LWEb8Lw-m$n|FQ^k83d^)lOo-Xqn!zTAD$m8joG z(S6@u`7pMf{@zeo20FFd2UTrIydj?x)DHaWg&BlO+3-;dl47eEJrH zg5+$nZBtumIP0T(s+JaR7{B!6CH2{#jwh;rKA9|3nm6q{7>%`7{d%BrIgbW@|3&)5b6=foMfZL$MmDRHw)JxDb6KpEMKh(8ch;Q1)~p7Evet#{wS|k@ z5k?5NBe){CU9PEJiLF0$oZEZ(vi#oGHZ0^Lwr+=&J^fEp44I*HPFgw#jB)*>pHQOm zNiroR;Z0$e;uS(AD#A{rk^*~%QeFiViQ_ycN)pf-iue?u0urxjaEfp|Ax!-$&r}tH zq!Atgr4lTOBRm#CRRwgIM`4wu7&^?*6wpW-0$Gg`ffB(q;}7vBQ6fMiDb92AQNkQh zR|2Ecri|wGL&24B+7+XNy4!jvaJ&}l>`>Er5pGP({7Ez>nx!793PpfBpIHHgj4L=h zDm`jF6UO|^EufHb1v4w4pj{@Thq~W-EdNx&%nB%ET*1r=C}^Ge|FxiSV_*KKE$E(i zHr=!ZLyy;agaYWjyU-Gp3o8d!wzkrPlZ{Tc7|!@hKr$Z{Xp(s-570c=Wu))^cLqXb z^^F3IRopW+MHPw@y=)H8%xoB|(YQiYYQ1`a5J`feZH1vtNY{W$Q`C~Uz`$#~g@Il1 z6s6QW(F+)x+GY|R1Av+aKy`$-fLafw7CLr@un7)2gbY$M?H34v*=Y_F5~Jqvv%rNN za3cxRFtA{3gJhqnpAc