diff --git a/Client/Assets/1_Script/System/Datas/ExcelDatas.cs b/Client/Assets/1_Script/System/Datas/ExcelDatas.cs index 4809cea4..e6390758 100644 --- a/Client/Assets/1_Script/System/Datas/ExcelDatas.cs +++ b/Client/Assets/1_Script/System/Datas/ExcelDatas.cs @@ -1,8 +1,26 @@ -using System.Collections; +using MEC; using System.Collections.Generic; -using UnityEngine; public class ExcelDatas { - public Dictionary ½ÃÆ®1; + public Dictionary unitData; + + + + + public IEnumerator ToJson() + { + yield return Timing.WaitForSeconds(0); + foreach (var data in unitData) + { + data.Value.toJson(); + UnityEngine.Debug.Log(data.Value.name); + } + yield return Timing.WaitForSeconds(0); + } } + +public abstract class Excel +{ + public abstract void toJson(); +} \ No newline at end of file diff --git a/Client/Assets/1_Script/System/Datas/UnitData.cs b/Client/Assets/1_Script/System/Datas/UnitData.cs new file mode 100644 index 00000000..e8d8737b --- /dev/null +++ b/Client/Assets/1_Script/System/Datas/UnitData.cs @@ -0,0 +1,22 @@ +using Newtonsoft.Json; +using System.Collections.Generic; +using System.Diagnostics; + +public class UnitData : Excel +{ + public int index; + public string name; + public int hp; + public int attack; + public float attack_speed; + public int defense; + public float move_speed; + public string buy_list; + + public List buy; + + public override void toJson() + { + buy = JsonConvert.DeserializeObject>(buy_list); + } +} diff --git a/Client/Assets/1_Script/System/Datas/시트1.cs.meta b/Client/Assets/1_Script/System/Datas/UnitData.cs.meta similarity index 100% rename from Client/Assets/1_Script/System/Datas/시트1.cs.meta rename to Client/Assets/1_Script/System/Datas/UnitData.cs.meta diff --git a/Client/Assets/1_Script/System/Datas/시트1.cs b/Client/Assets/1_Script/System/Datas/시트1.cs deleted file mode 100644 index 58e2b870..00000000 --- a/Client/Assets/1_Script/System/Datas/시트1.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class 시트1 -{ - public int index; - public string test1; - public int test2; - public testenums test3; - public string test4; - public DateTime test5; -} - -public enum testenums -{ - none = 0, - aaa, - bbb, - ccc, - ddd -} diff --git a/Client/Assets/1_Script/System/GameManager.cs b/Client/Assets/1_Script/System/GameManager.cs index 6b99a5cf..3f74bf4c 100644 --- a/Client/Assets/1_Script/System/GameManager.cs +++ b/Client/Assets/1_Script/System/GameManager.cs @@ -1,6 +1,5 @@ -using Newtonsoft.Json; -using System.Diagnostics; -using UnityEditor.UIElements; +using MEC; +using Newtonsoft.Json; using UnityEngine.SceneManagement; public class GameManager : DontDestroy @@ -17,17 +16,7 @@ public class GameManager : DontDestroy { Statics.excelDatas = JsonConvert.DeserializeObject(Crypto.Instance.Decompress(data.data)); Statics.version = data.version; - foreach (var item in Statics.excelDatas.시트1) - { - string newdata = "\n"; - newdata += $"index : {item.Value.index}\n"; - newdata += $"test1 : {item.Value.test1}\n"; - newdata += $"test2 : {item.Value.test2}\n"; - newdata += $"test3 : {item.Value.test3}\n"; - newdata += $"test4 : {item.Value.test4}\n"; - newdata += $"test5 : {item.Value.test5}\n"; - UnityEngine.Debug.Log($"data : {newdata}"); - } + Timing.RunCoroutine(Statics.excelDatas.ToJson()); }); } diff --git a/Client/Assets/1_Script/Test.cs b/Client/Assets/1_Script/Test.cs index 393989d4..9ebe59f7 100644 --- a/Client/Assets/1_Script/Test.cs +++ b/Client/Assets/1_Script/Test.cs @@ -1,20 +1,22 @@ +using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using UnityEngine; public class Test : MonoBehaviour { + public List testlist = new List(); [ContextMenu("test")] public void test() { - - DownlodeResp request = new DownlodeResp(); - request.Request((data) => - { - Crypto cr = new Crypto(); - Debug.Log(cr.Decompress(data.data)); - Statics.version = data.version; - }); + Debug.Log(JsonConvert.SerializeObject(testlist)); + //DownlodeResp request = new DownlodeResp(); + //request.Request((data) => + //{ + // Crypto cr = new Crypto(); + // Debug.Log(cr.Decompress(data.data)); + // Statics.version = data.version; + //}); } [ContextMenu("test2")] diff --git a/Client/Assets/1_Script/TitleCtrl.cs b/Client/Assets/1_Script/TitleCtrl.cs index 0ed54e2e..fbdf4899 100644 --- a/Client/Assets/1_Script/TitleCtrl.cs +++ b/Client/Assets/1_Script/TitleCtrl.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.UI;