From c62e5219bd313963fffed0cd0815dd6729b8830f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Baptiste=20Ve=CC=81re=CC=81?= Date: Sun, 14 May 2017 18:38:05 +0200 Subject: [PATCH] Fixed a problem with touch raycasting --- Assets/Scenes/Game.unity | Bin 42904 -> 55528 bytes Assets/Scripts/Player/TankMovements.cs | 3 ++- ProjectSettings/ProjectSettings.asset | Bin 40845 -> 40845 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 405476661317383c9d0bc0d9af2b8a8be600ad34..aa00ceed167d3948a3db5e9b9efd35d994fc4d68 100644 GIT binary patch delta 11003 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 G^nU?QsY#On delta 4982 zcmaKv4Nz3q702J=E?ITeH7>g9HfT!)QpATWvMS2P5UWkpb^HQBMT&?Oh9ow@1{>?7ElJZUnPN2YBmLjI=kg%wbeZ?= zyT5nd{hxc!Irlxf8wUm7iLz_jGwGW4T2Rxpk+}9X+HYl=4$yxxm-)}H`)oL{R%g<* zk|<3xRvcGMIIODW_*K zvm)`3W=YSYswnGb;sC!p|_Xk28c9Fv|y1!ecEjNR1%aT_n3m z^l=t{1Xj6>MB4G{k0;}vRtKh>DP^XA&v0fZvk;haW*0NhV}>(7XSNqiIkRKOfhj^G z><3idlrn6dU^ugRjxS9Zc7Sa_E0+H`W?rPCit!d^4PaTY8H!^>%dQz{w7Xy`S?$cS zzprT_-1Ez9P3)W_4FT025M);TL&KTSwluQ_ZXgOgU4-EPs;W%zG;<W_EoYzf7sKH_+w@X(+uI8%u2zeFvh-o zr+tOc*BStoNIRflo^(UxZDw^~O5_SNug4I%%B%`ZiF_TNn=Qs`15@F=$1FSp_3y+@ z3y!ZXi*toxCvsLfbB|g6Ov9P`%sRl7GY^;*XBf^rWY!F(oH@36XP(gL0gE_;`3D(x z&o+|l%dwBG7KU1;rmaOIlIsq$Vz3bUqH>o1wxs}#X7w5sv4UACm zVE&~5HXJW9^uoO)^oQZt&#Z(Q-mF?BvkJay+Y=}adW ze;fF80E4#N_1-@@x)_(*T`(7KG#@QL zB!WNn9}f{V(3KGE0J1e#b8S0USY>hXlWrZC32rx0xDdEoFm=bx& zOwTbizKO88S^!XqO#gW1^FpKO*O1zTM$5)m%lUXO26s9j0#F~cE$b~^V zx9~I-ExI*Wd-apqw-O)Do`dIR z_#nYNEqSV&CT5SKH*?+O^_wZKF(F3R({xW-pS`@WP<2kaw8$z-h;e&T@%J5zyjUvR z@1WfUkB^z^Np`2{ddjzL8jIqne&s0AvmJD8WdghD${jK&HD#LgB{PkLN`hL^rrQayU&Npd^J-9 zgu3$Wu!{ttu_2y(Yel~?H?qFHXA`J(ZGSySL53W0X+e@~cNZwdPYaBBI)3V+x_lc( z;=q$_T}0;xB^fWcem_IKFlPdNzRo4BYjYwwkyRw-TTv95@0&$B zdhh1NlWqM3*vVCH%39wQg}j`&aX&S0bW_QCTT}1G`z8v%#9kMM>dEK$y-N!;;;gx3c?$FU9y>_^0_$CM4{6ln8 z)UF{>rbp;}*=Sl*Hh5ww<|IA{C+o?csUCOQv=qGX`~8$o&29!Y3naP z`EC``rb;8|s66^>r3jso+#>AR2L^_H68-VO=twB?T-3EkmKM!9I9j9&(!Bhj7{fue z2m4&1yJu`ofkRePznnkpgneJSjZ8~U8BpB)gC9??PzVJcH{_%V7tCa@c5~~ZhUd*x zTb`b8W=dQyUq(nA>2ji*_G(P+M&VW@0&=j`OV3>2jGB*);T+K~uTLlal$o0Ab=j7lwwZ=B zeO3Qt6auGS4DRHV0Xv~e67gctll6hyU|gfzYWrRSljv6;iae}FUgV)1kcUliXW}Ad zAZjA3Ic#AuSFV+k&I%hd8QXg;6SdLyp6#zthz*9$smu$P+vU^O@*bz?Fz3HL_5WvI zWM{e-_L;CVt-TOSNo7N6(S?z+mx*)rg>;-pwun_UQ>fY@dy0vb97+`}qW`;=DL8-H zl1kn6cEmh&MtqCROw{(@S_js)`(po@ISMAxdlyw*JIVeV3nl(y6kW@U zBkv_Ka%0gLD!Jss)xejDqsjJG$i&iD+9JEOA-mx6K-t0^yh$z(*izd0P14S9l6K+P q`S#TRA+`1G!f3gtA(&KoZ8yGu1DUsbw`P9$!E*d#5TMvUUH>oX&y)@T diff --git a/Assets/Scripts/Player/TankMovements.cs b/Assets/Scripts/Player/TankMovements.cs index 9b87b08..cc0d7fa 100644 --- a/Assets/Scripts/Player/TankMovements.cs +++ b/Assets/Scripts/Player/TankMovements.cs @@ -63,10 +63,11 @@ void Update() { ray = Camera.main.ScreenPointToRay((Vector3)Input.GetTouch(i).position); RaycastHit hit; - if(Physics.Raycast(ray, out hit, LayerMask.NameToLayer("Ground")) && !EventSystem.current.IsPointerOverGameObject(Input.GetTouch(i).fingerId)) + if(canFire && tank.health > 0 && Physics.Raycast(ray, out hit, LayerMask.NameToLayer("Ground")) && !EventSystem.current.IsPointerOverGameObject(Input.GetTouch(i).fingerId)) { headTransform.LookAt(new Vector3(hit.point.x, headTransform.position.y, hit.point.z)); CmdSpawnMissile(missileSpawn.position); + canFire = false; } } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b41b1ba382b0872a27de58cebabbeb401ec1a0c7..053e524c78f9a7ebf3127eb513c1e98c7a32543e 100644 GIT binary patch delta 34 ecmeC(&(yo0X+z$0VN(VeV1zPQH#bh_;Q#=T0S12n delta 34 ecmeC(&(yo0X+z$0VIu|@V1zQ5HaAY^;Q#=Srv`Zd