로딩 꺼지는 타이밍 좀 더 정교하게
This commit is contained in:
parent
b4bfaffdbf
commit
1e6d824835
|
|
@ -24592,9 +24592,9 @@ RectTransform:
|
||||||
- {fileID: 516909275809143126}
|
- {fileID: 516909275809143126}
|
||||||
m_Father: {fileID: 9109461315942411836}
|
m_Father: {fileID: 9109461315942411836}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 40.665, y: -41.89}
|
||||||
m_SizeDelta: {x: 81.33, y: 83.78}
|
m_SizeDelta: {x: 81.33, y: 83.78}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3512535646758721854
|
--- !u!222 &3512535646758721854
|
||||||
|
|
@ -37020,7 +37020,7 @@ RectTransform:
|
||||||
m_Father: {fileID: 925291058961817483}
|
m_Father: {fileID: 925291058961817483}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 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_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -46863,9 +46863,9 @@ RectTransform:
|
||||||
- {fileID: 5070997152126263843}
|
- {fileID: 5070997152126263843}
|
||||||
m_Father: {fileID: 795777954291663711}
|
m_Father: {fileID: 795777954291663711}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 38.1, y: -38.26}
|
||||||
m_SizeDelta: {x: 76.2, y: 76.52}
|
m_SizeDelta: {x: 76.2, y: 76.52}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6794977624464831537
|
--- !u!222 &6794977624464831537
|
||||||
|
|
@ -47388,7 +47388,7 @@ RectTransform:
|
||||||
m_Father: {fileID: 3850105965408971949}
|
m_Father: {fileID: 3850105965408971949}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 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_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -52112,9 +52112,9 @@ RectTransform:
|
||||||
- {fileID: 9215642726506370053}
|
- {fileID: 9215642726506370053}
|
||||||
m_Father: {fileID: 795777954291663711}
|
m_Father: {fileID: 795777954291663711}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 252.56, y: -38.26}
|
||||||
m_SizeDelta: {x: 76.2, y: 76.52}
|
m_SizeDelta: {x: 76.2, y: 76.52}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6285734242704375772
|
--- !u!222 &6285734242704375772
|
||||||
|
|
@ -52188,7 +52188,7 @@ RectTransform:
|
||||||
m_Father: {fileID: 8846584700612234991}
|
m_Father: {fileID: 8846584700612234991}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 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_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -53751,7 +53751,7 @@ RectTransform:
|
||||||
m_Father: {fileID: 1406900139135982907}
|
m_Father: {fileID: 1406900139135982907}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 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_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -54195,9 +54195,9 @@ RectTransform:
|
||||||
- {fileID: 7400847127857308737}
|
- {fileID: 7400847127857308737}
|
||||||
m_Father: {fileID: 9109461315942411836}
|
m_Father: {fileID: 9109461315942411836}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 143.995, y: -41.89}
|
||||||
m_SizeDelta: {x: 81.33, y: 83.78}
|
m_SizeDelta: {x: 81.33, y: 83.78}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2897572520046386252
|
--- !u!222 &2897572520046386252
|
||||||
|
|
@ -57572,9 +57572,9 @@ RectTransform:
|
||||||
- {fileID: 8001933736921823976}
|
- {fileID: 8001933736921823976}
|
||||||
m_Father: {fileID: 795777954291663711}
|
m_Father: {fileID: 795777954291663711}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 145.32999, y: -38.26}
|
||||||
m_SizeDelta: {x: 76.2, y: 76.52}
|
m_SizeDelta: {x: 76.2, y: 76.52}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4650173689224874701
|
--- !u!222 &4650173689224874701
|
||||||
|
|
@ -90881,7 +90881,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &8541309915134075684
|
--- !u!224 &8541309915134075684
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -93514,7 +93514,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &2647977513349308266
|
--- !u!224 &2647977513349308266
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -136391,12 +136391,12 @@ PrefabInstance:
|
||||||
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.x
|
propertyPath: m_AnchorMax.x
|
||||||
value: 0
|
value: 0.845
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6957816333201879133, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
- target: {fileID: 6957816333201879133, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
|
||||||
|
|
@ -420,11 +420,11 @@ public class MobActor : Actor
|
||||||
|
|
||||||
if (IsSubRole(eSubRol.Boss))
|
if (IsSubRole(eSubRol.Boss))
|
||||||
{
|
{
|
||||||
Time.timeScale = 0.3f;
|
//Time.timeScale = 0.3f;
|
||||||
Set_Coroutine(() =>
|
//Set_Coroutine(() =>
|
||||||
{
|
//{
|
||||||
Time.timeScale = MyValue.Get_GameSpeed();
|
// Time.timeScale = MyValue.Get_GameSpeed();
|
||||||
}, 0.4f);
|
//}, 0.4f);
|
||||||
sdata.Add_MissionCount(MyValue.arr_Mission[0], 3);
|
sdata.Add_MissionCount(MyValue.arr_Mission[0], 3);
|
||||||
sdata.Add_MissionCount(MyValue.arr_Mission[1], 2);
|
sdata.Add_MissionCount(MyValue.arr_Mission[1], 2);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,6 @@ public class MobControlMgrList : MonoBehaviourSingletonTemplate<MobControlMgrLis
|
||||||
yield return null; // 다음 프레임까지 대기
|
yield return null; // 다음 프레임까지 대기
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingUI.Ins.End_Loading();
|
LoadingUI.Ins.End_Loading(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.AddressableAssets;
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
@ -15,6 +16,7 @@ public class LoadingUI : MyCoroutine
|
||||||
|
|
||||||
public RawImage loadingimg;
|
public RawImage loadingimg;
|
||||||
AsyncOperationHandle<Texture> currentHandle;
|
AsyncOperationHandle<Texture> currentHandle;
|
||||||
|
List<bool> list_loadingComplete = new List<bool> { false, false };
|
||||||
|
|
||||||
public int MaxImage = 1;
|
public int MaxImage = 1;
|
||||||
int m_index = 1;
|
int m_index = 1;
|
||||||
|
|
@ -40,6 +42,9 @@ public class LoadingUI : MyCoroutine
|
||||||
loadingimg.enabled = true;
|
loadingimg.enabled = true;
|
||||||
loadingimg.texture = handle.Result;
|
loadingimg.texture = handle.Result;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
for (int i = 0; i < list_loadingComplete.Count; i++)
|
||||||
|
list_loadingComplete[i] = false;
|
||||||
}
|
}
|
||||||
public void Set_LoadingSlider(float proc)
|
public void Set_LoadingSlider(float proc)
|
||||||
{
|
{
|
||||||
|
|
@ -47,8 +52,16 @@ public class LoadingUI : MyCoroutine
|
||||||
texts[1].text = $"{proc * 100f:N0}%";
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -68,6 +68,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
|
||||||
}
|
}
|
||||||
|
|
||||||
m_BattleUI.Set(eUICardType.Use, ServerInfo.Ins.m_ServerData.Equip.Preset);
|
m_BattleUI.Set(eUICardType.Use, ServerInfo.Ins.m_ServerData.Equip.Preset);
|
||||||
|
LoadingUI.Ins.End_Loading(1);
|
||||||
}
|
}
|
||||||
public void Refresh_DungeonUI(int addmob = 0)
|
public void Refresh_DungeonUI(int addmob = 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue