diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Lusif_B_Skill2.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Lusif_B_Skill2.prefab index 956a287bd..c0ccd6190 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/Lusif_B_Skill2.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/Lusif_B_Skill2.prefab @@ -358,7 +358,7 @@ Transform: m_GameObject: {fileID: 2400445043303193968} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000004371139} - m_LocalPosition: {x: -10, y: 0, z: 5} + m_LocalPosition: {x: 10, y: 0, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -729,7 +729,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4936081769240192992 Transform: m_ObjectHideFlags: 0 @@ -1721,7 +1721,7 @@ PrefabInstance: - target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8, type: 3} diff --git a/Assets/Script/Character/Mob/Boss/Boss_LusifB_Actor.cs b/Assets/Script/Character/Mob/Boss/Boss_LusifB_Actor.cs index 53d2b7998..f2156e3ba 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_LusifB_Actor.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_LusifB_Actor.cs @@ -30,9 +30,6 @@ public class Boss_LusifB_Actor : BossMobActor CoolTime_Skill1 = 1f; CoolTime_Skill2 = 2f; - CoolTime_Skill1 = 10000f; - //CoolTime_Skill2 = 20000f; - action_pb = pb => { pb.transform.eulerAngles = transform.eulerAngles; diff --git a/Assets/Script/Character/Mob/BossMobActor.cs b/Assets/Script/Character/Mob/BossMobActor.cs index ea6250e9c..e8793d99a 100644 --- a/Assets/Script/Character/Mob/BossMobActor.cs +++ b/Assets/Script/Character/Mob/BossMobActor.cs @@ -81,10 +81,6 @@ public class BossMobActor : MobActor base.Get_Damage(_dinfo); if (!CanUseSkill1) CanUseSkill1 = (Get_HP() / Get_MaxHP()) <= 0.9; if (!CanUseSkill2) CanUseSkill2 = (Get_HP() / Get_MaxHP()) <= 0.7; - - // 테스트 - CanUseSkill1 = true; - CanUseSkill2 = true; } protected override void Set_Die() diff --git a/Assets/Script/Character/Projectile/Projectile/ProjectileWaveControl.cs b/Assets/Script/Character/Projectile/Projectile/ProjectileWaveControl.cs index 7d67542a7..7c3bd37ae 100644 --- a/Assets/Script/Character/Projectile/Projectile/ProjectileWaveControl.cs +++ b/Assets/Script/Character/Projectile/Projectile/ProjectileWaveControl.cs @@ -7,7 +7,8 @@ public class ProjectileWaveControl : MonoBehaviour private void OnEnable() { + Debug.Log("웨이브 시작 1"); DSUtil.InActivateGameObjects(gos_wave, 0); - CoroutineMgr.Ins.Set_Coroutine(() => { DSUtil.InActivateGameObjects(gos_wave, 1); }, nextWaveDelayTime); + CoroutineMgr.Ins.Set_Coroutine(() => { Debug.Log("웨이브 시작 2"); gos_wave[1].SetActive(true); }, nextWaveDelayTime); } } \ No newline at end of file diff --git a/Assets/Script/Info/SceneInfo.cs b/Assets/Script/Info/SceneInfo.cs index 9f53f3f35..34a161da0 100644 --- a/Assets/Script/Info/SceneInfo.cs +++ b/Assets/Script/Info/SceneInfo.cs @@ -30,6 +30,7 @@ public class SceneInfo : MonoBehaviour { ActorInfo.Ins.Destroy_All(); IndicatorInfo.Ins.All_Off_Imm(); + if (MonsterSimpleInfo.isIns) MonsterSimpleInfo.Ins.Set_DelLockTarget(true); if (_add) { DSUtil.StartStopWatch();