#34 #35 InIslandPlayer, Crewmate, Enemy 조정

+ 03.Stage_Test 간단한 지형지물 추가
+ 캐릭터 HpSlider 기능 추가 및 연동
+ UiCanvas 추가(캐릭터 HpSlider 관리)
+ Sorting Layer(UI) 추가
+ FX 파티클 ParticleWeapon 스크립트로 관리
  ㄴ MagicOrk의 Fireball

fixed
+ InIslandPlayer가 스폰되고 나서 카메라가 흔들리거나 내려가는 버그 수정

BlueWater/Assets/01.Scenes/03.Stage_Test.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 921fae14d46bf2748b5d50b83b40a438
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/01.Scenes/03.Stage_Test/NavMesh-StageMap.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 12eb347cf1368c84fa911fea64af3fcc
+guid: 248a5d84e6704f242aaf236a312d9c69
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 23800000

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

@@ -1,9 +1,11 @@
 using System;
 using System.Collections;
+using BehaviorDesigner.Runtime;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.InputSystem;
+using UnityEngine.UI;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
@@ -13,6 +15,7 @@ namespace BlueWaterProject
     {
         #region Properties and variables
         
+        // DrawGizmos
         [Title("DrawGizmos")]
         [Tooltip("전체 Gizmos 그리기 여부")]
         [SerializeField] private bool isDrawGizmos = true;
@@ -29,6 +32,7 @@ namespace BlueWaterProject
         [Tooltip("타겟과의 상태 그리기 여부\n빨간색 = 공격 범위 밖\n파란색 = 공격 범위 안")]
         [SerializeField] private bool isDrawTargetRange = true;
 
+        // Stat
         [field: Title("Stat")]
         [field: Tooltip("최대 체력 설정")]
         [field: SerializeField] public float MaxHp { get; private set; } = 100f;
@@ -57,7 +61,23 @@ namespace BlueWaterProject
         [field: ShowIf("@IsRandomMove")]
         [field: Tooltip("Idle 상태에서 이동하는 범위 설정")]
         [field: SerializeField] public float RandomMoveRange { get; set; }
+        
+        // HpSlider
+        [Title("HpSlider")]
+        [SerializeField] private bool useHpSlider = true;
+        
+        [ShowIf("@useHpSlider")]
+        [Required("HpSlider 프리팹을 넣어주세요.")]
+        [SerializeField] private GameObject hpSliderPrefab;
+        
+        [ShowIf("@useHpSlider")]
+        [SerializeField] private Vector3 hpSliderOffset = Vector3.up;
+        
+        [ShowIf("@useHpSlider")]
+        [DisableIf("@true")]
+        [SerializeField] private Slider hpSlider;
 
+        // Data
         [field: Title("Data")]
         [field: DisableIf("@true")]
         [field: SerializeField] public Vector3 DefensePos { get; set; }
@@ -72,13 +92,18 @@ namespace BlueWaterProject
         [DisableIf("@true")]
         [SerializeField] protected bool isAttacking;
         
+        // 일반 변수
         protected bool usedNormalAttackCoroutine;
         protected WaitForSeconds waitAtkCooldown;
         
+        // 컴포넌트
         protected Rigidbody rb;
         public Collider MyCollider { get; set; }
-        protected Animator myAnimator;
         public NavMeshAgent Agent { get; set; }
+        private BehaviorTree bt;
+        private Transform unitRoot;
+        protected Animator myAnimator;
+        private Canvas uiCanvas;
         
         // Hash
         protected static readonly int RunStateHash = Animator.StringToHash("RunState");
@@ -106,12 +131,36 @@ namespace BlueWaterProject
             rb = GetComponent<Rigidbody>();
             MyCollider = GetComponent<Collider>();
             Agent = GetComponent<NavMeshAgent>();
+            bt = GetComponent<BehaviorTree>();
             
-            myAnimator = transform.Find("UnitRoot")?.GetComponent<Animator>();
+            unitRoot = transform.Find("UnitRoot");
-            if (myAnimator == null)
+            if (unitRoot == null)
             {
                 print("UnitRoot를 찾을 수 없습니다.");
             }
+            else
+            {
+                myAnimator = unitRoot.GetComponent<Animator>();
+                if (myAnimator == null)
+                {
+                    print("myAnimator를 찾을 수 없습니다.");
+                }
+            }
+            
+            uiCanvas = GameObject.Find("UiCanvas")?.GetComponent<Canvas>();
+            if (uiCanvas == null)
+            {
+                print("uiCanvas를 찾을 수 없습니다.");
+            }
+            else
+            {
+                if (useHpSlider)
+                {
+                    hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent<Slider>();
+                    hpSlider.gameObject.name = gameObject.name + " HpSlider";
+                    hpSlider.transform.rotation = unitRoot.transform.rotation;
+                }
+            }
         }
         
         protected override void Start()
@@ -124,11 +173,18 @@ namespace BlueWaterProject
             Agent.updateRotation = false;
             
             SetAgentSpeed(MoveSpd);
+            hpSlider.maxValue = MaxHp;
             SetCurrentHp(MaxHp);
         }
 
         protected override void Update()
         {
+            if (useHpSlider)
+            {
+                var localOffset = unitRoot.TransformPoint(hpSliderOffset);
+                hpSlider.transform.position = localOffset;
+            }
+            
             if (CurrentHp <= 0) return;
 
             if (GameManager.Inst.InIslandPlayer && GameManager.Inst.InIslandPlayer.UseRigidbody)
@@ -223,6 +279,12 @@ namespace BlueWaterProject
         {
             IsCombated = true;
             
+            if (!Target)
+            {
+                BeAttackedInIdle = true;
+                bt.SendEvent("BeAttackedInIdle", attackPos);
+            }
+            
             var changeHp = Mathf.Max(CurrentHp - attackerPower, 0);
             SetCurrentHp(changeHp);
             
@@ -362,8 +424,17 @@ namespace BlueWaterProject
             beAttacked = false;
         }
         
+        private void SetCurrentHp(float value)
+        { 
+            CurrentHp = value;
+
+            if (useHpSlider)
+            {
+                hpSlider.value = value;
+            }
+        }
+        
         private void SetAgentSpeed(float value) => Agent.speed = value;
-        private void SetCurrentHp(float value) => CurrentHp = value;
 
         #endregion
     }

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

@@ -4,6 +4,7 @@ using BehaviorDesigner.Runtime;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.AI;
+using UnityEngine.UI;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
@@ -12,6 +13,7 @@ namespace BlueWaterProject
     {
         #region Properties and variables
 
+        // DrawGizmos
         [Title("DrawGizmos")]
         [Tooltip("전체 Gizmos 그리기 여부")]
         [SerializeField] private bool isDrawGizmos = true;
@@ -32,6 +34,7 @@ namespace BlueWaterProject
         [Tooltip("타겟과의 상태 그리기 여부\n빨간색 = 공격 범위 밖\n파란색 = 공격 범위 안")]
         [SerializeField] private bool isDrawTargetRange = true;
 
+        // Stat
         [field: Title("Stat")]
         [field: Tooltip("행동 타입 설정")]
         [field: SerializeField] public EBehaviorType BehaviorType { get; private set; } = EBehaviorType.DEFENDER;
@@ -64,7 +67,23 @@ namespace BlueWaterProject
         [field: ShowIf("@IsRandomMove")]
         [field: Tooltip("Idle 상태에서 이동하는 범위 설정")]
         [field: SerializeField] public float RandomMoveRange { get; set; } = 5f;
+        
+        // HpSlider
+        [Title("HpSlider")]
+        [SerializeField] private bool useHpSlider = true;
+        
+        [ShowIf("@useHpSlider")]
+        [Required("HpSlider 프리팹을 넣어주세요.")]
+        [SerializeField] private GameObject hpSliderPrefab;
+        
+        [ShowIf("@useHpSlider")]
+        [SerializeField] private Vector3 hpSliderOffset = Vector3.up;
+        
+        [ShowIf("@useHpSlider")]
+        [DisableIf("@true")]
+        [SerializeField] private Slider hpSlider;
 
+        // Data
         [field: Title("Data")]
         [field: DisableIf("@true")]
         [field: SerializeField] public Vector3 DefensePos { get; set; }
@@ -77,14 +96,17 @@ namespace BlueWaterProject
         [DisableIf("@true")]
         [SerializeField] protected bool beAttacked;
 
+        // 일반 변수
         protected bool isAttacking;
         
-        // Component
+        // 컴포넌트
         protected Rigidbody rb;
         public Collider MyCollider { get; set; }
         public NavMeshAgent Agent { get; set; }
         protected BehaviorTree bt;
+        private Transform unitRoot;
         protected Animator myAnimator;
+        private Canvas uiCanvas;
         
         // Hash
         protected static readonly int RunStateHash = Animator.StringToHash("RunState");
@@ -191,10 +213,33 @@ namespace BlueWaterProject
             Agent = GetComponent<NavMeshAgent>();
             bt = GetComponent<BehaviorTree>();
             
-            myAnimator = transform.Find("UnitRoot")?.GetComponent<Animator>();
+            unitRoot = transform.Find("UnitRoot");
-            if (myAnimator == null)
+            if (unitRoot == null)
             {
-                print("UnitRoot오브젝트를 찾을 수 없거나, Animator컴포넌트가 존재하지 않습니다.");
+                print("UnitRoot를 찾을 수 없습니다.");
+            }
+            else
+            {
+                myAnimator = unitRoot.GetComponent<Animator>();
+                if (myAnimator == null)
+                {
+                    print("myAnimator를 찾을 수 없습니다.");
+                }
+            }
+            
+            uiCanvas = GameObject.Find("UiCanvas")?.GetComponent<Canvas>();
+            if (uiCanvas == null)
+            {
+                print("uiCanvas를 찾을 수 없습니다.");
+            }
+            else
+            {
+                if (useHpSlider)
+                {
+                    hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent<Slider>();
+                    hpSlider.gameObject.name = gameObject.name + " HpSlider";
+                    hpSlider.transform.rotation = unitRoot.transform.rotation;
+                }
             }
         }
 
@@ -208,9 +253,20 @@ namespace BlueWaterProject
             Agent.updateRotation = false;
             DefensePos = transform.position;
             SetAgentSpeed(MoveSpd);
+            
+            hpSlider.maxValue = MaxHp;
             SetCurrentHp(MaxHp);
         }
 
+        protected override void Update()
+        {
+            if (useHpSlider)
+            {
+                var localOffset = unitRoot.TransformPoint(hpSliderOffset);
+                hpSlider.transform.position = localOffset;
+            }
+        }
+
         #endregion
         
         #region Interface
@@ -384,9 +440,18 @@ namespace BlueWaterProject
                 iHelpCall.SetTarget(Target);
             }
         }
+        
+        private void SetCurrentHp(float value)
+        { 
+            CurrentHp = value;
+
+            if (useHpSlider)
+            {
+                hpSlider.value = value;
+            }
+        }
 
         private void SetAgentSpeed(float value) => Agent.speed = value;
-        private void SetCurrentHp(float value) => CurrentHp = value;
 
         #endregion
     }

BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs

@@ -35,6 +35,8 @@ namespace BlueWaterProject
 
         protected override void Update()
         {
+            base.Update();
+            
             if (CurrentHp <= 0) return;
             
             float runStateValue;

BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs

@@ -57,10 +57,10 @@ namespace BlueWaterProject
             var targetDir = (Target.bounds.center - myCenterPos).normalized;
            // targetLookRotation = Quaternion.LookRotation(targetDir);
             
-            var projectile = Instantiate(projectileObj, shootLocation.transform.position, Quaternion.identity, objectPoolLocation).GetComponent<ETFXProjectileScript>();
+            var particleWeapon = Instantiate(projectileObj, shootLocation.transform.position, Quaternion.identity, objectPoolLocation).GetComponent<ParticleWeapon>();
-            projectile.transform.LookAt(Target.bounds.center);
+            particleWeapon.transform.LookAt(Target.bounds.center);
-            projectile.power = Atk;
+            particleWeapon.SetPower(Atk);
-            projectile.GetComponent<Rigidbody>().AddForce(projectile.transform.forward * speed);
+            particleWeapon.GetComponent<Rigidbody>().AddForce(particleWeapon.transform.forward * speed);
             
             //weaponParticlePool.Get();
         }

BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs

