#35 InIslandPlayer 추가

- Player 이동 구현 - 03.Stage_Test 테스트 씬 추가 - SPUM prefab 스케일 1 -> 2 변경
2023-10-05 16:56:53 +09:00 · 2023-10-05 16:56:53 +09:00 · 17172a0633
commit 17172a0633
parent 383f8d5637
48 changed files with 1537766 additions and 471 deletions
--- a/BlueWater/Assets/01.Scenes/02.Main_TG.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main_TG.unity
@ -143266,7 +143266,7 @@ Transform:
  m_GameObject: {fileID: 193056413}
  serializedVersion: 2
  m_LocalRotation: {x: 0.68862504, y: 0.030224524, z: -0.028751038, w: 0.7239167}
-  m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -222809,8 +222809,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 310929530}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.6618745, y: 0.031248953, z: -0.02763417, w: 0.7484532}
-  m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744}
+  m_LocalRotation: {x: 0.6618744, y: 0.031249192, z: -0.027634379, w: 0.7484532}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -701704,8 +701704,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 978318587}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.6753436, y: 0.03074276, z: -0.028196778, w: 0.7363227}
-  m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744}
+  m_LocalRotation: {x: 0.6753436, y: 0.030742314, z: -0.02819636, w: 0.7363227}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
--- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
+++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
--- a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta
+++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta
@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: a55ee4efaad27d948ba5f03fc6d7bc80
+guid: dd9e1208df2066d4baf93ac5b45bffdb
+timeCreated: 1496770385
+licenseType: Store
 DefaultImporter:
-  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/BlueWater.cs
+++ b/BlueWater/Assets/02.Scripts/BlueWater.cs
@ -401,78 +401,6 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
                    ""isPartOfComposite"": false
                }
            ]
-        },
-        {
-            ""name"": ""InIslandPlayer"",
-            ""id"": ""ecd1ce71-0143-4a0d-b768-d3f1a7fe33b9"",
-            ""actions"": [
-                {
-                    ""name"": ""Move"",
-                    ""type"": ""Value"",
-                    ""id"": ""8bcf669e-cce8-4177-a248-711e234a39be"",
-                    ""expectedControlType"": ""Vector2"",
-                    ""processors"": """",
-                    ""interactions"": """",
-                    ""initialStateCheck"": true
-                }
-            ],
-            ""bindings"": [
-                {
-                    ""name"": ""WASD"",
-                    ""id"": ""32f0e967-e5de-4f01-aa1e-a607a0304c52"",
-                    ""path"": ""2DVector"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": """",
-                    ""action"": ""Move"",
-                    ""isComposite"": true,
-                    ""isPartOfComposite"": false
-                },
-                {
-                    ""name"": ""up"",
-                    ""id"": ""d2c8ac50-a12f-4f41-aacf-42310db8dee5"",
-                    ""path"": ""<Keyboard>/w"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": ""Keyboard&Mouse"",
-                    ""action"": ""Move"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": true
-                },
-                {
-                    ""name"": ""down"",
-                    ""id"": ""68dbc390-f395-4d17-8c23-1526b11f2363"",
-                    ""path"": ""<Keyboard>/s"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": ""Keyboard&Mouse"",
-                    ""action"": ""Move"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": true
-                },
-                {
-                    ""name"": ""left"",
-                    ""id"": ""2a8275a8-ada7-48c0-ab42-3030013101b0"",
-                    ""path"": ""<Keyboard>/a"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": ""Keyboard&Mouse"",
-                    ""action"": ""Move"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": true
-                },
-                {
-                    ""name"": ""right"",
-                    ""id"": ""fd4aca22-d5e4-4c5c-8d49-4aff6b308a83"",
-                    ""path"": ""<Keyboard>/d"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": ""Keyboard&Mouse"",
-                    ""action"": ""Move"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": true
-                }
-            ]
        }
    ],
    ""controlSchemes"": [
@ -526,9 +454,6 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        m_Unit_SelectUnit = m_Unit.FindAction("SelectUnit", throwIfNotFound: true);
        m_Unit_CancelSelectedUnit = m_Unit.FindAction("CancelSelectedUnit", throwIfNotFound: true);
        m_Unit_MoveUnit = m_Unit.FindAction("MoveUnit", throwIfNotFound: true);
-        // InIslandPlayer
-        m_InIslandPlayer = asset.FindActionMap("InIslandPlayer", throwIfNotFound: true);
-        m_InIslandPlayer_Move = m_InIslandPlayer.FindAction("Move", throwIfNotFound: true);
    }

    public void Dispose()
@ -820,52 +745,6 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        }
    }
    public UnitActions @Unit => new UnitActions(this);
-
-    // InIslandPlayer
-    private readonly InputActionMap m_InIslandPlayer;
-    private List<IInIslandPlayerActions> m_InIslandPlayerActionsCallbackInterfaces = new List<IInIslandPlayerActions>();
-    private readonly InputAction m_InIslandPlayer_Move;
-    public struct InIslandPlayerActions
-    {
-        private @BlueWater m_Wrapper;
-        public InIslandPlayerActions(@BlueWater wrapper) { m_Wrapper = wrapper; }
-        public InputAction @Move => m_Wrapper.m_InIslandPlayer_Move;
-        public InputActionMap Get() { return m_Wrapper.m_InIslandPlayer; }
-        public void Enable() { Get().Enable(); }
-        public void Disable() { Get().Disable(); }
-        public bool enabled => Get().enabled;
-        public static implicit operator InputActionMap(InIslandPlayerActions set) { return set.Get(); }
-        public void AddCallbacks(IInIslandPlayerActions instance)
-        {
-            if (instance == null || m_Wrapper.m_InIslandPlayerActionsCallbackInterfaces.Contains(instance)) return;
-            m_Wrapper.m_InIslandPlayerActionsCallbackInterfaces.Add(instance);
-            @Move.started += instance.OnMove;
-            @Move.performed += instance.OnMove;
-            @Move.canceled += instance.OnMove;
-        }
-
-        private void UnregisterCallbacks(IInIslandPlayerActions instance)
-        {
-            @Move.started -= instance.OnMove;
-            @Move.performed -= instance.OnMove;
-            @Move.canceled -= instance.OnMove;
-        }
-
-        public void RemoveCallbacks(IInIslandPlayerActions instance)
-        {
-            if (m_Wrapper.m_InIslandPlayerActionsCallbackInterfaces.Remove(instance))
-                UnregisterCallbacks(instance);
-        }
-
-        public void SetCallbacks(IInIslandPlayerActions instance)
-        {
-            foreach (var item in m_Wrapper.m_InIslandPlayerActionsCallbackInterfaces)
-                UnregisterCallbacks(item);
-            m_Wrapper.m_InIslandPlayerActionsCallbackInterfaces.Clear();
-            AddCallbacks(instance);
-        }
-    }
-    public InIslandPlayerActions @InIslandPlayer => new InIslandPlayerActions(this);
    private int m_KeyboardMouseSchemeIndex = -1;
    public InputControlScheme KeyboardMouseScheme
    {
@ -908,8 +787,4 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        void OnCancelSelectedUnit(InputAction.CallbackContext context);
        void OnMoveUnit(InputAction.CallbackContext context);
    }
-    public interface IInIslandPlayerActions
-    {
-        void OnMove(InputAction.CallbackContext context);
-    }
 }
--- a/BlueWater/Assets/02.Scripts/BlueWater.inputactions
+++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions
@ -379,78 +379,6 @@
                    "isPartOfComposite": false
                }
            ]
-        },
-        {
-            "name": "InIslandPlayer",
-            "id": "ecd1ce71-0143-4a0d-b768-d3f1a7fe33b9",
-            "actions": [
-                {
-                    "name": "Move",
-                    "type": "Value",
-                    "id": "8bcf669e-cce8-4177-a248-711e234a39be",
-                    "expectedControlType": "Vector2",
-                    "processors": "",
-                    "interactions": "",
-                    "initialStateCheck": true
-                }
-            ],
-            "bindings": [
-                {
-                    "name": "WASD",
-                    "id": "32f0e967-e5de-4f01-aa1e-a607a0304c52",
-                    "path": "2DVector",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Move",
-                    "isComposite": true,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "up",
-                    "id": "d2c8ac50-a12f-4f41-aacf-42310db8dee5",
-                    "path": "<Keyboard>/w",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "Move",
-                    "isComposite": false,
-                    "isPartOfComposite": true
-                },
-                {
-                    "name": "down",
-                    "id": "68dbc390-f395-4d17-8c23-1526b11f2363",
-                    "path": "<Keyboard>/s",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "Move",
-                    "isComposite": false,
-                    "isPartOfComposite": true
-                },
-                {
-                    "name": "left",
-                    "id": "2a8275a8-ada7-48c0-ab42-3030013101b0",
-                    "path": "<Keyboard>/a",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "Move",
-                    "isComposite": false,
-                    "isPartOfComposite": true
-                },
-                {
-                    "name": "right",
-                    "id": "fd4aca22-d5e4-4c5c-8d49-4aff6b308a83",
-                    "path": "<Keyboard>/d",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "Move",
-                    "isComposite": false,
-                    "isPartOfComposite": true
-                }
-            ]
        }
    ],
    "controlSchemes": [
--- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
@ -1,5 +1,6 @@
 using Sirenix.OdinInspector;
 using UnityEngine;
+using UnityEngine.AI;
 using UnityEngine.InputSystem;

 // ReSharper disable once CheckNamespace
@ -9,18 +10,65 @@ namespace BlueWaterProject
    {
        #region Properties and variables

-        [Title("Player Input System")]
-        [SerializeField] private float moveSpeed;
+        [Title("Movement")]
+        [SerializeField] private float moveSpeed = 5f;
+        [SerializeField] private float groundDistance = 0.2f;
+        [SerializeField] private LayerMask groundLayer;
+        [SerializeField] private bool isGrounded;
+
        private Vector2 movementInput;
        
+        private Rigidbody rb;
+        private Animator myAnimator;
+        private NavMeshAgent agent;
+        
+        private static readonly int RunStateHash = Animator.StringToHash("RunState");
+
        #endregion

        #region Unity built-in methods

+        protected override void Awake()
+        {
+            base.Awake();
+            
+            groundLayer = LayerMask.GetMask("Ground");
+            
+            rb = GetComponent<Rigidbody>();
+            myAnimator = transform.Find("UnitRoot")?.GetComponent<Animator>();
+            if (myAnimator == null)
+            {
+                print("UnitRoot를 찾을 수 없습니다.");
+            }
+
+            agent = transform.Find("Agent")?.GetComponent<NavMeshAgent>();
+            if (agent == null)
+            {
+                print("Agent를 찾을 수 없습니다.");
+            }
+        }
+
        protected override void Update()
        {
-            var movement = new Vector3(movementInput.x, 0, movementInput.y) * (moveSpeed * Time.deltaTime);
-            transform.Translate(movement);
+            isGrounded = Physics.Raycast(transform.position, Vector3.down, groundDistance, groundLayer);
+
+            if (isGrounded)
+            {
+                var localMovement = new Vector3(movementInput.x, 0, movementInput.y);
+                var worldDirection = transform.TransformDirection(localMovement);
+
+                var movement = worldDirection * moveSpeed;
+                rb.velocity = new Vector3(movement.x, 0, movement.z);
+            }
+
+            if (movementInput.x != 0 || movementInput.y != 0)
+            {
+                myAnimator.SetFloat(RunStateHash, 0.5f);
+            }
+            else
+            {
+                myAnimator.SetFloat(RunStateHash, 0f);
+            }
        }

        #endregion
@ -41,8 +89,10 @@ namespace BlueWaterProject
            movementInput = value.Get<Vector2>();
            
            // 2D 스프라이트 뒤집기
+            if (Mathf.Abs(movementInput.x) <= 0.01f) return;
+            
            var localScale = transform.localScale;
-            localScale.x = movementInput.x >= 0 ? Mathf.Abs(localScale.x) : -Mathf.Abs(localScale.x);
+            localScale.x = movementInput.x > 0 ? Mathf.Abs(localScale.x) : -Mathf.Abs(localScale.x);
            transform.localScale = localScale;
        }

@ -50,7 +100,17 @@ namespace BlueWaterProject

        #region Custom methods

+        private void UseRigidbodyMovement()
+        {
+            rb.isKinematic = false;
+            agent.enabled = false;
+        }
        
+        private void UseAgentMovement()
+        {
+            rb.isKinematic = true;
+            agent.enabled = true;
+        }

        #endregion
    }
--- a/BlueWater/Assets/02.Scripts/GameManager.cs
+++ b/BlueWater/Assets/02.Scripts/GameManager.cs
@ -15,15 +15,13 @@ namespace BlueWaterProject
        public ShipPlayer shipPlayer;
        public List<Boat> boats = new List<Boat>(10);
        [Required("BlueWater Player Input Action을 넣어주세요.")]
-        [SerializeField] private InputActionAsset playerAction;
+        public InputActionAsset playerAction;
        [Required("Viking Prefab을 넣어주세요.")]
-        [SerializeField] private GameObject inIslandPlayer;
+        public GameObject inIslandPlayer;

        [Range(0f, 1f)]
        [SerializeField] private float slowSpeed = 0.1f;

-        private const string IN_ISLAND_PLAYER_NAME = "InIslandPlayer";
-
        private void Init()
        {
            CameraController = FindAnyObjectByType<CameraController>();
@ -39,31 +37,6 @@ namespace BlueWaterProject
            Cursor.lockState = CursorLockMode.Confined;
        }

-        public void SpawnInIslandPlayer(Vector3 spawnPosition)
-        {
-            var islandPlayer = Instantiate(inIslandPlayer, spawnPosition, Quaternion.identity);
-            islandPlayer.name = IN_ISLAND_PLAYER_NAME;
-            
-            var playerInput = islandPlayer.GetComponent<PlayerInput>();
-            if (playerInput == null)
-            {
-                playerInput = islandPlayer.AddComponent<PlayerInput>();
-            }
-            playerInput.actions = playerAction;
-
-            var desiredActionMap = playerInput.actions.FindActionMap(IN_ISLAND_PLAYER_NAME);
-            if (desiredActionMap == null)
-            {
-                print($"Action map named '{IN_ISLAND_PLAYER_NAME}' not found in player actions!");
-                return;
-            }
-            
-            playerInput.defaultActionMap = IN_ISLAND_PLAYER_NAME;
-            playerInput.SwitchCurrentActionMap(IN_ISLAND_PLAYER_NAME);
-
-            islandPlayer.AddComponent<InIslandPlayer>();
-        }
-
        public void testPrint()
        {
            print("Boat가 목표에 도착해서 이 함수를 호출합니다");
--- a/BlueWater/Assets/02.Scripts/SpawnController.cs
+++ b/BlueWater/Assets/02.Scripts/SpawnController.cs
@ -0,0 +1,73 @@
+using Cinemachine;
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class SpawnController : MonoBehaviour
+    {
+        private GameObject spawnPositionObj;
+        private CinemachineVirtualCamera cinemachineVirtualCamera;
+        
+        private const string PLAYER_NAME = "Player";
+        private const string IN_ISLAND_PLAYER_NAME = "InIslandPlayer";
+
+        private void Start()
+        {
+            spawnPositionObj = GameObject.Find("StageMap/SpawnPosition");
+            if (spawnPositionObj == null)
+            {
+                print("StageMap 또는 SpawnPosition 오브젝트를 찾을 수 없습니다.");
+                return;
+            }
+
+            cinemachineVirtualCamera = GameObject.Find("Virtual Camera")?.GetComponent<CinemachineVirtualCamera>();
+            if (cinemachineVirtualCamera == null)
+            {
+                print("Virtual Camera 오브젝트를 찾을 수 없습니다.");
+                return;
+            }
+            
+            var currentSceneName = SceneManager.GetActiveScene().name;
+            if (currentSceneName != "02.Main")
+            {
+                SpawnInIslandPlayer(spawnPositionObj.transform.position, spawnPositionObj.transform.rotation);
+            }
+        }
+        
+        private void SpawnInIslandPlayer(Vector3 spawnPos, Quaternion spawnRotation)
+        {
+            var islandPlayer = Instantiate(GameManager.Inst.inIslandPlayer, spawnPos, spawnRotation);
+            islandPlayer.name = IN_ISLAND_PLAYER_NAME;
+            
+            var playerInput = islandPlayer.GetComponent<PlayerInput>();
+            if (playerInput == null)
+            {
+                playerInput = islandPlayer.AddComponent<PlayerInput>();
+            }
+            playerInput.actions = GameManager.Inst.playerAction;
+
+            var desiredActionMap = playerInput.actions.FindActionMap(PLAYER_NAME);
+            if (desiredActionMap == null)
+            {
+                print($"Action map named '{PLAYER_NAME}' not found in player actions!");
+                return;
+            }
+            
+            playerInput.defaultActionMap = PLAYER_NAME;
+
+            if (GameManager.Inst.shipPlayer != null)
+            {
+                GameManager.Inst.shipPlayer.GetComponent<PlayerInput>().enabled = false;
+            }
+            playerInput.SwitchCurrentActionMap(PLAYER_NAME);
+
+            islandPlayer.AddComponent<InIslandPlayer>();
+
+            cinemachineVirtualCamera.Follow = islandPlayer.transform;
+            cinemachineVirtualCamera.LookAt = islandPlayer.transform;
+        }
+    }
+}
--- a/BlueWater/Assets/02.Scripts/SpawnController.cs.meta
+++ b/BlueWater/Assets/02.Scripts/SpawnController.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 551a6add4224f7643ba9b247325d9049
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc1.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc1.prefab
@ -3041,8 +3041,8 @@ RectTransform:
  m_GameObject: {fileID: 6294429197787252722}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 6601977797241583183}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc2.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc2.prefab
@ -3245,8 +3245,8 @@ RectTransform:
  m_GameObject: {fileID: 7305287201485691239}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 7612554324961290458}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc3.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc3.prefab
@ -769,8 +769,8 @@ RectTransform:
  m_GameObject: {fileID: 2527913158230619112}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 3445344209315447381}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc4.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc4.prefab
@ -3485,8 +3485,8 @@ RectTransform:
  m_GameObject: {fileID: 8324368761444068393}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 9170094766524079508}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc5.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc5.prefab
@ -421,8 +421,8 @@ RectTransform:
  m_GameObject: {fileID: 795613200604023475}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 562444384213154574}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc6.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc6.prefab
@ -1351,8 +1351,8 @@ RectTransform:
  m_GameObject: {fileID: 4240854641551087113}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 3899601613661497268}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc7.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc7.prefab
@ -907,8 +907,8 @@ RectTransform:
  m_GameObject: {fileID: 2239584764280768861}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1427706675845429472}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc8.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc8.prefab
@ -1138,8 +1138,8 @@ RectTransform:
  m_GameObject: {fileID: 3778215956730531554}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 4083158164014350175}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Npcs/NPC_sailors.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Npcs/NPC_sailors.prefab
@ -3384,8 +3384,8 @@ RectTransform:
  m_GameObject: {fileID: 7891644557749838249}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 5173766130632890723}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Players/Skull_King.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Players/Skull_King.prefab
@ -3137,8 +3137,8 @@ RectTransform:
  m_GameObject: {fileID: 7671700086832248929}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1655713066471977021}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Players/TenTen.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Players/TenTen.prefab
@ -3215,8 +3215,8 @@ RectTransform:
  m_GameObject: {fileID: 7216996033527228451}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 3121891628484793615}
  m_Father: {fileID: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Players/Viking.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Players/Viking.prefab
@ -129,6 +129,60 @@ SpriteRenderer:
  m_WasSpriteAssigned: 0
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!1 &351607552145899027
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2616572857003424187}
+  - component: {fileID: 996690166393194758}
+  m_Layer: 8
+  m_Name: Agent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2616572857003424187
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 351607552145899027}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.05, z: 0.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 895707786071648807}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!195 &996690166393194758
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 351607552145899027}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.15
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 0.75
+  m_BaseOffset: 0.02
+  m_WalkableMask: 4294967295
+  m_ObstacleAvoidanceType: 4
 --- !u!1 &478461241365332483
 GameObject:
  m_ObjectHideFlags: 0
@ -1685,8 +1739,9 @@ GameObject:
  m_Component:
  - component: {fileID: 895707786071648807}
  - component: {fileID: 2790053813834214194}
-  - component: {fileID: 5961428674722413686}
-  m_Layer: 5
+  - component: {fileID: 6482459230564518963}
+  - component: {fileID: 4818569613637124799}
+  m_Layer: 8
  m_Name: Viking
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -1702,10 +1757,11 @@ RectTransform:
  m_GameObject: {fileID: 4681418249284042988}
  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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 6778889828054827754}
+  - {fileID: 2616572857003424187}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -1735,37 +1791,56 @@ MonoBehaviour:
  UnitTypeChanged:
    m_PersistentCalls:
      m_Calls: []
--- !u!114 &5961428674722413686
-MonoBehaviour:
+--- !u!54 &6482459230564518963
+Rigidbody:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4681418249284042988}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  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: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 112
+  m_CollisionDetection: 0
+--- !u!136 &4818569613637124799
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4681418249284042988}
+  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
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
-    type: 3}
-  m_NotificationBehavior: 0
-  m_UIInputModule: {fileID: 0}
-  m_DeviceLostEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_DeviceRegainedEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ControlsChangedEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ActionEvents: []
-  m_NeverAutoSwitchControlSchemes: 0
-  m_DefaultControlScheme: 
-  m_DefaultActionMap: ecd1ce71-0143-4a0d-b768-d3f1a7fe33b9
-  m_SplitScreenIndex: -1
-  m_Camera: {fileID: 0}
+  serializedVersion: 2
+  m_Radius: 0.15
+  m_Height: 0.75
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.3, z: 0.2}
 --- !u!1 &4698308777242127462
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta
+++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ed9b95dc6ed6d0647ad7f1a8f305385d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Blobcreate/Projectile
+++ b/BlueWater/Assets/Blobcreate/Projectile
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4ff1f29eab234cf4490d9bb383892c44
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Integration.unitypackage.meta
+++ b/Integration.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f5789d13135b86645a366dac6583d1cd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Distant
+++ b/BlueWater/Assets/Distant
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3643c0d76ec153646b1203880bfb64ed
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/(2020.3.45f1).unitypackage.meta
+++ b/(2020.3.45f1).unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3d7c4217783978e4abe6496ac71eee94
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta
+++ b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta
+++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 078b8f13a17171b49892ad10426d5af0
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta
+++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f9406a33814af9c47b352e77f079d798
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta
+++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9aacf6f3043624194bb6f6fe9a580786
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/FlatKit/[Render
+++ b/BlueWater/Assets/FlatKit/[Render
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f4227764308e84f89a765fbf315e2945
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/FlatKit/[Render
+++ b/BlueWater/Assets/FlatKit/[Render
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 41e59f562b69648719f2424c438758f3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b044a2387a61dac41bdf204adffdce9d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cd287c84e887ea24a8679e67aac7c074
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f211254f5bfad224ba88868f2c75432c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4368c9be31b3c174dbfd80f2caf98889
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta
+++ b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 617b3f1032a08c14ebfedfa340767cdf
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f597f19f656ba56eae4f6a3a7cc528f4
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 48e08dc33330d11e9d4a1b246c52e4f6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ed09910c0094cb27be8f3ca264680da3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cc355dd4cf1e6173beaeb22c2858cbe1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Curvature/SRP/HDRP.unitypackage.meta
+++ b/Curvature/SRP/HDRP.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7dd73fb2fec8fb642be983cf08cfd6b1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Curvature/SRP/URP.unitypackage.meta
+++ b/Curvature/SRP/URP.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1c45d0aac2834f14db81b11cdbcec705
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Example.unitypackage.meta
+++ b/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0e83bea63c06f674eb5018b4edaaa234
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Example.unitypackage.meta
+++ b/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c2a3494b77a23b54aa8b5ad80b580749
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Example.unitypackage.meta
+++ b/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 63fa4c6385d5807478747f832fef4a20
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/ProjectSettings/EditorBuildSettings.asset
+++ b/BlueWater/ProjectSettings/EditorBuildSettings.asset
@ -13,3 +13,4 @@ EditorBuildSettings:
      type: 2}
    com.unity.input.settings: {fileID: 11400000, guid: e0caac234b4984d92bb375ffa95898bf,
      type: 2}
+  m_UseUCBPForAssetBundles: 0