From a69366cbbbcacc4e1b038f95a15ef2ad800e53ff Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 20 Feb 2025 10:00:59 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=8A=A4=20=EA=B3=A8?= =?UTF-8?q?=EB=A0=98=20=EC=8A=A4=ED=82=AC1=20=EC=8A=A4=ED=84=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Script/Character/Mob/Boss/Boss_IceGolem.cs | 8 +++++++- Assets/Script/Character/Mob/BossMobActor.cs | 17 ++++------------- .../Character/Projectile/ProjectileBase.cs | 12 ++++++++++++ Assets/Script/Util/MyClass.cs | 5 ----- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs b/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs index 40f0750e4..4fb905e0f 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs @@ -10,9 +10,10 @@ public class Boss_IceGolem : BossMobActor public float Skill1Speed = 5f; [Header("스킬1 데미지")] public float Skill1Dmg = 3.5f; + [Header("스킬1 스턴 시간")] + public float Skill1StunTime = 2f; float m_skill1cooltime; - BossCCData skill1CCdata = new BossCCData { m_eSkillExtraType1 = eSkillExtraType.Stun, m_LifeTime1 = 2f }; protected override void Update() { @@ -40,4 +41,9 @@ public class Boss_IceGolem : BossMobActor protected override float Get_Skill1Dmg() { return Skill1Dmg; } protected override Vector3 Get_Skill1Pos() { return Get_Center_position(); } + protected override void Set_Skill1Projectile(ProjectileBase pb) + { + var pd = pb.Get_ProjectTileData(); + pd.Set_SkillExtra_MakeSkillListTableData(eSkillExtraType.Stun, Skill1StunTime); + } } \ No newline at end of file diff --git a/Assets/Script/Character/Mob/BossMobActor.cs b/Assets/Script/Character/Mob/BossMobActor.cs index dd758317e..12209e41f 100644 --- a/Assets/Script/Character/Mob/BossMobActor.cs +++ b/Assets/Script/Character/Mob/BossMobActor.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; -using static UnityEngine.GraphicsBuffer; public class BossMobActor : MobActor { @@ -90,29 +89,21 @@ public class BossMobActor : MobActor protected virtual float Get_Skill1Dmg() { return 1f; } protected virtual Vector3 Get_Skill1Pos() { return Get_CenterPositionFoward(); } - protected virtual BossCCData Get_Skill1CCData() { return null; } + protected virtual void Set_Skill1Projectile(ProjectileBase pb) { } protected virtual void BossProjectile2(string s) { if (ProjectileInfo.ProjectileInfoOn) ProjectileInfo.Ins.Shoot_Projectile(m_MonsterTableData.s_Porjectile2, this, m_Target, Get_Skill1Dmg(), Get_Skill1Pos(), - m_MonsterTableData.f_ProjectileLifeTime2, - pb => - { - var ccData = Get_Skill1CCData(); - if (!DSUtil.CheckNull(ccData)) - { - var pd = pb.Get_ProjectTileData(); - pd.list_eSkillExtraType = ccData.list_eSkillExtraType; - } - }); + m_MonsterTableData.f_ProjectileLifeTime2, pb => { Set_Skill1Projectile(pb); }); } protected virtual float Get_Skill2Dmg() { return 1f; } protected virtual Vector3 Get_Skill2Pos() { return Get_CenterPositionFoward(); } + protected virtual void Set_Skill2Projectile(ProjectileBase pb) { } protected virtual void BossProjectile3(string s) { if (ProjectileInfo.ProjectileInfoOn) ProjectileInfo.Ins.Shoot_Projectile(m_MonsterTableData.s_Porjectile3, this, m_Target, Get_Skill2Dmg(), Get_Skill2Pos(), - m_MonsterTableData.f_ProjectileLifeTime3); + m_MonsterTableData.f_ProjectileLifeTime3, pb => { Set_Skill2Projectile(pb); }); } protected void Run_byUseSkill(float range, float speed, Action moveend) diff --git a/Assets/Script/Character/Projectile/ProjectileBase.cs b/Assets/Script/Character/Projectile/ProjectileBase.cs index 0602b08ef..9c3e44183 100644 --- a/Assets/Script/Character/Projectile/ProjectileBase.cs +++ b/Assets/Script/Character/Projectile/ProjectileBase.cs @@ -107,6 +107,18 @@ public class ProjectileData pd.CC_AddVal2 = CC_AddVal2; pd.DamageArea = DamageArea; } + + public void Set_SkillExtra_MakeSkillListTableData(eSkillExtraType skillExtraType, float lifetime, float ccRate = 1f) + { + e_SkillExtraType = skillExtraType; + m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(skillExtraType); + m_SkillListTableData = new SkillListTableData + { + e_SkillExtraType = skillExtraType, + f_ExtraValue1 = lifetime, + f_ExtraValue4 = ccRate + }; + } } public class ProjectileBase : MonoBehaviour diff --git a/Assets/Script/Util/MyClass.cs b/Assets/Script/Util/MyClass.cs index 70c4b8a4a..aed4ba54c 100644 --- a/Assets/Script/Util/MyClass.cs +++ b/Assets/Script/Util/MyClass.cs @@ -237,11 +237,6 @@ public class CCData public double CCReduceTime;// { get { return _CCReduceTime; } set { _CCReduceTime = value; _CCReduceTime.RandomizeCryptoKey(); } } public float CC1Sec; } -public class BossCCData -{ - public List list_eSkillExtraType = new List(); - public List list_LifeTime = new List(); -} public class CountLevelData {