Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG

# Conflicts: # BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs
2023-08-31 16:39:15 +09:00 · 2023-08-31 16:39:15 +09:00 · 71e56b558b
commit 71e56b558b
parent dc00036723 9384999047
25 changed files with 953 additions and 729 deletions
--- a/BlueWater/Assets/01.Scenes/02.Main.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main.unity
@ -16961,7 +16961,7 @@ MonoBehaviour:
  - {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3}
  - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
  - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
-  cursorTexture: {fileID: 2800000, guid: c617a5b08493842c3833527a458fd612, type: 3}
+  cursorTexture: {fileID: 2800000, guid: 3a146044a282641d99ba04c33b8c2bbf, type: 3}
 --- !u!4 &107190135
 Transform:
  m_ObjectHideFlags: 0
@ -34764,6 +34764,87 @@ Transform:
  - {fileID: 847870679}
  m_Father: {fileID: 106415425}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &222471351
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 155222, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_Name
+      value: Toon Queen Worm - Pink (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -71.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.6878803
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7258242
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -266.925
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 155222, guid: 3ed5d7842716c504d8dd3ea20c75a637,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 451666486}
+    - targetCorrespondingSourceObject: {fileID: 155222, guid: 3ed5d7842716c504d8dd3ea20c75a637,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 451666485}
+  m_SourcePrefab: {fileID: 100100000, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
 --- !u!1 &222537145
 GameObject:
  m_ObjectHideFlags: 0
@ -70795,6 +70876,62 @@ SkinnedMeshRenderer:
    m_Center: {x: -0.06254879, y: 0.024880677, z: 0.00000011920929}
    m_Extent: {x: 0.5167997, y: 0.27444458, z: 0.7707152}
  m_DirtyAABB: 0
+--- !u!1 &451666484 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 155222, guid: 3ed5d7842716c504d8dd3ea20c75a637,
+    type: 3}
+  m_PrefabInstance: {fileID: 222471351}
+  m_PrefabAsset: {fileID: 0}
+--- !u!54 &451666485
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451666484}
+  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: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!136 &451666486
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451666484}
+  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: 2
+  m_Radius: 1
+  m_Height: 4
+  m_Direction: 1
+  m_Center: {x: 0, y: 1.9, z: 0}
 --- !u!1 &451981707
 GameObject:
  m_ObjectHideFlags: 0
@ -74235,8 +74372,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 176cfac66084d4bfb9b4c9f11c4b137f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  maxSpeed: 5
-  acceleration: 2
+  maxSpeed: 10
+  acceleration: 4
  deceleration: 2
  turnSpeed: 1
  characterSpeed: 2
@ -86739,7 +86876,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &550717941
 GameObject:
  m_ObjectHideFlags: 0
@ -182771,7 +182908,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -7.3424807
+      value: -1.9
      objectReference: {fileID: 0}
    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
      propertyPath: m_LocalPosition.y
@ -182779,7 +182916,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 15.353005
+      value: 15.7
      objectReference: {fileID: 0}
    - target: {fileID: 452206, guid: 3ed5d7842716c504d8dd3ea20c75a637, type: 3}
      propertyPath: m_LocalRotation.w
@ -190839,50 +190976,6 @@ SkinnedMeshRenderer:
    m_Center: {x: -0.06498811, y: 0.020641163, z: 0.00000014901161}
    m_Extent: {x: 0.5143604, y: 0.28673673, z: 0.7707151}
  m_DirtyAABB: 0
--- !u!1 &1234264506
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1234264508}
-  - component: {fileID: 1234264507}
-  m_Layer: 0
-  m_Name: InputSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1234264507
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1234264506}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 977b3558370da85488b8199c446577a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!4 &1234264508
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1234264506}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -187.1454, y: 12.477399, z: -121.38537}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1234566403
 GameObject:
  m_ObjectHideFlags: 0
@ -244929,7 +245022,7 @@ MonoBehaviour:
    IsHidden: 0
  - Type: 0
    Name: 
-    GameObject: {fileID: 1234264506}
+    GameObject: {fileID: 0}
    Ordinal: 4
    Priority: 0
    IconType: 1000
