From 1e6d824835407d3055498d2e6b8247715c6f4e96 Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 10 Mar 2025 16:25:29 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EB=94=A9=20=EA=BA=BC=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=ED=83=80=EC=9D=B4=EB=B0=8D=20=EC=A2=80=20=EB=8D=94?= =?UTF-8?q?=20=EC=A0=95=EA=B5=90=ED=95=98=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Res_Addr/MainUI/NewGameUI.prefab | 46 ++++++++++++------------- Assets/Script/Character/Mob/MobActor.cs | 10 +++--- Assets/Script/Mgr/MobControlMgrList.cs | 2 +- Assets/Script/UI/ETC/LoadingUI.cs | 17 +++++++-- Assets/Script/UI/NewGameUI.cs | 1 + 5 files changed, 45 insertions(+), 31 deletions(-) diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index adbe18cea..698c5ada5 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -24592,9 +24592,9 @@ RectTransform: - {fileID: 516909275809143126} m_Father: {fileID: 9109461315942411836} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40.665, y: -41.89} m_SizeDelta: {x: 81.33, y: 83.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3512535646758721854 @@ -37020,7 +37020,7 @@ RectTransform: m_Father: {fileID: 925291058961817483} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -46863,9 +46863,9 @@ RectTransform: - {fileID: 5070997152126263843} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 38.1, y: -38.26} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6794977624464831537 @@ -47388,7 +47388,7 @@ RectTransform: m_Father: {fileID: 3850105965408971949} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -52112,9 +52112,9 @@ RectTransform: - {fileID: 9215642726506370053} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 252.56, y: -38.26} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6285734242704375772 @@ -52188,7 +52188,7 @@ RectTransform: m_Father: {fileID: 8846584700612234991} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.076, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -53751,7 +53751,7 @@ RectTransform: m_Father: {fileID: 1406900139135982907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.412, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -54195,9 +54195,9 @@ RectTransform: - {fileID: 7400847127857308737} m_Father: {fileID: 9109461315942411836} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 143.995, y: -41.89} m_SizeDelta: {x: 81.33, y: 83.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2897572520046386252 @@ -57572,9 +57572,9 @@ RectTransform: - {fileID: 8001933736921823976} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 145.32999, y: -38.26} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4650173689224874701 @@ -90881,7 +90881,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8541309915134075684 RectTransform: m_ObjectHideFlags: 0 @@ -93514,7 +93514,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2647977513349308266 RectTransform: m_ObjectHideFlags: 0 @@ -136391,12 +136391,12 @@ PrefabInstance: - target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.845 objectReference: {fileID: 0} - target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6957816333201879133, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index 06e528ecc..eb3689c52 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -420,11 +420,11 @@ public class MobActor : Actor if (IsSubRole(eSubRol.Boss)) { - Time.timeScale = 0.3f; - Set_Coroutine(() => - { - Time.timeScale = MyValue.Get_GameSpeed(); - }, 0.4f); + //Time.timeScale = 0.3f; + //Set_Coroutine(() => + //{ + // Time.timeScale = MyValue.Get_GameSpeed(); + //}, 0.4f); sdata.Add_MissionCount(MyValue.arr_Mission[0], 3); sdata.Add_MissionCount(MyValue.arr_Mission[1], 2); } diff --git a/Assets/Script/Mgr/MobControlMgrList.cs b/Assets/Script/Mgr/MobControlMgrList.cs index 8a039b6b8..0502444f4 100644 --- a/Assets/Script/Mgr/MobControlMgrList.cs +++ b/Assets/Script/Mgr/MobControlMgrList.cs @@ -25,6 +25,6 @@ public class MobControlMgrList : MonoBehaviourSingletonTemplate currentHandle; + List list_loadingComplete = new List { false, false }; public int MaxImage = 1; int m_index = 1; @@ -40,6 +42,9 @@ public class LoadingUI : MyCoroutine loadingimg.enabled = true; loadingimg.texture = handle.Result; }); + + for (int i = 0; i < list_loadingComplete.Count; i++) + list_loadingComplete[i] = false; } public void Set_LoadingSlider(float proc) { @@ -47,8 +52,16 @@ public class LoadingUI : MyCoroutine texts[1].text = $"{proc * 100f:N0}%"; } - public void End_Loading() + public void End_Loading(int index) { - go.SetActive(false); + list_loadingComplete[index] = true; + bool endloading = true; + for (int i = 0; i < list_loadingComplete.Count; i++) + { + endloading = list_loadingComplete[i]; + if (!endloading) break; + } + + if (endloading) go.SetActive(false); } } \ No newline at end of file diff --git a/Assets/Script/UI/NewGameUI.cs b/Assets/Script/UI/NewGameUI.cs index e5943b9a6..14d4f38d7 100644 --- a/Assets/Script/UI/NewGameUI.cs +++ b/Assets/Script/UI/NewGameUI.cs @@ -68,6 +68,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate } m_BattleUI.Set(eUICardType.Use, ServerInfo.Ins.m_ServerData.Equip.Preset); + LoadingUI.Ins.End_Loading(1); } public void Refresh_DungeonUI(int addmob = 0) {