diff --git a/Client/Assets/0_Scenes/Title.unity b/Client/Assets/0_Scenes/Title.unity index 814c2539..bfb0ea4d 100644 --- a/Client/Assets/0_Scenes/Title.unity +++ b/Client/Assets/0_Scenes/Title.unity @@ -168,6 +168,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f71dc23ac80b51f4087e4120eb7f7893, type: 3} m_Name: m_EditorClassIdentifier: + testlist: 0100000002000000030000000400000005000000 --- !u!1 &753435365 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/1_Script/System/GameManager.cs b/Client/Assets/1_Script/System/GameManager.cs index 3f74bf4c..2246690e 100644 --- a/Client/Assets/1_Script/System/GameManager.cs +++ b/Client/Assets/1_Script/System/GameManager.cs @@ -9,14 +9,21 @@ public class GameManager : DontDestroy public eScene NowScene; public bool Over; + private CoroutineHandle corExcel; + + /// + /// 현재 엑셀 처리가 끝났는지 확인하는 부분. + /// + public bool isExcel { get { return corExcel != null || corExcel.IsRunning; } } + protected override void OnStart() { DownlodeResp request = new DownlodeResp(); request.Request((data) => { Statics.excelDatas = JsonConvert.DeserializeObject(Crypto.Instance.Decompress(data.data)); + corExcel = Timing.RunCoroutine(Statics.excelDatas.ToJson()); Statics.version = data.version; - Timing.RunCoroutine(Statics.excelDatas.ToJson()); }); } diff --git a/Client/Assets/1_Script/Test.cs b/Client/Assets/1_Script/Test.cs index 9ebe59f7..64b86e24 100644 --- a/Client/Assets/1_Script/Test.cs +++ b/Client/Assets/1_Script/Test.cs @@ -9,7 +9,7 @@ public class Test : MonoBehaviour [ContextMenu("test")] public void test() { - Debug.Log(JsonConvert.SerializeObject(testlist)); + //Debug.Log(JsonConvert.SerializeObject(testlist)); //DownlodeResp request = new DownlodeResp(); //request.Request((data) => //{