@ -338576,7 +338669,6 @@ SceneRoots:
  - {fileID: 1540310984}
  - {fileID: 1228753929}
  - {fileID: 107190135}
-  - {fileID: 1234264508}
  - {fileID: 2105062291}
  - {fileID: 1560348101}
  - {fileID: 476261175}
@ -338587,6 +338679,7 @@ SceneRoots:
  - {fileID: 1545641374}
  - {fileID: 1188875250}
  - {fileID: 1178452038}
+  - {fileID: 222471351}
  - {fileID: 1994033914}
  - {fileID: 342641572}
  - {fileID: 99817019}
--- a/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs
+++ b/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs
@ -1,12 +1,13 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using BlueWaterProject;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.Animations;
-using UnityEngine.UI;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class Boat : MonoBehaviour
    {
        private NavMeshAgent agent;
@ -21,7 +22,7 @@ public class Boat : MonoBehaviour
        public Vector3 Target { get; set; }
        public string CardIndex { get; set; }

-    public delegate void LandedEventHandler(string cardIndex, Vector3 assignPos);
+    public delegate void LandedEventHandler(string cardIndex, AttackerType attackerType, Vector3 assignPos);
    public event LandedEventHandler OnLanded;

        private void Awake()
@ -67,7 +68,7 @@ public class Boat : MonoBehaviour
            lineRenderer.enabled = false;
            if (draw != null) StopCoroutine(draw);
            
-        OnLanded?.Invoke(CardIndex, Target);
+        OnLanded?.Invoke(CardIndex, AttackerType.OFFENSE, Target);
        Destroy(gameObject);
    }

@ -87,3 +88,4 @@ public class Boat : MonoBehaviour
            }
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs
+++ b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs
@ -1,12 +1,13 @@
-using System;
 using System.Collections;
-using _02.Scripts.WaterAndShip;
 using BlueWaterProject;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler
    {
        [Title("Card")]
@ -134,3 +135,4 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I
            }
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/CameraController.cs
+++ b/BlueWater/Assets/02.Scripts/CameraController.cs
@ -1,11 +1,11 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using Cinemachine;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.InputSystem;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class CameraController : MonoBehaviour
    {
        [Title("Dredge Cam")]
@ -103,3 +103,4 @@ public class CameraController : MonoBehaviour
            }
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/Data/CardDataSo.cs
+++ b/BlueWater/Assets/02.Scripts/Data/CardDataSo.cs
@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using _02.Scripts.WaterAndShip;
 using UnityEngine;

 // ReSharper disable once CheckNamespace
--- a/BlueWater/Assets/02.Scripts/DataManager.cs
+++ b/BlueWater/Assets/02.Scripts/DataManager.cs
@ -1,9 +1,10 @@
 using System.Collections.Generic;
-using _02.Scripts.WaterAndShip;
-using BlueWaterProject;
 using Sirenix.OdinInspector;
 using UnityEngine;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class DataManager : Singleton<DataManager>
    {
        [field: Title("Scriptable Object")]
@ -75,3 +76,4 @@ public class DataManager : Singleton<DataManager>
        public Unit GetEnemyUnitSoKey(string idx) => EnemyUnitDataSo.unitDataList.Find(item => item.Idx == idx);
 #endif
    }
