Merge branch 'ntg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject

# Conflicts:
#	Assets/02.Scripts/BlueWater/Sail/ShipMove.cs
#	Assets/02.Scripts/BlueWater/Sail/ShipMove.cs.meta
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures.meta
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/LightingData.asset
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/LightingData.asset.meta
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/ReflectionProbe-0.exr.meta

Assets/01.Scenes/Old/03.Sail2.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd4fd403ba43a4e4080abe1c0fd810cf
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/ActivateSkill.cs

@@ -1,33 +0,0 @@
-using System;
-using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Enemies.Bosses;
-using UnityEngine;
-using Action = BehaviorDesigner.Runtime.Tasks.Action;
-
-namespace BlueWater.BehaviorTrees.Enemies.Bosses.Actions
-{
-    [TaskCategory("Custom/Enemy/Boss")]
-    [Serializable]
-    public class ActivateSkill : Action
-    {
-        [SerializeField]
-        private BossSkillName _bossSkillName;
-        
-        private BossSkillController _bossSkillController;
-
-        public override void OnAwake()
-        {
-            _bossSkillController = GetComponent<BossSkillController>();
-        }
-
-        public override void OnStart()
-        {
-            _bossSkillController.ActivateSkill(_bossSkillName.ToString());
-        }
-
-        public override TaskStatus OnUpdate()
-        {
-            return _bossSkillController.IsSkillActive ? TaskStatus.Running : TaskStatus.Success;
-        }
-    }
-}

Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/ActivateSkill.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: cbf37dc0abe6468988411b3fa27179ee
-timeCreated: 1717194018

Assets/02.Scripts/BehaviorTree/Enemy/Boss/Conditional.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 407c41de314749f0bd30514c6b81c7e3
-timeCreated: 1717196125

Assets/02.Scripts/BehaviorTree/Enemy/Boss/Conditional/CanSkill.cs

@@ -1,27 +0,0 @@
-using System;
-using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Enemies.Bosses;
-using UnityEngine;
-
-namespace BlueWater.BehaviorTrees.Enemies.Bosses.Conditionals
-{
-    [TaskCategory("Custom/Enemy/Boss")]
-    [Serializable]
-    public class CanSkill : Conditional
-    {
-        [SerializeField]
-        private BossSkillName _bossSkillName;
-
-        private BossSkillController _bossSkillController;
-
-        public override void OnAwake()
-        {
-            _bossSkillController = GetComponent<BossSkillController>();
-        }
-
-        public override TaskStatus OnUpdate()
-        {
-            return _bossSkillController.CanSkill(_bossSkillName.ToString()) ? TaskStatus.Success : TaskStatus.Failure;
-        }
-    }
-}

Assets/02.Scripts/BehaviorTree/Enemy/Boss/Conditional/CanSkill.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 194f72b456454df49f67adf5eab5246d
-timeCreated: 1717196135