@@ -1,9 +1,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using BehaviorDesigner.Runtime;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.AI;
+using UnityEngine.InputSystem;
+using UnityEngine.UI;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
@@ -12,6 +15,7 @@ namespace BlueWaterProject
     {
         #region Properties and variables
 
+        // DrawGizmos
         [Title("DrawGizmos")]
         [Tooltip("전체 Gizmos 그리기 여부")]
         [SerializeField] private bool isDrawGizmos = true;
@@ -28,6 +32,7 @@ namespace BlueWaterProject
         [Tooltip("타겟과의 상태 그리기 여부\n빨간색 = 공격 범위 밖\n파란색 = 공격 범위 안")]
         [SerializeField] private bool isDrawTargetRange = true;
 
+        // Stat
         [field: Title("Stat")]
         [field: Tooltip("최대 체력 설정")]
         [field: SerializeField] public float MaxHp { get; private set; } = 100f;
@@ -53,12 +58,23 @@ namespace BlueWaterProject
         [field: ShowIf("@IsRandomMove")]
         [field: Tooltip("Idle 상태에서 이동하는 범위 설정")]
         [field: SerializeField] public float RandomMoveRange { get; set; }
-        
-        [Title("Ground")]
-        [SerializeField] private float groundDistance = 0.2f;
-        [SerializeField] private LayerMask groundLayer;
-        [SerializeField] private bool isGrounded;
 
+        // HpSlider
+        [Title("HpSlider")]
+        [SerializeField] private bool useHpSlider = true;
+        
+        [ShowIf("@useHpSlider")]
+        [Required("HpSlider 프리팹을 넣어주세요.")]
+        [SerializeField] private GameObject hpSliderPrefab;
+        
+        [ShowIf("@useHpSlider")]
+        [SerializeField] private Vector3 hpSliderOffset = Vector3.up;
+        
+        [ShowIf("@useHpSlider")]
+        [DisableIf("@true")]
+        [SerializeField] private Slider hpSlider;
+
+        // Data
         [field: Title("Data")]
         [field: DisableIf("@true")]
         [field: SerializeField] public Vector3 DefensePos { get; set; }
@@ -73,16 +89,22 @@ namespace BlueWaterProject
         [DisableIf("@true")]
         [SerializeField] private bool isAttacking;
 
+        // Crewmate Data
         [field: Title("Crewmate Data")]
         [field: SerializeField] public List<Crewmate> CrewmateList { get; set; }
         
+        // 일반 변수
         private bool usedNormalAttackCoroutine;
         private WaitForSeconds waitAtkCooldown;
         
+        // 컴포넌트
         public Rigidbody Rb { get; private set; }
         public Collider MyCollider { get; set; }
-        private Animator myAnimator;
         public NavMeshAgent Agent { get; set; }
+        private BehaviorTree bt;
+        private Transform unitRoot;
+        private Animator myAnimator;
+        private Canvas uiCanvas;
         
         // Hash
         private static readonly int RunStateHash = Animator.StringToHash("RunState");
@@ -142,30 +164,63 @@ namespace BlueWaterProject
             Rb = GetComponent<Rigidbody>();
             MyCollider = GetComponent<Collider>();
             Agent = GetComponent<NavMeshAgent>();
-            
+            bt = GetComponent<BehaviorTree>();
-            myAnimator = transform.Find("UnitRoot")?.GetComponent<Animator>();
+
-            if (myAnimator == null)
+            unitRoot = transform.Find("UnitRoot");
+            if (unitRoot == null)
             {
                 print("UnitRoot를 찾을 수 없습니다.");
             }
+            else
+            {
+                myAnimator = unitRoot.GetComponent<Animator>();
+                if (myAnimator == null)
+                {
+                    print("myAnimator를 찾을 수 없습니다.");
+                }
+            }
+            
+            uiCanvas = GameObject.Find("UiCanvas")?.GetComponent<Canvas>();
+            if (uiCanvas == null)
+            {
+                print("uiCanvas를 찾을 수 없습니다.");
+            }
+            else
+            {
+                if (useHpSlider)
+                {
+                    hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent<Slider>();
+                    hpSlider.gameObject.name = gameObject.name + " HpSlider";
+                    hpSlider.transform.rotation = unitRoot.transform.rotation;
+                }
+            }
         }
 
         protected override void Start()
         {
             base.Start();
             
-            groundLayer = LayerMask.GetMask("Ground");
             TargetLayer = LayerMask.GetMask("Enemy");
                 
             waitAtkCooldown = new WaitForSeconds(AtkCooldown);
             Agent.updateRotation = false;
             
             SetAgentSpeed(MoveSpd);
+            if (useHpSlider)
+            {
+                hpSlider.maxValue = MaxHp;
+            }
             SetCurrentHp(MaxHp);
         }
 
         protected override void Update()
         {
+            if (useHpSlider)
+            {
+                var localOffset = unitRoot.TransformPoint(hpSliderOffset);
+                hpSlider.transform.position = localOffset;
+            }
+            
             if (CurrentHp <= 0) return;
             
             // 움직이는 경우
@@ -262,6 +317,12 @@ namespace BlueWaterProject
         {
             IsCombated = true;
             
+            if (!Target)
+            {
+                BeAttackedInIdle = true;
+                bt.SendEvent("BeAttackedInIdle", attackPos);
+            }
+            
             var changeHp = Mathf.Max(CurrentHp - attackerPower, 0);
             SetCurrentHp(changeHp);
             
@@ -331,17 +392,16 @@ namespace BlueWaterProject
 
         #region Player input system
 
-        // public override void OnMove(InputValue value)
+        public override void OnMove(InputValue value)
-        // {
+        {
-        //     base.OnMove(value);
+            if (CurrentHp <= 0)
-        //     
+            {
-        //     // 2D 스프라이트 뒤집기
+                Rb.velocity = Vector3.zero;
-        //     if (Mathf.Abs(movementInput.x) <= 0.01f) return;
+                return;
-        //     
+            }
-        //     var localScale = transform.localScale;
+            
-        //     localScale.x = movementInput.x > 0 ? Mathf.Abs(localScale.x) : -Mathf.Abs(localScale.x);
+            base.OnMove(value);
-        //     transform.localScale = localScale;
+        }
-        // }
 
         #endregion
 
@@ -376,7 +436,7 @@ namespace BlueWaterProject
             Agent.enabled = false;
         }
         
-        private void UseAgentMovement()
+        public void UseAgentMovement()
         {
             DefensePos = transform.position;
             foreach (var crewmate in CrewmateList)
@@ -396,9 +456,18 @@ namespace BlueWaterProject
 
             beAttacked = false;
         }
+        
+        private void SetCurrentHp(float value)
+        { 
+            CurrentHp = value;
+
+            if (useHpSlider)
+            {
+                hpSlider.value = value;
+            }
+        }
 
         private void SetAgentSpeed(float value) => Agent.speed = value;
-        private void SetCurrentHp(float value) => CurrentHp = value;
 
         #endregion
     }

BlueWater/Assets/02.Scripts/SpawnController.cs

@@ -88,6 +88,8 @@ namespace BlueWaterProject
                 inIslandPlayer = islandPlayer.AddComponent<InIslandPlayer>();
             }
 
+            inIslandPlayer.UseAgentMovement();
+
             cinemachineVirtualCamera.Follow = islandPlayer.transform;
             cinemachineVirtualCamera.LookAt = islandPlayer.transform;
 

BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs

