diff --git a/Assets/ResWork/Table/Export/SkillTypeConfig.json b/Assets/ResWork/Table/Export/SkillTypeConfig.json index 2b219885e..fd53b7b03 100644 --- a/Assets/ResWork/Table/Export/SkillTypeConfig.json +++ b/Assets/ResWork/Table/Export/SkillTypeConfig.json @@ -1 +1 @@ -[{"e_SkillExtraType": "Frost", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "1_Frost", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Frost", "n_EffectInfoDesc": "14001", "exception": "sss"}, {"e_SkillExtraType": "Cure", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "2_Cure", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Cure", "n_EffectInfoDesc": "14002", "exception": "sss"}, {"e_SkillExtraType": "Freezing", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "3_Freezing", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Stun", "n_EffectInfoDesc": "14003", "exception": "sss"}, {"e_SkillExtraType": "Blood", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "4_Blood", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Blood", "n_EffectInfoDesc": "14004", "exception": "sss"}, {"e_SkillExtraType": "Poison", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "5_Poison", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Poison", "n_EffectInfoDesc": "14005", "exception": "sss"}, {"e_SkillExtraType": "Burn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "6_Burn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Burn", "n_EffectInfoDesc": "14006", "exception": "sss"}, {"e_SkillExtraType": "Stun", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "7_Stun", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Stun", "n_EffectInfoDesc": "14007", "exception": ""}, {"e_SkillExtraType": "Slow", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "8_Slow", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Slow", "n_EffectInfoDesc": "14008", "exception": ""}, {"e_SkillExtraType": "StatUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "9_StatUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_StatUp", "n_EffectInfoDesc": "14009", "exception": ""}, {"e_SkillExtraType": "ManaShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "10_ManaShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_ManaShield", "n_EffectInfoDesc": "14010", "exception": ""}, {"e_SkillExtraType": "SwordShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "11_SwordShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_SwordShield", "n_EffectInfoDesc": "14011", "exception": ""}, {"e_SkillExtraType": "SpeedUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "12_SpeedUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_SpeedUp", "n_EffectInfoDesc": "14012", "exception": ""}, {"e_SkillExtraType": "DefenceDecrease", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "13_DefenceDecrease", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_DefenceDecrease", "n_EffectInfoDesc": "14013", "exception": ""}, {"e_SkillExtraType": "Aggro", "e_SkillExtraTiming": "Skill", "s_SkillNoticeIconPath": "14_Aggro", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Aggro", "n_EffectInfoDesc": "14014", "exception": "스킬에서 처리"}, {"e_SkillExtraType": "VampirHeal", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "15_VampirHeal", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_VampirHeal", "n_EffectInfoDesc": "14015", "exception": ""}, {"e_SkillExtraType": "Knockback", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "16_Knockback", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "None", "n_EffectInfoDesc": "14016", "exception": ""}, {"e_SkillExtraType": "Airborne", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "17_Airborne", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "None", "n_EffectInfoDesc": "14017", "exception": ""}, {"e_SkillExtraType": "Curse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "18_Curse", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Curse", "n_EffectInfoDesc": "14018", "exception": ""}, {"e_SkillExtraType": "ManaBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "19_ManaBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_ManaBurn", "n_EffectInfoDesc": "14019", "exception": ""}, {"e_SkillExtraType": "HPBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "20_HPBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_HPBurn", "n_EffectInfoDesc": "14020", "exception": ""}, {"e_SkillExtraType": "SilenceCurse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "21_SilenceCurse", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_SilenceCurse", "n_EffectInfoDesc": "14021", "exception": ""}, {"e_SkillExtraType": "Barrier", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "22_Barrier", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Barrier", "n_EffectInfoDesc": "14022", "exception": ""}, {"e_SkillExtraType": "Reincarnation", "e_SkillExtraTiming": "AfterDie", "s_SkillNoticeIconPath": "23_Reincarnation", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Reincarnation", "n_EffectInfoDesc": "14023", "exception": ""}, {"e_SkillExtraType": "Blind", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "24_Blind", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Blind", "n_EffectInfoDesc": "14024", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_SPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "25_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_SPD", "n_EffectInfoDesc": "14025", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_ADEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "26_PerHPBuff_ADEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_ADEF", "n_EffectInfoDesc": "14026", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AMDEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "27_PerHPBuff_AMDEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AMDEF", "n_EffectInfoDesc": "14027", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AASPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "28_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AASPD", "n_EffectInfoDesc": "14028", "exception": ""}] \ No newline at end of file +[{"e_SkillExtraType": "Frost", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "1_Frost", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Frost", "n_EffectInfoDesc": "14001", "exception": "sss"}, {"e_SkillExtraType": "Cure", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "2_Cure", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Cure", "n_EffectInfoDesc": "14002", "exception": "sss"}, {"e_SkillExtraType": "Freezing", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "3_Freezing", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Stun", "n_EffectInfoDesc": "14003", "exception": "sss"}, {"e_SkillExtraType": "Blood", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "4_Blood", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Blood", "n_EffectInfoDesc": "14004", "exception": "sss"}, {"e_SkillExtraType": "Poison", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "5_Poison", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Poison", "n_EffectInfoDesc": "14005", "exception": "sss"}, {"e_SkillExtraType": "Burn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "6_Burn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Burn", "n_EffectInfoDesc": "14006", "exception": "sss"}, {"e_SkillExtraType": "Stun", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "7_Stun", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Stun", "n_EffectInfoDesc": "14007", "exception": ""}, {"e_SkillExtraType": "Slow", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "8_Slow", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Slow", "n_EffectInfoDesc": "14008", "exception": ""}, {"e_SkillExtraType": "StatUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "9_StatUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_StatUp", "n_EffectInfoDesc": "14009", "exception": ""}, {"e_SkillExtraType": "ManaShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "10_ManaShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_ManaShield", "n_EffectInfoDesc": "14010", "exception": ""}, {"e_SkillExtraType": "SwordShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "11_SwordShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_SwordShield", "n_EffectInfoDesc": "14011", "exception": ""}, {"e_SkillExtraType": "SpeedUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "12_SpeedUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_SpeedUp", "n_EffectInfoDesc": "14012", "exception": ""}, {"e_SkillExtraType": "DefenceDecrease", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "13_DefenceDecrease", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_DefenceDecrease", "n_EffectInfoDesc": "14013", "exception": ""}, {"e_SkillExtraType": "Aggro", "e_SkillExtraTiming": "Skill", "s_SkillNoticeIconPath": "14_Aggro", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Aggro", "n_EffectInfoDesc": "14014", "exception": "스킬에서 처리"}, {"e_SkillExtraType": "VampirHeal", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "15_VampirHeal", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_VampirHeal", "n_EffectInfoDesc": "14015", "exception": ""}, {"e_SkillExtraType": "Knockback", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "16_Knockback", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "None", "n_EffectInfoDesc": "14016", "exception": ""}, {"e_SkillExtraType": "Airborne", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "17_Airborne", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "None", "n_EffectInfoDesc": "14017", "exception": ""}, {"e_SkillExtraType": "Curse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "18_Curse", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Curse", "n_EffectInfoDesc": "14018", "exception": ""}, {"e_SkillExtraType": "ManaBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "19_ManaBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_ManaBurn", "n_EffectInfoDesc": "14019", "exception": ""}, {"e_SkillExtraType": "HPBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "20_HPBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_HPBurn", "n_EffectInfoDesc": "14020", "exception": ""}, {"e_SkillExtraType": "SilenceCurse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "21_SilenceCurse", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_SilenceCurse", "n_EffectInfoDesc": "14021", "exception": ""}, {"e_SkillExtraType": "Barrier", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "22_Barrier", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Barrier", "n_EffectInfoDesc": "14022", "exception": ""}, {"e_SkillExtraType": "Reincarnation", "e_SkillExtraTiming": "AfterDie", "s_SkillNoticeIconPath": "23_Reincarnation", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Reincarnation", "n_EffectInfoDesc": "14023", "exception": ""}, {"e_SkillExtraType": "Blind", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "24_Blind", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_Blind", "n_EffectInfoDesc": "14024", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_SPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "25_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_SPD", "n_EffectInfoDesc": "14025", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_ADEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "26_PerHPBuff_ADEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_ADEF", "n_EffectInfoDesc": "14026", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AMDEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "27_PerHPBuff_AMDEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AMDEF", "n_EffectInfoDesc": "14027", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AASPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "28_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AASPD", "n_EffectInfoDesc": "14028", "exception": ""}, {"e_SkillExtraType": "KnockbackStun", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "29_KnockbackStun", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "n_EffectScale": "1", "e_SkillEffect": "None", "n_EffectInfoDesc": "14029", "exception": ""}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index f023f4529..1b21e7db8 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Mobs/FieldBoss/Mega_Ice_Golem.prefab b/Assets/Res_Addr/Mobs/FieldBoss/Mega_Ice_Golem.prefab index 0ad2c8178..317ad2ae3 100644 --- a/Assets/Res_Addr/Mobs/FieldBoss/Mega_Ice_Golem.prefab +++ b/Assets/Res_Addr/Mobs/FieldBoss/Mega_Ice_Golem.prefab @@ -512,12 +512,12 @@ MonoBehaviour: Skill1Dmg: 3.5 Skill1StunTime: 2 Skill1Indicator: IceGolem_Skill1_Indicator - bbbbbbbbbbbbbbbbbbbbbbbb: 0 + Perforation_Line: 0 Skill2CoolTime: 10 Skill2Speed: 7 Skill2Dmg: 3.5 Skill2KnockBackTime: 0.3 - Skill2StunTime: 2 + Skill2StunTime: 1 Skill2Indicator: IceGolem_Skill2_Indicator --- !u!95 &6834610517749107232 Animator: diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index 1543954b7..594744ac5 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -1174,6 +1174,9 @@ public class Actor : MyCoroutine case eSkillExtraType.Blind: GlobalVolumeMgr.Ins.Set(1, LifeTime); break; + case eSkillExtraType.KnockbackStun: + KnockBack(val1, 4f, () => { Stun(val2, true); }); + break; } if (!dic_skillextra.ContainsKey(skillExtraData.e_SkillExtraType)) @@ -1476,13 +1479,13 @@ public class Actor : MyCoroutine #endregion #region 상태이상 : 넉백 float StunAfterKnockBackTime = 0f; - public virtual void KnockBack(double _time, float speed = 4f) + public virtual void KnockBack(double _time, float speed = 4f, Action after = null) { if (IsRole(eRole.OBJ) || IsSubRole(eSubRol.Boss) || DSUtil.CheckNull(m_NavMeshAgent) || IsCC()) return; if (dic_ccData[eCC.KnockBack].CCTime < _time) - StartCoroutine(Co_KnockBack(_time, speed)); + StartCoroutine(Co_KnockBack(_time, speed, after)); } - IEnumerator Co_KnockBack(double _time, float speed) + IEnumerator Co_KnockBack(double _time, float speed, Action after) { dic_ccData[eCC.KnockBack].CCTime = _time; @@ -1501,6 +1504,7 @@ public class Actor : MyCoroutine dic_ccData[eCC.KnockBack].CCTime = 0f; OriginalAnimSpeed = 1f; On_NavMeshAgent(); + after?.Invoke(); if (StunAfterKnockBackTime > 0) { diff --git a/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs b/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs index ff0ede2bf..71d8d5a09 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_IceGolem.cs @@ -27,7 +27,7 @@ public class Boss_IceGolem : BossMobActor [Header("스킬2 넉백 시간")] public float Skill2KnockBackTime = 0.3f; [Header("스킬2 스턴 시간")] - public float Skill2StunTime = 2f; + public float Skill2StunTime = 1f; [Header("스킬2 인디케이터")] public string Skill2Indicator = "IceGolem_Skill2_Indicator"; @@ -125,4 +125,9 @@ public class Boss_IceGolem : BossMobActor protected override float Get_Skill2Dmg() { return Skill2Dmg; } protected override Vector3 Get_Skill2Pos() { return Get_position(); } + protected override void Set_Skill2Projectile(ProjectileBase pb) + { + var pd = pb.Get_ProjectTileData(); + pd.Set_SkillExtra_MakeSkillListTableData(eSkillExtraType.KnockbackStun, Skill2KnockBackTime, Skill2StunTime); + } } \ No newline at end of file diff --git a/Assets/Script/Character/Mob/BullRushMobActor.cs b/Assets/Script/Character/Mob/BullRushMobActor.cs index 43a77d486..9a1f6d48d 100644 --- a/Assets/Script/Character/Mob/BullRushMobActor.cs +++ b/Assets/Script/Character/Mob/BullRushMobActor.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using UnityEngine; @@ -17,7 +18,7 @@ public class BullRushMobActor : MobActor StartCoroutine(Co_Attack()); } - public override void KnockBack(double _time, float speed = 4) + public override void KnockBack(double _time, float speed = 4, Action after = null) { return; } diff --git a/Assets/Script/Character/Projectile/ProjectileBase.cs b/Assets/Script/Character/Projectile/ProjectileBase.cs index 9c3e44183..a7c92e827 100644 --- a/Assets/Script/Character/Projectile/ProjectileBase.cs +++ b/Assets/Script/Character/Projectile/ProjectileBase.cs @@ -108,14 +108,15 @@ public class ProjectileData pd.DamageArea = DamageArea; } - public void Set_SkillExtra_MakeSkillListTableData(eSkillExtraType skillExtraType, float lifetime, float ccRate = 1f) + public void Set_SkillExtra_MakeSkillListTableData(eSkillExtraType skillExtraType, float val1, float val2 = 0f, 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_ExtraValue1 = val1, + f_ExtraValue2 = val2, f_ExtraValue4 = ccRate }; } diff --git a/Assets/Script/Table/Skill/table_skilllist.cs b/Assets/Script/Table/Skill/table_skilllist.cs index 90c146e66..3144005a7 100644 --- a/Assets/Script/Table/Skill/table_skilllist.cs +++ b/Assets/Script/Table/Skill/table_skilllist.cs @@ -8,7 +8,7 @@ public enum eSkillTarget { Enemy, Self, SelfEnemy, Team, Pet } public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield, SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, ManaBurn, HPBurn, SilenceCurse, Barrier, Reincarnation, Blind, PerHPBuff_SPD, PerHPBuff_ADEF, PerHPBuff_AMDEF, - PerHPBuff_AASPD, } + PerHPBuff_AASPD, KnockbackStun, } public class SkillListTableData : TableDataBase {