Merge branch 'BS' into ulongcha

Grapplers/Assets/Audio/SFX/bullet_impact_body_thump_02.wav.meta

 fileFormatVersion: 2
-guid: 4a53b7140d8804d48902cc8b4126bfcb
+guid: f987a037ba06e484c8db4d5ae010f697
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Audio/SFX/bullet_impact_concrete_brick_01.wav.meta

 fileFormatVersion: 2
-guid: a187624ea6c57db43ac585ca043dade4
+guid: c221eaf8dc711ad4993c76f0d2e8552e
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Audio/SFX/bullet_impact_metal_heavy_08.wav.meta

 fileFormatVersion: 2
-guid: f02bab0c28ab1334b8e764bf2769b295
+guid: 7496b23b2d19dda4d9a81492bae5ab6d
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Audio/SFX/dagger_rr_1.wav.meta

 fileFormatVersion: 2
-guid: 24d63e760facb6b48ba2956444fca90e
+guid: 57e4a7d0d1a3e834caa7600ebe6832bc
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Audio/SFX/dagger_rr_2.wav.meta

 fileFormatVersion: 2
-guid: 11fcf8cb69c44d747b865748207ce233
+guid: a38e743645d4cfd46a7ab3c137a738fa
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Audio/SFX/dagger_rr_3.wav.meta

 fileFormatVersion: 2
-guid: 64410a7adb1f1464a905cc4d6f1687c3
+guid: 41741eca352ec594d92c5b669c6ab279
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Audio/SFX/gun.wav.meta

 fileFormatVersion: 2
-guid: c188195679b510c47a16390d501f813c
+guid: 3def6dd83cd1bfa44be7b17626eced69
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Grapplers/Assets/Materials/Player.physicMaterial

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Player
+  dynamicFriction: 1
+  staticFriction: 1
+  bounciness: 0
+  frictionCombine: 0
+  bounceCombine: 0

Grapplers/Assets/Materials/Player.physicMaterial.meta

+fileFormatVersion: 2
+guid: f529349e6ff9028458dcf46cb375eb07
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Grapplers/Assets/Prefabs/Player.prefab.meta

+fileFormatVersion: 2
+guid: d06de160369998643b438095a9d8244e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Grapplers/Assets/Prefabs/StartTimeline.playable.meta

+fileFormatVersion: 2
+guid: 65c30e43583fa9d49956b1775a871385
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Grapplers/Assets/ReadySignal.signal

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
+  m_Name: ReadySignal
+  m_EditorClassIdentifier: 

Grapplers/Assets/ReadySignal.signal.meta

+fileFormatVersion: 2
+guid: 0242a934515cff642a78ec15209a3ba5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Grapplers/Assets/Scenes/Mapwork.unity

@@ -17883,6 +17883,7 @@ MonoBehaviour:
   comboText: {fileID: 1582354879}
   damageText: {fileID: 968624425}
   OutOfMapWarningUI: {fileID: 204903075}
+  distanceText: {fileID: 0}
 --- !u!114 &1741517729
 MonoBehaviour:
   m_ObjectHideFlags: 0

Grapplers/Assets/Scenes/Mapwork_Profiles/Main Camera Profile.asset

@@ -18,7 +18,7 @@ MonoBehaviour:
     value: 1
   intensity:
     overrideState: 1
-    value: 17.69
+    value: 10
   threshold:
     overrideState: 0
     value: 1
@@ -1380,6 +1380,34 @@ MonoBehaviour:
   sampleCount:
     overrideState: 1
     value: 5
+--- !u!114 &-7653435643296087632
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 556797029e73b2347956b6579e77e05b, type: 3}
+  m_Name: DepthOfField
+  m_EditorClassIdentifier: 
+  active: 1
+  enabled:
+    overrideState: 1
+    value: 1
+  focusDistance:
+    overrideState: 1
+    value: 5
+  aperture:
+    overrideState: 1
+    value: 7.6
+  focalLength:
+    overrideState: 1
+    value: 67
+  kernelSize:
+    overrideState: 1
+    value: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1397,6 +1425,7 @@ MonoBehaviour:
   - {fileID: -7753695407939056566}
   - {fileID: -8621508592174753373}
   - {fileID: 4882075946469032659}
+  - {fileID: -7653435643296087632}
 --- !u!114 &4882075946469032659
 MonoBehaviour:
   m_ObjectHideFlags: 3

Grapplers/Assets/Scripts/CameraController.cs

@@ -26,6 +26,8 @@ public class CameraController : MonoBehaviour
     private void Start()
     {
         cam = GetComponent<Camera>();
+		currentX = 0;
+		currentY = 0;
     }
 
     private void Update()

Grapplers/Assets/Scripts/IngameUIManager.cs

@@ -39,6 +39,8 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
 	[SerializeField]
 	private Text OutOfMapWarningUI;
 