@@ -0,0 +1,88 @@
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class ParticleWeapon : MonoBehaviour
+    {
+        public GameObject impactParticle; // Effect spawned when projectile hits a collider
+        public GameObject projectileParticle; // Effect attached to the gameobject as child
+        public GameObject muzzleParticle; // Effect instantly spawned when gameobject is spawned
+        [Header("Adjust if not using Sphere Collider")]
+        public float colliderRadius = 1f;
+        [Range(0f, 1f)] // This is an offset that moves the impact effect slightly away from the point of impact to reduce clipping of the impact effect
+        public float collideOffset = 0.15f;
+
+        [SerializeField] private LayerMask targetLayer;
+        [SerializeField] private float power;
+
+        private Rigidbody rb;
+        private SphereCollider sphereCollider;
+
+        private void Awake()
+        {
+            rb = GetComponent<Rigidbody>();
+            sphereCollider = GetComponent<SphereCollider>();
+        }
+
+        private void Start()
+        {
+            projectileParticle = Instantiate(projectileParticle, transform.position, transform.rotation, transform) as GameObject;
+            projectileParticle.transform.parent = transform;
+            if (muzzleParticle)
+            {
+                muzzleParticle = Instantiate(muzzleParticle, transform.position, transform.rotation, transform) as GameObject;
+                Destroy(muzzleParticle, 1.5f); // 2nd parameter is lifetime of effect in seconds
+            }
+        }
+		
+        private void FixedUpdate()
+        {	
+			if (rb.velocity.magnitude != 0)
+			{
+			    transform.rotation = Quaternion.LookRotation(rb.velocity); // Sets rotation to look at direction of movement
+			}
+			
+            float radius; // Sets the radius of the collision detection
+            if (sphereCollider)
+                radius = sphereCollider.radius;
+            else
+                radius = colliderRadius;
+
+            var direction = rb.velocity; // Gets the direction of the projectile, used for collision detection
+            if (rb.useGravity)
+                direction += Physics.gravity * Time.deltaTime; // Accounts for gravity if enabled
+            direction = direction.normalized;
+
+            var detectionDistance = rb.velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame
+
+            if (Physics.SphereCast(transform.position, radius, direction, out var hit, detectionDistance, targetLayer)) // Checks if collision will happen
+            {
+                transform.position = hit.point + (hit.normal * collideOffset); // Move projectile to point of collision
+
+                var impactP = Instantiate(impactParticle, transform.position, Quaternion.FromToRotation(Vector3.up, hit.normal), transform) as GameObject; // Spawns impact effect
+
+                var trails = GetComponentsInChildren<ParticleSystem>(); // Gets a list of particle systems, as we need to detach the trails
+                //Component at [0] is that of the parent i.e. this object (if there is any)
+                for (var i = 1; i < trails.Length; i++) // Loop to cycle through found particle systems
+                {
+                    var trail = trails[i];
+
+                    if (trail.gameObject.name.Contains("Trail"))
+                    {
+                        trail.transform.SetParent(null); // Detaches the trail from the projectile
+                        Destroy(trail.gameObject, 2f); // Removes the trail after seconds
+                    }
+                }
+
+                Destroy(projectileParticle, 3f); // Removes particle effect after delay
+                Destroy(impactP, 3.5f); // Removes impact effect after delay
+                Destroy(gameObject); // Removes the projectile
+
+                hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
+            }
+        }
+
+        public void SetPower(float value) => power = value;
+    }
+}

BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 52a5789acf05f7448942846ed09cac2b
+guid: 289299db27a030e4eaf9e2e8486f4afc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

BlueWater/Assets/02.Scripts/Weapon/WeaponParticle.cs

@@ -1,58 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using Sirenix.OdinInspector;
-using UnityEngine;
-using UnityEngine.Pool;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    public class WeaponParticle : MonoBehaviour
-    {
-        #region properties and variables
-        
-        [SerializeField] private List<string> targetTags;
-        
-        [DisableIf("@true")]
-        [SerializeField] private float power;
-        
-        private IObjectPool<WeaponParticle> managedWeaponPool;
-
-        #endregion
-        
-        #region Unity built-in methods
-
-        private void OnParticleCollision(GameObject other)
-        {
-            // 여러 태그 중 하나와 일치하는지 확인
-            foreach (var item in targetTags)
-            {
-                if (!other.CompareTag(item)) continue;
-
-                var iDamageable = other.GetComponent<IDamageable>();
-                iDamageable?.TakeDamage(power);
-                print("충돌");
-                
-                Destroy(gameObject);
-                return;
-            }
-            
-            Destroy(gameObject);
-        }
-        
-        #endregion
-        
-        #region Custom methods
-
-        public void SetPower(float value) => power = value;
-        
-        #endregion
-        
-        // #region ObjectPool function
-        //
-        // private void DestroyObject() => managedWeaponPool.Release(this);
-        // public void SetManagedPool(IObjectPool<WeaponParticle> pool) => managedWeaponPool = pool;
-        //
-        // #endregion
-    }
-}

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc1.prefab

@@ -3211,7 +3211,7 @@ MonoBehaviour:
         byteDataArray: 
       Version: 1.7.7
   gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 0
+  showBehaviorDesignerGizmo: 1
 --- !u!114 &8609741102290131020
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3239,6 +3239,11 @@ MonoBehaviour:
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc2.prefab

@@ -3403,7 +3403,7 @@ MonoBehaviour:
         byteDataArray: 
       Version: 1.7.7
   gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 0
+  showBehaviorDesignerGizmo: 1
 --- !u!114 &9066994917784352948
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3427,10 +3427,15 @@ MonoBehaviour:
   <MoveSpd>k__BackingField: 5
   <Atk>k__BackingField: 10
   <AtkCooldown>k__BackingField: 2
-  <AtkRange>k__BackingField: 10
+  <AtkRange>k__BackingField: 8
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc3.prefab

@@ -954,6 +954,11 @@ MonoBehaviour:
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc4.prefab

@@ -3683,6 +3683,11 @@ MonoBehaviour:
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc5.prefab

@@ -606,6 +606,11 @@ MonoBehaviour:
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc6.prefab

@@ -1553,7 +1553,7 @@ MonoBehaviour:
         byteDataArray: 
       Version: 1.7.7
   gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 0
+  showBehaviorDesignerGizmo: 1
 --- !u!114 &7840501591079286990
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1577,10 +1577,15 @@ MonoBehaviour:
   <MoveSpd>k__BackingField: 5
   <Atk>k__BackingField: 10
   <AtkCooldown>k__BackingField: 1
-  <AtkRange>k__BackingField: 1.5
+  <AtkRange>k__BackingField: 8
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc7.prefab

@@ -1105,6 +1105,11 @@ MonoBehaviour:
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc8.prefab

@@ -1336,6 +1336,11 @@ MonoBehaviour:
   <DefenseRange>k__BackingField: 20
   <IsRandomMove>k__BackingField: 1
   <RandomMoveRange>k__BackingField: 5
+  useHpSlider: 1
+  hpSliderPrefab: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
+    type: 3}
+  hpSliderOffset: {x: 0, y: 1, z: 0}
+  hpSlider: {fileID: 0}
   <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0

BlueWater/Assets/05.Prefabs/HpSliders.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b7a0ffe309754c47b79c4d6a358fae4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab

@@ -0,0 +1,245 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8436250465056310821
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1525762081838968274, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Name
+      value: EnemyHpSlider
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 550
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.002
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968300, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_WholeNumbers
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.20392157
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.17254902
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.5647059
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720563, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720563, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082444024363, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177040, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177041, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177041, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177041, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177043, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.20392157
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177043, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.17254902
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177043, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.5647059
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762083567577821, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.15294118
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762083567577821, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.15294118
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762083567577821, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.19215687
+      objectReference: {fileID: 0}
+    - target: {fileID: 4356157407239556766, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.28235295
+      objectReference: {fileID: 0}
+    - target: {fileID: 4356157407239556766, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.29411766
+      objectReference: {fileID: 0}
+    - target: {fileID: 4356157407239556766, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.36862746
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bb4f1e43ee7824c8e8009facee710768, type: 3}

BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 27422d4ba1ec18843b41367444c27888
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab

@@ -0,0 +1,250 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8436250465056310821
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1525762081838968274, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Name
+      value: PlayerHpSlider
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 550
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.002
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762081838968300, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_WholeNumbers
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720563, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082425720563, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082444024363, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177040, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177041, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177041, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177041, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177043, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.57254905
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177043, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.3764706
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082577177043, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.14509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762082697409117, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762083567577821, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.15294118
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762083567577821, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.15294118
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525762083567577821, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.19215687
+      objectReference: {fileID: 0}
+    - target: {fileID: 4356157407239556766, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.28235295
+      objectReference: {fileID: 0}
+    - target: {fileID: 4356157407239556766, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.29411766
+      objectReference: {fileID: 0}
+    - target: {fileID: 4356157407239556766, guid: bb4f1e43ee7824c8e8009facee710768,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.36862746
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bb4f1e43ee7824c8e8009facee710768, type: 3}

BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6ca833d1d80448e4b8d030887386814e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Props.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55abc65b0f29fe043860e00858682648
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Props/Walls.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee90b7d5d4fb7e34a8cdd4c4e5e86b67
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Props/Walls/SnowWall.prefab

@@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3787353890336101794
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7657062295540949947}
+  - component: {fileID: 834261514565263608}
+  - component: {fileID: 1841492490463293336}
+  - component: {fileID: 4807884705664833509}
+  - component: {fileID: 4677551699406495672}
+  m_Layer: 21
+  m_Name: SnowWall
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7657062295540949947
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3787353890336101794}
+  serializedVersion: 2
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &834261514565263608
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3787353890336101794}
+  m_Mesh: {fileID: 4300002, guid: 887d1895fa6cf544e80516c4bdfdda72, type: 3}
+--- !u!23 &1841492490463293336
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3787353890336101794}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 6e3ac6e47b4d7a44685dfef9bf209413, type: 2}
+  - {fileID: 2100000, guid: 5f35ae9530edec84085e28d4c3302e29, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &4807884705664833509
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3787353890336101794}
+  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: 3
+  m_Size: {x: 1.8503973, y: 2.5796149, z: 0.27830717}
+  m_Center: {x: -0.005100906, y: 1.1396996, z: -0.05692398}
+--- !u!208 &4677551699406495672
+NavMeshObstacle:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3787353890336101794}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.9250001, y: 1.2900001, z: 0.13900001}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: -0.0050000004, y: 1.1400001, z: -0.057000004}
+  m_TimeToStationary: 0.5

BlueWater/Assets/05.Prefabs/Props/Walls/SnowWall.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 96655553cce1e754db2014362eda9d4d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 450904}
   - component: {fileID: 13576440}
   - component: {fileID: 5479992}
-  - component: {fileID: 11464288}
+  - component: {fileID: 5419941813869181919}
   m_Layer: 0
   m_Name: FireBallSoftBlueOBJ
   m_TagString: Missile
@@ -82,7 +82,7 @@ Rigidbody:
   m_Interpolate: 1
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!114 &11464288
+--- !u!114 &5419941813869181919
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -91,7 +91,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 128572}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: acd27932048c3254597a02078fa2cb26, type: 3}
+  m_Script: {fileID: 11500000, guid: 289299db27a030e4eaf9e2e8486f4afc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   impactParticle: {fileID: 1564713908722058, guid: 0b788a608fab3b049abb2c09688337c8,
@@ -100,8 +100,8 @@ MonoBehaviour:
     type: 3}
   muzzleParticle: {fileID: 1458448907343064, guid: bc4155e80a221c446be915ff0332c546,
     type: 3}
-  colliderRadius: 0.1
+  colliderRadius: 1
-  collideOffset: 0.1
+  collideOffset: 0.15
   targetLayer:
     serializedVersion: 2
     m_Bits: 1536

BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/MuzzleFireballSoftBlue.prefab

@@ -25,12 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1271855301279558}
+  serializedVersion: 2
   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_Children: []
   m_Father: {fileID: 4971754496143008}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &198786594774073584
 ParticleSystem:
@@ -39,19 +40,19 @@ ParticleSystem:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1271855301279558}
-  serializedVersion: 6
+  serializedVersion: 8
   lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 3
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
+  emitterVelocityMode: 0
   looping: 0
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 0
-  useRigidbodyForVelocity: 1
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -214,6 +215,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -243,6 +245,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     startSize:
@@ -528,7 +531,9 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
+    gravitySource: 0
     maxNumParticles: 1000
+    customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
     rotation3D: 0
     gravityModifier:
@@ -1314,6 +1319,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 3
       minGradient:
@@ -1343,6 +1349,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
@@ -2111,6 +2118,62 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
+  LifetimeByEmitterSpeedModule:
+    enabled: 0
+    m_Curve:
+      serializedVersion: 2
+      minMaxState: 1
+      scalar: 1
+      minScalar: 1
+      maxCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: -0.8
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 0.2
+          inSlope: -0.8
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      minCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    m_Range: {x: 0, y: 1}
   ForceModule:
     enabled: 0
     x:
@@ -3507,6 +3570,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -3536,24 +3600,26 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     range: {x: 0, y: 1}
   CollisionModule:
     enabled: 0
-    serializedVersion: 3
+    serializedVersion: 4
     type: 1
     collisionMode: 0
     colliderForce: 0
     multiplyColliderForceByParticleSize: 0
     multiplyColliderForceByParticleSpeed: 0
     multiplyColliderForceByCollisionAngle: 1
-    plane0: {fileID: 0}
+    m_Planes:
-    plane1: {fileID: 0}
+    - {fileID: 0}
-    plane2: {fileID: 0}
+    - {fileID: 0}
-    plane3: {fileID: 0}
+    - {fileID: 0}
-    plane4: {fileID: 0}
+    - {fileID: 0}
-    plane5: {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
     m_Dampen:
       serializedVersion: 2
       minMaxState: 0
@@ -3727,17 +3793,20 @@ ParticleSystem:
     interiorCollisions: 1
   TriggerModule:
     enabled: 0
-    collisionShape0: {fileID: 0}
+    serializedVersion: 2
-    collisionShape1: {fileID: 0}
-    collisionShape2: {fileID: 0}
-    collisionShape3: {fileID: 0}
-    collisionShape4: {fileID: 0}
-    collisionShape5: {fileID: 0}
     inside: 1
     outside: 0
     enter: 0
     exit: 0
+    colliderQueryMode: 0
     radiusScale: 1
+    primitives:
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
   SubModule:
     serializedVersion: 2
     enabled: 0
@@ -3921,6 +3990,7 @@ ParticleSystem:
         m_RotationOrder: 4
     minVertexDistance: 0.2
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     ribbonCount: 1
     shadowBias: 0.5
     worldSpace: 0
@@ -3963,6 +4033,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -3992,6 +4063,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     widthOverTrail:
@@ -4079,6 +4151,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4108,6 +4181,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   CustomDataModule:
@@ -4146,6 +4220,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4175,6 +4250,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel0: Color
@@ -4428,6 +4504,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4457,6 +4534,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel1: Color
@@ -4688,10 +4766,12 @@ ParticleSystemRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4717,6 +4797,7 @@ ParticleSystemRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_RenderMode: 0
+  m_MeshDistribution: 0
   m_SortMode: 0
   m_MinParticleSize: 0
   m_MaxParticleSize: 0.5
@@ -4733,11 +4814,17 @@ ParticleSystemRenderer:
   m_EnableGPUInstancing: 0
   m_ApplyActiveColorSpace: 1
   m_AllowRoll: 1
+  m_FreeformStretching: 0
+  m_RotateWithStretchDirection: 1
   m_VertexStreams: 0001030405
   m_Mesh: {fileID: 0}
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
+  m_MeshWeighting: 1
+  m_MeshWeighting1: 1
+  m_MeshWeighting2: 1
+  m_MeshWeighting3: 1
   m_MaskInteraction: 0
 --- !u!1 &1458448907343064
 GameObject:
@@ -4764,13 +4851,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1458448907343064}
+  serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4308825295340958}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!198 &198072747584707614
 ParticleSystem:
@@ -4779,19 +4867,19 @@ ParticleSystem:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1458448907343064}
-  serializedVersion: 6
+  serializedVersion: 8
   lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 3
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
+  emitterVelocityMode: 0
   looping: 0
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 1
-  useRigidbodyForVelocity: 1
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -4954,6 +5042,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4983,6 +5072,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     startSize:
@@ -5286,7 +5376,9 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
+    gravitySource: 0
     maxNumParticles: 1000
+    customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
     rotation3D: 0
     gravityModifier:
@@ -6090,6 +6182,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 3
         m_NumAlphaKeys: 3
       minGradient:
@@ -6119,6 +6212,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
@@ -6887,6 +6981,62 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
+  LifetimeByEmitterSpeedModule:
+    enabled: 0
+    m_Curve:
+      serializedVersion: 2
+      minMaxState: 1
+      scalar: 1
+      minScalar: 1
+      maxCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: -0.8
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 0.2
+          inSlope: -0.8
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      minCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    m_Range: {x: 0, y: 1}
   ForceModule:
     enabled: 0
     x:
@@ -8283,6 +8433,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -8312,24 +8463,26 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     range: {x: 0, y: 1}
   CollisionModule:
     enabled: 0
-    serializedVersion: 3
+    serializedVersion: 4
     type: 1
     collisionMode: 0
     colliderForce: 0
     multiplyColliderForceByParticleSize: 0
     multiplyColliderForceByParticleSpeed: 0
     multiplyColliderForceByCollisionAngle: 1
-    plane0: {fileID: 0}
+    m_Planes:
-    plane1: {fileID: 0}
+    - {fileID: 0}
-    plane2: {fileID: 0}
+    - {fileID: 0}
-    plane3: {fileID: 0}
+    - {fileID: 0}
-    plane4: {fileID: 0}
+    - {fileID: 0}
-    plane5: {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
     m_Dampen:
       serializedVersion: 2
       minMaxState: 0
@@ -8503,17 +8656,20 @@ ParticleSystem:
     interiorCollisions: 0
   TriggerModule:
     enabled: 0
-    collisionShape0: {fileID: 0}
+    serializedVersion: 2
-    collisionShape1: {fileID: 0}
-    collisionShape2: {fileID: 0}
-    collisionShape3: {fileID: 0}
-    collisionShape4: {fileID: 0}
-    collisionShape5: {fileID: 0}
     inside: 1
     outside: 0
     enter: 0
     exit: 0
+    colliderQueryMode: 0
     radiusScale: 1
+    primitives:
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
   SubModule:
     serializedVersion: 2
     enabled: 0
@@ -8697,6 +8853,7 @@ ParticleSystem:
         m_RotationOrder: 4
     minVertexDistance: 0.2
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     ribbonCount: 1
     shadowBias: 0.5
     worldSpace: 0
@@ -8739,6 +8896,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -8768,6 +8926,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     widthOverTrail:
@@ -8855,6 +9014,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -8884,6 +9044,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   CustomDataModule:
@@ -8922,6 +9083,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -8951,6 +9113,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel0: Color
@@ -9204,6 +9367,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -9233,6 +9397,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel1: Color
@@ -9464,10 +9629,12 @@ ParticleSystemRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9493,6 +9660,7 @@ ParticleSystemRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_RenderMode: 1
+  m_MeshDistribution: 0
   m_SortMode: 0
   m_MinParticleSize: 0
   m_MaxParticleSize: 0.5
@@ -9509,9 +9677,15 @@ ParticleSystemRenderer:
   m_EnableGPUInstancing: 0
   m_ApplyActiveColorSpace: 1
   m_AllowRoll: 1
+  m_FreeformStretching: 0
+  m_RotateWithStretchDirection: 1
   m_VertexStreams: 0001030405
   m_Mesh: {fileID: 0}
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
+  m_MeshWeighting: 1
+  m_MeshWeighting1: 1
+  m_MeshWeighting2: 1
+  m_MeshWeighting3: 1
   m_MaskInteraction: 0

BlueWater/Assets/09.BehaviorTree/Enemy/Crewmate.asset

@@ -35,21 +35,21 @@ MonoBehaviour:
         != null"},"ID":19,"Name":"Compare Shared Collider","Instant":true,"SharedCollidervariable":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedCollidercompareTo":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(118.636337,150.562012)"},"ID":20,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-95.48871,148.5675)"},"ID":21,"Name":"Sequence","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BlueWaterProject.BehaviorAsset.Enemy.IsTargetWithinRange","NodeData":{"Offset":"(-155.961533,147.5)","Comment":"Is
         Target Within Range == true"},"ID":22,"Name":"Is Target Within Range","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityNavMeshAgent.SetIsStopped","NodeData":{"Offset":"(108.343018,154.24353)","Comment":"isStopped
         = true"},"ID":23,"Name":"Set Is Stopped","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"SharedBoolisStopped":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true}}]},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(168.788086,151.5149)","Comment":"Target
-        Move(Default)\nreturn true"},"ID":24,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(1114.03149,149.316284)"},"ID":25,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,300)"},"ID":26,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-1371.45886,150.000244)"},"ID":27,"Name":"BeAttacked
+        Move(1\ubc30\uc18d)\nreturn true"},"ID":24,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(1114.03149,149.316284)"},"ID":25,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,300)"},"ID":26,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-1371.45886,150.000244)"},"ID":27,"Name":"BeAttacked
         Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.HasReceivedEvent","NodeData":{"Offset":"(-104.7641,148.421387)","Comment":"BeAttacked
         Event"},"ID":28,"Name":"Has Received Event","Instant":true,"SharedStringeventName":{"Type":"BehaviorDesigner.Runtime.SharedString","Name":null,"StringmValue":"BeAttackedInIdle"},"SharedVariablestoredValue1":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"}},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(65.65216,150)","Comment":"Target