+}
--- a/BlueWater/Assets/02.Scripts/GameManager.cs
+++ b/BlueWater/Assets/02.Scripts/GameManager.cs
@ -1,11 +1,11 @@
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using _02.Scripts.WaterAndShip;
 using BlueWaterProject;
 using Sirenix.OdinInspector;
 using UnityEngine;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class GameManager : Singleton<GameManager>
    {
        [Title("Controller")]
@ -48,3 +48,4 @@ public class GameManager : Singleton<GameManager>
            Time.fixedDeltaTime = 0.02f;
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/Interface/IDameable23.cs
+++ b/BlueWater/Assets/02.Scripts/Interface/IDameable23.cs
@ -0,0 +1,7 @@
+namespace BlueWaterProject
+{
+    public interface IDamageable2
+    {
+        public void TakeDamage(float damage);
+    }
+}
--- a/BlueWater/Assets/02.Scripts/Interface/IDameable23.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Interface/IDameable23.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4fdb6e266dc14508a1b2645a7783193c
+timeCreated: 1693456465
--- a/BlueWater/Assets/02.Scripts/Player/Card.cs
+++ b/BlueWater/Assets/02.Scripts/Player/Card.cs
@ -2,7 +2,8 @@ using System;
 using BlueWaterProject;
 using UnityEngine;

-namespace _02.Scripts.WaterAndShip
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
 {
    [Serializable]
    public class Card : IIdx
--- a/BlueWater/Assets/02.Scripts/Player/Player.cs
+++ b/BlueWater/Assets/02.Scripts/Player/Player.cs
@ -1,10 +1,10 @@
-using Cinemachine;
+using Blobcreate.ProjectileToolkit;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.InputSystem;
-using Blobcreate. ProjectileToolkit;

-namespace _02.Scripts.WaterAndShip
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
 {
    [RequireComponent(typeof(Rigidbody))]
    [RequireComponent(typeof(PlayerInput))]
@ -31,6 +31,11 @@ namespace _02.Scripts.WaterAndShip
        [Tooltip("캐릭터의 이동 속도")]
        public float characterSpeed = 10f;
        
+        [Title("레이더")]
+        public Collider[] radar = new Collider[10];
+        public Transform[] inCameraRadar = new Transform[10];
+        public Transform target;
+        
        public bool IsAssaultMode { get; set; }
        public bool IsInShipMode { get; set; }
        public bool IsDredgeMode { get; set; }
--- a/BlueWater/Assets/02.Scripts/UiManager.cs
+++ b/BlueWater/Assets/02.Scripts/UiManager.cs
@ -1,11 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Doozy.Runtime.Reactor.Animations;
 using Doozy.Runtime.Reactor.Animators;
 using Sirenix.OdinInspector;
 using UnityEngine;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class UiManager : Singleton<UiManager>
    {
        [Title("Card")]
@ -49,7 +48,8 @@ public class UiManager : Singleton<UiManager>
        private void CursorTextureChange()
        {
            cursorTexture = DataManager.Inst.cursorTexture;
-        var hotSpot = new Vector2(cursorTexture.width / 2f, cursorTexture.height / 2f);
+            //var hotSpot = new Vector2(cursorTexture.width / 2f, cursorTexture.height / 2f);
+            var hotSpot = Vector2.zero;
            Cursor.SetCursor(cursorTexture, hotSpot, CursorMode.Auto);
        }

@ -64,3 +64,4 @@ public class UiManager : Singleton<UiManager>
            }
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs
+++ b/BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs
@ -1,3 +1,6 @@
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class GlobalValue
    {
        public const int CARD_DATA_CAPACITY = 50;
@ -23,3 +26,4 @@ public class GlobalValue
            SWORDMAN_P
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner
+++ b/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner
@ -1,8 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
 using Sirenix.OdinInspector;
 using UnityEngine;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    [RequireComponent(typeof(Rigidbody))]
    public class Floater : MonoBehaviour
    {
@ -47,3 +48,4 @@ public class Floater : MonoBehaviour
            rb.MoveRotation(Quaternion.Slerp(transform.rotation, targetRotation, Time.deltaTime * waveGenerator.speed));
        }
    }
+}
--- a/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner
+++ b/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner
@ -1,8 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
 using Sirenix.OdinInspector;
 using UnityEngine;

+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
    public class GerstnerWave : MonoBehaviour
    {
        [InfoBox("파도의 길이를 결정, 값이 클수록 파도 간의 간격이 커짐")]
@ -59,3 +60,4 @@ public class GerstnerWave : MonoBehaviour
            return normal;
        }
    }
+}
--- a/BlueWater/Assets/03.Images/Materials.meta
+++ b/BlueWater/Assets/03.Images/Materials.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9be5d028954e34a15b3129993935f16d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/03.Images/Materials/cha_03_front.mat
+++ b/BlueWater/Assets/03.Images/Materials/cha_03_front.mat
@ -1,133 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8597644214347470203
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: cha_03_front
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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:
-    RenderType: Opaque
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 34aa7a8380a65426b86643fc3f7dbd50, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 34aa7a8380a65426b86643fc3f7dbd50, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 1
-    - _BumpScale: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
-    - _EnvironmentReflections: 1
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.005
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _WorkflowMode: 1
-    - _ZWrite: 1
-    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-  m_BuildTextureStacks: []
--- a/BlueWater/Assets/03.Images/Materials/cha_03_front.mat.meta
+++ b/BlueWater/Assets/03.Images/Materials/cha_03_front.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7099ab9e7778140b789b0edd4d6a2dbe
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/03.Images/icons8-cursor-96-2.png
+++ b/BlueWater/Assets/03.Images/icons8-cursor-96-2.png
--- a/BlueWater/Assets/03.Images/icons8-cursor-96-2.png.meta
+++ b/BlueWater/Assets/03.Images/icons8-cursor-96-2.png.meta
@ -0,0 +1,124 @@
+fileFormatVersion: 2
+guid: 590154def7f1447b7901d2416764ee39
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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: 8
+  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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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: 
--- a/BlueWater/Assets/03.Images/icons8-cursor-96.png
+++ b/BlueWater/Assets/03.Images/icons8-cursor-96.png
--- a/BlueWater/Assets/03.Images/icons8-cursor-96.png.meta
+++ b/BlueWater/Assets/03.Images/icons8-cursor-96.png.meta
@ -0,0 +1,124 @@
+fileFormatVersion: 2
+guid: 3a146044a282641d99ba04c33b8c2bbf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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: 8
+  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: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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: 
--- a/BlueWater/Assets/05.Prefabs/Boat.prefab
+++ b/BlueWater/Assets/05.Prefabs/Boat.prefab
@ -97,7 +97,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: -1372625422
  m_Radius: 0.5
