diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index a086d8e23..ef576e370 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -82,6 +82,3 @@ messageinfo 엄청 느린 버그 버프 이펙트 안 사라짐 -펫 stun, casting, casting_end(idle로 화살표, 이벤트 : SkillEvent), idle 이벤트 : Event_Idle -stun은 idle 2배, casting은 idle 3배 - diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index 6ed579c26..c8ef8b3b3 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -95,8 +95,8 @@ public class Actor : MyCoroutine dic_ccAddRate.Clear(); foreach (var key in dic_skillextra.Keys.ToList()) dic_skillextra[key] = false; - foreach (var key in dic_CCEffect.Keys.ToList()) - dic_CCEffect[key].Off_Imm(); + foreach (var item in dic_CCEffect) + dic_CCEffect[item.Key].Off_Imm(); } protected void Check_CCAddRate(eCC cc, Actor actor, double v = 0) { diff --git a/Assets/Script/Character/Projectile/Skill/Skill_HeavyRain.cs b/Assets/Script/Character/Projectile/Skill/Skill_HeavyRain.cs index 00d170c7d..ae86803f5 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_HeavyRain.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_HeavyRain.cs @@ -34,6 +34,7 @@ public class Skill_HeavyRain : ProjectileBase while (count > 0) { --count; + if (DSUtil.CheckNull(m_ProjecTileData.shooter)) break; var enemies = Get_Enemies(m_ProjecTileData.shooter.transform, area); if (enemies.Count > 0) { diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index ea795e29e..4db752be5 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -143,6 +143,13 @@ public partial class InGameInfo : MyCoroutine //DropEventCoolTime = 60f; } + public void AllEffectOff() + { + foreach (var item in dic_str_Effect) + for (int i = 0; i < item.Value.Count; i++) + item.Value[i].SetActive(false); + } + void OnCheaterDetected() { Time.timeScale = 0f; @@ -158,6 +165,7 @@ public partial class InGameInfo : MyCoroutine /// public void Load_Map(int id) { + AllEffectOff(); MyValue.MyChoiceMapData.n_MapID = id; var Tdata = table_battlemapconfig.Ins.Get_Data(MyValue.MyChoiceMapData.n_MapID); m_GameMode = Tdata.e_MapType;