던전 1,2,3

Assets/Ino_nerdnavis.txt

@@ -77,4 +77,3 @@ UI
  - 장비 도감
  - 유물 도감
  - 정수 연구
- - 던전1, 2, 3

Assets/ResWork/UI/Image/Dungeon/timer frame 6.png.meta

@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 45, y: 0, z: 45, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -139,7 +139,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Script/Character/PCActor.cs

@@ -27,7 +27,8 @@ public class PCActor : MyActor
         if (!m_Enemy && !isUI)
         {
             MyValue.MyPC = null;
-            MyValue.m_RealCamera.Set_Target(null, 0f);
+            if (!DSUtil.CheckNull(MyValue.m_RealCamera))
+                MyValue.m_RealCamera.Set_Target(null, 0f);
         }
     }
 

Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs

@@ -4,7 +4,8 @@ using UnityEngine;
 public class Ingame_Dungeon : MonoBehaviour
 {
     public Ingame_DungeonBase[] ingame_Dungeons; // 0 미믹, 1 미궁, 2 악몽, 3 웨이브
-    public TextMeshProUGUI[] texts_base; // 0 던전 정보, 1 남은 시간
+    public TextMeshProUGUI[] texts_base; // 0 던전 정보, 1 2 남은 시간
+    public GameObject[] gos_time; // 0 전체 시간, 1 미믹 시간
 
     public void Set(float time, int maxMobCount)
     {
@@ -24,22 +25,26 @@ public class Ingame_Dungeon : MonoBehaviour
         switch (MyValue.MyChoiceMapData.Get_DungeonMapData_orNull().e_DungeonType)
         {
             case eDungeon.d1_Mimic:
-                texts_base[0].text = $"{mapData.Get_Name()} Lv.{MyValue.MyChoiceMapData.n_DungeonLv}";
+                texts_base[0].text = $"{mapData.Get_Name()} <color=#86E2E7>Lv.{MyValue.MyChoiceMapData.n_DungeonLv}";
+                DSUtil.InActivateGameObjects(gos_time, 1);
                 break;
             case eDungeon.d2_Maze:
-                texts_base[0].text = $"{mapData.Get_Name()} F{MyValue.MyChoiceMapData.n_DungeonLv}";
+                texts_base[0].text = $"{mapData.Get_Name()} <color=#86E2E7>F{MyValue.MyChoiceMapData.n_DungeonLv}";
+                DSUtil.InActivateGameObjects(gos_time, 0);
                 break;
             case eDungeon.d3_Nightmare:
-                texts_base[0].text = $"{mapData.Get_Name()} {MyValue.MyChoiceMapData.n_Difficult}";
+                texts_base[0].text = $"{mapData.Get_Name()} <color=#86E2E7>{MyValue.MyChoiceMapData.n_Difficult}";
                 DungeonInfo.Ins.Set_Nightmare(ingame_Dungeons[MyValue.MyChoiceMapData.Get_DungeonIndex()].Set_TotalDmg);
+                DSUtil.InActivateGameObjects(gos_time, 0);
                 break;
             case eDungeon.d4_Wave:
-                texts_base[0].text = $"{mapData.Get_Name()} {MyValue.MyChoiceMapData.n_Difficult}";
+                texts_base[0].text = $"{mapData.Get_Name()} <color=#86E2E7>{MyValue.MyChoiceMapData.n_Difficult}";
                 var dgindex = MyValue.MyChoiceMapData.Get_DungeonIndex();
                 DungeonInfo.Ins.Set_Wave(ingame_Dungeons[dgindex].Set_TotalScore, ingame_Dungeons[dgindex].Set_TotalLife,
                                          ingame_Dungeons[dgindex].Set_WaveGold);
+                DSUtil.InActivateGameObjects(gos_time, 0);
                 break;
         }
     }
-    void Set_TextTime(float time) { texts_base[1].text = Mathf.Max(0f, time).ToString("F2"); }
+    void Set_TextTime(float time) { texts_base[1].text = texts_base[2].text = Mathf.Max(0f, time).ToString("F2"); }
 }

Assets/Script/UI/Ingame/Dungeon/Ingame_Mimic.cs

@@ -1,7 +1,9 @@
 using TMPro;
+using UnityEngine.UI;
 
 public class Ingame_Mimic : Ingame_DungeonBase
 {
+    public Slider m_slider;
     public TextMeshProUGUI[] texts_mimic; // 0 몹 수
     public MoneyForm[] rewards;
 
@@ -19,6 +21,7 @@ public class Ingame_Mimic : Ingame_DungeonBase
     public override void Add_MobCount(int mobid)
     {
         ++MobCount;
+        m_slider.value = MobCount / (float)MaxMobCount;
         texts_mimic[0].text = DSUtil.Format("{0}/{1}", MobCount, MaxMobCount);
     }
 }