-        Move(DEFAULT)\nreturn false"},"ID":29,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-532.353,150)"},"ID":30,"Name":"Comeback
+        Move(1\ubc30\uc18d)\nreturn false"},"ID":29,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-532.353,150)"},"ID":30,"Name":"Comeback
         Selector","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-485.7771,147.14563)"},"ID":31,"Name":"Go
         Out Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWaterProject.BehaviorAsset.Enemy.GoOutOfBounds","NodeData":{"Offset":"(-297.9041,150)","Comment":"Go
         Out Of Bounds == true"},"ID":32,"Name":"Go Out Of Bounds","Instant":true},{"Type":"BlueWaterProject.SetTarget","NodeData":{"Offset":"(-100,150)","Comment":"Target
         = null"},"ID":33,"Name":"Set Target","Instant":true},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(90.9448242,150)","Comment":"Target
-        Move(FAST)\nreturn true"},"ID":34,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":2,"EStopTypestopType":"MAXIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(265.113647,149.967529)","Comment":"IsCombated
+        Move(1\ubc30\uc18d)\nreturn true"},"ID":34,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"MAXIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(265.113647,149.967529)","Comment":"IsCombated
         = false"},"ID":35,"Name":"Set Shared Bool","Instant":true,"SharedBooltargetValue":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedBooltargetVariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"BooleanmValue":false}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(456.0724,153.845825)"},"ID":36,"Name":"Comeback
         Sequence","Instant":true,"AbortTypeabortType":"Self","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedCollider","NodeData":{"Offset":"(-467.13443,150)","Comment":"Target
         == null"},"ID":37,"Name":"Compare Shared Collider","Instant":true,"SharedCollidervariable":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedCollidercompareTo":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedBool","NodeData":{"Offset":"(-252.028122,145.4104)","Comment":"IsCombated
         == true"},"ID":38,"Name":"Compare Shared Bool","Instant":true,"SharedBoolvariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"BooleanmValue":false},"SharedBoolcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedBool","NodeData":{"Offset":"(-75.26315,146.842163)","Comment":"BeAttacked
         == false"},"ID":39,"Name":"Compare Shared Bool","Instant":true,"SharedBoolvariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"BooleanmValue":false},"SharedBoolcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(61.0610847,149.344238)"},"ID":40,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0.1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(185.022949,146.189819)","Comment":"Target
-        Move(Default)\nreturn true"},"ID":41,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":2,"EStopTypestopType":"MAXIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(335,147.5)","Comment":"IsCombated
+        Move(1\ubc30\uc18d)\nreturn true"},"ID":41,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"MAXIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(335,147.5)","Comment":"IsCombated
         = false"},"ID":42,"Name":"Set Shared Bool","Instant":true,"SharedBooltargetValue":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedBooltargetVariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"BooleanmValue":false}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(658.652,154.838745)"},"ID":43,"Name":"Attack
         Sequence","Instant":true,"AbortTypeabortType":"Both","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-161.277924,151.643555)"},"ID":44,"Name":"CanAttack
         Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Inverter","NodeData":{"Offset":"(-90,150)"},"ID":45,"Name":"Inverter","Instant":true,"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedCollider","NodeData":{"Offset":"(0,150)","Comment":"Target

BlueWater/Assets/09.BehaviorTree/Enemy/InIslandPlayer.asset

@@ -35,21 +35,21 @@ MonoBehaviour:
         != null"},"ID":19,"Name":"Compare Shared Collider","Instant":true,"SharedCollidervariable":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedCollidercompareTo":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(118.636337,150.562012)"},"ID":20,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-95.48871,148.5675)"},"ID":21,"Name":"Sequence","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BlueWaterProject.BehaviorAsset.Enemy.IsTargetWithinRange","NodeData":{"Offset":"(-155.961533,147.5)","Comment":"Is
         Target Within Range == true"},"ID":22,"Name":"Is Target Within Range","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityNavMeshAgent.SetIsStopped","NodeData":{"Offset":"(108.343018,154.24353)","Comment":"isStopped
         = true"},"ID":23,"Name":"Set Is Stopped","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"SharedBoolisStopped":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true}}]},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(168.788086,151.5149)","Comment":"Target
-        Move(Default)\nreturn true"},"ID":24,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(1114.03149,149.316284)"},"ID":25,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,300)"},"ID":26,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-1371.45886,150.000244)"},"ID":27,"Name":"BeAttacked
+        Move(1\ubc30\uc18d)\nreturn true"},"ID":24,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(1114.03149,149.316284)"},"ID":25,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,300)"},"ID":26,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-1371.45886,150.000244)"},"ID":27,"Name":"BeAttacked
         Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.HasReceivedEvent","NodeData":{"Offset":"(-104.7641,148.421387)","Comment":"BeAttacked
         Event"},"ID":28,"Name":"Has Received Event","Instant":true,"SharedStringeventName":{"Type":"BehaviorDesigner.Runtime.SharedString","Name":null,"StringmValue":"BeAttackedInIdle"},"SharedVariablestoredValue1":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"}},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(65.65216,150)","Comment":"Target
-        Move(DEFAULT)\nreturn false"},"ID":29,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-532.353,150)"},"ID":30,"Name":"Comeback
+        Move(1\ubc30\uc18d)\nreturn false"},"ID":29,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"ATK_RANGE","BooleanisArrivedReturnSuccess":false}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-532.353,150)"},"ID":30,"Name":"Comeback
         Selector","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-485.7771,147.14563)"},"ID":31,"Name":"Go
         Out Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWaterProject.BehaviorAsset.Enemy.GoOutOfBounds","NodeData":{"Offset":"(-297.9041,150)","Comment":"Go
         Out Of Bounds == true"},"ID":32,"Name":"Go Out Of Bounds","Instant":true},{"Type":"BlueWaterProject.SetTarget","NodeData":{"Offset":"(-100,150)","Comment":"Target
         = null"},"ID":33,"Name":"Set Target","Instant":true},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(90.9448242,150)","Comment":"Target
