Fixed #15 Tank are now more than twice bigger, Replaced map hitboxes

Stolous · May 14, 2017 · df2630d · df2630d
1 parent b9129db
commit df2630d
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 3 deletions.
diff --git a/Assets/Prefabs/Missile.prefab b/Assets/Prefabs/Missile.prefab
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity
diff --git a/Assets/Scripts/Player/TankMovements.cs b/Assets/Scripts/Player/TankMovements.cs
@@ -13,7 +13,7 @@ namespace TankFighters.Player
 	[RequireComponent (typeof(CharacterController))]
 	public class TankMovements : NetworkBehaviour
 	{
-		public int speed = 1;
+		public float speed = 1f;
 		public Transform headTransform;
 		public Transform missileSpawn;
 
@@ -56,14 +56,16 @@ void Update()
 			movement *= Time.deltaTime;
 			controller.Move(movement);
 
+			int layerMask = 1 << LayerMask.NameToLayer("Ground");
+
 #if !UNITY_EDITOR
 			for (var i = 0; i < Input.touchCount; ++i)
 			{
 				if (Input.GetTouch(i).phase == TouchPhase.Began)
 				{
 					ray = Camera.main.ScreenPointToRay((Vector3)Input.GetTouch(i).position);
 					RaycastHit hit;
-					if(canFire && tank.health > 0 && 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, 100f, LayerMask) && !EventSystem.current.IsPointerOverGameObject(Input.GetTouch(i).fingerId))
 					{
 						headTransform.LookAt(new Vector3(hit.point.x, headTransform.position.y, hit.point.z));
 						CmdSpawnMissile(missileSpawn.position);
@@ -76,7 +78,7 @@ void Update()
 			{
 				ray = Camera.main.ScreenPointToRay(Input.mousePosition + new Vector3(0f, 0f, 10f));
 				RaycastHit hit;
-				if(canFire && tank.health > 0 && Physics.Raycast(ray, out hit, LayerMask.NameToLayer("Ground")))
+				if(canFire && tank.health > 0 && Physics.Raycast(ray, out hit, 10000f, layerMask))
 				{
 					headTransform.LookAt(new Vector3(hit.point.x, headTransform.position.y, hit.point.z));
 					CmdSpawnMissile(missileSpawn.position);

diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset