G;;q z!)v>n2Y=?rjtySld4e{TQoEp@93p6V{ROo8{CEtRB*4pbv}bap%gRJs+UmqvZ-Vl@ z&suySRRJ*WF`ekc`P&TP7*wIn*7@34VvWbsb)od30v%o)M3jX-I#K?WteyJVO0MUD z(}wz|IG|hO&YwRDY3b<}tpuaB-O!>T?{5Q=K^*wOLE{qV;HW;9pRRBs&?h+fLVt~E znR!)5ht7k}2j#Kd-QBV#FyOrjMl~rZsiyGbJy3BV1!Z(S0>Fr-A4a9n!_7iFzjg9Q zZn9{GY&q@(wN4tgPF}Hk>yEw_394N^I0)vVNdEJyFRS_`R?yMwW|sfJmn%EJ&z*z! z)-7gE+eWudB`iTxi<`5vv!5#Soh%%N4atG%vjP;B|=nrQysI7glnkeHwLtfa1{CJK+o zSFfq4s8qGIs2@EI2;deJ>{?pf(a_N7J`8E_E6U5ypPQR|yt99Js5Uq_sHioH86O|# zP;P$HO#6gt)>_|{wD)mmvnBec9J#UVyy36BON-ZrKF>u_x~8?$PE_ljlaqxuDEDhb zhx}vcY!^pf*2+YzpY|u~v;+kfvGmf6uU5&2ZfcQZAO<~yGfSPs2j$8~lO)JoMKeyM zAYjr{bz3b >oW9}p4HB(=M?ggW~pL@N5Ne&WO`bhT>tco z0-&j>sdHrou^fI{-@sJg 4uba#8*nr{(#BTq5eRrRVZQ zf#;2$fDGq?$c$>Y(cw|{se8GPeHJS`sy&P(ON z!hOHDjjRPsv YS6c&cJOquQquThBO(U56=p7}1P@LcFE=97TNjP3=YS zTX@lBQ(?@fn!Q*fA_M0gO2<0F&)mBP{g!44){5XVWQ}Ao#>3N7Qaf(+?yoi `%JV_Y%wn*0NqIThWZ+x>b<8{dFK#lUMQvH6eMUnt~v2IqAI{ z)&^uiQHYJ2C)v*5jZ}l0O`yrQcV2b9Kx}Z}-@V$HT)4z?gIXmhkxP}Rd~N97-`db2 zJ^inr-yx>@-X@IsfPi%Tr3YMB;28|v9NaL&j^s_GZwG4er*#bKxEMI(SjR;X%5}TA z`PWB%8HXOUv=?M4bI5=!w+}(&_l>=F@XP)$kiW(We-TPdFvl2yn-yvBqNIjcFa1|Y z4!md_DuEA lD9C)Q!5m+b+@X+}xQ;CsZke^@evgoB$3h&{y ziD7rrgMzyL!$># KoE`h0Br_!zRiu08h&p7QKYy ?rABtvY|B>}CyP;^2CL#eBqENnDasMCv`M(V)3-y9O zp@c#suBG8^{>zg}L14;JPB6HNuBxs!^JfQ0bHGKpCA6yRmoLKOP%cnrcKCfXH^}z- z_3H+_RL?|3VB_zvW+MJI7GNrlJ@Z3cB1lkXf`h``%u$XbZ_H&F<>NPzu4u_nPEc%y z!tVXVMLG7^zj{+fyT4)}wgoT#07^vqUWhZVYj3yxJL+)jU10elX5J+v#DX&YOhu2u zjWMVwmuhR6-%_1OMRA)BJFMm9;vm#th~4a8n`7fqxDF73;tLmKWPjfa1}94YOMyS? zhekwDgeIUQHL 1VPq*|(1*&XtE duR|&&5ssEq3WETa*|3rp*Ya~ z@o%rla-(e38!AK~CprDA3zZCUg6>G|i8<=1oI7=WWZPDP}TQijD^h@{xUoaC^%N zp7x{Fa!j& &Q=8z+q+h1cp0i`yLWAU zokckEL}6pHHJ);K0Xp~g0#}zrpmQfDLTtj?MyE|FOVc>=acf-vIzIpnxI%TnIuo+VkXB&CFnhv1BoKy@8)Uf4b0J>aQ`>s+pRu z<)}j1vKl9lyUT7xHqg$9U7&zzN{GR~b<( G>;R+g6sQ_0ckI9TI?=DV^<<5IOENmsj)FWjors19BKCT zfmhn5_jKD9baZq~fMXjf(-Whp#rn$1N+u1j_Xu=`@;?)9_#*m& fVYZe>Lwd*=$_FBb!}FORIX)TAW9qJoCL0yfHn}=gAxMqx4DC}z0+)MSa13H zNkRBaR~joTE0;!+8rKW3mPKIXRLIihI+90D$t!8WyMQzRFv?Sig}y0Z?ZF%;6$AId zmsCLti-Ajua`pwD9_=Qs%^AzKwYR7JWdPF*3=C$6E?-oFPCYhGPft6KDe#vzuGv~{ ze(yKQCszcmrs_2Xs<(XI)c!9Prqy %D*x{Krg5?*zzySMQD*+l1^A`%?(m;FuBYjM*4Eas$w^pPq}O+2pgbm! zCObR(&qgcxBM` ymxG{oG1A(o1y 8rxKllkjbi&OV(9{rNtL+8 z5Ec(rm$=DH1XAK?hR5h)IOBq^TAg1Em?vlyyz@js7i`Bf?6Y%n=qDsBT)Nupv#$$S ziakt^b>vK%tFx@=)tB-h8I}@XHKkXsNxy))00j)puiV+7eTq Vu&{i$CW3r$BZZ@H?S~!~{Eo1BmITo1v6jR42o-=^l zZ_lq>i)Bz|+hC9;ANEd#dtJ3qnj{UF^xKKW;;nt3M4Po|%8u{~4!6ZWYNEXhB)6*; zI(yXgZh4-H_dQ&{wNj_#pWvcitz7mi|2@sE*Z=6Q0aR!GJ#q5Ynsvbwgp2lWW>0sI zPbm~J&fIr<2hd5(ISz}NQLR#Fi|`1}*pkeuNt?-gC$fAr{Yi6A^0DOMFNu{Dv8!`5 z;bCF#$NA>3(=z;woV=gXQ8~WpMGi>SWHuabi{TU{^PLkmTOQJ(q-t}t 77VML)+t1mn2DwpiClDw6=9op&x#1 xBPhCFg6z? ze?y!98y$G;=H|BQ^c; 0#ddpNzt>^s>9(j3r*vtN&g*ix`E-T_F zQnSu}KOpyr7@YWLysvY?41TA(U-bR+ENRY`N(za66cQ3rrxG9( %XX09HeNUFo02n-()wm_adu3aLj>!O $DpxC85pP z^OosxI;3uoCS1nUmC5p)>S{T()l+ZdnsC;^r3OYR&ixEBUu)1rBjfZ13I>f{r)o<6 zWpjF`J5`6;bmDM0@l!LS)O%L(f`!G4e$7gl$MHhv!cW@IWIous{6qO6aM9@>h%*cZ akfG!+P~N}K@V%_R3B VE*FR3g#< literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Symbol_1.png.meta b/Assets/Sprites/Symbol_1.png.meta new file mode 100644 index 0000000..8b0b9d6 --- /dev/null +++ b/Assets/Sprites/Symbol_1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: fa8f31dc92661784a9c4bc994a7073d7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/builderzone.png b/Assets/Sprites/builderzone.png new file mode 100644 index 0000000000000000000000000000000000000000..77a762ecad0830d4cb44bad9b8def7a54fa98697 GIT binary patch literal 27212 zcmeIbXH=8<*Dj1Y>WmH`sGw8@XDl>PDH4hW0Z~B(X;KuFUPL4T0>m;1NRx386#^mx zN^c?5pwd(XL=2%O5~PMCgc54PyEBIWbI!Zok7qsWIqxzb^ybc8es%ACUArXmyosUU zCW%b~0s?}kjr1=H2yBcL5cmc0>jpUU_r)iB1q5~poYp^X9*{iIuXDrPGDYKCt=rDs zzk3JjUyZtZv4G|Jwn6M!PyJ5M;g~nwNmpGS-6`q*^=MM$n{Lm)-gm|id1|b6IV|#` zF>Hg<0sN*-N(WxM?#@)Zh%@lH(SQ3q{%c+VqcboiTR94ygpRvFA&jI@76SGjBFR%7 z^|yrvt`QJ;6Y8%aXDp&BDx#-fzYtO0_ihRr_r_a+J0%env4E1JUeu2+D?A1#KX1x# zun!YUTnEQ&+!1llPg3S(m5$ z<4`~VZD{oSkK>11cB{hChq1A-$dr^63vu3qZC>QWYhd+cRS$`(9w}|k=w2tTVz4|v zxJYk`lZ`XWGNA_sveO-lcKG@Ed6e1J%BX7hJ)3&z?5RlAs14+dOpmk~T3Vh=)be_9 z@wI-DRrJEbLPW%l9T7XE`(-I_vEH7FRdLHxIgt?&!Md_pCfElI2IFx;)Nn%c(32-m zA`%i3EPFR>C|+!Bh*DAz6D$urOr;e#tW*>fsB8*5(fqM)_&|bjbX;81)YMdtSEBOu zIdx>? %uG&dfql#<-RtUA(L?HDtU6&2ytH<}LAb!i?0LvAUCWmE=2(5A z10y65c`|R&M2V?i?=HVl8>5SM9h*_P<3W-maLU-a$62j`Go$U5QJ%HI_qE<8IvDg3 zu$;b*j;;6Z-ILga`1Iw=Md)s=`(Mo?CA6k{CbXDXXHr-1Y{Z>AcQla`R%brecUFgB zFZEaAFbDoxx{%i@ahJ-rR8DjX4i0W9Q?M)!7b`0;|2Y0DapN24Uuy8wX^+hf1hWGP zjyG=}lKXlNWs`?aVn?zqb2 -z8CzgOP2;uP!r zW896pit{=o=Xm4B!B`ocp2`zNf3&6OMC~lbTb|>D@eZQ&m&* z)yWQ_SC_(bDsSvYw~pPC9D45K5l}g{G$+3)EW**(Bg|b~!^fbnD)Ev8S^e qQkC!*>^sK_@p(p7xZRhuv2TsqnMMXuiI!yI;O1EFFtg0HE8S5wrvTAK} zA;o>PqS+CWFNsYp;Ciz%Ghdh=z`Z={c@Bj_wOnE46ckfRXn8t <{ zVoVOywNogy&b{ f?JO^{ro% z*7%y5#@#M&xpW}GKPJjDzq|lf;@ AW7Xy5<<3j9G?CgRyQobK5 TB?qsnTOZWQdW|z8C|vgJp%Xrf^Mi5zrCn=?==Wce z5}5A|KE%a3uW+#`)*%bm>oMGs9xojo9giMuO4(H-?Slumh!kbIbbh(mxz*KmpT~3B zwUZ~i@6lJ5+j{6K_SF#)HwL`S)b^z$B}Ea5q>^WP=*MaYl8<&Qq^2Q}EJvi@YxU;^ z`T31~eaR+Uq=#YYT{w_n9}=&J7GqIXu>Ga3d2zZQy{k2R2;N qbwr=2x?)o*4eG(cYyBht+ox2# ~`thA4Cgb zTU)qQV=#1fqKbn7?9Vw0h7#i`nJvi7xaekAw}hg&1yH Fj(AwG75zRE+ao{>}+X$Nwyllg&!0Pb=iyz%R+Mj;lXirJWUGMw5F zB@TlvV!ggujg-RW&f#K06O8|`uMQAl)~*mlth};wauhxeO;v6zk;Ry+^!?`2`Za&) z)TqFj>1>b4+M_myQrq4gjQOkgu=?Zm^*)H3-``ihUT{-^arDR}N57X4kI8q}b8@my zq9h&GyEHpHyYqP8RT-V2Z6H=J<2k6>ty}O>HfG=1b907VI *!=`-SbZp#emx+7qvP%CtJ>Jq $4{^3&z<07|+sJusF#b#h;Twe$<=C)VJ5 ZC6Xgp;sqU1jCvY52U{-1_?ZzdQ=g z`TP451y2yTHhW*uB_y)@uV|^NrjZTnQeaZ@cMrW=AH(Xsg#EkRLcSH$Rm % Rx^pF?m_ zr~?LrxrIV81E0FugVFZk!w0qAsRh!&)~dnb7R6opmsCE1Q2nqsbplq`qni~{!ZO-c z8tcvy^DbjK3(8_8Qy7jv-P&x!h7A%a=R7;cGINBaG`GkGPafCCaI2lixg&Zm8YAPM zhfVxO&zI$YdH;S@I@#}h{of@M3UOsPi-z{cuSJ>bN?W;hpCQqeE&(~jK6Ug5&D*v zmeniVC0ggc*!TGrz4&u_{U+J7_ia2{Y64jArgrnTZH{-%Bsav&)Q9x+uyy}pOQ Em(=6(D?mTaXJHnz zYE-tJ uE*7$9# zd2B3#S$2ASy;D-0h0H1+8XBUTYS Xv7e(cAJhh&u?M{DyIypOS=kaoIW~NkRTKe1f50BJbZbiH|`0h|W z+T(^xOIwt$5*HUA%t{SCwB9>hGkAXTe#d9n(`x@nexS(Q4=-taVFN~!lcVDaPM+ZG z+#D&HtRt6{&!9H624}i%tf`rm4RRm^kHLs`cXwA_?V6=wb+%v5Axd7qbp60v_7Mc4 z%G-{S9c+KBPdQtDCuTaSC%s56_juoFu=ZgX_hn{gx(i*b3?kx4LJV@A-r7Tn%?;na zeX|#j{FArq*%Q{wGaaUC_tH&-KKJy4EJM!I@wmB>n@3BUJ o*8Ku)>(hcJ}&!wj7H0zFLTvR_a^EoZ^ ZCH&&9UtRpi|T&ky)Ac4hUH4ch`!F6d2YL$IpR~kpR2&f^y8SNcsT?kxtu{19CK$HAe?URXniN(hxOE^8q#F?BW9ZV&1T>gI>7A+i)Q1 zB*`QKM}6}H75j-?mj}r6^m23Nv-u^;iuXS{1^*al%rA_jdN2S?JiTapuSHU_xkuca zlE0DyLUjJyJz;kKdCzREV)vk+%3fS!?KW=Lhe1zImyZojyau`Po)}*Xk9_xM;C=xlVRG zj+=`tyutD82T?nYJoIryo;#D(Dz)1|(Yg61Q8Gj(o``Bq(UAnz%B>7ZirEvoSI&Y) zUnXHVB*D!Z2*hQ-ycZgm6xy)rcDDXK6G1gw Hf?I4b=M%jCJd}nbtRmTIuQCbsYwC@c@dzo;<(C(=X;L zsx`GOsK@3E4riP(F;{rODcIE1G+E2v*s9Oq vztYmnl8iG%VOmvnbnNhC(rYi %GeeiTcH7)0vzR5*7F^WJSj53*)W1bf?F1|+ickm#0)cn-Y1j;eHgr1Wh ziHo;Y76*%>okSX$?!T`-zF_Ik4Yr6Ry&_9wT GksJKA*1om?z$~wziH0Tc9)9 zn{y7u2q<&MwcO3l=5j;L&f+T!PUJ*HT*lvO^vX!mC?OeK@|Ql;Ljnw~9l9LQ!LHjZ zUR>tbW{q(2RP>NsT% wxGg`t{!+}52^de6!5&=eZwnG`=8^Bkw&?{-UIA-o)7NL`l@rsg6ulRBv3an2 z(*tHJ-K}&@de6=m1qE#pP3jk4n~ &XqwUOvDU^m^F^7OL)qJR@7&|!hRkBlAPRE z>Sv~#3bUtnTx}1d#(?JIbLd&|tc2i$9NICYqsli6w^F|=Y3Dy{#@~iz1$MjY;lm{Z zOVK^ XXQP$Y}#Tjm&y;qkCje1e3t$LsHNIF7fD zpi{h_2PuDZKRI;sD6B7u%FaFtva!F)+Fn(?v&-LXD1}%JDsW$dank)d5iCk}zgP*) zw?xRdMcZ`3+Q?R?8-_ N0x7FkB|8%D={9;By(PN(-c$NXb;;npVbV@6>rQp8I!`N z9=VK(dLMKpyA}sK%)R_AcX8HE`IGKptsblJ4D qe!1GlQ)d5kKDTV_ib+H)1~bwU-!@At578)k@4{p zBQ09V>Q!e)Q|{MaYMJ>J=(F1vnm4~2&CJf8dTriwOF|b2HP^7b)?*dcM%4;-mN|Y` zG!FGi@@Te!q2@%vm{K@|dtd?mE+k}tLe0g>qDjLVTK?na@Q{X%EYsQdJhBo#uAhNI za1i{|FIZLiYwJK=_~0W`-ALZ#h(!tJ9R(_p_j&l@hcJt%3m0aN2MSG$w_|*PUeZLf zJ%O~EXc+r(oq*OyFd2D|=$^f;=@@r{8o`5?cG9APKQ8zj$%EN7H8p4?!4B&kwE6yJ zJ7}x)XGxKhBEI;BA%W+FA_p!)svD&aca(mzkCq8Fs|u^9lveVduxBXTLR{dsAT};y zDNp$qfj2_dUjA#c*`AedysvNn`CG&q0py*BJ9vKq54-z> $!YxZtld`0(;LMP=x@~WB`bweYN<#j#WK+v?6Pr zcNKE!mosP1z+XF?o13db4y=AZ16FH9#QbEPFp6VaB_XP!sK{e2Q-tIAOK9|nX^M6v z7|NRd<6rYrTu7NoDOhYwWaMvacq}-4j@@&1cBaD4stSs=`z L*D_y&vk<{&>iq>w$qs|NQe$$E#PbHpSIA?e+zR zf~ObPQSaQrYVr0yeBN-&ii<@bJ$l3f`chhl5&Ks?@BzGDL$CZPezWfN@86pw^Y`MF zmGV#>xzvIh9{`S-Sy_W%fL?fQj{F|nD-`MC;-X=Tng5azk&1~e5A>^Y;kTp 72(^xK-Lapk`9pa5Q+?`pOF(Ix>l{>1KP3nn>66GLF5 z#l*!?d-joU8dYC77CdO6U$n!Q-eVERpRR`~X=$G3ETG-it)tCZ-lKxfQA%|>v)dO8 z!<}13rbXr$*9UI+FdsMn^5gLjO9uuN6$wH99701w1L&t{;3zVjG^9oKLYFl``E+{e zVRRL~fByXVBY(u-NCu(hy~&@PZ-!p>*Y^btuvjh_UJqs-j~+RE_%MxaSM#hT#*2RS z$2)Fg{pmLKa}<}uh*~!os|O8^ii(Oy{HyPu;5BfEtZW>(BY+v}I76v+3;I_Qfh_93 zxo}gxWI92?17Gkj_}2f_+NvI$d+sC^& 5Hc+>gcCFo`4*-utqyY!2SLVSL j~kA?Lmt_aPsq1*(`M!oBy1kdFE2zO zP;w7Wb)4b(Yv5BF6(6tITyyJnMJ@j7gW!P^x!mRH&PN{dt8x_SvWJyaa2b!hvWJC5 zh@hCxn|JZ={Y)S%AEJ_LA~uVwhf?nEW;H}1EO-6;SOEbf>GS#e$;n2ho9j8gbQWN5 z{MTs&R~$R>7r%`Hzln(QpSMT<|K(l!d7;41;rVY`6zn5=l*Q(zJo(G_Yq1RzS6S&- zfSz+yOD(|UJJ|ETS-Q}lJo7FL+v3dZ>()%{e-vMzo-R_maISuN*?v{(KKEOmcdBoQ z63O^N#`;+riaJyjkBwek-Bq_a-W}DquIx%m3&b0W`dB@orz|(dWUh5w-5-SxYX3YP zo-SIPZj+V}rBo7c9aCJjXV^LS{W^kmEmHNEg%9VKnD}j5HuHDuZBF* XMGs$89vuU-PebYknj4%;uEP86X5FE4Q=?-}{VsSac={Zj1O5(QMqdSw z<3XCP|1n;L% 2oCg91+)N&b zEWQBmnlnk(6ahbGJdfl|N{ySRMn$O9M(;}~L!~H%*UQUW?;ai@F~Lvh3n&a;aam>O zk9Qt(1n;5*kXbQ2`lAoCgjDaC?&|7nE6R8n@UMH(oe5mJQ8EIh44yE&{i-FP?~g(? z)h;*J*1vgktmOiavQ1R+3DNiM*v*=}LBCyI$)40(nbu3Pm-z9fD@n1p92c&v#sWwq z#Gt_dd-2|sujXY(CN1t#Gfz;P6XgjD&Kx#$bBB~vG&rq?&-}Pw;Mh6vWW)k|1yE|Q zkv-4lM4Z^|c&oI+Nqw7WT+H=po0ZAB#gKLD)?L`QEn0?ek97S3#x-xK{XMp~wHXGp zPWc^YW%Als?-Tkc mK7hF~n)6i=L!JX*P znPOjA$t}FiH>s~MfzWLN&Q1bgyjoT&uz}7G$nOy%MLnaxp@V{`0BeBdtV)<_eE04I zSO=aKGCz8Bo0I9SjL_8FVHhXlwRjt_Ay1JiE341WN!S=^0-*o!Xm5 %OTT zr*y0^pza~>Yd|W4^Q^&kBJq3*KiJ@nO!oZ-(^TCUfY(;`_T)*9 4lM$R@%iM zN(2)c#dFXH0Dc4df*3-%6C)(IYt@F6va_?}P0avW{r6Sv*5&Y15B=1>|1KbYL<=1M zG*149nPd-jHb;V(2e?$DCH-T!A2S4A2^~bx`7JW>@nhgm8zH2}K6w=oIstuD4-ClM zM6g{|$X)O`ZQZ)HsJOVeH;a#OMvZ{}f-|BJM$|LwM|U?`1~~O3C57B##uq3Pn*k;i zm6mSfM;h57+VcOZ2Z<)57b>OVK MF(P0VWf-oFaUU0@U}Vr z2P!C80r?2tvG*g>Ak1Inc(^$AuS57h2Xp~EjH;U2AFHyeD-)mwFQN%xPI^;+{KIna z64cl0gH)r}5Ad585dm0;2QWZ&FuGLnKfn;rIT{#P!9Y(fL`Z4?$mn5o^KW1$o=KG3 zut7bvZD!^c&oA=$@#C@(0_aje#jM2I T+t%(kVl)GA~1)LO!V+)x4b{yiq?#EWR8G#lV1U~n51rrbx zvo>yrbjy7meg_Ln$jNsXzhv| QNdu+^1;w#eUhqrB#WQwm^mOoM3s)_tlZ~PC_8$V)HVH^CPnVDq_n-PHfpcwLP zemd!~@tHH55|o7Eowvw6zN0m f}5lnjKozCNER`M>?BQ6ka =gt54* z4hMO>s7vXWgalVFZ=tNV{5)*;bwkO>rC;mw;#WHOVmVksN38>gQ_&Wk+Zl0+Kak&E zjK6*=wy8a6VQO=9J(GNj)|p3GSG3AA*_!L1I!+7(?|slD6Dh0b?NgbmHx-w}*AL~l z7a3V7W|{D4XlFbiGe*?8vu7h#xiy1z(xpn zD?MKc*L$b;#BQ6mRACiSj6b>dd!mCJL=ie*bV7oIg0w&fL#$~7MC}Cr8=MW}ReoMf zOpF&708W?JgW=&K6pSqE+j0FoBzJa0Y(35fy%nO?$Y0&^Z7W29^Yw*D i6&0m^plV?{i6WqDm9=4Q$2GZBY Wy^njbe05tck^?Bm>V5-|qp%$S*A!x@O~ zv8@SGgNa(S=QG^52O#W{=V5@r6N;mckBX3x(2H(Q_Dq$F0Tqms@}SxAV|!PJVFwmk z*g(v&ggCg}WqAA`XKBubYeF)zRTOjb_4Rd? bLv%!=5wUS`2*T1O zeB>{yl18No=zWOn$Y big1(_aSpfU9bo^Wmz zc8`L@ZES2bNCpREa9+FtHK<00= _;ULK!;FiO&Lu~)|M>A{ z0p)+{>gwXdsqy+$@Xfxm$XUB8LsLPPJ3=DKwP|4;QOvLP@Q^MuzSZ)wu%u+`($bRr zQ}oRzk2vgJpQ56o-COwICU adeLgwbMh`PF~dB6U6 z`HdnkFRxSS?GXx=`QW*}F~vBapG2lm;_~wH^6v!rt5Fjj?icYn>o*O)E1^qoy!N8e zXwX+w(31OTSOrlMZ8l(boXBiSMpR%NR>wrM1-yPL_P2x^VhrRDBz!ziFw?%VC!a)v zTPs5`<>w;;<_}UoJUVW vhA2q-YGtZP#N096Hn;uX>q9XC{ qx;RkR z$_&=L(C4#{aa0twxn4m*gh|Gk3MU$e N 9#}ei4X8A89Au9Dka42Oj~aG &?%Z-*9cBPLWFACMKqKX?AW{D=Lx}0}%EP=iM zh1%t4RjEQj>u0; H>jey8#1Yx>Pn0~JY zXR|UrCk5OKGLp+`0t=yo@-!tS)~A-E4k;E(l;8OCDk1`bzgyv9QI17jEUW`2W?zC_ zHjz8b*e_a8VAxl^6S8Ep;!Mw; 2TzNR0eOsxtSt+ ze%zrb#xu^Kaei#$RXvjXZ^i(RXg6!ZaBv|4^SS4jF(U2bE(5P$zn*V);EDnU4{=Zm zxpiwBB%0=~Y9QMq(p8=iK?fsD__MdaKL(uUn!37N*WB}(oL!R}bu7v7fG4S`abPyh zGY fmdQMjn8O45fyh;c4iShB(&lWKQ@2$3klQT}3@d^#o;g&33Id8WVt zK0gfidw888ti}THp7zFN;-n&(OpXP!$MuMWG=-Dhs}IrqtES-_aVoeAe8KAa3BP&c z^%G+K?_*#m&uVXPFK4fsu{(gH>Fw1T6f)T#~U<*QOs|zR~O-Q=bP| zstFOuB>Tp#k$61b$-^Tj(b6G0K;g$l0)u5_uSwwZ0AIZTEPMU1d|Z81RaFrlPomLQ zq=r`G&~)!Ov<0QLyXt3L+}RvSjX%YMo%3_GE7AxABHe}$dcVDMRZn680r-mOE^p_u zhlgC7YPquo0V`b2zEw?B{_qDNkw>CXhGmVP<$Zy%gba}uXTSd)sRA0_<7X=5cj(S) zppYhjTRAzN1OEH>$uEr0CZbFRqmf1`Ky091#>>g*$#kw-6XJD{@Yw{{Q-LbJP(TVV zBcGS^#o5Gw>NIPzu#ij9iwj`MQHNWu=JI`wH+(_+6;*T}6_b^f1;oA6W}mL*9^Ioy zBi(U}OR6J!RcO3)IJ56)+X4RYiC=#G)jP*D)nMBu**J})mb5VH9o{aw05P^^>wMEb z6Koc{OClB)rak$XZ&w`9z(oOWV}nJ)X#r^TlC8(@+ahy_?r;YPZP}RqN+NmY-o}w0 zejM&GV< G }euh-xw&@YNGrGqX!XokjV-B2xrn%~b zNaUfIi^Bgg*dBI$mh;Wop4ZaisuR2eY#^@idQ|@>unQ~Ecn+nd z2))96D8~v+|Ig_yBJ$Do9AtNa?uXP>s(kP6RdaEV+|Q$*V*oio|848w%?ci+*LJ~T zOy*5$n$t-~M-BB2k2XCb+!e{pHO}lST!&)3!J^hPsugYoT2dVZ7!0AlG2^Zng{vAR zPYzj}+iv_65p!|i#2*Plcdq?yd;rBVQFu5<-{Y#K*E(XBaKevlEc^T@hcJR}^@DA? z>u0vos;TiaN9+H1W}1=VNh*tFLf~_~0)ZA$1Pe W;R|oe> z%fx~j!qf({lYBbcuH%pF;g086<(aGhFEQmc?)}ve@NR{D+TF05_311-sq4KDdu)}t zoj5M}@vNbt(`>H~>Z;Lli-x4KiqdMV`o%(sN1qz9+a~HjSUxdOxZ2;YW_4_8Y%F8) zVSw|W7H!E3=hhVc=er#HeJAtGi$9~9AR{m|DWgkeQ4(Ewn6Dtw5Z!!HZ{b?_U-b~3 z7c}s0QCc~{I0w|P|CKApR&~!y=$ukwv*e}+ZOM^Dpr0jAQvF8MAG?y=aYQ^N6g>;Y zimat~?)*>4%KihNP8%8+SWuwK3z5s^5-+~~s%{4DD4g&0anRnw=<#f8YLahFi77|p z=bv4Cy=^u~2cpN*b38g!_y+pJWQYROhjJKaO-&6;x}zZ+K#laN)u69DKE#e7<;xA$ z$5mF4y7BFsFAq$nuJq~dVlbI;&>loKG5bHk*IU_4iYx?@v$CMv5>&;20D ~plK3NdS8W~OAVJl z;uC6N6%+5@^HNjumexIMaXymN0)djs)x%Rm5k*B2D2fvIsMkrVcHWJ0iyW_4>84v( zb$H}r%WmIhD%BC%QF~A^-~2(2zM*Gf-z|N8aEN?$$AO=u2(!W!L~Y@(N=h4-vy=`- zDn#IG2hSgblr^X8*M}0>$Thz88%{tX+?`Pxt#>B>D!+AQt#HHO`*?ZZ@9*OwDj^CY zEUm1p0{%SM+M&KDbOehEC7JN8;mIW$jTVI`2Pr@akU??{+N({8OnMv2pT5Gd%F4 YgVlBPGb;FJfIJ^5{|t2e8R*EDIsg4Ri )IBas}RtFLc#GBu0&kKa2b1# zV4mKHhlsC++yN2QGOV<*zFM)~i1RfJPZfAR!itHek{P@RX;1m%*Ikmia|Pn^FGRR~ zAn=T$Z+5^JFSBta+u{Ge|0`dfXG4JU`>-01_U$O7D?`%H3!ot$sqi`ELZ<}dj98af z(kdD{hYpDXwTcbpB?AW-WEA)7z`^Z^w6wI*@$vCd4 z$7lp#o6AQN*$W*6Br;dvdd`oZ%9 zi=>^hT|6=vg6ThaEe$6Lq3%mVMV%-p&3ExD&EK$Ki--s>IT|9k-ysK$MtD_|AnDAx z_RCJZ_jWu~%7CypEbVth=f{u6kl|ZeGyL_nkpF$@ELW-S*nW)(d&!+Ha?xt&OC>v@ z_+49QTcf&7r=;wGgbC}l>e=lP268xU{`UaJTOnI0PnmTUn|u zHso#4vzCdPFUq?hM~VCxb7evs8s)K;YL=yF+?~^!;zc2E@{Shv{0i>(tH*3#m!nP- zGtSU^!|&gJVUve^sWRaSWwKl)w>Z?eOO2I+-*|DB&NyXblIktH4P5nIwHQp(VqNR( zV4Pl~XVOMalsKuD;^MPdCp%SJ3waHYScRlC+~+`6yBD+NM~9w<1)GMeL%}RyU(&O( zT$Z#NV_85M)f9Rm)sxPsr+zZ9tK7yK%Ua;oF1$c#?Dv5A?LVZZc1iPt#6VqQjGKB% ze`;I7au6A83`2Oox|-VdIVQznIz*wCoe70Wz5Dig>p|_R=$M$N$F9^tkl)RwhmWJg z5nVfx(KJ$&&y0NW?fK7XC$Y3Gh)%FIu5QnWh&b$W_Rz!oG?M)N@abMKSbCKI+^aMj zR721IJUw!0jnSnlEEWb3OZ&BoeA%aF`^l3hX|ZZC22GXv;pRCW)8Sxh@e(FrY0<~F zA&jqM{oHhyKRcSK=i8Bw>gY%Vp^v3~@+ =BR*ba z_ZD7aLiy$M9d9=-k~>^Wg(p4^75m;fXU)6bEd&hBs?*(Q@R qyZgEs~0 zP@AU Y;C65>`Hr+oA6JFxAt@c_a+ih^x}OvkO;pqxRaM{0@j7D^ z%!Jf$8=H?_2>*|J6lfj^zqsM=mDkql#Y!VGqZOgHK{s-wwZBSaa8P<;%Vqaq?aSCp zrMF*Ra+FYahp13*3c=25&CsW(o-ZDhM#te(6~~!O@h#K5J^Aioz^x;jBl7Iz{%~>< zaR|B8$6aO}e3`R-n>h9oryun$X ObYj;n>`$+-WLn4Mc z?gvY&-Sx;X4Ux3*@drFR%fQfZGxMZe@$;_aEt0-;n z~yV@C$k#bo# z`{IW`E7sS)9Gzz=jxJ0! EWnuX;1@n`H#s;^6BR)$SW zV|=yh9yth#RS$yH$J>(r>Z3$UhZxA)0Yme>SFOLo649zeBRbA7m>cN31a%Cx1E==b z2M#6h RlwnkMXp5C+nfGVfdEGzj;wWV#f zm9{RVuE0`L?S7xh>wssHpJ2YN2;=4G@&eWUPY} C;Ax@tB)8wA*3dznLpV{W&C zNvblrom32EUGYAYSnv+U&O~B8YL*^GM8xSq8Hp14{;T2$3?X2GSDnrvy`80+1+^^F z+d-P)Kjt2fXR#FDE7-V+#A7*G(TXD0$ATeF>mA$pkIPSP&Ssa$vmbyQ(Ot?dudy%K z9MSy`tj)57U-Rv8 V&2xyF zAb+kdjdj3^wX6I`X}Q%&YT%TVZm=eRshhp97aM+SJwcJ|!TOLPC#*PaQ`iJ#Lx->+ z{0gt6!(mhzo0breM@PX?xePVZMqMkGl!PM_6BD5irTwi^15(O8lCo_w^AFU+9vf%u zkdU~^mKBMQK|q#S7`?8p`(r+hR6;~Frt~uxXCs95KKXdicOi9;Cbd^$_8<7;7SxOg zefZdeRE#wagg|Ym8+rsVAEjNls04R;kH?h2A=rT 8&jLH7z!@ z;s9i6LQT}(=TNq`MZBHdT|#e4hBT>izY&wByHq8?NM4n`RxE &EBv27GWNR|AY%4IQ8ym5`#xxzBr8u#n#8$ik+H qq(fh4bO0Uk*rk@G{Xa$tr7K zhw`$8iv6$6KAx?c&L-x5F||M6XLDNEl$T9D@O>iha_r$V7d)hP%C!2_qUXE~&uA2D z T9iIMV%pMs-A1gRbjfvjW=XOl$(Fm z)YP0mp?3>vHbaiLnbnJ;Q^(FCc(v5$FyeU21KZcA)`HvGr)pY7uBv@$G+hY!KncYS zhKk|&9K!7<;%Y~aT9<3hKQcYL_T~8Z4-vH-rCK@|M2!+DMb*_(dfa)Zfs)THNn*Lj zQ%DYR^Q7A1({m#@q-c&%T?Y^Wib_gDy6ec*PiwNw9~w8`S=as7vcrl*JnD=d#0~JO zN`hjGor~$u>9_KuS%@hTxQptyqLqB7uGNb>Z1b^t2GwzR{E5^aX t9ViOez0|HEr&f- deea z(m+u5mXW%wkOsaf7Gnl~Omyc4)!3J(&(F9KH?#jn63^K%`m4la4C<^-=wI8uksP{2 z?^}wGn2?$-QXTwdA)7csxLzaOKz$~Lhw>dn-fskePlW|`n)hkhP!hIY^0x?u1kYLM zzUR2%qldz}?;UhxL?CZe(g(@}NNEQYmS7#5+`(_hv+bY`%zzqHn7}NYDbot?FX;Yc zfehvNhb~P{-Z1a!Z#l_}Z{QUwyV>-&SyuG!*AlXE^KC1id}zQdftAvVjF8UjFA@i- zbgkpVBP>&V;?Ipj`qgvxyaL?ZwOB~hKUHB{b}ZbbdU>juHQJu8=64|~s=Eu#qOxbA z=w^A&QN`YUR=s6VVG=eEucl-pA>=Z0lPvl?c<&%Pp|5DTF=j$1E9foxe4cYv-E`x_ z$6$~J%#2?6_nBYLsQBmmO&CE2KC8#0U_0Z0cg)rU!sox=6E3c3LV7rY>~U~4WCbB2 zG5Ci8@@rV5uIk;x>mF$j4tDF^fAK8~EFA89lOB|8W_UJr71{ie*}J}8#QODq**EB> z504tE7Vn3L5Av)^`j#p(*wlSBXbqI&QIzuK_Px7IOmm7qP^mp-ckZlNquS;wz6DB8 z%*i3Q)HO 4WnrRS^t=mO`ZKe8@=&p`=s3E>RUg`W(fJW}P%7F%NX~=3$OoWoCFA8&Q z^wp12mz5rXb+NqAX1x$L!YfiC=~FFIP{V$9DP`F)J%g@dd%ogIfvb86_K(0vVX#$V zA)9HVYEp4|c~{x3jKdKfL{H~O9|B$8fgW!FYHbA35X**2_zk?WrNNZLTdK?F$O !|9oVWm@Pu*Lr7)HMsa^3h;wgs0+yl1o_e9Aq=qgZxhK_7t;_DZCvc zx7XA;b+<#Pb#M!mSmYUBU<9ep97c$WVpceFUTtgDj-CLc@bYe!!%6~$491+iynL7% z=X8g`I%<3SgmY_OI|B@(9N(z5jxJkDtYK2%w-ofg-`5fm0UdVkNp`0Ywfez&oK1_6 zV<-4>D}-%R?tH@|0uOBt^d{R@J>x<(EY?Sbf?rYd4TO*->QJIXEU*4~6$(llNya5` zOigjml%!UuQMlu6fEOXH9I68+j+|Ea1TDiF&nakxwljhQJRB*p)S9dCOBT~@y$&UX zg}e3*?}X*<3l*gSZ>lDheEe3$EMDsE$kI_M?qm%%G&z^@%1YKXO?tW+K_U7b5MK?6 z<+cGaA4DFMo=AOBEDgn~c!f;hG17E#MDN$HUn^a<7+!N(fdco9DK*b==_)F_@`>)g zP(Yf82S*T%`NRX8lkihZUtc@;d_CP^D0>|tkOE4Y8lyoT4F)^-!CK(Ki$A!|?Vjw# zA+K?URN6K)@JbgSJ}eJSR;ih}SUvSoq2f4; 0>~k#Y-IrY9s-)Y z#$>C^VDSSB4wccY50m>UuV4LWf1#j2wo|{_>NhJk0jd E9a4Iu&|8_}iN`8CeUb6!xV&duG#t9K8Rb%N*B=kd?e#HM&PG z$K-jmP7)EcvnDy1<6kykZqE$B&tq}Aho^=!Q_4z9XU=47O-ga){qTuRo)~1pS2W?s z 6Qh%Fw6B_vEl!X @bGD`p94^?3Nav5`(G*I+U0lyt}kD1vPfDJ}b4XHWQE6fb9$Ud *>kznHc}JmEdQ;iKc*&!rCdsLnE4+ uy#|jF;yG6lcu_Bmv76e&1la_XHJ&PcRV~(i67X!ibdv z^ PyqJYEWc^gOdv$57)@GmQS` z{wJ@g(rvw; _ zU>s3@9I~N{Q&SZa=Yk1u+t>i*i;!!I4eW2Ei*AQsa`?6|?a?H #tUI#_!>a5<&j6|?Q%V`EnOy1$}g$N^Yp(S8U)zl zwJF=nyD#yITofk#_8-@BvCqF;DV!BJHu7IpL5o%7@_kTyd8gqs8qr9IDBmX1;>F+x z5er;q_Q-NMvI!C8 z-La!a5QV?8U;Kt2{l;d1Gr$?h8B7QYfe;h|&OjlsjzA$00?q(GNVCi33g|QZ4bnYT zr?zTKLfxF1o}TW33(FyY@C00e7N~(@!Qc483=}}aU6>)>xQlpnq`(<)dmEy{&m1dD zAlb#z`6zhqPYz@|+BJ%V`z%pJ@~k=D>?*PQ*8rD&%=`?+@F7Oy%mi}6{44h`wu>c1 z>aJbsw&qJnm|lOQ9E{Frpu&bYWBi=(-es}1;Tgu!l|Y;6Vx6~i#sD=@iXse3A>aaS z`}j9GW++@Ea@5@Sn5)7(x=s&~JnP5*2@W+|I5dESfSDvlkJTbasTh6h3FYbZ5qM?W z*%h=Vm0|vsOB*kV#OyACw(9wJ*8HkiVDq0NjxIMLlIIP1-CAV? zc5o4G8TGZ)t~D#n%X NUO3_BLOO>vw7D);DM@q3iNFo46GfWgTZ6GOZ%R$` zhY@o{>ax&pV2y1AW}yO|_?$3=Fd&I483~0c6EQnwnOQW%>hT+*Qx(rgVaoH?#3VC@ zw;7?l>b^bg;f #TuyLkHEd#Bd453h2M&S66^Rd|0rPyF> znJ6bEkLhN*n2X>BwA|O8>cKh!d-@DmTZ=J~4lP!!yy+s{5ZfMS>&4YJz&kM@ EM6(bf3$K)0h$-|t!ThAA~DxF=V z)sDp_9H@#Bxk$wt0`*}QtBBy{MJCeXp>7J!Dwd1jCcdjk9;Ly!7G5`fZ;%p)-~*RS z;DoUSo)KrUG?W!m3huU* A-(1Ft_+)P2Yv{g$?mNG%n$=VhNqu z-8QmI!(1aw*}wW;A)OO{8Iig$ca7Z+v+Ig{(DNll@^Bb$M7E(w4M9%{2DQzP1cxyr z+$szfnn)#YAQA{K-zYW`Dz}SNY 6XRIVvbQz&}J%W4cyY~&BOCcj{i6jiB2%Fdo$DB#ectuJwj&blZ zA @S1R`hxE=OwaC@?#R|HqBGNg68x;eELz^uNtXm0h_9)HL zVp;DU_P0)dLW(exzC?OXVZCY}lS1kkJA{qwEANr!veJZVdGdZffL{kh`Um)JN=<*1 z=ueaO>*71`AMnS{cJ%S>@$bJ2f2G8zd`=vDq>7J=c0!ylA`#moEhB~8i}fNd0>`Jy zHdO>R_U#qLYIu^ipR5
~>%Q{4`jP0UEjl4#cUZ`wr#5uN&>0&X{vzy9Rp)<^_?3;MT!i)5w zq?9qSR-INBtl_?Hh>kSe_kSrLkrMD{TfLw43ciW6sAc4MbYZ!`8fk7tP^c@09O)n@ z;17Q-nQR1v@yV8lvtBG^xlLrL3l!43Ifn=a^VaDA-^@)!b6aDs69Kz)??`BaEn!AD zRA!gh;q| zFB8?z zgz+d+>mps}`j#M^C5P!XD=_n^<~m})S+wctQz+uLqG919&StU3su)*-G9S03BNNC7 zNH)rjNW%AORycqug@^o!NJ8;(%USdcDFLC-X}+x$#sN{RqBF_@imAm~P8g985DJZ4 zG8r1gNiph-oYhs#{Bt}DqhdLMYBqjiey}DulWt2VjF2 TF0000 Date: Sun, 21 Apr 2024 03:10:37 +0200 Subject: [PATCH 02/15] black hole sfx done --- Assets/Scripts/Tower/GravityTower.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Tower/GravityTower.cs b/Assets/Scripts/Tower/GravityTower.cs index a024b49..4f87ed0 100644 --- a/Assets/Scripts/Tower/GravityTower.cs +++ b/Assets/Scripts/Tower/GravityTower.cs @@ -16,6 +16,7 @@ public class GravityTower : Tower [SerializeField] private string audioName; + private AudioSource audioSc; public override void TowerSelected(bool selected) { @@ -33,8 +34,7 @@ public class GravityTower : Tower if (!string.IsNullOrEmpty(audioName)) { - Debug.Log("play"); - AudioManager.PlaySound(audioName, transform.position); + audioSc = AudioManager.PlaySound(audioName, transform.position, false, true, true); } } @@ -53,6 +53,8 @@ public class GravityTower : Tower protected override void OnDestroy() { base.OnDestroy(); + + audioSc.Stop(); } protected override void Update() From e81daa0302a96aa8a299d1e42886886db6e6c8ac Mon Sep 17 00:00:00 2001 From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com> Date: Sun, 21 Apr 2024 03:21:23 +0200 Subject: [PATCH 03/15] tried to fix bug with silhouette --- Assets/Scripts/PlacementSystem/PlacementManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/PlacementSystem/PlacementManager.cs b/Assets/Scripts/PlacementSystem/PlacementManager.cs index 202a5ab..2ebbee2 100644 --- a/Assets/Scripts/PlacementSystem/PlacementManager.cs +++ b/Assets/Scripts/PlacementSystem/PlacementManager.cs @@ -5,6 +5,8 @@ using System.Linq; using Unity.Mathematics; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; public class TowerPlacementManager : MonoBehaviour { @@ -154,7 +156,7 @@ public class TowerPlacementManager : MonoBehaviour { var comp = objScripts[i]; - if (comp is not Renderer && comp is not Transform && comp is not MeshFilter) + if (comp is not Renderer && comp is not Transform && comp is not MeshFilter && comp is not UIBehaviour) { Destroy(comp); } From 99bc1cac0c33542ee04e768906e854295a3fc62a Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 03:22:20 +0200 Subject: [PATCH 04/15] bullet bounce sfx --- Assets/Scripts/Tower/Projectile.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/Scripts/Tower/Projectile.cs b/Assets/Scripts/Tower/Projectile.cs index 6157677..ed54230 100644 --- a/Assets/Scripts/Tower/Projectile.cs +++ b/Assets/Scripts/Tower/Projectile.cs @@ -1,5 +1,6 @@ using UnityEngine; using UnityEngine.Assertions; +using UnityEngine.Events; [RequireComponent(typeof(Collider))] public class Projectile : MonoBehaviour @@ -19,6 +20,8 @@ public class Projectile : MonoBehaviour public HealthComponent comingFrom; + public UnityEvent OnReflect; + private Vector3 prevVel; private void Awake() @@ -59,6 +62,8 @@ public class Projectile : MonoBehaviour } Vector3 newVel = Vector3.Reflect(prevVel.normalized, collision.contacts[0].normal.normalized); body.velocity = newVel.normalized * prevVel.magnitude * bounciness; + OnReflect?.Invoke(); + AudioManager.PlaySound("BulletBounce", transform.position); } } } From 630f3398fa2dfb4921708c1b172a477d561e56f2 Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 03:22:56 +0200 Subject: [PATCH 05/15] sync --- Assets/Prefabs/Camera/TowerCam.prefab | 154 ++++--- Assets/Scenes/GameScene.unity | 501 +++++++++++++++++++++- Assets/Scripts/Camera/CameraController.cs | 4 +- Assets/Scripts/Camera/HideWall.cs | 7 + Assets/Scripts/Camera/TowerCam.cs | 6 +- 5 files changed, 590 insertions(+), 82 deletions(-) diff --git a/Assets/Prefabs/Camera/TowerCam.prefab b/Assets/Prefabs/Camera/TowerCam.prefab index 3ff165e..b9882df 100644 --- a/Assets/Prefabs/Camera/TowerCam.prefab +++ b/Assets/Prefabs/Camera/TowerCam.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3935553693191687206} - component: {fileID: 3732065988533673491} - component: {fileID: 2139314887802289122} - - component: {fileID: 3078086233640988956} + - component: {fileID: 3080339522778764198} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -100,7 +100,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &3078086233640988956 +--- !u!114 &3080339522778764198 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -109,24 +109,9 @@ MonoBehaviour: m_GameObject: {fileID: 1257898757355507338} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &2261812770106084702 GameObject: m_ObjectHideFlags: 3 @@ -217,7 +202,7 @@ GameObject: - component: {fileID: 3027632321437918642} - component: {fileID: 4362122749243549594} - component: {fileID: 8016315811664278882} - - component: {fileID: 6889278937293188591} + - component: {fileID: 4301055406757644015} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -265,7 +250,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -306,7 +291,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &6889278937293188591 +--- !u!114 &4301055406757644015 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315,24 +300,9 @@ MonoBehaviour: m_GameObject: {fileID: 4740903846569071278} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &6141502994562452495 GameObject: m_ObjectHideFlags: 3 @@ -423,7 +393,7 @@ GameObject: - component: {fileID: 8170234917192505078} - component: {fileID: 511076899392859752} - component: {fileID: 1492161936061921830} - - component: {fileID: 4059060178688909238} + - component: {fileID: 8827996852199296668} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -471,7 +441,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -512,7 +482,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &4059060178688909238 +--- !u!114 &8827996852199296668 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -521,24 +491,9 @@ MonoBehaviour: m_GameObject: {fileID: 6870596811972565747} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &7138673713016148905 GameObject: m_ObjectHideFlags: 3 @@ -629,6 +584,9 @@ GameObject: - component: {fileID: 1628714305827477991} - component: {fileID: 9015098249639605300} - component: {fileID: 6162594480593627889} + - component: {fileID: 5831827090361496139} + - component: {fileID: 1880671857495123661} + - component: {fileID: 3685285690701009546} m_Layer: 0 m_Name: TowerCam m_TagString: Untagged @@ -694,14 +652,14 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_YAxis: - Value: 0.5 + Value: 1 m_SpeedMode: 0 m_MaxSpeed: 2 m_AccelTime: 0.2 m_DecelTime: 0.1 m_InputAxisName: Mouse Y m_InputAxisValue: 0 - m_InvertInput: 0 + m_InvertInput: 1 m_MinValue: 0 m_MaxValue: 1 m_Wrap: 0 @@ -725,7 +683,7 @@ MonoBehaviour: m_DecelTime: 0.1 m_InputAxisName: Mouse X m_InputAxisValue: 0 - m_InvertInput: 1 + m_InvertInput: 0 m_MinValue: -180 m_MaxValue: 180 m_Wrap: 1 @@ -771,3 +729,79 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bb343e5418f1e1144aab7c51b7482da7, type: 3} m_Name: m_EditorClassIdentifier: + m_gameObject: {fileID: 0} +--- !u!114 &5831827090361496139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612880158138396871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf9c49671cd01e143b3f6bb3ecf490d5, type: 3} + m_Name: + m_EditorClassIdentifier: + cam: {fileID: 7612880158138396871} + scrollSpeed: 2.5 + stopAfterTime: 5 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + sens: {x: 300, y: 3} +--- !u!114 &1880671857495123661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612880158138396871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44d70cc20219cd84593f67d248eafe36, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Offset: {x: 0, y: 0, z: -0.1} + m_ApplyAfter: 1 + m_PreserveComposition: 0 +--- !u!114 &3685285690701009546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612880158138396871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0aa8da13840a5cb43997aca17b09b15d, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + origin: {fileID: 7612880158138396871} + towerCamScript: {fileID: 6162594480593627889} + hideFadeSpeed: 7 + showFadeSpeed: 2 + sphereRadius: 3.5 + sphereRange: 2.5 + sphereOffset: {x: 0, y: 8, z: 0} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index a55ae87..84d897e 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -356,6 +356,47 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3} +--- !u!21 &213120911 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + m_BuildTextureStacks: [] --- !u!1 &224165741 GameObject: m_ObjectHideFlags: 0 @@ -896,6 +937,47 @@ Material: - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] +--- !u!21 &631366007 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + m_BuildTextureStacks: [] --- !u!1 &779612215 GameObject: m_ObjectHideFlags: 0 @@ -1014,6 +1096,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &909993411 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + m_BuildTextureStacks: [] --- !u!1 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1145,60 +1268,65 @@ PrefabInstance: propertyPath: m_Name value: Cinemachine objectReference: {fileID: 0} + - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.10023358 + value: 0.08534324 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.022605715 + value: 0.019247489 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9703356 + value: 0.9717585 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.21884015 + value: -0.219161 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 10.297432 + value: 2.4309583 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y - value: 12.445195 + value: 12.445194 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.z - value: 18.85268 + value: 18.973312 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.09954502 + value: 0.08475693 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.02546724 + value: 0.021683902 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9636698 + value: 0.9650828 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.2465418 + value: -0.24690327 objectReference: {fileID: 0} - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1225,11 +1353,26 @@ PrefabInstance: propertyPath: maxSphereRayDistance value: 7 objectReference: {fileID: 0} + - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.9598308 + objectReference: {fileID: 0} - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y value: 7.6427956 objectReference: {fileID: 0} + - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.z + value: 10.336213 + objectReference: {fileID: 0} + - target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: stopAfterTime + value: 7.5 + objectReference: {fileID: 0} - target: {fileID: 5664717836218291588, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_Orbits.Array.data[0].m_Height @@ -1245,50 +1388,65 @@ PrefabInstance: propertyPath: m_Orbits.Array.data[2].m_Height value: -10 objectReference: {fileID: 0} + - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.09954503 + value: 0.08475693 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.025467241 + value: 0.021683903 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9636698 + value: 0.9650828 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.24654177 + value: -0.24690327 + objectReference: {fileID: 0} + - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.098769374 + value: 0.08409653 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.028326679 + value: 0.024118563 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.956161 + value: 0.95756304 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.27422333 + value: -0.27462542 objectReference: {fileID: 0} - target: {fileID: 7757173428948913319, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1621,6 +1779,47 @@ Transform: m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} --- !u!21 &1164447743 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + m_BuildTextureStacks: [] +--- !u!21 &1270081032 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1891,6 +2090,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} +--- !u!21 &1630739536 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] --- !u!21 &1671723125 Material: serializedVersion: 8 @@ -1932,6 +2172,47 @@ Material: - _r: {r: 5, g: 5, b: 0, a: 0} - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] +--- !u!21 &1765594345 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + m_BuildTextureStacks: [] --- !u!1 &1785574039 GameObject: m_ObjectHideFlags: 0 @@ -2056,6 +2337,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} +--- !u!21 &1838569748 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1 &1902554698 GameObject: m_ObjectHideFlags: 0 @@ -2174,6 +2496,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &2067473092 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: m_ObjectHideFlags: 0 @@ -2359,6 +2722,26 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2757975024506450034, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material @@ -2474,6 +2857,26 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1362039392} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material @@ -2484,11 +2887,71 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1671723125} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4992629952180980787, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: objectReference: {fileID: 937715444} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material diff --git a/Assets/Scripts/Camera/CameraController.cs b/Assets/Scripts/Camera/CameraController.cs index 67e610c..65df70b 100644 --- a/Assets/Scripts/Camera/CameraController.cs +++ b/Assets/Scripts/Camera/CameraController.cs @@ -6,11 +6,11 @@ public class CameraController : MonoBehaviour { [SerializeField] private GameObject cam; - public float scrollSpeed; + public float scrollSpeed = 2.5f; [Range(5f, 30f)] public float stopAfterTime; public AnimationCurve curve = new AnimationCurve(new Keyframe(0f, 0f, 1f, 1f), new Keyframe(1f, 1f, 1f, 1f)); - public Vector2 sens; + public Vector2 sens = new Vector2(300f, 3f); private Vector2 defaultMaxSpeed; private float timer; diff --git a/Assets/Scripts/Camera/HideWall.cs b/Assets/Scripts/Camera/HideWall.cs index b2a3e0c..9b3f3b5 100644 --- a/Assets/Scripts/Camera/HideWall.cs +++ b/Assets/Scripts/Camera/HideWall.cs @@ -6,6 +6,8 @@ public class HideWall : MonoBehaviour [SerializeField] private GameObject target; [SerializeField] private GameObject origin; + [SerializeField] private TowerCam towerCamScript; + [Range(1f, 10f)] public float hideFadeSpeed; [Range(1f, 10f)] public float showFadeSpeed; @@ -18,6 +20,11 @@ public class HideWall : MonoBehaviour void Update() { + if (target == null && towerCamScript != null) + { + target = towerCamScript.m_gameObject; + } + maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius * 2) + sphereRange; Vector3 direction = ((target.transform.position + sphereOffset) - origin.transform.position).normalized; diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index e79de07..307fe7e 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -3,7 +3,7 @@ using UnityEngine; public class TowerCam : MonoBehaviour { - private GameObject m_gameObject; + public GameObject m_gameObject; private void Start() { @@ -18,6 +18,10 @@ public class TowerCam : MonoBehaviour m_gameObject.GetComponent ().m_LookAt = target.transform; m_gameObject.GetComponent ().m_Follow = target.transform; m_gameObject.GetComponent ().m_Priority = 11; + + m_gameObject.GetComponent ().GetRig(0).LookAt = target.transform; + m_gameObject.GetComponent ().GetRig(1).LookAt = target.transform; + m_gameObject.GetComponent ().GetRig(2).LookAt = target.transform; } else { From eb233df679cf96bff61310b86ef7a9697a32555f Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 03:36:14 +0200 Subject: [PATCH 06/15] use correct bullets --- Assets/Audio/AudioLib.asset | 2 +- Assets/Models/1ShootTower.fbx.meta | 2 +- Assets/Models/BlackHole.fbx.meta | 4 +- Assets/Models/GreenBoy.fbx.meta | 4 +- Assets/Models/Gripper.fbx.meta | 4 +- Assets/Models/MrLazer.fbx.meta | 4 +- Assets/Models/Tesla.fbx.meta | 4 +- .../Prefabs/Projectiles/PlasmaBullet.prefab | 172 ++++++++---------- Assets/Prefabs/Towers/Tesla.prefab | 20 +- Assets/Prefabs/Towers/Turret.prefab | 18 +- Assets/Scenes/TowerTest.unity | 34 ++-- 11 files changed, 125 insertions(+), 143 deletions(-) diff --git a/Assets/Audio/AudioLib.asset b/Assets/Audio/AudioLib.asset index 1821385..511dae3 100644 --- a/Assets/Audio/AudioLib.asset +++ b/Assets/Audio/AudioLib.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: AudioLib m_EditorClassIdentifier: Clips: - - {fileID: 8300000, guid: ea208a46b2ab9bc45b936d5d7e0455cf, type: 3} + - {fileID: 8300000, guid: 866ac77aa3587de4aa79a63029d631e6, type: 3} - {fileID: 8300000, guid: 58d0fae7e12873e4293f7e9bce59fcdc, type: 3} - {fileID: 8300000, guid: 1d08abd4771cf954a92649be9eaa32da, type: 3} - {fileID: 8300000, guid: fe1f2d7ea272e2d47aa2140b739f93fa, type: 3} diff --git a/Assets/Models/1ShootTower.fbx.meta b/Assets/Models/1ShootTower.fbx.meta index 198f782..2d121d0 100644 --- a/Assets/Models/1ShootTower.fbx.meta +++ b/Assets/Models/1ShootTower.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 diff --git a/Assets/Models/BlackHole.fbx.meta b/Assets/Models/BlackHole.fbx.meta index 9b6bfd3..275d93e 100644 --- a/Assets/Models/BlackHole.fbx.meta +++ b/Assets/Models/BlackHole.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/GreenBoy.fbx.meta b/Assets/Models/GreenBoy.fbx.meta index e08f8f5..a32cc30 100644 --- a/Assets/Models/GreenBoy.fbx.meta +++ b/Assets/Models/GreenBoy.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/Gripper.fbx.meta b/Assets/Models/Gripper.fbx.meta index feabd42..b943f96 100644 --- a/Assets/Models/Gripper.fbx.meta +++ b/Assets/Models/Gripper.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/MrLazer.fbx.meta b/Assets/Models/MrLazer.fbx.meta index cb753d6..fbe0deb 100644 --- a/Assets/Models/MrLazer.fbx.meta +++ b/Assets/Models/MrLazer.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/Tesla.fbx.meta b/Assets/Models/Tesla.fbx.meta index d3e5c90..786af76 100644 --- a/Assets/Models/Tesla.fbx.meta +++ b/Assets/Models/Tesla.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Prefabs/Projectiles/PlasmaBullet.prefab b/Assets/Prefabs/Projectiles/PlasmaBullet.prefab index 98339d9..bdec4dd 100644 --- a/Assets/Prefabs/Projectiles/PlasmaBullet.prefab +++ b/Assets/Prefabs/Projectiles/PlasmaBullet.prefab @@ -11,8 +11,7 @@ GameObject: - component: {fileID: 5074286193465566833} - component: {fileID: 622750128577529191} - component: {fileID: 6351475726872690782} - - component: {fileID: 599986095408968252} - m_Layer: 0 + m_Layer: 6 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -84,27 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &599986095408968252 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 351786554158684029} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3238744023741729767 GameObject: m_ObjectHideFlags: 0 @@ -116,8 +94,7 @@ GameObject: - component: {fileID: 2775812873468504414} - component: {fileID: 4675805639711564604} - component: {fileID: 4219885489247769707} - - component: {fileID: 5021138776713670615} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -189,27 +166,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5021138776713670615 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3238744023741729767} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3248525637879141301 GameObject: m_ObjectHideFlags: 0 @@ -222,7 +178,10 @@ GameObject: - component: {fileID: 99605857738449373} - component: {fileID: 7995358721369753704} - component: {fileID: 6343727252069474822} - m_Layer: 0 + - component: {fileID: 4402499257783305611} + - component: {fileID: 40811086166306172} + - component: {fileID: -5026537654431272615} + m_Layer: 6 m_Name: PlasmaBullet m_TagString: Untagged m_Icon: {fileID: 0} @@ -353,6 +312,73 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!65 &4402499257783305611 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248525637879141301} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.35, y: 0.35, z: 0.35} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &40811086166306172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248525637879141301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a98521a4b559621438fc196adc605f3b, type: 3} + m_Name: + m_EditorClassIdentifier: + bounciness: 1 + damage: 10 + wallRebounces: 4 + comingFrom: {fileID: 0} + OnReflect: + m_PersistentCalls: + m_Calls: [] +--- !u!54 &-5026537654431272615 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248525637879141301} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &4076130981359727988 GameObject: m_ObjectHideFlags: 0 @@ -364,8 +390,7 @@ GameObject: - component: {fileID: 1553517095972250766} - component: {fileID: 6040231071127825331} - component: {fileID: 8585621083194835676} - - component: {fileID: 4415436936380299287} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -437,27 +462,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &4415436936380299287 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4076130981359727988} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5166680093018848385 GameObject: m_ObjectHideFlags: 0 @@ -469,7 +473,7 @@ GameObject: - component: {fileID: 952306820225547086} - component: {fileID: 3616690214030999077} - component: {fileID: 6503966235850705177} - m_Layer: 0 + m_Layer: 6 m_Name: Bounce / Shoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -5366,7 +5370,7 @@ GameObject: - component: {fileID: 3826416426683448326} - component: {fileID: 6047847810707290244} - component: {fileID: 1756746869659166590} - m_Layer: 0 + m_Layer: 6 m_Name: Particle System m_TagString: Untagged m_Icon: {fileID: 0} @@ -10205,8 +10209,7 @@ GameObject: - component: {fileID: 5911113516372945005} - component: {fileID: 7029898274017296766} - component: {fileID: 7206949835680583260} - - component: {fileID: 2153801654926115010} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -10278,24 +10281,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &2153801654926115010 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8900264520011667323} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Towers/Tesla.prefab b/Assets/Prefabs/Towers/Tesla.prefab index 2512c4e..9261409 100644 --- a/Assets/Prefabs/Towers/Tesla.prefab +++ b/Assets/Prefabs/Towers/Tesla.prefab @@ -1423,17 +1423,17 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.29548866 + value: 0.2954887 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.24788545 + value: 0.2478855 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.079687834 + value: -0.07968786 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1513,17 +1513,17 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.32868278 + value: 0.32868275 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.24482724 + value: 0.24482721 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.08863968 + value: -0.08863967 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1548,17 +1548,17 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.31211528 + value: 0.3121153 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.24639907 + value: 0.24639902 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.08417174 + value: -0.08417173 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1708,7 +1708,7 @@ MonoBehaviour: - Arc: 0 Amount: 1 Speed: 100 - bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee, + bulletPrefab: {fileID: 3248525637879141301, guid: 2ad3be6c6ede5d64e9c73ce6b7a060a5, type: 3} Burst: 0 BurstDelay: 0 diff --git a/Assets/Prefabs/Towers/Turret.prefab b/Assets/Prefabs/Towers/Turret.prefab index 9c61ed3..e7be8b1 100644 --- a/Assets/Prefabs/Towers/Turret.prefab +++ b/Assets/Prefabs/Towers/Turret.prefab @@ -911,7 +911,7 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.84 + value: -0.839 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -931,12 +931,12 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 3.153011e-36 + value: -0 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: 1.3634104e-37 + value: -0 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1006,7 +1006,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.84 + value: -0.839 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1021,7 +1021,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 2.524355e-29 + value: 3.59e-43 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1041,7 +1041,7 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.84 + value: -0.839 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1061,12 +1061,12 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000001990998 + value: -0.00000001785987 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -3.6221226e-10 + value: -3.2491562e-10 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1641,7 +1641,7 @@ MonoBehaviour: - Arc: 0 Amount: 1 Speed: 100 - bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee, + bulletPrefab: {fileID: 4420203067853765648, guid: 86d1599960f06fa4b830584980cb93c7, type: 3} Burst: 0 BurstDelay: 0 diff --git a/Assets/Scenes/TowerTest.unity b/Assets/Scenes/TowerTest.unity index 1a2964c..03d57a7 100644 --- a/Assets/Scenes/TowerTest.unity +++ b/Assets/Scenes/TowerTest.unity @@ -149,12 +149,12 @@ PrefabInstance: - target: {fileID: 681885395900820027, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000017203512 + value: 0.000000017203536 objectReference: {fileID: 0} - target: {fileID: 681885395900820027, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, type: 3} propertyPath: m_LocalRotation.z - value: 3.129748e-10 + value: 3.1297526e-10 objectReference: {fileID: 0} - target: {fileID: 2251032668217228560, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, type: 3} @@ -648,12 +648,12 @@ PrefabInstance: - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000023165915 + value: -0.000000023165905 objectReference: {fileID: 0} - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000074471567 + value: 0.0000000074471527 objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} @@ -683,12 +683,12 @@ PrefabInstance: - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000016282518 + value: -0.000000016282542 objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000055622285 + value: 0.0000000055622356 objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} @@ -718,12 +718,12 @@ PrefabInstance: - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: -0.000000022880894 + value: 0.00000002288009 objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: 0.000000008284025 + value: -0.000000008283735 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -955,7 +955,7 @@ PrefabInstance: - target: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8717774532810144392, guid: 9415cb10a1bd579269301ca4f61a1554, type: 3} @@ -1698,42 +1698,42 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 3.3133156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y - value: 2.95 + value: 3.339 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.z - value: 11.533513 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.13855627 + value: -3e-45 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.015462777 + value: -1e-45 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9841245 + value: 0.9402716 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.10982757 + value: -0.34042525 objectReference: {fileID: 0} - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: field of view - value: 60 + value: 40 objectReference: {fileID: 0} - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} From 596d4dd40067a65ff63ad04e81aaa1a81ca006cc Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 03:38:28 +0200 Subject: [PATCH 07/15] tower camera --- Assets/Prefabs/Towers/BaseTower.prefab | 727 ------------------------- Assets/Scenes/GameScene.unity | 328 ++++++----- Assets/Scripts/Camera/TowerCam.cs | 6 +- 3 files changed, 182 insertions(+), 879 deletions(-) diff --git a/Assets/Prefabs/Towers/BaseTower.prefab b/Assets/Prefabs/Towers/BaseTower.prefab index b731fe1..c07e1b2 100644 --- a/Assets/Prefabs/Towers/BaseTower.prefab +++ b/Assets/Prefabs/Towers/BaseTower.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 7883233016828513649} - component: {fileID: 5565472806559733162} - component: {fileID: -4368249141776341009} - - component: {fileID: 8326258332086092779} - component: {fileID: 1772828647246745231} - component: {fileID: 3214375543219620994} m_Layer: 8 @@ -36,9 +35,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5000648575824335922} - - {fileID: 3231648858884615218} - - {fileID: 4220667717328304921} - - {fileID: 85471039882070109} - {fileID: 8658008248069201232} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -142,111 +138,6 @@ MonoBehaviour: precomputeOutline: 0 bakeKeys: [] bakeValues: [] ---- !u!114 &8326258332086092779 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872127579833310669} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 527409087646353271} - m_Follow: {fileID: 527409087646353271} - m_CommonLens: 1 - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_YAxis: - Value: 0.5 - m_SpeedMode: 0 - m_MaxSpeed: 2 - m_AccelTime: 0.2 - m_DecelTime: 0.1 - m_InputAxisName: Mouse Y - m_InputAxisValue: 0 - m_InvertInput: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_Wrap: 0 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_YAxisRecentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: Mouse X - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 5 - m_SplineCurvature: 0.2 - m_Orbits: - - m_Height: 4.5 - m_Radius: 1.75 - - m_Height: 2.5 - m_Radius: 3 - - m_Height: 0.4 - m_Radius: 1.3 - m_LegacyHeadingBias: 3.4028235e+38 - m_Rigs: - - {fileID: 6733197279741857448} - - {fileID: 3875905170154804327} - - {fileID: 7471033669110783771} --- !u!114 &1772828647246745231 MonoBehaviour: m_ObjectHideFlags: 0 @@ -273,545 +164,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &881819783351085137 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3043206501377313387} - - component: {fileID: 1604521831440090531} - - component: {fileID: 3654006014515307891} - - component: {fileID: 8314437777887737673} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3043206501377313387 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 85471039882070109} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1604521831440090531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &3654006014515307891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &8314437777887737673 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &1829274643066236986 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5028610344310564584} - - component: {fileID: 2921780199747443927} - - component: {fileID: 703045981101343854} - - component: {fileID: 429639274105194281} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5028610344310564584 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3231648858884615218} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2921780199747443927 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &703045981101343854 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &429639274105194281 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &3352080502988888719 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7908333169234343085} - - component: {fileID: 932518073561982220} - - component: {fileID: 2611612522491397238} - - component: {fileID: 2140871769417237111} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7908333169234343085 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4220667717328304921} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &932518073561982220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2611612522491397238 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &2140871769417237111 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &3558272651156871278 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3231648858884615218} - - component: {fileID: 6733197279741857448} - m_Layer: 0 - m_Name: TopRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3231648858884615218 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3558272651156871278} - serializedVersion: 2 - m_LocalRotation: {x: 0.34042525, y: -0.00000002288009, z: 0.000000008283735, w: 0.9402716} - m_LocalPosition: {x: -1.745, y: 2.334, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5028610344310564584} - m_Father: {fileID: 527409087646353271} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6733197279741857448 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3558272651156871278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 5028610344310564584} ---- !u!1 &4474798581911876227 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4220667717328304921} - - component: {fileID: 3875905170154804327} - m_Layer: 0 - m_Name: MiddleRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4220667717328304921 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4474798581911876227} - serializedVersion: 2 - m_LocalRotation: {x: 0.32326588, y: -0.000000016282542, z: 0.0000000055622356, w: 0.9463082} - m_LocalPosition: {x: -1.745, y: 2.334, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7908333169234343085} - m_Father: {fileID: 527409087646353271} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3875905170154804327 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4474798581911876227} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 7908333169234343085} --- !u!1 &4657144566828515878 GameObject: m_ObjectHideFlags: 0 @@ -1148,85 +500,6 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6616012430861705016 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 85471039882070109} - - component: {fileID: 7471033669110783771} - m_Layer: 0 - m_Name: BottomRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &85471039882070109 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6616012430861705016} - serializedVersion: 2 - m_LocalRotation: {x: 0.3060453, y: 0.000000023165901, z: -0.0000000074471513, w: 0.952017} - m_LocalPosition: {x: -1.745, y: 2.334, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3043206501377313387} - m_Father: {fileID: 527409087646353271} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7471033669110783771 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6616012430861705016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 3043206501377313387} --- !u!1 &8398575655800056308 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 84d897e..bf72a4f 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -356,47 +356,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3} ---- !u!21 &213120911 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} - m_BuildTextureStacks: [] --- !u!1 &224165741 GameObject: m_ObjectHideFlags: 0 @@ -792,6 +751,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &344706649 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + m_BuildTextureStacks: [] --- !u!1001 &359510068 PrefabInstance: m_ObjectHideFlags: 0 @@ -937,7 +937,7 @@ Material: - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] ---- !u!21 &631366007 +--- !u!21 &552210252 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -974,9 +974,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} m_BuildTextureStacks: [] --- !u!1 &779612215 GameObject: @@ -1096,7 +1096,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &909993411 +--- !u!21 &898760272 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1133,9 +1133,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} m_BuildTextureStacks: [] --- !u!1 &922758185 GameObject: @@ -1276,12 +1276,12 @@ PrefabInstance: - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08534324 + value: 0.08534326 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.019247489 + value: 0.019247493 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1296,7 +1296,7 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 2.4309583 + value: 2.4309573 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1311,12 +1311,12 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08475693 + value: 0.08475698 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.021683902 + value: 0.021683913 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1396,12 +1396,12 @@ PrefabInstance: - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08475693 + value: 0.08475697 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.021683903 + value: 0.021683915 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1778,7 +1778,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} ---- !u!21 &1164447743 +--- !u!21 &1026789633 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1815,11 +1815,52 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} m_BuildTextureStacks: [] ---- !u!21 &1270081032 +--- !u!21 &1082681661 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + m_BuildTextureStacks: [] +--- !u!21 &1164447743 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1901,6 +1942,47 @@ Material: - _r: {r: 0, g: 0, b: 0, a: 40} - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} m_BuildTextureStacks: [] +--- !u!21 &1342574748 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!114 &1346132657 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, @@ -2090,47 +2172,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} ---- !u!21 &1630739536 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] --- !u!21 &1671723125 Material: serializedVersion: 8 @@ -2172,47 +2213,6 @@ Material: - _r: {r: 5, g: 5, b: 0, a: 0} - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] ---- !u!21 &1765594345 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} - m_BuildTextureStacks: [] --- !u!1 &1785574039 GameObject: m_ObjectHideFlags: 0 @@ -2337,7 +2337,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} ---- !u!21 &1838569748 +--- !u!21 &1817645069 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2375,8 +2375,8 @@ Material: - _UseUIAlphaClip: 0 m_Colors: - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] --- !u!1 &1902554698 GameObject: @@ -2496,7 +2496,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &2067473092 +--- !u!21 &1982688566 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2533,9 +2533,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: @@ -2595,11 +2595,41 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3685285690701009546, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: scrollSpeed + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: stopAfterTime + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7612880158138396871, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} propertyPath: m_Name value: TowerCam objectReference: {fileID: 0} + - target: {fileID: 9015098249639605300, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_YAxis.Value + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index 307fe7e..9e3ed4a 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -19,9 +19,9 @@ public class TowerCam : MonoBehaviour m_gameObject.GetComponent ().m_Follow = target.transform; m_gameObject.GetComponent ().m_Priority = 11; - m_gameObject.GetComponent ().GetRig(0).LookAt = target.transform; - m_gameObject.GetComponent ().GetRig(1).LookAt = target.transform; - m_gameObject.GetComponent ().GetRig(2).LookAt = target.transform; + //m_gameObject.GetComponent ().GetRig(0).LookAt = target.transform; + //m_gameObject.GetComponent ().GetRig(1).LookAt = target.transform; + //m_gameObject.GetComponent ().GetRig(2).LookAt = target.transform; } else { From 0294f74ac53c67589e81c8b4224ae28aa81e161d Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 03:40:38 +0200 Subject: [PATCH 08/15] gripper sfx --- Assets/Prefabs/Towers/Gripper.prefab | 119 ++++++++++++++++++++++++++- Assets/Prefabs/Towers/MrLazer.prefab | 8 +- Assets/Prefabs/Towers/Turret.prefab | 12 +-- 3 files changed, 126 insertions(+), 13 deletions(-) diff --git a/Assets/Prefabs/Towers/Gripper.prefab b/Assets/Prefabs/Towers/Gripper.prefab index 0e3792f..866c013 100644 --- a/Assets/Prefabs/Towers/Gripper.prefab +++ b/Assets/Prefabs/Towers/Gripper.prefab @@ -1184,6 +1184,41 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.99934006 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.03632495 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.x @@ -1239,6 +1274,46 @@ PrefabInstance: propertyPath: m_Name value: Gripper objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -1e-45 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y @@ -1262,12 +1337,17 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.00000001990998 + value: 0.000000017203536 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: 3.6221226e-10 + value: 3.1297526e-10 + objectReference: {fileID: 0} + - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1601,7 +1681,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3c6fb039e74d12a7bbfde22591bc7eee, type: 3} m_Name: m_EditorClassIdentifier: - selectedUI: {fileID: 0} + selectedUI: {fileID: 6852259792091155131} + OnAttack: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3684608807871333407} + m_TargetAssemblyTypeName: PlaySound, Assembly-CSharp + m_MethodName: PlayASound + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Shotgun Shoot + m_BoolArgument: 0 + m_CallState: 2 barrel: {fileID: 2362138183372646645} horizontalArc: {fileID: 9137069524165408036} verticalArc: {fileID: 8606494081824023083} @@ -1833,6 +1928,18 @@ MonoBehaviour: m_BiasX: 0 m_BiasY: 0 m_CenterOnActivate: 1 +--- !u!114 &3684608807871333407 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + m_PrefabInstance: {fileID: 2286031694991280285} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415246146501367120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &3855707480985977590 stripped Transform: m_CorrespondingSourceObject: {fileID: 3043206501377313387, guid: f54a14318952c90c5b47a300aedb0d15, @@ -1897,6 +2004,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2286031694991280285} m_PrefabAsset: {fileID: 0} +--- !u!1 &6852259792091155131 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + m_PrefabInstance: {fileID: 2286031694991280285} + m_PrefabAsset: {fileID: 0} --- !u!4 &8248789844841184304 stripped Transform: m_CorrespondingSourceObject: {fileID: 7908333169234343085, guid: f54a14318952c90c5b47a300aedb0d15, diff --git a/Assets/Prefabs/Towers/MrLazer.prefab b/Assets/Prefabs/Towers/MrLazer.prefab index 6cc8a2e..2d523a8 100644 --- a/Assets/Prefabs/Towers/MrLazer.prefab +++ b/Assets/Prefabs/Towers/MrLazer.prefab @@ -1178,7 +1178,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.w - value: 0.7807551 + value: 0.78075516 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1218,17 +1218,17 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.268424 + value: 0.26842403 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.527322 + value: 0.52732193 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.18013711 + value: -0.18013707 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} diff --git a/Assets/Prefabs/Towers/Turret.prefab b/Assets/Prefabs/Towers/Turret.prefab index e7be8b1..ea5a8bc 100644 --- a/Assets/Prefabs/Towers/Turret.prefab +++ b/Assets/Prefabs/Towers/Turret.prefab @@ -911,7 +911,7 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.839 + value: -0.84 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1006,7 +1006,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.839 + value: -0.84 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1021,7 +1021,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 3.59e-43 + value: -1e-45 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1041,7 +1041,7 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.839 + value: -0.84 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1061,12 +1061,12 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000001785987 + value: -0.000000017203536 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -3.2491562e-10 + value: -3.1297526e-10 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} From 133bba34fb9f21761b5420ffd350e7866433bb0e Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 03:44:27 +0200 Subject: [PATCH 09/15] gripper fix --- Assets/Prefabs/Towers/Gripper.prefab | 490 +-------------------------- Assets/Scenes/TowerTest.unity | 89 ++++- 2 files changed, 81 insertions(+), 498 deletions(-) diff --git a/Assets/Prefabs/Towers/Gripper.prefab b/Assets/Prefabs/Towers/Gripper.prefab index 866c013..67c5137 100644 --- a/Assets/Prefabs/Towers/Gripper.prefab +++ b/Assets/Prefabs/Towers/Gripper.prefab @@ -192,7 +192,7 @@ Transform: m_GameObject: {fileID: 1335003672673836309} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.00226} + m_LocalPosition: {x: 0, y: -0, z: 0.00265} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1384,21 +1384,6 @@ PrefabInstance: propertyPath: m_Rigs.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - propertyPath: m_Rigs.Array.data[0] - value: - objectReference: {fileID: 2535829998905118396} - - target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - propertyPath: m_Rigs.Array.data[1] - value: - objectReference: {fileID: 451396761876996652} - - target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - propertyPath: m_Rigs.Array.data[2] - value: - objectReference: {fileID: 137830739692147640} m_RemovedComponents: - {fileID: 703045981101343854, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} - {fileID: 429639274105194281, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1452,217 +1437,7 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 518739909791365985} - - targetCorrespondingSourceObject: {fileID: 3558272651156871278, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2535829998905118396} - - targetCorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: -653555726885491193} - - targetCorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: -1985646451265340337} - - targetCorrespondingSourceObject: {fileID: 4474798581911876227, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 451396761876996652} - - targetCorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 7361492656729499411} - - targetCorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: -5494429373303235990} - - targetCorrespondingSourceObject: {fileID: 6616012430861705016, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 137830739692147640} - - targetCorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 3170189884128747661} - - targetCorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 577103753674577615} m_SourcePrefab: {fileID: 100100000, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} ---- !u!1 &494127321866500263 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &-653555726885491193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494127321866500263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &-1985646451265340337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494127321866500263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &1406609474406375628 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &3170189884128747661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406609474406375628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &577103753674577615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406609474406375628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &1415246146501367120 stripped GameObject: m_CorrespondingSourceObject: {fileID: 872127579833310669, guid: f54a14318952c90c5b47a300aedb0d15, @@ -1714,7 +1489,7 @@ MonoBehaviour: - Arc: 0 Amount: 1 Speed: 100 - bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee, + bulletPrefab: {fileID: 4420203067853765648, guid: 86d1599960f06fa4b830584980cb93c7, type: 3} Burst: 0 BurstDelay: 0 @@ -1737,197 +1512,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2286031694991280285} m_PrefabAsset: {fileID: 0} ---- !u!1 &2422989569247558174 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4474798581911876227, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &451396761876996652 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2422989569247558174} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 8248789844841184304} ---- !u!1 &3375478334972236019 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3558272651156871278, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2535829998905118396 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375478334972236019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 6516897509766409845} ---- !u!1 &3548105072935637522 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7361492656729499411 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548105072935637522} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &-5494429373303235990 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548105072935637522} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!114 &3684608807871333407 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15, @@ -1940,79 +1524,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3855707480985977590 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3043206501377313387, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4929561385314670501 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6616012430861705016, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &137830739692147640 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4929561385314670501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 3855707480985977590} ---- !u!4 &6516897509766409845 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5028610344310564584, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} --- !u!1 &6852259792091155131 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} m_PrefabInstance: {fileID: 2286031694991280285} m_PrefabAsset: {fileID: 0} ---- !u!4 &8248789844841184304 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7908333169234343085, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/TowerTest.unity b/Assets/Scenes/TowerTest.unity index 03d57a7..5b6cd7f 100644 --- a/Assets/Scenes/TowerTest.unity +++ b/Assets/Scenes/TowerTest.unity @@ -1698,42 +1698,42 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 3.3133156 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y - value: 3.339 + value: 2.95 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.z - value: 3 + value: 11.533513 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -3e-45 + value: -0.13855627 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -1e-45 + value: -0.015462777 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9402716 + value: 0.9841245 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.34042525 + value: -0.10982757 objectReference: {fileID: 0} - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: field of view - value: 40 + value: 60 objectReference: {fileID: 0} - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1813,7 +1813,7 @@ PrefabInstance: - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.1380528 + value: -0.13805284 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1828,7 +1828,7 @@ PrefabInstance: - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.13815574 + value: -0.13815573 objectReference: {fileID: 0} - target: {fileID: 8882344377078016156, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -2026,6 +2026,74 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1732242001} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2014351057 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1415246146501367120, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_Name + value: Gripper + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.2806312 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.452 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.97678995 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 91554800af50ec827822f376e2fc5f64, type: 3} --- !u!1001 &667212637924654954 PrefabInstance: m_ObjectHideFlags: 0 @@ -2115,3 +2183,4 @@ SceneRoots: - {fileID: 1090335998} - {fileID: 1231481559} - {fileID: 100479262} + - {fileID: 2014351057} From 681882c3817d0d12909f02d76e50f242609945eb Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 03:49:10 +0200 Subject: [PATCH 10/15] build sfx --- Assets/Scripts/PlacementSystem/PlacementManager.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assets/Scripts/PlacementSystem/PlacementManager.cs b/Assets/Scripts/PlacementSystem/PlacementManager.cs index 2ebbee2..b7e678e 100644 --- a/Assets/Scripts/PlacementSystem/PlacementManager.cs +++ b/Assets/Scripts/PlacementSystem/PlacementManager.cs @@ -65,14 +65,21 @@ public class TowerPlacementManager : MonoBehaviour private void OnEnable() { + OnTowerPlaced += PlayPlaceSfx; MoneyManager.OnShopSelected += OnShopSelected; } private void OnDisable() { + OnTowerPlaced -= PlayPlaceSfx; MoneyManager.OnShopSelected -= OnShopSelected; } + private void PlayPlaceSfx(TowerInfo info) + { + AudioManager.PlaySound("BuildTower", Vector3.zero); + } + private void OnShopSelected(TowerInfo info) { SelectedTowerInfo = info; From 924c43d90481d72d0d9a3000e2d0eb16d4b2e18a Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 04:00:56 +0200 Subject: [PATCH 11/15] camera should be kinda working --- Assets/Scenes/GameScene.unity | 433 +++++++++++++++--------------- Assets/Scripts/Camera/HideWall.cs | 4 +- Assets/Scripts/Camera/TowerCam.cs | 12 +- 3 files changed, 229 insertions(+), 220 deletions(-) diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index bf72a4f..bdd7a66 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -515,6 +515,47 @@ Material: - _r: {r: 40, g: 0, b: 0, a: 40} - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} m_BuildTextureStacks: [] +--- !u!21 &265070096 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + m_BuildTextureStacks: [] --- !u!1 &280779768 GameObject: m_ObjectHideFlags: 0 @@ -751,47 +792,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &344706649 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} - m_BuildTextureStacks: [] --- !u!1001 &359510068 PrefabInstance: m_ObjectHideFlags: 0 @@ -937,7 +937,7 @@ Material: - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] ---- !u!21 &552210252 +--- !u!21 &494872442 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1096,47 +1096,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &898760272 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] --- !u!1 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1778,7 +1737,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} ---- !u!21 &1026789633 +--- !u!21 &1098436319 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1815,50 +1774,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} - m_BuildTextureStacks: [] ---- !u!21 &1082681661 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} m_BuildTextureStacks: [] --- !u!21 &1164447743 Material: @@ -1942,47 +1860,6 @@ Material: - _r: {r: 0, g: 0, b: 0, a: 40} - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} m_BuildTextureStacks: [] ---- !u!21 &1342574748 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!114 &1346132657 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, @@ -2036,6 +1913,47 @@ Material: - _r: {r: 0, g: 0, b: 0, a: 40} - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} m_BuildTextureStacks: [] +--- !u!21 &1501320188 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1 &1515922344 GameObject: m_ObjectHideFlags: 0 @@ -2172,6 +2090,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} +--- !u!21 &1624304924 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!21 &1671723125 Material: serializedVersion: 8 @@ -2337,47 +2296,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} ---- !u!21 &1817645069 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1 &1902554698 GameObject: m_ObjectHideFlags: 0 @@ -2496,7 +2414,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1982688566 +--- !u!21 &2003428257 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2533,9 +2451,91 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + m_BuildTextureStacks: [] +--- !u!21 &2041862586 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] +--- !u!21 &2057343428 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: @@ -2600,6 +2600,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 3685285690701009546, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: sphereOffset.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} propertyPath: m_Enabled diff --git a/Assets/Scripts/Camera/HideWall.cs b/Assets/Scripts/Camera/HideWall.cs index 9b3f3b5..41a2e97 100644 --- a/Assets/Scripts/Camera/HideWall.cs +++ b/Assets/Scripts/Camera/HideWall.cs @@ -12,7 +12,7 @@ public class HideWall : MonoBehaviour [Range(1f, 10f)] public float showFadeSpeed; public float sphereRadius; - [Range(0, 10)] public float sphereRange; + [Range(0, 100)] public float sphereRange; public Vector3 sphereOffset; float maxSphereRayDistance; @@ -22,7 +22,7 @@ public class HideWall : MonoBehaviour { if (target == null && towerCamScript != null) { - target = towerCamScript.m_gameObject; + target = towerCamScript.newTarget; } maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius * 2) + sphereRange; diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index 9e3ed4a..b458403 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -3,7 +3,9 @@ using UnityEngine; public class TowerCam : MonoBehaviour { - public GameObject m_gameObject; + [SerializeField] private GameObject m_gameObject; + + public GameObject newTarget; private void Start() { @@ -15,13 +17,15 @@ public class TowerCam : MonoBehaviour { if (target != null) { + newTarget = target; + m_gameObject.GetComponent ().m_LookAt = target.transform; m_gameObject.GetComponent ().m_Follow = target.transform; m_gameObject.GetComponent ().m_Priority = 11; - //m_gameObject.GetComponent ().GetRig(0).LookAt = target.transform; - //m_gameObject.GetComponent ().GetRig(1).LookAt = target.transform; - //m_gameObject.GetComponent ().GetRig(2).LookAt = target.transform; + m_gameObject.GetComponent ().GetRig(0).LookAt = target.transform; + m_gameObject.GetComponent ().GetRig(1).LookAt = target.transform; + m_gameObject.GetComponent ().GetRig(2).LookAt = target.transform; } else { From 4a3336b4e5cc25f1ec1cbf9c3b7ee2ae245e22b3 Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 04:06:13 +0200 Subject: [PATCH 12/15] tower collection --- Assets/Prefabs/Towers/Tesla.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/Towers/Tesla.prefab b/Assets/Prefabs/Towers/Tesla.prefab index 9261409..24555ff 100644 --- a/Assets/Prefabs/Towers/Tesla.prefab +++ b/Assets/Prefabs/Towers/Tesla.prefab @@ -1443,12 +1443,12 @@ PrefabInstance: - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: 7.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} From a29568067f5cc5d2bbb8c29c96420b8d9b5eff5d Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 04:09:41 +0200 Subject: [PATCH 13/15] de-select --- Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs index 102acfb..7355048 100644 --- a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs +++ b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs @@ -51,6 +51,14 @@ public class CameraSlotClickDetect : MonoBehaviour else Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector"); } + else + { + GameManager.Instance.SelectedTower = null; + if (towerCam != null) + towerCam.ChangeToTarget(null); + else + Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector"); + } } void ShootHoverRay() From 676a6935f7384a1b378e130f80f329a00bd1604c Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 04:14:39 +0200 Subject: [PATCH 14/15] tower col --- Assets/ScriptableObjects/TowerCollection.asset | 7 +++++++ Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/Assets/ScriptableObjects/TowerCollection.asset b/Assets/ScriptableObjects/TowerCollection.asset index a983a6a..2331f27 100644 --- a/Assets/ScriptableObjects/TowerCollection.asset +++ b/Assets/ScriptableObjects/TowerCollection.asset @@ -21,6 +21,13 @@ MonoBehaviour: price: 250 prefab: {fileID: 1415246146501367120, guid: 91554800af50ec827822f376e2fc5f64, type: 3} + - name: Mr Lazer + price: 500 + prefab: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} + - name: Tesla + price: 500 + prefab: {fileID: 1328109535653931045, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} - name: Black hole price: 500 prefab: {fileID: 4611178744751000815, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, diff --git a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs index 7355048..cf7e2e0 100644 --- a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs +++ b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs @@ -17,6 +17,14 @@ public class CameraSlotClickDetect : MonoBehaviour { ShootClickRay(); } + if (Input.GetKeyDown(KeyCode.Escape)) + { + GameManager.Instance.SelectedTower = null; + if (towerCam != null) + towerCam.ChangeToTarget(null); + else + Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector"); + } ShootHoverRay(); } From 5b46c1d3c35f6e8025dadf5baef360cd802a2eb7 Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 04:37:42 +0200 Subject: [PATCH 15/15] offset fix --- Assets/Scenes/GameScene.unity | 607 +++++++++++----------- Assets/Scripts/Camera/CameraController.cs | 1 + Assets/Scripts/Camera/TowerCam.cs | 6 + 3 files changed, 323 insertions(+), 291 deletions(-) diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index bdd7a66..dd9d72e 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -268,6 +268,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 66896262} m_PrefabAsset: {fileID: 0} +--- !u!21 &143475085 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1001 &203396308 PrefabInstance: m_ObjectHideFlags: 0 @@ -356,6 +397,47 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3} +--- !u!21 &209003985 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + m_BuildTextureStacks: [] --- !u!1 &224165741 GameObject: m_ObjectHideFlags: 0 @@ -515,47 +597,6 @@ Material: - _r: {r: 40, g: 0, b: 0, a: 40} - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} m_BuildTextureStacks: [] ---- !u!21 &265070096 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} - m_BuildTextureStacks: [] --- !u!1 &280779768 GameObject: m_ObjectHideFlags: 0 @@ -674,6 +715,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &287645411 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1 &339673435 GameObject: m_ObjectHideFlags: 0 @@ -937,47 +1019,6 @@ Material: - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] ---- !u!21 &494872442 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} - m_BuildTextureStacks: [] --- !u!1 &779612215 GameObject: m_ObjectHideFlags: 0 @@ -1096,6 +1137,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &891221911 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + m_BuildTextureStacks: [] --- !u!1 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1292,6 +1374,11 @@ PrefabInstance: propertyPath: field of view value: 60 objectReference: {fileID: 0} + - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 1399 + objectReference: {fileID: 0} - target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: sphereRange @@ -1327,6 +1414,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 10.336213 objectReference: {fileID: 0} + - target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: scrollSpeed + value: 4 + objectReference: {fileID: 0} - target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: stopAfterTime @@ -1737,47 +1829,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} ---- !u!21 &1098436319 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} - m_BuildTextureStacks: [] --- !u!21 &1164447743 Material: serializedVersion: 8 @@ -1819,6 +1870,47 @@ Material: - _r: {r: 30.96, g: 0, b: 0, a: 0} - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} m_BuildTextureStacks: [] +--- !u!21 &1264086189 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] --- !u!21 &1336732493 Material: serializedVersion: 8 @@ -1913,47 +2005,6 @@ Material: - _r: {r: 0, g: 0, b: 0, a: 40} - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} m_BuildTextureStacks: [] ---- !u!21 &1501320188 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1 &1515922344 GameObject: m_ObjectHideFlags: 0 @@ -2090,7 +2141,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} ---- !u!21 &1624304924 +--- !u!21 &1568062461 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2127,9 +2178,50 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + m_BuildTextureStacks: [] +--- !u!21 &1574897282 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} m_BuildTextureStacks: [] --- !u!21 &1671723125 Material: @@ -2296,6 +2388,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} +--- !u!21 &1846975739 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + m_BuildTextureStacks: [] --- !u!1 &1902554698 GameObject: m_ObjectHideFlags: 0 @@ -2414,129 +2547,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &2003428257 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} - m_BuildTextureStacks: [] ---- !u!21 &2041862586 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] ---- !u!21 &2057343428 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} - m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: m_ObjectHideFlags: 0 @@ -2595,6 +2605,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1880671857495123661, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Offset.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1880671857495123661, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_ApplyAfter + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1880671857495123661, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_PreserveComposition + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3685285690701009546, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} propertyPath: m_Enabled diff --git a/Assets/Scripts/Camera/CameraController.cs b/Assets/Scripts/Camera/CameraController.cs index 65df70b..cd3d250 100644 --- a/Assets/Scripts/Camera/CameraController.cs +++ b/Assets/Scripts/Camera/CameraController.cs @@ -49,6 +49,7 @@ public class CameraController : MonoBehaviour cam.GetComponent ().m_Offset.z += scroll * scrollSpeed; + cam.GetComponent ().m_Offset.z = Mathf.Clamp(cam.GetComponent ().m_Offset.z, -20, 10); timer += Time.deltaTime; float evalTime = timer / stopAfterTime; diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index b458403..073f783 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -15,6 +15,8 @@ public class TowerCam : MonoBehaviour public void ChangeToTarget(GameObject target) { + float originalOffset = m_gameObject.GetComponent ().m_Offset.z; + if (target != null) { newTarget = target; @@ -26,10 +28,14 @@ public class TowerCam : MonoBehaviour m_gameObject.GetComponent ().GetRig(0).LookAt = target.transform; m_gameObject.GetComponent ().GetRig(1).LookAt = target.transform; m_gameObject.GetComponent ().GetRig(2).LookAt = target.transform; + + m_gameObject.GetComponent ().m_Offset.z = 0; } else { m_gameObject.GetComponent ().m_Priority = 9; + + m_gameObject.GetComponent ().m_Offset.z = originalOffset; } } }