+	[SerializeField]
+	private Text distanceText;
 
 	public void UpdateTargetLockedUIs(Vector3[] pos)
 	{
@@ -151,4 +153,12 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
 		else
 			OutOfMapWarningUI.text = string.Format("{0:F1}",remainTime);
 	}
+
+	public void UpdateDistanceUI(float distance)
+	{
+		if (distance < 0)
+			distanceText.text = "";
+		else
+			distanceText.text = string.Format("{0:F1}", distance) + "m"; ;
+	}
 }

Grapplers/Assets/Scripts/PlayerController.cs

@@ -2,33 +2,33 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-[RequireComponent(typeof(CharacterController))]
 public class PlayerController : MonoBehaviour
 {
-    public float distance = 10.0f;
+	public float distance = 10.0f;
 
 
-    float velocityY = 0.0f;
-    const float gravity = 9.8f;
+	float velocityY = 0.0f;
+	const float gravity = 9.8f;
 
-    public HookBehaviour hook;
+	public HookBehaviour hook;
 
-    private Rigidbody rb;
+	private Rigidbody rb;
 	private CapsuleCollider col;
-	private DistanceJoint3D joint; 
-    private bool isWired;
+	private DistanceJoint3D joint;
+	private bool isWired;
+
+	private float movement;
+	private Animator animator;
 
-    private float movement;
-    private Animator animator;
 
-    
 	[SerializeField]
 	private Transform groundChecker;
 	public LayerMask groundMask;
 	private bool IsGrounded
 	{
 		get {
-			return Physics.OverlapSphere(groundChecker.position, 0.2f, groundMask).Length > 0;
+			RaycastHit hit;
+			return Physics.SphereCast(transform.position, col.radius / 2, Vector3.down, out hit, col.bounds.extents.y + 0.5f, groundMask);
 		}
 	}
 
@@ -55,9 +55,10 @@ public class PlayerController : MonoBehaviour
 		Gizmos.color = Color.red;
         Gizmos.DrawLine(transform.position, Camera.main.transform.forward.normalized * 200);
 
+		col = GetComponent<CapsuleCollider>();
 		if (IsGrounded)
 			Gizmos.color = Color.green;
-		Gizmos.DrawSphere(groundChecker.position, 0.1f);
+		Gizmos.DrawSphere(transform.position + Vector3.down * (col.bounds.extents.y + 0.05f), 0.1f);
 	}
 #endif
 
@@ -71,9 +72,6 @@ public class PlayerController : MonoBehaviour
         movement = 0.0f;
         animator = GetComponentInChildren<Animator>();
 
-		//col.enabled = !IsGrounded;
-		//cc.enabled = IsGrounded;
-
 		MaxHealth = Health = 100;
     }
     private void Update()
@@ -83,7 +81,15 @@ public class PlayerController : MonoBehaviour
 
         Animate(vertical, horizontal);
 
-        if (Input.GetMouseButtonDown(1))
+		RaycastHit hit;
+		if (!hook.gameObject.activeSelf && Physics.Raycast(transform.position, Camera.main.transform.forward, out hit, 700))
+		{
+			IngameUIManager.inst.UpdateDistanceUI(Vector3.Distance(transform.position, hit.point));
+		}
+		else
+			IngameUIManager.inst.UpdateDistanceUI(-1);
+
+		if (Input.GetMouseButtonDown(1))
         {
             if (!hook.gameObject.activeSelf)
             {
@@ -95,16 +101,21 @@ public class PlayerController : MonoBehaviour
 		
 		if (IsGrounded)
 		{
-			rb.velocity = (horizontal * transform.right + vertical * transform.forward).normalized * 10.0f;
+			//rb.velocity = Vector3.zero;
+			transform.position += (horizontal * transform.right + vertical * transform.forward).normalized * 10.0f * Time.deltaTime;
+			//rb.velocity = (horizontal * transform.right + vertical * transform.forward).normalized * 10.0f;
 			if (Input.GetButtonDown("Jump"))
-				rb.velocity += new Vector3(0, 5 -rb.velocity.y, 0);
+			{
+				rb.velocity = (horizontal * transform.right + vertical * transform.forward).normalized * 5.0f;
+				rb.velocity += new Vector3(0, 10 - rb.velocity.y, 0);
+			}
 		}
         else
         {
 			if (joint.enabled)
 				joint.moveDelta = (horizontal * transform.right + vertical * transform.forward).normalized * 30.0f;
 			else
-				rb.AddForce(horizontal * Camera.main.transform.right + vertical * Camera.main.transform.forward * 10.0f);
+				rb.AddForce((horizontal * transform.right + vertical * transform.forward).normalized * 10.0f);
         }
 
 		if (MapManager.inst.IsOutOfMapBounds(transform.position))
@@ -128,6 +139,20 @@ public class PlayerController : MonoBehaviour
         }
     }
 