-        Move(FAST)\nreturn true"},"ID":34,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":2,"EStopTypestopType":"MINIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(265.113647,149.967529)","Comment":"IsCombated
+        Move(1\ubc30\uc18d)\nreturn true"},"ID":34,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"MINIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(265.113647,149.967529)","Comment":"IsCombated
         = false"},"ID":35,"Name":"Set Shared Bool","Instant":true,"SharedBooltargetValue":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedBooltargetVariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"BooleanmValue":false}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(456.0724,153.845825)"},"ID":36,"Name":"Comeback
         Sequence","Instant":true,"AbortTypeabortType":"Self","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedCollider","NodeData":{"Offset":"(-467.13443,150)","Comment":"Target
         == null"},"ID":37,"Name":"Compare Shared Collider","Instant":true,"SharedCollidervariable":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true},"SharedCollidercompareTo":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedBool","NodeData":{"Offset":"(-252.028122,145.4104)","Comment":"IsCombated
         == true"},"ID":38,"Name":"Compare Shared Bool","Instant":true,"SharedBoolvariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"BooleanmValue":false},"SharedBoolcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedBool","NodeData":{"Offset":"(-75.26315,146.842163)","Comment":"BeAttacked
         == false"},"ID":39,"Name":"Compare Shared Bool","Instant":true,"SharedBoolvariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"BooleanmValue":false},"SharedBoolcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(61.0610847,149.344238)"},"ID":40,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0.1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWaterProject.BehaviorAsset.Enemy.MoveTarget","NodeData":{"Offset":"(185.022949,146.189819)","Comment":"Target
-        Move(Default)\nreturn true"},"ID":41,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":2,"EStopTypestopType":"MINIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(335,147.5)","Comment":"IsCombated
+        Move(1\ubc30\uc18d)\nreturn true"},"ID":41,"Name":"Move Target","Instant":true,"SharedCollidertarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null},"SharedVector3movePos":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"Vector3mValue":"(0,0,0)"},"BooleanrandomMove":false,"SinglemultiplyMoveSpd":1,"EStopTypestopType":"MINIMUM","BooleanisArrivedReturnSuccess":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.SetSharedBool","NodeData":{"Offset":"(335,147.5)","Comment":"IsCombated
         = false"},"ID":42,"Name":"Set Shared Bool","Instant":true,"SharedBooltargetValue":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedBooltargetVariable":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"BooleanmValue":false}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(658.652,154.838745)"},"ID":43,"Name":"Attack
         Sequence","Instant":true,"AbortTypeabortType":"Both","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-161.277924,151.643555)"},"ID":44,"Name":"CanAttack
         Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Inverter","NodeData":{"Offset":"(-90,150)"},"ID":45,"Name":"Inverter","Instant":true,"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedCollider","NodeData":{"Offset":"(0,150)","Comment":"Target

BlueWater/Assets/Epic Toon FX/Demo/Scripts/ETFXProjectileScript.cs

@@ -1,6 +1,4 @@
 using UnityEngine;
-using System.Collections;
-using BlueWaterProject;
 
 namespace EpicToonFX
 {
@@ -14,9 +12,6 @@ namespace EpicToonFX
         [Range(0f, 1f)] // This is an offset that moves the impact effect slightly away from the point of impact to reduce clipping of the impact effect
         public float collideOffset = 0.15f;
 
-        public LayerMask targetLayer;
-        public float power;
-
         void Start()
         {
             projectileParticle = Instantiate(projectileParticle, transform.position, transform.rotation) as GameObject;
@@ -50,7 +45,7 @@ namespace EpicToonFX
 
             float detectionDistance = transform.GetComponent<Rigidbody>().velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame
 
-            if (Physics.SphereCast(transform.position, radius, direction, out hit, detectionDistance, targetLayer)) // Checks if collision will happen
+            if (Physics.SphereCast(transform.position, radius, direction, out hit, detectionDistance)) // Checks if collision will happen
             {
                 transform.position = hit.point + (hit.normal * collideOffset); // Move projectile to point of collision
 
@@ -72,8 +67,6 @@ namespace EpicToonFX
                 Destroy(projectileParticle, 3f); // Removes particle effect after delay
                 Destroy(impactP, 3.5f); // Removes impact effect after delay
                 Destroy(gameObject); // Removes the projectile
-
-                hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
             }
         }
     }

BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Slider/Clamped/Slider - Clamped (Whole Number) - Blue.prefab

@@ -5,12 +5,13 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 6709817470718081999, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.r
+      propertyPath: m_Color.b
-      value: 0.14509805
+      value: 0.57254905
       objectReference: {fileID: 0}
     - target: {fileID: 6709817470718081999, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
@@ -19,13 +20,13 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6709817470718081999, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.b
+      propertyPath: m_Color.r
-      value: 0.57254905
+      value: 0.14509805
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472087114518, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.r
+      propertyPath: m_Color.b
-      value: 0.36862746
+      value: 0.28235295
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472087114518, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
@@ -34,13 +35,13 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472087114518, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.b
+      propertyPath: m_Color.r
-      value: 0.28235295
+      value: 0.36862746
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472344930804, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.r
+      propertyPath: m_Color.b
-      value: 0.14509805
+      value: 0.57254905
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472344930804, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
@@ -49,13 +50,28 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472344930804, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.b
+      propertyPath: m_Color.r
-      value: 0.57254905
+      value: 0.14509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472344930807, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472344930807, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472344930807, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472453103871, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.r
+      propertyPath: m_Color.b
-      value: 0.19215687
+      value: 0.15294118
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472453103871, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
@@ -64,14 +80,59 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472453103871, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.b
+      propertyPath: m_Color.r
-      value: 0.15294118
+      value: 0.19215687
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472521016540, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
       propertyPath: m_Name
       value: Slider - Clamped (Whole Number) - Blue
       objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 550
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 25
+      objectReference: {fileID: 0}
     - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -87,6 +148,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
       propertyPath: m_LocalRotation.x
@@ -104,12 +170,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_LocalRotation.w
+      propertyPath: m_AnchoredPosition.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
@@ -127,60 +193,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6709817472521016541, guid: 354f77bec796e4107be1fbeea445a0fe,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
     - target: {fileID: 6709817472667298180, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.r
+      propertyPath: m_Color.b
-      value: 0.14509805
+      value: 0.57254905
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472667298180, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
@@ -189,13 +205,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6709817472667298180, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.b
+      propertyPath: m_Color.r
-      value: 0.57254905
+      value: 0.14509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472667298183, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6709817472667298183, guid: 354f77bec796e4107be1fbeea445a0fe,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7888449935818564603, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.r
+      propertyPath: m_Color.b
-      value: 0.36862746
+      value: 0.28235295
       objectReference: {fileID: 0}
     - target: {fileID: 7888449935818564603, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
@@ -204,8 +230,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7888449935818564603, guid: 354f77bec796e4107be1fbeea445a0fe,
         type: 3}
-      propertyPath: m_Color.b
+      propertyPath: m_Color.r
-      value: 0.28235295
+      value: 0.36862746
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 354f77bec796e4107be1fbeea445a0fe, type: 3}

BlueWater/ProjectSettings/TagManager.asset

@@ -11,6 +11,9 @@ TagManager:
   - CombatCrewmate
   - FieldMinion
   - FieldBoss
+  - Enemy
+  - Unit
+  - House
   layers:
   - Default
   - TransparentFX
@@ -48,3 +51,6 @@ TagManager:
   - name: Default
     uniqueID: 0
     locked: 0
+  - name: UI
+    uniqueID: 3097537685
+    locked: 0