-  m_Speed: 3.5
+  m_Speed: 5
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 500
--- a/Pack/Terrain_Assets/Materials/CPT_Terrain_01.mat
+++ b/Pack/Terrain_Assets/Materials/CPT_Terrain_01.mat
@ -13,6 +13,7 @@ Material:
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
  - DR_GRADIENT_ON
+  - DR_OUTLINE_ON
  - DR_RIM_ON
  - _CELPRIMARYMODE_SINGLE
  - _DETAILMAPBLENDINGMODE_MULTIPLY
@ -24,8 +25,7 @@ Material:
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
-  disabledShaderPasses:
-  - SRPDEFAULTUNLIT
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
@ -144,7 +144,7 @@ Material:
    - _Mode: 0
    - _OcclusionStrength: 1
    - _OutlineDepthOffset: 0
-    - _OutlineEnabled: 0
+    - _OutlineEnabled: 1
    - _OutlineScale: 1
    - _OutlineWidth: 1
    - _OverrideLightmapDir: 0
--- a/Pack/Terrain_Assets/Materials/Ice_01.mat
+++ b/Pack/Terrain_Assets/Materials/Ice_01.mat
@ -13,6 +13,7 @@ Material:
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
  - DR_GRADIENT_ON
+  - DR_OUTLINE_ON
  - DR_RIM_ON
  - _CELPRIMARYMODE_SINGLE
  - _DETAILMAPBLENDINGMODE_MULTIPLY
@ -25,8 +26,7 @@ Material:
  m_CustomRenderQueue: 2000
  stringTagMap:
    RenderType: Opaque
-  disabledShaderPasses:
-  - SRPDEFAULTUNLIT
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
@ -213,7 +213,7 @@ Material:
    - _NumLayersCount: 1
    - _OcclusionStrength: 1
    - _OutlineDepthOffset: 0
-    - _OutlineEnabled: 0
+    - _OutlineEnabled: 1
    - _OutlineScale: 1
    - _OutlineWidth: 1
    - _OverrideLightmapDir: 0