diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index db94f48a6..0ea2aad17 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -12514,7 +12514,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalRotation.x @@ -12522,7 +12522,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalRotation.z @@ -12534,7 +12534,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs b/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs index 1e54f74df..846e9beab 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs @@ -13,7 +13,10 @@ namespace BlueWater.Enemies.Bosses Rhinoceros, SandMole, MiniSandMole, - GhostBarrel + GhostBarrel, + BoomBarrel, + SwordBarrel, + LavaBarrel } public enum BossSkillName @@ -62,7 +65,7 @@ namespace BlueWater.Enemies.Bosses [field: SerializeField, Required] public BossHealthPoint BossHealthPoint { get; private set; } - [field: SerializeField, Required] + [field: SerializeField] public AiMovement AIMovement { get; private set; } [field: SerializeField, Required] diff --git a/Assets/02.Scripts/Character/Enemy/Boss/BossHealthPoint.cs b/Assets/02.Scripts/Character/Enemy/Boss/BossHealthPoint.cs index 519c63850..720791b0a 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/BossHealthPoint.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/BossHealthPoint.cs @@ -55,13 +55,14 @@ namespace BlueWater.Enemies.Bosses private Coroutine _damageIntervalCoroutine; private bool _enableHealthChangedEvent; + private string _bossName; private MaterialPropertyBlock _materialPropertyBlock; // Hashes private static readonly int _isHitHash = Shader.PropertyToID("_IsHit"); // Events - public event Action OnHealthChanged; + public event Action OnHealthChanged; public event Action OnDead; private void Awake() @@ -95,13 +96,14 @@ namespace BlueWater.Enemies.Bosses { _enableHealthChangedEvent = enableHealthChangedEvent; MaxHealthPoint = maxHealthPoint; + _bossName = bossName; _particleInstantiateLocation = particleInstantiateLocation; _fieldBossHealthPointUi ??= CombatUiManager.Instance.FieldBossHealthPointUi; if (_enableHealthChangedEvent) { OnHealthChanged += _fieldBossHealthPointUi.SetCurrentHealthPoint; - _fieldBossHealthPointUi.SetBoss(MaxHealthPoint, bossName); + _fieldBossHealthPointUi.SetBoss(MaxHealthPoint, _bossName); } SetCurrentHealthPoint(MaxHealthPoint); @@ -111,7 +113,7 @@ namespace BlueWater.Enemies.Bosses public void SetCurrentHealthPoint(int changedHealthPoint) { CurrentHealthPoint = changedHealthPoint; - OnHealthChanged?.Invoke(changedHealthPoint); + OnHealthChanged?.Invoke(changedHealthPoint, _bossName); } public bool CanDamage() => !IsInvincible; diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrel.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrel.cs new file mode 100644 index 000000000..ca5aa63d4 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrel.cs @@ -0,0 +1,153 @@ +using System.Collections; +using BlueWater.Maps; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.GhostBarrel +{ + public enum BoomBarrelSkill + { + None = 0, + } + + public enum BoomBarrelSkin + { + + } + + public enum BoomBarrelAnimation + { + None = 0, + Empty, + Idle, + In, + Out + } + + public class BoomBarrel : SpineBoss + { + // Variables + #region Variables + + public BoomBarrelData BoomBarrelData { get; private set; } + public GhostBarrelMapController GhostBarrelMapController { get; private set; } + + [Title("효과")] + [SerializeField] + private float _spawnDissolveTime = 2f; + + [SerializeField] + private float _dieDissolveTime = 1f; + + // Hashes + private static readonly int _dissolveValueHash = Shader.PropertyToID("_DissolveValue"); + + #endregion + + // Unity events + #region Unity events + + protected override void OnDestroy() + { + base.OnDestroy(); + + //BossHealthPoint.OnHealthChanged -= SummonMiniSandMole; + } + + #endregion + + // Initialize methods + #region Initialize methods + + protected override void InitializeComponents() + { + base.InitializeComponents(); + + BoomBarrelData = BossData as BoomBarrelData; + GhostBarrelMapController = MapManager.Instance.GhostBarrelMapController; + } + + public override void Initialize() + { + StartCoroutine(InitializeCoroutine()); + } + + private IEnumerator InitializeCoroutine() + { + HitBoxCollider.enabled = false; + BossHealthPoint.Initialize(true, BossData.MaxHealthPoint, + BossData.DisplayName, GhostBarrelMapController.ParticleInstanceLocation); + BossSkillController.Initialize(BossData.SkillDataList); + + yield return null; + + SpineController.PlayAnimation(BoomBarrelAnimation.Empty.ToString(), false); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _spawnDissolveTime) + { + if (CurrentHealthPoint == 0) yield break; + + var value = Mathf.Lerp(0f, 1f, elapsedTime / _spawnDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + + BehaviorTree.EnableBehavior(); + HitBoxCollider.enabled = true; + } + + #endregion + + // Methods + #region Methods + + protected override void Die() + { + StartCoroutine(DieCoroutine()); + } + + private IEnumerator DieCoroutine() + { + BossSkillController.StopAllCoroutine(); + BehaviorTree.DisableBehavior(); + + HitBoxCollider.enabled = false; + if (Rigidbody) + { + Rigidbody.linearVelocity = Vector3.zero; + Rigidbody.isKinematic = true; + } + + // TODO : 죽는 애니메이션 추가 + //SpineController.SetSkin(SandMoleSkin.Idle.ToString()); + //var dieTrack = SpineController.PlayAnimation(SandMoleAnimation.Die.ToString(), false); + + //await SpineController.WaitForAnimationCompletion(dieTrack); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _dieDissolveTime) + { + var value = Mathf.Lerp(1f, 0f, elapsedTime / _dieDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + + Destroy(gameObject); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrel.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrel.cs.meta new file mode 100644 index 000000000..7819598ef --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 81ecdc79816d02940b99b2e913878fce +timeCreated: 1717140083 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrelData.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrelData.cs new file mode 100644 index 000000000..53d4d51bf --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrelData.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.GhostBarrel +{ + [CreateAssetMenu(fileName = "BoomBarrelData", menuName = "ScriptableObjects/Enemy/BoomBarrelData")] + public class BoomBarrelData : BossData + { + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrelData.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrelData.cs.meta new file mode 100644 index 000000000..9a76934e9 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/BoomBarrelData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8a42d30b03045b94f8c864af3e20f5b5 +timeCreated: 1717087643 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/GhostBarrel.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/GhostBarrel.cs index e204df940..666005afe 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/GhostBarrel.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/GhostBarrel.cs @@ -1,7 +1,4 @@ using System.Collections; -using System.Collections.Generic; -using System.Linq; -using BlueWater.Audios; using BlueWater.Items; using BlueWater.Maps; using Sirenix.OdinInspector; @@ -32,29 +29,25 @@ namespace BlueWater.Enemies.Bosses.GhostBarrel { // Variables #region Variables - - // [field: Title("SandMole 컴포넌트")] - // [field: SerializeField, Required] - // public SandMoleStatus SandMoleStatus { get; private set; } - // - // private List _summonMiniSandMoles; public GhostBarrelData GhostBarrelData { get; private set; } public GhostBarrelMapController GhostBarrelMapController { get; private set; } + + [Title("효과")] + [SerializeField] + private float _spawnDissolveTime = 2f; + + [SerializeField] + private float _dieDissolveTime = 1f; + + // Hashes + private static readonly int _dissolveValueHash = Shader.PropertyToID("_DissolveValue"); #endregion // Unity events #region Unity events - protected override void Update() - { - base.Update(); - - HandleMovement(); - FlipVisualLook(); - } - protected override void OnDestroy() { base.OnDestroy(); @@ -80,32 +73,51 @@ namespace BlueWater.Enemies.Bosses.GhostBarrel { StartCoroutine(InitializeCoroutine()); } - - #endregion - - // Methods - #region Methods - + private IEnumerator InitializeCoroutine() { HitBoxCollider.enabled = false; BossHealthPoint.Initialize(true, GhostBarrelData.MaxHealthPoint, GhostBarrelData.DisplayName, GhostBarrelMapController.ParticleInstanceLocation); - //BossHealthPoint.OnHealthChanged += SummonMiniSandMole; BossSkillController.Initialize(BossData.SkillDataList); SetMoveSpeed(GhostBarrelData.MoveSpeed); StopMove(); - - yield return null; + + SpineController.PlayAnimation(BoomBarrelAnimation.In.ToString(), false); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _spawnDissolveTime) + { + if (CurrentHealthPoint == 0) yield break; + + var value = Mathf.Lerp(0f, 1f, elapsedTime / _spawnDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); BehaviorTree.EnableBehavior(); HitBoxCollider.enabled = true; } - protected override async void Die() + #endregion + + // Methods + #region Methods + + protected override void Die() + { + StartCoroutine(DieCoroutine()); + } + + private IEnumerator DieCoroutine() { BossSkillController.StopAllCoroutine(); - //SandMoleStatus.StopAllCoroutine(); BehaviorTree.DisableBehavior(); StopMove(); @@ -116,12 +128,27 @@ namespace BlueWater.Enemies.Bosses.GhostBarrel Rigidbody.isKinematic = true; } + GhostBarrelMapController.ClearMap(gameObject); + // TODO : 죽는 애니메이션 추가 //SpineController.SetSkin(SandMoleSkin.Idle.ToString()); //var dieTrack = SpineController.PlayAnimation(SandMoleAnimation.Die.ToString(), false); - //GhostBarrelMapController.ClearMap(gameObject); //await SpineController.WaitForAnimationCompletion(dieTrack); - ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _dieDissolveTime) + { + var value = Mathf.Lerp(1f, 0f, elapsedTime / _dieDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + Destroy(gameObject); } diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrel.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrel.cs new file mode 100644 index 000000000..a4235d3c5 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrel.cs @@ -0,0 +1,153 @@ +using System.Collections; +using BlueWater.Maps; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.GhostBarrel +{ + public enum LavaBarrelSkill + { + None = 0, + } + + public enum LavaBarrelSkin + { + + } + + public enum LavaBarrelAnimation + { + None = 0, + Empty, + Idle, + In, + Out + } + + public class LavaBarrel : SpineBoss + { + // Variables + #region Variables + + public LavaBarrelData LavaBarrelData { get; private set; } + public GhostBarrelMapController GhostBarrelMapController { get; private set; } + + [Title("효과")] + [SerializeField] + private float _spawnDissolveTime = 2f; + + [SerializeField] + private float _dieDissolveTime = 1f; + + // Hashes + private static readonly int _dissolveValueHash = Shader.PropertyToID("_DissolveValue"); + + #endregion + + // Unity events + #region Unity events + + protected override void OnDestroy() + { + base.OnDestroy(); + + //BossHealthPoint.OnHealthChanged -= SummonMiniSandMole; + } + + #endregion + + // Initialize methods + #region Initialize methods + + protected override void InitializeComponents() + { + base.InitializeComponents(); + + LavaBarrelData = BossData as LavaBarrelData; + GhostBarrelMapController = MapManager.Instance.GhostBarrelMapController; + } + + public override void Initialize() + { + StartCoroutine(InitializeCoroutine()); + } + + private IEnumerator InitializeCoroutine() + { + HitBoxCollider.enabled = false; + BossHealthPoint.Initialize(true, BossData.MaxHealthPoint, + BossData.DisplayName, GhostBarrelMapController.ParticleInstanceLocation); + BossSkillController.Initialize(BossData.SkillDataList); + + yield return null; + + SpineController.PlayAnimation(BoomBarrelAnimation.Empty.ToString(), false); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _spawnDissolveTime) + { + if (CurrentHealthPoint == 0) yield break; + + var value = Mathf.Lerp(0f, 1f, elapsedTime / _spawnDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + + BehaviorTree.EnableBehavior(); + HitBoxCollider.enabled = true; + } + + #endregion + + // Methods + #region Methods + + protected override void Die() + { + StartCoroutine(DieCoroutine()); + } + + private IEnumerator DieCoroutine() + { + BossSkillController.StopAllCoroutine(); + BehaviorTree.DisableBehavior(); + + HitBoxCollider.enabled = false; + if (Rigidbody) + { + Rigidbody.linearVelocity = Vector3.zero; + Rigidbody.isKinematic = true; + } + + // TODO : 죽는 애니메이션 추가 + //SpineController.SetSkin(SandMoleSkin.Idle.ToString()); + //var dieTrack = SpineController.PlayAnimation(SandMoleAnimation.Die.ToString(), false); + + //await SpineController.WaitForAnimationCompletion(dieTrack); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _dieDissolveTime) + { + var value = Mathf.Lerp(1f, 0f, elapsedTime / _dieDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + + Destroy(gameObject); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrel.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrel.cs.meta new file mode 100644 index 000000000..7f8943c05 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a295a3476b42f6841b374883d52dab2c +timeCreated: 1717140083 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrelData.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrelData.cs new file mode 100644 index 000000000..d53e66d02 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrelData.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.GhostBarrel +{ + [CreateAssetMenu(fileName = "LavaBarrelData", menuName = "ScriptableObjects/Enemy/LavaBarrelData")] + public class LavaBarrelData : BossData + { + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrelData.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrelData.cs.meta new file mode 100644 index 000000000..f7df3bcc7 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/LavaBarrelData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1168ae704d4881b478b5b429655f398c +timeCreated: 1717087643 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrel.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrel.cs new file mode 100644 index 000000000..687e54a0e --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrel.cs @@ -0,0 +1,153 @@ +using System.Collections; +using BlueWater.Maps; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.GhostBarrel +{ + public enum SwordBarrelSkill + { + None = 0, + } + + public enum SwordBarrelSkin + { + + } + + public enum SwordBarrelAnimation + { + None = 0, + Empty, + Idle, + In, + Out + } + + public class SwordBarrel : SpineBoss + { + // Variables + #region Variables + + public SwordBarrelData SwordBarrelData { get; private set; } + public GhostBarrelMapController GhostBarrelMapController { get; private set; } + + [Title("효과")] + [SerializeField] + private float _spawnDissolveTime = 2f; + + [SerializeField] + private float _dieDissolveTime = 1f; + + // Hashes + private static readonly int _dissolveValueHash = Shader.PropertyToID("_DissolveValue"); + + #endregion + + // Unity events + #region Unity events + + protected override void OnDestroy() + { + base.OnDestroy(); + + //BossHealthPoint.OnHealthChanged -= SummonMiniSandMole; + } + + #endregion + + // Initialize methods + #region Initialize methods + + protected override void InitializeComponents() + { + base.InitializeComponents(); + + SwordBarrelData = BossData as SwordBarrelData; + GhostBarrelMapController = MapManager.Instance.GhostBarrelMapController; + } + + public override void Initialize() + { + StartCoroutine(InitializeCoroutine()); + } + + private IEnumerator InitializeCoroutine() + { + HitBoxCollider.enabled = false; + BossHealthPoint.Initialize(true, BossData.MaxHealthPoint, + BossData.DisplayName, GhostBarrelMapController.ParticleInstanceLocation); + BossSkillController.Initialize(BossData.SkillDataList); + + yield return null; + + SpineController.PlayAnimation(BoomBarrelAnimation.Empty.ToString(), false); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _spawnDissolveTime) + { + if (CurrentHealthPoint == 0) yield break; + + var value = Mathf.Lerp(0f, 1f, elapsedTime / _spawnDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + + BehaviorTree.EnableBehavior(); + HitBoxCollider.enabled = true; + } + + #endregion + + // Methods + #region Methods + + protected override void Die() + { + StartCoroutine(DieCoroutine()); + } + + private IEnumerator DieCoroutine() + { + BossSkillController.StopAllCoroutine(); + BehaviorTree.DisableBehavior(); + + HitBoxCollider.enabled = false; + if (Rigidbody) + { + Rigidbody.linearVelocity = Vector3.zero; + Rigidbody.isKinematic = true; + } + + // TODO : 죽는 애니메이션 추가 + //SpineController.SetSkin(SandMoleSkin.Idle.ToString()); + //var dieTrack = SpineController.PlayAnimation(SandMoleAnimation.Die.ToString(), false); + + //await SpineController.WaitForAnimationCompletion(dieTrack); + + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 1f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + var elapsedTime = 0f; + while (elapsedTime <= _dieDissolveTime) + { + var value = Mathf.Lerp(1f, 0f, elapsedTime / _dieDissolveTime); + MaterialPropertyBlock.SetFloat(_dissolveValueHash, value); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + elapsedTime += Time.deltaTime; + yield return null; + } + MaterialPropertyBlock.SetFloat(_dissolveValueHash, 0f); + MeshRenderer.SetPropertyBlock(MaterialPropertyBlock); + + Destroy(gameObject); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrel.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrel.cs.meta new file mode 100644 index 000000000..e6eed398b --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b4ea6fbc02d91f74cb14877b7c97c990 +timeCreated: 1717140083 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrelData.cs b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrelData.cs new file mode 100644 index 000000000..a83664960 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrelData.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.GhostBarrel +{ + [CreateAssetMenu(fileName = "SwordBarrelData", menuName = "ScriptableObjects/Enemy/SwordBarrelData")] + public class SwordBarrelData : BossData + { + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrelData.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrelData.cs.meta new file mode 100644 index 000000000..4c33c4fe0 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/GhostBarrel/SwordBarrelData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9bd2cf362c429924ba00b75780b0c68e +timeCreated: 1717087643 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs index 734ffa035..a538a50fe 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using BlueWater.Audios; using Sirenix.OdinInspector; using UnityEngine; diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs index 1f4e18495..67be455fc 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs @@ -158,7 +158,7 @@ namespace BlueWater.Enemies.Bosses.SandMole Destroy(gameObject); } - private void SummonMiniSandMole(int currentHp) + private void SummonMiniSandMole(int currentHp, string bossName) { if (currentHp == 0) return; diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SpineBoss.cs b/Assets/02.Scripts/Character/Enemy/Boss/SpineBoss.cs index b8f59f76f..276943e5a 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/SpineBoss.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/SpineBoss.cs @@ -79,6 +79,8 @@ namespace BlueWater.Enemies.Bosses protected virtual void HandleMovement() { + if (AstarAi == null) return; + if (!AstarAi.canMove || AstarAi.isStopped) { IsMoving = false; diff --git a/Assets/02.Scripts/Map/GhostBarrelMapController.cs b/Assets/02.Scripts/Map/GhostBarrelMapController.cs index 94b1080fc..421e7f68e 100644 --- a/Assets/02.Scripts/Map/GhostBarrelMapController.cs +++ b/Assets/02.Scripts/Map/GhostBarrelMapController.cs @@ -1,12 +1,124 @@ -using System.Collections.Generic; +using System.Collections; +using System.Collections.Generic; +using BlueWater.Audios; using BlueWater.Enemies; -using Sirenix.OdinInspector; +using BlueWater.Enemies.Bosses; +using BlueWater.Enemies.Bosses.GhostBarrel; +using BlueWater.Uis; using UnityEngine; namespace BlueWater.Maps { public class GhostBarrelMapController : BossMapController { + [SerializeField] + private List _ghostBarrelSpawns; + [SerializeField] + private List _boomBarrelSpawns; + + [SerializeField] + private List _swordBarrelSpawns; + + [SerializeField] + private List _lavaBarrelSpawns; + + [SerializeField] + private List _ghostBarrels; + + protected override void InitializeComponents() + { + base.InitializeComponents(); + + _ghostBarrelSpawns = new List(3); + var ghostBarrelSpawns = transform.Find("Spawns/GhostBarrelSpawns"); + foreach (Transform element in ghostBarrelSpawns) + { + _ghostBarrelSpawns.Add(element); + } + + _boomBarrelSpawns = new List(3); + var boomBarrelSpawns = transform.Find("Spawns/BoomBarrelSpawns"); + foreach (Transform element in boomBarrelSpawns) + { + _boomBarrelSpawns.Add(element); + } + + _swordBarrelSpawns = new List(2); + var swordBarrelSpawns = transform.Find("Spawns/SwordBarrelSpawns"); + foreach (Transform element in swordBarrelSpawns) + { + _swordBarrelSpawns.Add(element); + } + + _lavaBarrelSpawns = new List(2); + var lavaBarrelSpawns = transform.Find("Spawns/LavaBarrelSpawns"); + foreach (Transform element in lavaBarrelSpawns) + { + _lavaBarrelSpawns.Add(element); + } + } + + protected override void InitializeBoss() + { + _ghostBarrels = new List(_ghostBarrelSpawns.Count); + foreach (var element in _ghostBarrelSpawns) + { + var boss = EnemyManager.Instance.InstantiateBoss(BossType.GhostBarrel, element.position, EnemyInstanceLocation); + _ghostBarrels.Add(boss.GetComponent()); + } + + foreach (var element in _boomBarrelSpawns) + { + EnemyManager.Instance.InstantiateBoss(BossType.BoomBarrel, element.position, EnemyInstanceLocation); + } + + foreach (var element in _swordBarrelSpawns) + { + EnemyManager.Instance.InstantiateBoss(BossType.SwordBarrel, element.position, EnemyInstanceLocation); + } + + foreach (var element in _lavaBarrelSpawns) + { + EnemyManager.Instance.InstantiateBoss(BossType.LavaBarrel, element.position, EnemyInstanceLocation); + } + } + + public override void ClearMap(GameObject bossObject) + { + StartCoroutine(ClearMapCoroutine(bossObject)); + } + + protected override IEnumerator ClearMapCoroutine(GameObject bossObject) + { + _ghostBarrels.Remove(bossObject.GetComponent()); + if (_ghostBarrels.Count > 0) yield break; + + IsCleared = true; + AudioManager.Instance.PlaySfx("Shining"); + GameManager.Instance.CurrentCombatPlayer.ActivateInvincibility(); + VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f); + CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y); + + var elapsedTime = 0f; + while (elapsedTime <= 3f) + { + elapsedTime += Time.unscaledDeltaTime; + yield return null; + } + DestroyAllEnemiesExceptBoss(bossObject); + VisualFeedbackManager.Instance.SetBaseTimeScale(1f); + + elapsedTime = 0f; + while (elapsedTime <= 2f) + { + elapsedTime += Time.unscaledDeltaTime; + yield return null; + } + + OpenMapEntrances(); + GameManager.Instance.CurrentCombatPlayer.DeactivateInvincibility(); + AudioManager.Instance.PlayBgm(MapManager.Instance.DailyBgm); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BoomBarrelData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BoomBarrelData.asset new file mode 100644 index 000000000..9ddc992c2 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BoomBarrelData.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a42d30b03045b94f8c864af3e20f5b5, type: 3} + m_Name: BoomBarrelData + m_EditorClassIdentifier: + k__BackingField: BoomBarrel + k__BackingField: "\uD3ED\uD0C4 \uC220\uD1B5" + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: + serializedVersion: 2 + m_Bits: 2048 + k__BackingField: [] diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BoomBarrelData.asset.meta b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BoomBarrelData.asset.meta new file mode 100644 index 000000000..f0adb9da2 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BoomBarrelData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c727f915017f83a40b7cece9ea8cbff9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset index ee1e530ff..f79750ca6 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset @@ -23,3 +23,9 @@ MonoBehaviour: k__BackingField: {fileID: 3920647224749190631, guid: 95f91f8d7fca3544fb0577a9dd14caf6, type: 3} - k__BackingField: 5 k__BackingField: {fileID: 3920647224749190631, guid: f508e60d6ca76554ba30cfc6c479d04e, type: 3} + - k__BackingField: 6 + k__BackingField: {fileID: 3920647224749190631, guid: 48310c9e31d1eaa4194ccd53d12c50a0, type: 3} + - k__BackingField: 7 + k__BackingField: {fileID: 3920647224749190631, guid: 34361e844edda9e448ed94c297908534, type: 3} + - k__BackingField: 8 + k__BackingField: {fileID: 3920647224749190631, guid: 5a02353a3459c3d40a9d8d3b57cbe4a6, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/LavaBarrelData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/LavaBarrelData.asset new file mode 100644 index 000000000..1d9559077 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/LavaBarrelData.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1168ae704d4881b478b5b429655f398c, type: 3} + m_Name: LavaBarrelData + m_EditorClassIdentifier: + k__BackingField: LavaBarrel + k__BackingField: "\uC6A9\uC554 \uC220\uD1B5" + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: + serializedVersion: 2 + m_Bits: 2048 + k__BackingField: [] diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/LavaBarrelData.asset.meta b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/LavaBarrelData.asset.meta new file mode 100644 index 000000000..19fe727bd --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/LavaBarrelData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6dff949bd6e6c047b9cf4166092e8d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SwordBarrelData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SwordBarrelData.asset new file mode 100644 index 000000000..4c4f78aad --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SwordBarrelData.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bd2cf362c429924ba00b75780b0c68e, type: 3} + m_Name: SwordBarrelData + m_EditorClassIdentifier: + k__BackingField: SwordBarrel + k__BackingField: "\uAC80 \uC220\uD1B5" + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: + serializedVersion: 2 + m_Bits: 2048 + k__BackingField: [] diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SwordBarrelData.asset.meta b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SwordBarrelData.asset.meta new file mode 100644 index 000000000..85c5e0c43 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SwordBarrelData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2b62b0c41b6f284ba0d6d4ac3805eb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Ui/Combat/FieldBossHealthPointUi.cs b/Assets/02.Scripts/Ui/Combat/FieldBossHealthPointUi.cs index 640c0c1cb..58e002c30 100644 --- a/Assets/02.Scripts/Ui/Combat/FieldBossHealthPointUi.cs +++ b/Assets/02.Scripts/Ui/Combat/FieldBossHealthPointUi.cs @@ -57,9 +57,14 @@ namespace BlueWater.Uis SetActiveHpSlider(true); } - public void SetCurrentHealthPoint(int value) + public void SetCurrentHealthPoint(int value, string bossName) { if (!_slider || !_damageEffectSlider) return; + + if (!string.IsNullOrEmpty(bossName) && !_nameText.text.Equals(bossName)) + { + _nameText.text = bossName; + } _damageEffectCoroutineInstance = StartCoroutine(DamageEffect(value)); } diff --git a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs index bee0dbfcb..e755c53b8 100644 --- a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs +++ b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs @@ -1,3 +1,4 @@ +using System; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.EventSystems; @@ -17,12 +18,18 @@ namespace BlueWater.Titles private Color _highlightedColor; private Color _originalColor; + private bool _isQuitting; private void Start() { _originalColor = _selectedImage.color; } + private void OnApplicationQuit() + { + _isQuitting = true; + } + public void OnSelect(BaseEventData eventData) { _selectedImage.color = _originalColor; @@ -44,7 +51,7 @@ namespace BlueWater.Titles public void OnPointerExit(PointerEventData eventData) { - if (EventSystem.current.currentSelectedGameObject == gameObject) return; + if (_isQuitting || EventSystem.current.currentSelectedGameObject == gameObject) return; _selectedImage.color = _originalColor; _selectedImage.enabled = false; diff --git a/Assets/04.Materials/Characters/BoomBarrel.mat b/Assets/04.Materials/Characters/BoomBarrel.mat new file mode 100644 index 000000000..5de47e74b --- /dev/null +++ b/Assets/04.Materials/Characters/BoomBarrel.mat @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BoomBarrel + m_Shader: {fileID: -6465566751694194690, guid: 25b64c74397178e47a04794eb9a74d8f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d0d2333e88d496541b7bd6f34e562194, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaClipThreshold: 0.5 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DissolveValue: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowSize: 0.1 + - _IsHit: 0 + - _IsSeeThrough: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Opacity: 0.7 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Size: 0 + - _Smoothness: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FlashColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 1.7824347, g: 0.40541652, b: 0, a: 0} + - _PlayerPosition: {r: 0.5, g: 0.55, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3929801182760292753 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Characters/BoomBarrel.mat.meta b/Assets/04.Materials/Characters/BoomBarrel.mat.meta new file mode 100644 index 000000000..892438398 --- /dev/null +++ b/Assets/04.Materials/Characters/BoomBarrel.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc007033623c8e54fa2a1bb2d4facdbf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Characters/GhostBarrel.mat b/Assets/04.Materials/Characters/GhostBarrel.mat index 3455e75a9..92f01a12a 100644 --- a/Assets/04.Materials/Characters/GhostBarrel.mat +++ b/Assets/04.Materials/Characters/GhostBarrel.mat @@ -95,7 +95,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DissolveValue: 1 + - _DissolveValue: 0 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 @@ -126,7 +126,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FlashColor: {r: 1, g: 1, b: 1, a: 1} - - _GlowColor: {r: 5.3403134, g: 5.3403134, b: 0, a: 0} + - _GlowColor: {r: 0.20178512, g: 0.20178512, b: 0.20178512, a: 0} - _PlayerPosition: {r: 0.5, g: 0.55, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/04.Materials/Characters/LavaBarrel.mat b/Assets/04.Materials/Characters/LavaBarrel.mat new file mode 100644 index 000000000..aafa3a0f6 --- /dev/null +++ b/Assets/04.Materials/Characters/LavaBarrel.mat @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LavaBarrel + m_Shader: {fileID: -6465566751694194690, guid: 25b64c74397178e47a04794eb9a74d8f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d0d2333e88d496541b7bd6f34e562194, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaClipThreshold: 0.5 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DissolveValue: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowSize: 0.1 + - _IsHit: 0 + - _IsSeeThrough: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Opacity: 0.7 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Size: 0 + - _Smoothness: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FlashColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 3.1770732, g: 0, b: 0, a: 0} + - _PlayerPosition: {r: 0.5, g: 0.55, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3929801182760292753 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Characters/LavaBarrel.mat.meta b/Assets/04.Materials/Characters/LavaBarrel.mat.meta new file mode 100644 index 000000000..b7dde0085 --- /dev/null +++ b/Assets/04.Materials/Characters/LavaBarrel.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0fdc458aca72414e93e030540fdb5da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Characters/SwordBarrel.mat b/Assets/04.Materials/Characters/SwordBarrel.mat new file mode 100644 index 000000000..ae631d161 --- /dev/null +++ b/Assets/04.Materials/Characters/SwordBarrel.mat @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SwordBarrel + m_Shader: {fileID: -6465566751694194690, guid: 25b64c74397178e47a04794eb9a74d8f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d0d2333e88d496541b7bd6f34e562194, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaClipThreshold: 0.5 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DissolveValue: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowSize: 0.1 + - _IsHit: 0 + - _IsSeeThrough: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Opacity: 0.7 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Size: 0 + - _Smoothness: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FlashColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 1.7824348, g: 1.3925114, b: 0, a: 0} + - _PlayerPosition: {r: 0.5, g: 0.55, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3929801182760292753 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Characters/SwordBarrel.mat.meta b/Assets/04.Materials/Characters/SwordBarrel.mat.meta new file mode 100644 index 000000000..ff4c9c93b --- /dev/null +++ b/Assets/04.Materials/Characters/SwordBarrel.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e994e5453a732c4f85a5a85ce79f84f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/TransparentLit.mat b/Assets/04.Materials/TransparentLit.mat index 51dbce48c..4497ef2c0 100644 --- a/Assets/04.Materials/TransparentLit.mat +++ b/Assets/04.Materials/TransparentLit.mat @@ -40,7 +40,6 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly - - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/BoomBarrel.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/BoomBarrel.prefab new file mode 100644 index 000000000..05ffabbca --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/BoomBarrel.prefab @@ -0,0 +1,371 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2624839957929985237 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8932196953512409498} + m_Modifications: + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9051303996272931366, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_Name + value: StunParticle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} +--- !u!4 &1203712363435651660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + m_PrefabInstance: {fileID: 2624839957929985237} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6191278097168840020 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _animationName + value: Idle + objectReference: {fileID: 0} + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: initialSkinName + value: + objectReference: {fileID: 0} + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 3537c8d5c7f99994badd46d83eb7b9d3, type: 2} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customSlotMaterials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].originalMaterial + value: + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].overrideDisabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].replacementMaterial + value: + objectReference: {fileID: 2100000, guid: bc007033623c8e54fa2a1bb2d4facdbf, type: 2} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _originalMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _skeletonAnimation + value: + objectReference: {fileID: 8381193314241175309} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _replacementMaterial + value: + objectReference: {fileID: 2100000, guid: d9ca9344cd131c049810707093126ca7, type: 2} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6377054450616127915, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _renderer + value: + objectReference: {fileID: 8739437251540422414} + - target: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_Name + value: BoomBarrel + objectReference: {fileID: 0} + - target: {fileID: 8919762167155522148, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4032255264356834775, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 6820170460284289212, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 9052061988704076548, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 6865346796134993564, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3323198499126332622, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: -1 + addedObject: {fileID: 1203712363435651660} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: 3 + addedObject: {fileID: -4544136169557839496} + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: -1 + addedObject: {fileID: 8132759628659026963} + m_SourcePrefab: {fileID: 100100000, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} +--- !u!114 &978424182761841919 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6377054450616127915, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b9900c0671da864e910821e6447affc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!136 &1655659061481113974 stripped +CapsuleCollider: + m_CorrespondingSourceObject: {fileID: 4832858849328938018, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1835238398239900901 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &2853719656385728416 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 8246553021837507316, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!54 &3324372096500518704 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8919762167155522148, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3920647224749190631 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-4544136169557839496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 0 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 0} + mBehaviorSource: + behaviorName: BoomBarrel + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: [] + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 0 +--- !u!114 &8132759628659026963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81ecdc79816d02940b99b2e913878fce, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 3324372096500518704} + k__BackingField: {fileID: 1655659061481113974} + k__BackingField: {fileID: -4544136169557839496} + k__BackingField: {fileID: 7338101022445811476} + k__BackingField: {fileID: 2853719656385728416} + k__BackingField: {fileID: 11400000, guid: c727f915017f83a40b7cece9ea8cbff9, type: 2} + k__BackingField: {fileID: 978424182761841919} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 7805708340751103456} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 8739437251540422414} + k__BackingField: {fileID: 1835238398239900901} + _spawnDissolveTime: 2 + _dieDissolveTime: 1 +--- !u!4 &7338101022445811476 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3476210053167940160, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7805708340751103456 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4159255405813448884, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e547505a3a98b44c9660eec12b91720, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8381193314241175309 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!23 &8739437251540422414 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8932196953512409498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3323198499126332622, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/BoomBarrel.prefab.meta b/Assets/05.Prefabs/Characters/Enemies/Bosses/BoomBarrel.prefab.meta new file mode 100644 index 000000000..a558ee620 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/BoomBarrel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48310c9e31d1eaa4194ccd53d12c50a0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/GhostBarrel.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/GhostBarrel.prefab index 694a8c82d..015570f42 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/GhostBarrel.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/GhostBarrel.prefab @@ -109,7 +109,7 @@ PrefabInstance: - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: c7e76be332cedb84bb385483c2eb86d1, type: 2} + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} propertyPath: customSlotMaterials.Array.size value: 1 @@ -144,15 +144,15 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: d9ca9344cd131c049810707093126ca7, type: 2} - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} propertyPath: m_LocalScale.x - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} propertyPath: m_LocalScale.y - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} propertyPath: m_LocalScale.z - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} propertyPath: m_LocalPosition.x @@ -333,6 +333,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: {fileID: 8739437251540422414} k__BackingField: {fileID: 1835238398239900901} + _spawnDissolveTime: 2 + _dieDissolveTime: 1 --- !u!4 &7338101022445811476 stripped Transform: m_CorrespondingSourceObject: {fileID: 3476210053167940160, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/LavaBarrel.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/LavaBarrel.prefab new file mode 100644 index 000000000..811e8e589 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/LavaBarrel.prefab @@ -0,0 +1,371 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2624839957929985237 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8932196953512409498} + m_Modifications: + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9051303996272931366, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_Name + value: StunParticle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} +--- !u!4 &1203712363435651660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + m_PrefabInstance: {fileID: 2624839957929985237} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6191278097168840020 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _animationName + value: Idle + objectReference: {fileID: 0} + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: initialSkinName + value: + objectReference: {fileID: 0} + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 3537c8d5c7f99994badd46d83eb7b9d3, type: 2} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customSlotMaterials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].originalMaterial + value: + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].overrideDisabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].replacementMaterial + value: + objectReference: {fileID: 2100000, guid: f0fdc458aca72414e93e030540fdb5da, type: 2} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _originalMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _skeletonAnimation + value: + objectReference: {fileID: 8381193314241175309} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _replacementMaterial + value: + objectReference: {fileID: 2100000, guid: d9ca9344cd131c049810707093126ca7, type: 2} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6377054450616127915, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _renderer + value: + objectReference: {fileID: 8739437251540422414} + - target: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_Name + value: LavaBarrel + objectReference: {fileID: 0} + - target: {fileID: 8919762167155522148, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4032255264356834775, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 6820170460284289212, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 9052061988704076548, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 6865346796134993564, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3323198499126332622, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: -1 + addedObject: {fileID: 1203712363435651660} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: 3 + addedObject: {fileID: -4544136169557839496} + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: -1 + addedObject: {fileID: 52596636333935393} + m_SourcePrefab: {fileID: 100100000, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} +--- !u!114 &978424182761841919 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6377054450616127915, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b9900c0671da864e910821e6447affc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!136 &1655659061481113974 stripped +CapsuleCollider: + m_CorrespondingSourceObject: {fileID: 4832858849328938018, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1835238398239900901 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &2853719656385728416 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 8246553021837507316, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!54 &3324372096500518704 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8919762167155522148, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3920647224749190631 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-4544136169557839496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 0 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 0} + mBehaviorSource: + behaviorName: LavaBarrel + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: [] + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 0 +--- !u!114 &52596636333935393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a295a3476b42f6841b374883d52dab2c, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 3324372096500518704} + k__BackingField: {fileID: 1655659061481113974} + k__BackingField: {fileID: -4544136169557839496} + k__BackingField: {fileID: 7338101022445811476} + k__BackingField: {fileID: 2853719656385728416} + k__BackingField: {fileID: 11400000, guid: f6dff949bd6e6c047b9cf4166092e8d8, type: 2} + k__BackingField: {fileID: 978424182761841919} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 7805708340751103456} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 8739437251540422414} + k__BackingField: {fileID: 1835238398239900901} + _spawnDissolveTime: 2 + _dieDissolveTime: 1 +--- !u!4 &7338101022445811476 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3476210053167940160, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7805708340751103456 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4159255405813448884, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e547505a3a98b44c9660eec12b91720, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8381193314241175309 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!23 &8739437251540422414 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8932196953512409498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3323198499126332622, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/LavaBarrel.prefab.meta b/Assets/05.Prefabs/Characters/Enemies/Bosses/LavaBarrel.prefab.meta new file mode 100644 index 000000000..a6f48fc2e --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/LavaBarrel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a02353a3459c3d40a9d8d3b57cbe4a6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/SwordBarrel.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/SwordBarrel.prefab new file mode 100644 index 000000000..ab5dbe9a3 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/SwordBarrel.prefab @@ -0,0 +1,371 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2624839957929985237 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8932196953512409498} + m_Modifications: + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9051303996272931366, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + propertyPath: m_Name + value: StunParticle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} +--- !u!4 &1203712363435651660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3808140985359726233, guid: 5cf7cd372801c784a9875e0740cf9038, type: 3} + m_PrefabInstance: {fileID: 2624839957929985237} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6191278097168840020 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _animationName + value: Idle + objectReference: {fileID: 0} + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: initialSkinName + value: + objectReference: {fileID: 0} + - target: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 3537c8d5c7f99994badd46d83eb7b9d3, type: 2} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customSlotMaterials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].originalMaterial + value: + objectReference: {fileID: 2100000, guid: 68323e714dc62c1408c6a8039d7cfe34, type: 2} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].overrideDisabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4172430046422716170, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: customMaterialOverrides.Array.data[0].replacementMaterial + value: + objectReference: {fileID: 2100000, guid: 1e994e5453a732c4f85a5a85ce79f84f, type: 2} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _originalMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _skeletonAnimation + value: + objectReference: {fileID: 8381193314241175309} + - target: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _replacementMaterial + value: + objectReference: {fileID: 2100000, guid: d9ca9344cd131c049810707093126ca7, type: 2} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6377054450616127915, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: _renderer + value: + objectReference: {fileID: 8739437251540422414} + - target: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_Name + value: SwordBarrel + objectReference: {fileID: 0} + - target: {fileID: 8919762167155522148, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4032255264356834775, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 6820170460284289212, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 9052061988704076548, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + - {fileID: 6865346796134993564, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3323198499126332622, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: -1 + addedObject: {fileID: 1203712363435651660} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: 3 + addedObject: {fileID: -4544136169557839496} + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + insertIndex: -1 + addedObject: {fileID: 761261145299296087} + m_SourcePrefab: {fileID: 100100000, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} +--- !u!114 &978424182761841919 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6377054450616127915, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b9900c0671da864e910821e6447affc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!136 &1655659061481113974 stripped +CapsuleCollider: + m_CorrespondingSourceObject: {fileID: 4832858849328938018, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1835238398239900901 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5517970820860260785, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &2853719656385728416 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 8246553021837507316, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!54 &3324372096500518704 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8919762167155522148, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3920647224749190631 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7170637981020870835, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-4544136169557839496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 0 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 0} + mBehaviorSource: + behaviorName: SwordBarrel + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: [] + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 0 +--- !u!114 &761261145299296087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b4ea6fbc02d91f74cb14877b7c97c990, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 3324372096500518704} + k__BackingField: {fileID: 1655659061481113974} + k__BackingField: {fileID: -4544136169557839496} + k__BackingField: {fileID: 7338101022445811476} + k__BackingField: {fileID: 2853719656385728416} + k__BackingField: {fileID: 11400000, guid: c2b62b0c41b6f284ba0d6d4ac3805eb7, type: 2} + k__BackingField: {fileID: 978424182761841919} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 7805708340751103456} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 8739437251540422414} + k__BackingField: {fileID: 1835238398239900901} + _spawnDissolveTime: 2 + _dieDissolveTime: 1 +--- !u!4 &7338101022445811476 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3476210053167940160, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7805708340751103456 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4159255405813448884, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3920647224749190631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e547505a3a98b44c9660eec12b91720, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8381193314241175309 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2424111193999207001, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!23 &8739437251540422414 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3216521486739552858, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8932196953512409498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3323198499126332622, guid: 5c2f67e75ea578f478f4a2f61f6acfca, type: 3} + m_PrefabInstance: {fileID: 6191278097168840020} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/SwordBarrel.prefab.meta b/Assets/05.Prefabs/Characters/Enemies/Bosses/SwordBarrel.prefab.meta new file mode 100644 index 000000000..bbba0b89d --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/SwordBarrel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 34361e844edda9e448ed94c297908534 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Maps/MapControllers/GhostBarrelMapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/GhostBarrelMapController.prefab index 7ae7854ac..16672d553 100644 --- a/Assets/05.Prefabs/Maps/MapControllers/GhostBarrelMapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/GhostBarrelMapController.prefab @@ -1,5 +1,227 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &145745000628715368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060650435608347874} + m_Layer: 0 + m_Name: GhostBarrelSpawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2060650435608347874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145745000628715368} + 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: + - {fileID: 7408596293771563199} + - {fileID: 9064602016224086767} + - {fileID: 6387793740548406681} + m_Father: {fileID: 6960399737772514917} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1505102443966145844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3237375442489846130} + m_Layer: 0 + m_Name: SwordBarrelSpawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3237375442489846130 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1505102443966145844} + 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: + - {fileID: 2804542643795896664} + - {fileID: 6310737807195447950} + m_Father: {fileID: 6960399737772514917} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1545617093066609525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9064602016224086767} + m_Layer: 0 + m_Name: GhostBarrelSpawn (1) + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9064602016224086767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1545617093066609525} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3, y: 0, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2060650435608347874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2078793613044768224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5600560070973920792} + m_Layer: 0 + m_Name: LavaBarrelSpawn + m_TagString: Untagged + m_Icon: {fileID: -1412012063857583412, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5600560070973920792 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078793613044768224} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7, y: 0, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 862592823362467377} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2489534110430149064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6310737807195447950} + m_Layer: 0 + m_Name: SwordBarrelSpawn (1) + m_TagString: Untagged + m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6310737807195447950 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489534110430149064} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3237375442489846130} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2558494191942858304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2804542643795896664} + m_Layer: 0 + m_Name: SwordBarrelSpawn + m_TagString: Untagged + m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2804542643795896664 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2558494191942858304} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7, y: 0, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3237375442489846130} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2752976575517705867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 381062051182767639} + m_Layer: 0 + m_Name: BoomBarrelSpawn (2) + m_TagString: Untagged + m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &381062051182767639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2752976575517705867} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7, y: 0, z: -6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4379465901599906763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3389752583977293500 GameObject: m_ObjectHideFlags: 0 @@ -108,6 +330,68 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3391519544746894035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1367325363437333205} + m_Layer: 0 + m_Name: BoomBarrelSpawn (1) + m_TagString: Untagged + m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1367325363437333205 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391519544746894035} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4379465901599906763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4161474127311607575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 621479147528365370} + m_Layer: 0 + m_Name: BoomBarrelSpawn + m_TagString: Untagged + m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &621479147528365370 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4161474127311607575} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4379465901599906763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4978820410574331929 GameObject: m_ObjectHideFlags: 0 @@ -216,6 +500,133 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5232049461429835402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8036799880576612401} + m_Layer: 0 + m_Name: LavaBarrelSpawn (1) + m_TagString: Untagged + m_Icon: {fileID: -1412012063857583412, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8036799880576612401 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5232049461429835402} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7, y: 0, z: -6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 862592823362467377} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7113816109367216978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4379465901599906763} + m_Layer: 0 + m_Name: BoomBarrelSpawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4379465901599906763 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7113816109367216978} + 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: + - {fileID: 621479147528365370} + - {fileID: 1367325363437333205} + - {fileID: 381062051182767639} + m_Father: {fileID: 6960399737772514917} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7551236403626437582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7408596293771563199} + m_Layer: 0 + m_Name: GhostBarrelSpawn + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7408596293771563199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7551236403626437582} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2060650435608347874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7726105315207503792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6387793740548406681} + m_Layer: 0 + m_Name: GhostBarrelSpawn (2) + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6387793740548406681 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7726105315207503792} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3, y: 0, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2060650435608347874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7740764229238772796 GameObject: m_ObjectHideFlags: 0 @@ -324,6 +735,39 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7754841016698645137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 862592823362467377} + m_Layer: 0 + m_Name: LavaBarrelSpawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &862592823362467377 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7754841016698645137} + 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: + - {fileID: 5600560070973920792} + - {fileID: 8036799880576612401} + m_Father: {fileID: 6960399737772514917} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9008763449328480997 GameObject: m_ObjectHideFlags: 0 @@ -505,6 +949,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 626585320665436581, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalScale.z value: 2 @@ -533,6 +989,10 @@ PrefabInstance: propertyPath: m_Intensity value: 65 objectReference: {fileID: 0} + - target: {fileID: 1525427743978086377, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 0} - target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalPosition.x value: -6.15 @@ -541,6 +1001,18 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2986811746704976679, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2986811746704976679, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2986811746704976679, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalScale.x value: 8 @@ -553,6 +1025,26 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 6 objectReference: {fileID: 0} + - target: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 4835769001966080896, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_Enabled value: 0 @@ -613,6 +1105,22 @@ PrefabInstance: propertyPath: m_Name value: GhostBarrelMapController objectReference: {fileID: 0} + - target: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8874040642671342955, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: 4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -628,6 +1136,18 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: 6 addedObject: {fileID: 3499223873025712686} + - targetCorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 2060650435608347874} + - targetCorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 4379465901599906763} + - targetCorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 3237375442489846130} + - targetCorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 862592823362467377} - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 4483216113731692748} @@ -702,12 +1222,27 @@ MonoBehaviour: - {fileID: 60991982810615371} - {fileID: 6632898035063951688} SaveStage: 6 - BgmName: + BgmName: GhostBarrelMap InitializeFadeInOutTime: {x: 0.2, y: 1} ClearFadeInOutTime: {x: 0.2, y: 0.3} BossSpawnTransform: {fileID: 6522622582430961898} BossType: 5 BossMapTrigger: {fileID: 486059084208967709} + _ghostBarrelSpawns: + - {fileID: 7408596293771563199} + - {fileID: 9064602016224086767} + - {fileID: 6387793740548406681} + _boomBarrelSpawns: + - {fileID: 621479147528365370} + - {fileID: 1367325363437333205} + - {fileID: 381062051182767639} + _swordBarrelSpawns: + - {fileID: 2804542643795896664} + - {fileID: 6310737807195447950} + _lavaBarrelSpawns: + - {fileID: 5600560070973920792} + - {fileID: 8036799880576612401} + _ghostBarrels: [] --- !u!4 &6328821892107758958 stripped Transform: m_CorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} @@ -718,6 +1253,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8874040642671342955, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 2424043105665738113} m_PrefabAsset: {fileID: 0} +--- !u!4 &6960399737772514917 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} --- !u!4 &7552954649617714894 stripped Transform: m_CorrespondingSourceObject: {fileID: 5292453453235858255, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}