diff --git a/Managers/BattleMgr.cs b/Managers/BattleMgr.cs index aafd3ca..5045160 100644 --- a/Managers/BattleMgr.cs +++ b/Managers/BattleMgr.cs @@ -23,19 +23,7 @@ public class BattleMgr { //CUILoading.OpenLoading(); //CUILoading.SetLoading(0); - string path = Application.dataPath; Mt.Table.Load(); - try - { - var test = Newtonsoft.Json.JsonConvert.DeserializeObject>("{\"id\":123423.45454, \"Name\":\"Test\", \"age\":38.4344}"); - int i = 2; - var t1 = new Test(); - - }catch(Exception e) - { - int i = 0; - } - GameObject fightRootObject = new GameObject("fight"); { fightRootObject.transform.parent = LuaHelper.GetGameManager().m_pGameMap.transform; diff --git a/Mt/Map.cs b/Mt/Map.cs new file mode 100644 index 0000000..9d4f222 --- /dev/null +++ b/Mt/Map.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mt +{ + class Map : Mtb.Map + { + } + + class MapTable : F6.IdMetaTable + { + + public MapTable(string fileName, string primKey) : base(fileName, primKey) + { + + } + } + +} diff --git a/Mt/Table.cs b/Mt/Table.cs index 32ea15f..823b27d 100644 --- a/Mt/Table.cs +++ b/Mt/Table.cs @@ -8,11 +8,14 @@ namespace Mt { class Table { - public static EquipTable Equip = new EquipTable(@"D:\opensource\pubgv4\branch\config_v4_dev3d_10_9\upload_files\equip@equip.json", "id"); + public static string RES_PATH = @"D:\opensource\pubgv4\branch\config_v4_dev3d_10_9\upload_files\equip@equip.json"; + public static EquipTable Equip = new EquipTable(RES_PATH + "equip@equip.json", "id"); + public static MapTable Map = new MapTable(RES_PATH + "map@map.json", "map_id"); public static void Load() { Equip.Load(); + Map.Load(); } } diff --git a/Mtb/Map.cs b/Mtb/Map.cs new file mode 100644 index 0000000..4b2a591 --- /dev/null +++ b/Mtb/Map.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mtb +{ + class Map : F6.BaseTable + { + public readonly int map_id; + public readonly string asset_name; + } +}