From 169505013b021228c157c64116df25230fe50ccc Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 27 Jan 2025 10:48:47 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=B8=EA=B6=81=205=EB=B2=88=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AC=EC=96=B4=20=ED=9B=84=206=EB=B2=88=EC=A7=B8=20?= =?UTF-8?q?=EB=B3=B4=EC=8A=A4=20=EB=93=B1=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Script/Info/DungeonInfo.cs | 46 +++++++++++++++---- .../UI/Ingame/Dungeon/Ingame_DungeonBase.cs | 1 - Assets/Script/Util/RealCamera.cs | 2 +- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Assets/Script/Info/DungeonInfo.cs b/Assets/Script/Info/DungeonInfo.cs index 282871fcc..bf0a74953 100644 --- a/Assets/Script/Info/DungeonInfo.cs +++ b/Assets/Script/Info/DungeonInfo.cs @@ -2,16 +2,40 @@ using CodeStage.AntiCheat.ObscuredTypes; using System; using System.Collections; using UnityEngine; -using WebSocketSharp; public class DungeonInfo : MonoBehaviourSingletonTemplate { - public ObscuredFloat m_Time; - public ObscuredInt m_MaxDieMobCount; public Action act_Time; public Action act_MobDieCount; - ObscuredInt m_DieCount; + private ObscuredFloat _Time; + public float m_Time + { + get { return _Time; } + set { _Time = value; _Time.RandomizeCryptoKey(); } + } + + private ObscuredInt _MaxDieMobCount; + public int m_MaxDieMobCount + { + get { return _MaxDieMobCount; } + set { _MaxDieMobCount = value; _MaxDieMobCount.RandomizeCryptoKey(); } + } + + private ObscuredInt _DieCount; + public int m_DieCount + { + get { return _DieCount; } + set { _DieCount = value; _DieCount.RandomizeCryptoKey(); } + } + + private ObscuredInt _MazeClear; + public int m_MazeClear + { + get { return _MazeClear; } + set { _MazeClear = value; _MazeClear.RandomizeCryptoKey(); } + } + eDungeon m_Dungeon; public void Stop_Dungeon(bool? win) @@ -27,7 +51,6 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate { yield return null; m_Time -= Time.deltaTime; - m_Time.RandomizeCryptoKey(); act_Time?.Invoke(m_Time); } @@ -37,7 +60,6 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate void Set_MobDie(int mobid) { ++m_DieCount; - m_DieCount.RandomizeCryptoKey(); act_MobDieCount?.Invoke(m_DieCount); if (m_DieCount == m_MaxDieMobCount) { @@ -45,7 +67,8 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate { case eDungeon.d1_Mimic: Stop_Dungeon(true); break; case eDungeon.d2_Maze: - // 다음 층으로 + ++m_MazeClear; + // 포탈 열기 break; case eDungeon.d3_Nightmare: break; @@ -67,10 +90,10 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate }); } - public void Start_Dungeon() + public void Start_Dungeon(bool first) { m_DieCount = 0; - m_DieCount.RandomizeCryptoKey(); + if (first) m_MazeClear = 0; m_Dungeon = MyValue.MyChoiceMapData.Get_MapData().e_Dungeon; switch (m_Dungeon) @@ -108,8 +131,11 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate for (int i = 0; i < dgData.n_MobCount; i++) Make_Mob(eSubRol.None, table_monsterlist.Ins.Get_RandomData(eSubRol.None), dgData, min, max); - if (MyValue.MyChoiceMapData.n_DungeonLv % 6 == 0) + if (m_MazeClear >= 5) + { + m_MazeClear = 0; Make_Mob(eSubRol.Boss, table_monsterlist.Ins.Get_RandomData(eSubRol.Boss), dgData, min, max); + } yield return new WaitForSeconds(1f); StartCoroutine(Co_Update_Time()); diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs index da03bd1d9..c1869353c 100644 --- a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs @@ -13,7 +13,6 @@ public class Ingame_DungeonBase : MonoBehaviour MaxMobCount.RandomizeCryptoKey(); DungeonInfo.Ins.m_MaxDieMobCount = MaxMobCount; - DungeonInfo.Ins.m_MaxDieMobCount.RandomizeCryptoKey(); DungeonInfo.Ins.act_MobDieCount = Add_MobCount; } public virtual void Add_MobCount(int mobid) { } diff --git a/Assets/Script/Util/RealCamera.cs b/Assets/Script/Util/RealCamera.cs index de1221d03..4cf3fe544 100644 --- a/Assets/Script/Util/RealCamera.cs +++ b/Assets/Script/Util/RealCamera.cs @@ -178,7 +178,7 @@ public class RealCamera : MyCoroutine ActorInfo.Ins.All_Stop(false); NewGameUI.Ins.go_Camera.SetActive(true); Time.timeScale = MyValue.Get_GameSpeed(); - DungeonInfo.Ins.Start_Dungeon(); + DungeonInfo.Ins.Start_Dungeon(true); } void Update_Cam()