+	private void FixedUpdate()
+	{
+		/*
+		if (IsGrounded)
+		{
+			RaycastHit hit;
+			Debug.Log(Physics.Raycast(transform.position, Vector3.down, out hit, groundMask));
+			Debug.Log(Physics.gravity + " * " + hit.normal + " = " + Vector3.Dot(Physics.gravity, hit.normal));
+			//Debug.Log(Physics.gravity + Physics.gravity * Vector3.Dot(Physics.gravity, hit.normal));
+			rb.AddForce(Physics.gravity + Physics.gravity * Vector3.Dot(Physics.gravity, hit.normal));
+		}
+		*/
+	}
+
 	private void FireHook()
     {
         joint.enabled = false;

Grapplers/Assets/Scripts/WeaponBehaviour.cs

@@ -24,19 +24,34 @@ public class WeaponBehaviour : MonoBehaviour
 	private ParticleSystem knifeEffect;
 	[SerializeField]
 	private LayerMask enemyMask, blockMask;
-	private IWeapon weapon;
+
+	private IWeapon weapon { get { return weaponList[weaponIndex]; } }
+	private List<IWeapon> weaponList = new List<IWeapon>();
+	private int weaponIndex = 0;
+
+	[SerializeField]
+	private List<RoundRobin> weaponAudioRRs = new List<RoundRobin>();
 
 	private void Start()
 	{
-		weapon = new Gun(gunDamage,gunRange, bulletEffect);
 		IngameUIManager.inst.UpdateWeaponTypeUI(WeaponType.GUN);
+
+		weaponList.Add(new Gun(gunDamage, gunRange, bulletEffect));
+		weaponList.Add(new Knife(knifeDamage, knifeRange, bulletEffect, transform));
 	}
 
 	private void Update()
 	{
-		weapon.UpdateWeapon();
+		foreach (var weapon in weaponList)
+		{
+			weapon.UpdateWeapon();
+		}
+
 		Enemy[] hitEnemies = weapon.WeaponLockOn(enemyMask, blockMask);
-		weapon.UseWeapon(hitEnemies);
+		if (weapon.UseWeapon(hitEnemies))
+		{
+			weaponAudioRRs[weaponIndex].Play();
+		}
 
 		if (Input.GetKeyDown(KeyCode.Tab))
 		{
@@ -50,23 +65,15 @@ public class WeaponBehaviour : MonoBehaviour
 
 	private void SwapWeapon()
 	{
-		if (weapon.GetType() == typeof(Gun))
-		{
-			weapon = new Knife(knifeDamage, knifeRange, bulletEffect, transform);
-			IngameUIManager.inst.UpdateWeaponTypeUI(WeaponType.KNIFE);
-		}
-		else
-		{
-			weapon = new Gun(gunDamage, gunRange, bulletEffect);
-			IngameUIManager.inst.UpdateWeaponTypeUI(WeaponType.GUN);
-		}
+		weaponIndex = (weaponIndex + 1) % 2;
+		IngameUIManager.inst.UpdateWeaponTypeUI((WeaponType)weaponIndex);
 		
 	}
 }
 
 public interface IWeapon
 {
-	void UseWeapon(Enemy[] hitEnemies);
+	bool UseWeapon(Enemy[] hitEnemies);
 	void UseSkill();
 	Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask);
 	void UpdateWeapon();
@@ -89,10 +96,10 @@ public class Gun : IWeapon
 		this.effect = effect;
 	}
 
-	public void UseWeapon(Enemy[] hitEnemies)
+	public bool UseWeapon(Enemy[] hitEnemies)
 	{
 		if (timer > 0)
-			return;
+			return false;
 		if (Input.GetMouseButton(0))
 		{
 			effect.transform.rotation = Camera.main.transform.rotation;
@@ -103,7 +110,9 @@ public class Gun : IWeapon
 				IngameUIManager.inst.UpdateComboUI(weaponDamage);
 			}
 			timer = gunShotInterval;
+			return true;
 		}
+		return false;
 	}
 
 	public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask)
@@ -156,7 +165,7 @@ public class Knife : IWeapon
 		this.player = player;
 	}
 
-	public void UseWeapon(Enemy[] hitEnemies)
+	public bool UseWeapon(Enemy[] hitEnemies)
 	{
 		if (Input.GetMouseButtonDown(0))
 		{
@@ -169,7 +178,9 @@ public class Knife : IWeapon
 				if (enemy.IsDead)
 					skillTimer = 0;
 			}
+			return true;
 		}
+		return false;
 	}
 
 	public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask)

Grapplers/Assets/StartSignal.signal

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
+  m_Name: StartSignal
+  m_EditorClassIdentifier: 

Grapplers/Assets/StartSignal.signal.meta

+fileFormatVersion: 2
+guid: 38706e2356d0dca40a5866d8d9df87a2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Grapplers/ProjectSettings/TagManager.asset

@@ -18,7 +18,7 @@ TagManager:
   - PlayerPassable
   - Enemy
   - Terrain
-  - 
+  - PostProcessing
   - 
   - 
   -