Assets/02.Scripts/BlueWater.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5d3e10ed2add07547affe9ff672e98f5
+guid: 9416daf50aaa65a468e0acb2d11e18c0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/02.Scripts/BlueWater/AspectRatioController.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace BlueWater
+namespace DDD
 {
     public class AspectRatioController : MonoBehaviour
     {

Assets/02.Scripts/BlueWater/Audio/AudioManager.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 using UnityEngine.Audio;
 using UnityEngine.SceneManagement;
 
-namespace BlueWater.Audios
+namespace DDD.Audios
 {
     [Serializable]
     public class SfxPitch

Assets/02.Scripts/BlueWater/Audio/BgmData.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace BlueWater.Audios
+namespace DDD.Audios
 {
     [Serializable]
     public class BgmData

Assets/02.Scripts/BlueWater/Audio/BgmDataSo.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace BlueWater.Audios
+namespace DDD.Audios
 {
     [CreateAssetMenu(fileName = "BgmData", menuName = "ScriptableObjects/Audio/BgmData")]
     public class BgmDataSo : ScriptableObject

Assets/02.Scripts/BlueWater/Audio/SfxData.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace BlueWater.Audios
+namespace DDD.Audios
 {
     [Serializable]
     public class SfxData

Assets/02.Scripts/BlueWater/Audio/SfxDataSo.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace BlueWater.Audios
+namespace DDD.Audios
 {
     [CreateAssetMenu(fileName = "SfxData", menuName = "ScriptableObjects/Audio/SfxData")]
     public class SfxDataSo : ScriptableObject

Assets/02.Scripts/BlueWater/BehaviorTree/Action/AddSharedInt.cs

@@ -4,7 +4,7 @@ using BehaviorDesigner.Runtime.Tasks;
 using UnityEngine;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Action/HasReachedDestination.cs

@@ -1,9 +1,9 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Enemies;
+using DDD.Enemies;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Action/Move.cs

@@ -1,11 +1,11 @@
 using System;
 using BehaviorDesigner.Runtime;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Enemies;
+using DDD.Enemies;
 using UnityEngine;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Action/PlaySpineAnimation.cs

@@ -1,10 +1,10 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Players;
+using DDD.Players;
 using UnityEngine;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [Serializable]
     [TaskCategory("Custom")]

Assets/02.Scripts/BlueWater/BehaviorTree/Action/ReturnSuccess.cs

@@ -1,6 +1,6 @@
 using BehaviorDesigner.Runtime.Tasks;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom")]
     public class ReturnSuccess : Action

Assets/02.Scripts/BlueWater/BehaviorTree/Action/SelfStun.cs

@@ -1,10 +1,10 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Interfaces;
+using DDD.Interfaces;
 using UnityEngine;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Action/IsCompletedMission.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews;
+using DDD.Npcs.Crews;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew")]
     public class IsCompletedMission : Action

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews.Bartender;
+using DDD.Npcs.Crews.Bartender;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew/BartenderCrew")]
     public class MakingCocktail : Action

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Action/MoveToRandomPositionInRange.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews;
+using DDD.Npcs.Crews;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew")]
     public class MoveToRandomPositionInRange : Action

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Action/Refind.cs

@@ -1,9 +1,9 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews.Server;
+using DDD.Npcs.Crews.Server;
-using BlueWater.Tycoons;
+using DDD.Tycoons;
 using UnityEngine;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew/ServerCrew")]
     public class Refind : Action

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Conditional/CheckOnMission.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews;
+using DDD.Npcs.Crews;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew")]
     public class CheckOnMission : Conditional

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews.Bartender;
+using DDD.Npcs.Crews.Bartender;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew/BartenderCrew")]
     public class CheckOrderedCocktail : Conditional

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Conditional/OnMission.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews;
+using DDD.Npcs.Crews;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew")]
     public class OnMission : Conditional

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Conditional/Serving.cs

@@ -1,8 +1,8 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews.Server;
+using DDD.Npcs.Crews.Server;
 using UnityEngine;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew/ServerCrew")]
     public class Serving : Conditional

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs

@@ -1,7 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Crews.Server;
+using DDD.Npcs.Crews.Server;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Crew/ServerCrew")]
     public class TakeServingItem : Conditional

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/CheckOut.cs

@@ -1,9 +1,9 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/EatCocktail.cs

@@ -1,10 +1,10 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using UnityEngine;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/FindTable.cs

@@ -1,10 +1,10 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
-using BlueWater.Tycoons;
+using DDD.Tycoons;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/MoveMoneyCounterPosition.cs

@@ -1,9 +1,9 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs

@@ -1,9 +1,9 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/OrderFail.cs

@@ -1,10 +1,10 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Interfaces;
+using DDD.Interfaces;
-using BlueWater.Players.Tycoons;
+using DDD.Players.Tycoons;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/PayMoney.cs

@@ -1,9 +1,9 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs

@@ -1,9 +1,9 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Action/Vomit.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 using UnityEngine;
 using Action = BehaviorDesigner.Runtime.Tasks.Action;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs

@@ -1,12 +1,12 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
-using BlueWater.Tycoons;
+using DDD.Tycoons;
-using BlueWater.Utility;
+using DDD.Utility;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs

@@ -1,8 +1,8 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs

@@ -1,12 +1,12 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Items;
+using DDD.Items;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
-using BlueWater.Uis;
+using DDD.Uis;
 using PixelCrushers.DialogueSystem;
 using UnityEngine;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs

@@ -1,8 +1,8 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs

@@ -1,13 +1,13 @@
 using System;
 using BehaviorDesigner.Runtime.Tasks;
-using BlueWater.Items;
+using DDD.Items;
-using BlueWater.Npcs.Customers;
+using DDD.Npcs.Customers;
-using BlueWater.Uis;
+using DDD.Uis;
 using PixelCrushers.DialogueSystem;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace BlueWater.BehaviorTrees.Actions
+namespace DDD.BehaviorTrees.Actions
 {
     [TaskCategory("Custom/Npc/Customer")]
     [Serializable]

Assets/02.Scripts/BlueWater/Character/AiMovement.cs

@@ -1,10 +1,10 @@
 using System;
-using BlueWater.Players.Tycoons;
+using DDD.Players.Tycoons;
 using Pathfinding;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace BlueWater.Enemies
+namespace DDD.Enemies
 {
     public class AiMovement : MonoBehaviour
     {

Assets/02.Scripts/BlueWater/Character/AnimationController.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using Sirenix.OdinInspector;
 using UnityEngine;
 
-namespace BlueWater
+namespace DDD
 {
     public class AnimationController : MonoBehaviour
     {

Assets/02.Scripts/BlueWater/Character/CharacterData.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace BlueWater
+namespace DDD
 {
     [Serializable]
     public class CharacterData