From e1b5fc5101e553c3c52efead70a42ce0f24e3670 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 21 Jun 2023 11:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=8A=BD=E5=8D=A1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawpool.json | 20 +- ...e_drawweigth.json => game_drawweight.json} | 0 bin/json/game_equipcolor.json | 37 - bin/json/game_herofusion.json | 102 -- bin/json/game_librarycomplot.json | 182 --- bin/json/game_lottery.json | 1374 ++++++++++++++++- bin/json/game_monsterformat.json | 48 +- bin/json/game_newreddot.json | 342 ---- bin/json/game_rdtasknpc.json | 18 +- bin/json/game_reddotgroup.json | 226 --- bin/json/game_worldbattle.json | 48 +- bin/json/game_worldtask.json | 6 +- modules/hero/configure_comp.go | 22 + sys/configure/structs/Game.DrawPoolData.go | 8 +- sys/configure/structs/Game.DrawWeight.go | 42 + ...awWeigthData.go => Game.DrawWeightData.go} | 14 +- sys/configure/structs/Game.DrawWeigth.go | 42 - sys/configure/structs/Tables.go | 6 +- 18 files changed, 1483 insertions(+), 1054 deletions(-) rename bin/json/{game_drawweigth.json => game_drawweight.json} (100%) delete mode 100644 bin/json/game_equipcolor.json delete mode 100644 bin/json/game_herofusion.json delete mode 100644 bin/json/game_librarycomplot.json delete mode 100644 bin/json/game_newreddot.json delete mode 100644 bin/json/game_reddotgroup.json create mode 100644 sys/configure/structs/Game.DrawWeight.go rename sys/configure/structs/{Game.DrawWeigthData.go => Game.DrawWeightData.go} (72%) delete mode 100644 sys/configure/structs/Game.DrawWeigth.go diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json index cfecb5388..22a156da4 100644 --- a/bin/json/game_drawpool.json +++ b/bin/json/game_drawpool.json @@ -25,8 +25,8 @@ "n3pool": "base_pool10", "n4pool": "base_pool11", "n5pool": "base_pool12", - "b4": 10, - "b6": 90, + "baodi4": 10, + "baidi5": 90, "etime": -1, "permission": 1, "consumeA": [ @@ -64,8 +64,8 @@ "n3pool": "base_pool10", "n4pool": "base_pool11", "n5pool": "base_pool12", - "b4": 10, - "b6": 0, + "baodi4": 10, + "baidi5": 0, "etime": -1, "permission": 1, "consumeA": [ @@ -103,8 +103,8 @@ "n3pool": "base_pool10", "n4pool": "base_pool11", "n5pool": "base_pool12", - "b4": 10, - "b6": 0, + "baodi4": 10, + "baidi5": 0, "etime": -1, "permission": 1, "consumeA": [ @@ -142,8 +142,8 @@ "n3pool": "base_pool10", "n4pool": "base_pool11", "n5pool": "base_pool12", - "b4": 10, - "b6": 0, + "baodi4": 10, + "baidi5": 0, "etime": -1, "permission": 1, "consumeA": [ @@ -181,8 +181,8 @@ "n3pool": "base_pool10", "n4pool": "base_pool11", "n5pool": "base_pool12", - "b4": 10, - "b6": 0, + "baodi4": 10, + "baidi5": 0, "etime": -1, "permission": 1, "consumeA": [ diff --git a/bin/json/game_drawweigth.json b/bin/json/game_drawweight.json similarity index 100% rename from bin/json/game_drawweigth.json rename to bin/json/game_drawweight.json diff --git a/bin/json/game_equipcolor.json b/bin/json/game_equipcolor.json deleted file mode 100644 index d0edafc0b..000000000 --- a/bin/json/game_equipcolor.json +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - "num": 0, - "color": { - "key": "equip_equip_color_color_1", - "text": "普通" - } - }, - { - "num": 1, - "color": { - "key": "equip_equip_color_color_2", - "text": "稀有" - } - }, - { - "num": 2, - "color": { - "key": "equip_equip_color_color_3", - "text": "卓越" - } - }, - { - "num": 3, - "color": { - "key": "equip_equip_color_color_4", - "text": "优秀" - } - }, - { - "num": 4, - "color": { - "key": "equip_equip_color_color_5", - "text": "完美" - } - } -] \ No newline at end of file diff --git a/bin/json/game_herofusion.json b/bin/json/game_herofusion.json deleted file mode 100644 index e2b7a4626..000000000 --- a/bin/json/game_herofusion.json +++ /dev/null @@ -1,102 +0,0 @@ -[ - { - "hero": "14007", - "switch": 1, - "pointhero": [ - "35001", - "35001", - "35001", - "35001" - ], - "awaken": 1, - "start": 1, - "lv": 1, - "fuison": [ - { - "a": "attr", - "t": "gold", - "n": 15000 - } - ] - }, - { - "hero": "35001", - "switch": 1, - "pointhero": [ - "25001", - "25001", - "25001", - "25001" - ], - "awaken": 1, - "start": 1, - "lv": 1, - "fuison": [ - { - "a": "attr", - "t": "gold", - "n": 15000 - } - ] - }, - { - "hero": "25001", - "switch": 1, - "pointhero": [ - "25004", - "25004", - "25004", - "25004" - ], - "awaken": 1, - "start": 1, - "lv": 1, - "fuison": [ - { - "a": "attr", - "t": "gold", - "n": 15000 - } - ] - }, - { - "hero": "25004", - "switch": 1, - "pointhero": [ - "44005", - "44005", - "44005", - "44005" - ], - "awaken": 1, - "start": 1, - "lv": 1, - "fuison": [ - { - "a": "attr", - "t": "gold", - "n": 15000 - } - ] - }, - { - "hero": "45003", - "switch": 1, - "pointhero": [ - "44005", - "44005", - "44005", - "44005" - ], - "awaken": 1, - "start": 1, - "lv": 1, - "fuison": [ - { - "a": "attr", - "t": "gold", - "n": 15000 - } - ] - } -] \ No newline at end of file diff --git a/bin/json/game_librarycomplot.json b/bin/json/game_librarycomplot.json deleted file mode 100644 index c9da2672b..000000000 --- a/bin/json/game_librarycomplot.json +++ /dev/null @@ -1,182 +0,0 @@ -[ - { - "id": 10100, - "subTask": 0, - "nodeIndex": 0, - "order": "1", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_1", - "text": "让阿宝变强1" - }, - "describe": { - "key": "library_companionplot_describe_1", - "text": "让阿宝变强1" - }, - "img": "zx_pt_01", - "ending": 0 - }, - { - "id": 10101, - "subTask": 10100, - "nodeIndex": 1, - "order": "2", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_2", - "text": "让阿宝变强2" - }, - "describe": { - "key": "library_companionplot_describe_2", - "text": "让阿宝变强2" - }, - "img": "zx_pt_02", - "ending": 0 - }, - { - "id": 10102, - "subTask": 10101, - "nodeIndex": 2, - "order": "3", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_3", - "text": "让阿宝变强3" - }, - "describe": { - "key": "library_companionplot_describe_3", - "text": "让阿宝变强3" - }, - "img": "zx_pt_03", - "ending": 0 - }, - { - "id": 10103, - "subTask": 10102, - "nodeIndex": 3, - "order": "4", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_4", - "text": "让阿宝变强4" - }, - "describe": { - "key": "library_companionplot_describe_4", - "text": "让阿宝变强4" - }, - "img": "zx_pt_04", - "ending": 0 - }, - { - "id": 10104, - "subTask": 10103, - "nodeIndex": 4, - "order": "5", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_5", - "text": "让阿宝变强5" - }, - "describe": { - "key": "library_companionplot_describe_5", - "text": "让阿宝变强5" - }, - "img": "zx_pt_05", - "ending": 0 - }, - { - "id": 10105, - "subTask": 10104, - "nodeIndex": 5, - "order": "6", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_6", - "text": "让阿宝变强6" - }, - "describe": { - "key": "library_companionplot_describe_6", - "text": "让阿宝变强6" - }, - "img": "zx_pt_06", - "ending": 0 - }, - { - "id": 10106, - "subTask": 10105, - "nodeIndex": 6, - "order": "7", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_7", - "text": "让阿宝变强7" - }, - "describe": { - "key": "library_companionplot_describe_7", - "text": "让阿宝变强7" - }, - "img": "zx_pt_07", - "ending": 0 - }, - { - "id": 10107, - "subTask": 10106, - "nodeIndex": 7, - "order": "8", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_8", - "text": "让阿宝变强8" - }, - "describe": { - "key": "library_companionplot_describe_8", - "text": "让阿宝变强8" - }, - "img": "zx_pt_08", - "ending": 0 - }, - { - "id": 10108, - "subTask": 10107, - "nodeIndex": 8, - "order": "9", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_9", - "text": "让阿宝变强9" - }, - "describe": { - "key": "library_companionplot_describe_9", - "text": "让阿宝变强9" - }, - "img": "zx_pt_01", - "ending": 0 - }, - { - "id": 10109, - "subTask": 10108, - "nodeIndex": 9, - "order": "10", - "story_id": 300001, - "fetter_id": 40001, - "name": { - "key": "library_companionplot_name_10", - "text": "让阿宝变强10" - }, - "describe": { - "key": "library_companionplot_describe_10", - "text": "让阿宝变强10" - }, - "img": "zx_pt_02", - "ending": 1 - } -] \ No newline at end of file diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index a6a78ca4e..2d9cffe34 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -5089,6 +5089,1302 @@ }, { "id": 213, + "lotteryid": 10001001, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1001, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 3, + "max": 3, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 214, + "lotteryid": 10001002, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1002, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 215, + "lotteryid": 10001003, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1003, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 10, + "max": 10, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 216, + "lotteryid": 10001004, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1004, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 15, + "max": 15, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 217, + "lotteryid": 10001005, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1005, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 21, + "max": 21, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 218, + "lotteryid": 10001006, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1006, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 219, + "lotteryid": 10001006, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1006, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001002", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 220, + "lotteryid": 10001007, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1007, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001001", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 5, + "max": 5, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 221, + "lotteryid": 10001007, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1007, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001002", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 222, + "lotteryid": 10001008, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1008, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001002", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 223, + "lotteryid": 10001008, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1008, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001003", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 224, + "lotteryid": 10001009, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1009, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001002", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 225, + "lotteryid": 10001009, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1009, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001003", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 21, + "max": 21, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 226, + "lotteryid": 10001010, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1010, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001003", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 27, + "max": 27, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 227, + "lotteryid": 10001010, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1010, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001004", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 228, + "lotteryid": 10001011, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1011, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001003", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 12, + "max": 12, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 229, + "lotteryid": 10001011, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1011, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001004", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 26, + "max": 26, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 230, + "lotteryid": 10001012, + "description": "火焰泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 1012, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13001004", + "n": 1 + }, + "itemdes": "火焰泰坦装备材料", + "itemwt": 1000, + "min": 45, + "max": 45, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 231, + "lotteryid": 10002001, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2001, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 3, + "max": 3, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 232, + "lotteryid": 10002002, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2002, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 233, + "lotteryid": 10002003, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2003, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 10, + "max": 10, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 234, + "lotteryid": 10002004, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2004, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 15, + "max": 15, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 235, + "lotteryid": 10002005, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2005, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 21, + "max": 21, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 236, + "lotteryid": 10002006, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2006, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 237, + "lotteryid": 10002006, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2006, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003002", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 238, + "lotteryid": 10002007, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2007, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003001", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 5, + "max": 5, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 239, + "lotteryid": 10002007, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2007, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003002", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 240, + "lotteryid": 10002008, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2008, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003002", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 241, + "lotteryid": 10002008, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2008, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003003", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 242, + "lotteryid": 10002009, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2009, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003002", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 243, + "lotteryid": 10002009, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2009, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003003", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 21, + "max": 21, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 244, + "lotteryid": 10002010, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2010, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003003", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 27, + "max": 27, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 245, + "lotteryid": 10002010, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2010, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003004", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 246, + "lotteryid": 10002011, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2011, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003003", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 12, + "max": 12, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 247, + "lotteryid": 10002011, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2011, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003004", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 26, + "max": 26, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 248, + "lotteryid": 10002012, + "description": "冰霜泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 2012, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13003004", + "n": 1 + }, + "itemdes": "冰霜泰坦装备材料", + "itemwt": 1000, + "min": 45, + "max": 45, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 249, + "lotteryid": 10003001, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3001, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 3, + "max": 3, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 250, + "lotteryid": 10003002, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3002, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 251, + "lotteryid": 10003003, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3003, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 10, + "max": 10, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 252, + "lotteryid": 10003004, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3004, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 15, + "max": 15, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 253, + "lotteryid": 10003005, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3005, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 21, + "max": 21, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 254, + "lotteryid": 10003006, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3006, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 255, + "lotteryid": 10003006, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3006, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002002", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 256, + "lotteryid": 10003007, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3007, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002001", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 5, + "max": 5, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 257, + "lotteryid": 10003007, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3007, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002002", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 258, + "lotteryid": 10003008, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3008, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002002", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 16, + "max": 16, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 259, + "lotteryid": 10003008, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3008, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002003", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 260, + "lotteryid": 10003009, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3009, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002002", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 261, + "lotteryid": 10003009, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3009, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002003", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 21, + "max": 21, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 262, + "lotteryid": 10003010, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3010, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002003", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 27, + "max": 27, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 263, + "lotteryid": 10003010, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3010, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002004", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 264, + "lotteryid": 10003011, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3011, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002003", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 12, + "max": 12, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 265, + "lotteryid": 10003011, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3011, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002004", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 26, + "max": 26, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 266, + "lotteryid": 10003012, + "description": "森林泰坦装备材料", + "type": 2, + "groupwt": 1000, + "groupid": 3012, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "13002004", + "n": 1 + }, + "itemdes": "森林泰坦装备材料", + "itemwt": 1000, + "min": 45, + "max": 45, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 267, "lotteryid": 30010, "description": "经验副本1", "type": 1, @@ -5112,7 +6408,7 @@ "notice": 0 }, { - "id": 214, + "id": 268, "lotteryid": 30010, "description": "经验副本1", "type": 1, @@ -5136,7 +6432,7 @@ "notice": 0 }, { - "id": 215, + "id": 269, "lotteryid": 30010, "description": "经验副本1", "type": 1, @@ -5160,7 +6456,7 @@ "notice": 0 }, { - "id": 216, + "id": 270, "lotteryid": 30020, "description": "经验副本2", "type": 1, @@ -5184,7 +6480,7 @@ "notice": 0 }, { - "id": 217, + "id": 271, "lotteryid": 30020, "description": "经验副本2", "type": 1, @@ -5208,7 +6504,7 @@ "notice": 0 }, { - "id": 218, + "id": 272, "lotteryid": 30020, "description": "经验副本2", "type": 1, @@ -5232,7 +6528,7 @@ "notice": 0 }, { - "id": 219, + "id": 273, "lotteryid": 30030, "description": "经验副本3", "type": 1, @@ -5256,7 +6552,7 @@ "notice": 0 }, { - "id": 220, + "id": 274, "lotteryid": 30030, "description": "经验副本3", "type": 1, @@ -5280,7 +6576,7 @@ "notice": 0 }, { - "id": 221, + "id": 275, "lotteryid": 30030, "description": "经验副本3", "type": 1, @@ -5304,7 +6600,7 @@ "notice": 0 }, { - "id": 222, + "id": 276, "lotteryid": 30040, "description": "经验副本4", "type": 1, @@ -5328,7 +6624,7 @@ "notice": 0 }, { - "id": 223, + "id": 277, "lotteryid": 30040, "description": "经验副本4", "type": 1, @@ -5352,7 +6648,7 @@ "notice": 0 }, { - "id": 224, + "id": 278, "lotteryid": 30040, "description": "经验副本4", "type": 1, @@ -5376,7 +6672,7 @@ "notice": 0 }, { - "id": 225, + "id": 279, "lotteryid": 30050, "description": "经验副本5", "type": 1, @@ -5400,7 +6696,7 @@ "notice": 0 }, { - "id": 226, + "id": 280, "lotteryid": 30050, "description": "经验副本5", "type": 1, @@ -5424,7 +6720,7 @@ "notice": 0 }, { - "id": 227, + "id": 281, "lotteryid": 30050, "description": "经验副本5", "type": 1, @@ -5448,7 +6744,7 @@ "notice": 0 }, { - "id": 228, + "id": 282, "lotteryid": 30060, "description": "经验副本6", "type": 1, @@ -5472,7 +6768,7 @@ "notice": 0 }, { - "id": 229, + "id": 283, "lotteryid": 30060, "description": "经验副本6", "type": 1, @@ -5496,7 +6792,7 @@ "notice": 0 }, { - "id": 230, + "id": 284, "lotteryid": 30060, "description": "经验副本6", "type": 1, @@ -5520,7 +6816,7 @@ "notice": 0 }, { - "id": 231, + "id": 285, "lotteryid": 30070, "description": "经验副本7", "type": 1, @@ -5544,7 +6840,7 @@ "notice": 0 }, { - "id": 232, + "id": 286, "lotteryid": 30070, "description": "经验副本7", "type": 1, @@ -5568,7 +6864,7 @@ "notice": 0 }, { - "id": 233, + "id": 287, "lotteryid": 30070, "description": "经验副本7", "type": 1, @@ -5592,7 +6888,7 @@ "notice": 0 }, { - "id": 234, + "id": 288, "lotteryid": 30080, "description": "经验副本8", "type": 1, @@ -5616,7 +6912,7 @@ "notice": 0 }, { - "id": 235, + "id": 289, "lotteryid": 30080, "description": "经验副本8", "type": 1, @@ -5640,7 +6936,7 @@ "notice": 0 }, { - "id": 236, + "id": 290, "lotteryid": 30080, "description": "经验副本8", "type": 1, @@ -5664,7 +6960,7 @@ "notice": 0 }, { - "id": 237, + "id": 291, "lotteryid": 30090, "description": "经验副本9", "type": 1, @@ -5688,7 +6984,7 @@ "notice": 0 }, { - "id": 238, + "id": 292, "lotteryid": 30090, "description": "经验副本9", "type": 1, @@ -5712,7 +7008,7 @@ "notice": 0 }, { - "id": 239, + "id": 293, "lotteryid": 30090, "description": "经验副本9", "type": 1, @@ -5736,7 +7032,7 @@ "notice": 0 }, { - "id": 240, + "id": 294, "lotteryid": 30090, "description": "经验副本9", "type": 1, @@ -5760,7 +7056,7 @@ "notice": 0 }, { - "id": 241, + "id": 295, "lotteryid": 30100, "description": "经验副本10", "type": 1, @@ -5784,7 +7080,7 @@ "notice": 0 }, { - "id": 242, + "id": 296, "lotteryid": 30100, "description": "经验副本10", "type": 1, @@ -5808,7 +7104,7 @@ "notice": 0 }, { - "id": 243, + "id": 297, "lotteryid": 30100, "description": "经验副本10", "type": 1, @@ -5832,7 +7128,7 @@ "notice": 0 }, { - "id": 244, + "id": 298, "lotteryid": 30100, "description": "经验副本10", "type": 1, @@ -5856,7 +7152,7 @@ "notice": 0 }, { - "id": 245, + "id": 299, "lotteryid": 30110, "description": "经验副本11", "type": 1, @@ -5880,7 +7176,7 @@ "notice": 0 }, { - "id": 246, + "id": 300, "lotteryid": 30110, "description": "经验副本11", "type": 1, @@ -5904,7 +7200,7 @@ "notice": 0 }, { - "id": 247, + "id": 301, "lotteryid": 30110, "description": "经验副本11", "type": 1, @@ -5928,7 +7224,7 @@ "notice": 0 }, { - "id": 248, + "id": 302, "lotteryid": 30110, "description": "经验副本11", "type": 1, @@ -5952,7 +7248,7 @@ "notice": 0 }, { - "id": 249, + "id": 303, "lotteryid": 30120, "description": "经验副本12", "type": 1, @@ -5976,7 +7272,7 @@ "notice": 0 }, { - "id": 250, + "id": 304, "lotteryid": 30120, "description": "经验副本12", "type": 1, @@ -6000,7 +7296,7 @@ "notice": 0 }, { - "id": 251, + "id": 305, "lotteryid": 30120, "description": "经验副本12", "type": 1, @@ -6024,7 +7320,7 @@ "notice": 0 }, { - "id": 252, + "id": 306, "lotteryid": 30120, "description": "经验副本12", "type": 1, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 71d8a5375..3abb8cbbd 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -124663,8 +124663,8 @@ "Id": 306003, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 3, "equip": [], @@ -124963,8 +124963,8 @@ "Id": 306006, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 3, "equip": [], @@ -125263,8 +125263,8 @@ "Id": 306009, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 3, "equip": [], @@ -125563,8 +125563,8 @@ "Id": 306012, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 3, "equip": [], @@ -125863,8 +125863,8 @@ "Id": 306015, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 4, "equip": [], @@ -126163,8 +126163,8 @@ "Id": 306018, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 4, "equip": [], @@ -126463,8 +126463,8 @@ "Id": 306021, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 4, "equip": [], @@ -126763,8 +126763,8 @@ "Id": 306024, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 4, "equip": [], @@ -127063,8 +127063,8 @@ "Id": 306027, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 5, "equip": [], @@ -127363,8 +127363,8 @@ "Id": 306030, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 5, "equip": [], @@ -127663,8 +127663,8 @@ "Id": 306033, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 5, "equip": [], @@ -127963,8 +127963,8 @@ "Id": 306036, "pos": 4, "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, + "IsBoss": 0, + "bossHpCnt": 0, "heroid": 53003, "star": 5, "equip": [], diff --git a/bin/json/game_newreddot.json b/bin/json/game_newreddot.json deleted file mode 100644 index 8a820b664..000000000 --- a/bin/json/game_newreddot.json +++ /dev/null @@ -1,342 +0,0 @@ -[ - { - "id": 10100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Task", - "header": "" - }, - { - "id": 10101, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "task", - "path": "Root|Task|Daily", - "header": "赵长远" - }, - { - "id": 10102, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "task", - "path": "Root|Task|Week", - "header": "赵长远" - }, - { - "id": 10103, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "task", - "path": "Root|Task|Achievement", - "header": "赵长远" - }, - { - "id": 10200, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Task|Daily", - "header": "" - }, - { - "id": 10201, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "task", - "path": "Root|Task|Daily|Active", - "header": "" - }, - { - "id": 10300, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Task|Week", - "header": "" - }, - { - "id": 10301, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "task", - "path": "Root|Task|Week|Active", - "header": "" - }, - { - "id": 11100, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|MainLine", - "header": "梅雄风" - }, - { - "id": 12100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Email", - "header": "" - }, - { - "id": 12101, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Email|Btn", - "header": "" - }, - { - "id": 12102, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Email|UnreadBtn", - "header": "" - }, - { - "id": 13100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|ViKingExpedition", - "header": "" - }, - { - "id": 13101, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|ViKingExpedition|MainPage", - "header": "" - }, - { - "id": 13102, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|ViKingExpedition|MainPage|Btn", - "header": "" - }, - { - "id": 14100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hunting", - "header": "" - }, - { - "id": 14101, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hunting|MainPage", - "header": "" - }, - { - "id": 14102, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hunting|MainPage|Btn", - "header": "" - }, - { - "id": 20100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero", - "header": "" - }, - { - "id": 20101, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero|Heroup", - "header": "" - }, - { - "id": 20102, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero|Heroup|Btn", - "header": "" - }, - { - "id": 20200, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero|Awake", - "header": "" - }, - { - "id": 20201, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero|Awake|Btn", - "header": "" - }, - { - "id": 20300, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero|Heroup", - "header": "" - }, - { - "id": 20301, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Hero|Heroup|Btn", - "header": "" - }, - { - "id": 15100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "sociaty", - "path": "Root|Guild", - "header": "赵长远" - }, - { - "id": 15101, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "sociaty", - "path": "Root|Guild|MBtn", - "header": "赵长远" - }, - { - "id": 15102, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "sociaty", - "path": "Root|Guild|MBtn|Btn", - "header": "赵长远" - }, - { - "id": 15200, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "sociaty", - "path": "Root|Guild|Apply", - "header": "" - }, - { - "id": 15201, - "msg_type": 1, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "sociaty", - "path": "Root|Guild|Apply|Btn", - "header": "" - }, - { - "id": 16100, - "msg_type": 0, - "tree_type": 0, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Bag", - "header": "赵长远" - }, - { - "id": 16101, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Bag|Item", - "header": "赵长远" - }, - { - "id": 16102, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Bag|Equip", - "header": "赵长远" - }, - { - "id": 16103, - "msg_type": 2, - "tree_type": 1, - "show_type": 0, - "count_type": 0, - "group": "", - "path": "Root|Bag|Shard", - "header": "赵长远" - } -] \ No newline at end of file diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 8b5a68416..8f8bfea6d 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1540,7 +1540,7 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "云朵先生", "901" ], "event": [ @@ -1554,7 +1554,7 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "暴芙那特", "901" ], "event": [ @@ -1580,7 +1580,7 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ @@ -1621,9 +1621,9 @@ "id": 10320, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -1659,9 +1659,9 @@ "id": 10330, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, diff --git a/bin/json/game_reddotgroup.json b/bin/json/game_reddotgroup.json deleted file mode 100644 index 5ef47c195..000000000 --- a/bin/json/game_reddotgroup.json +++ /dev/null @@ -1,226 +0,0 @@ -[ - { - "id": 10001, - "type": 1, - "group": "task", - "layer": "Root|Task|Daily", - "header": "赵长远" - }, - { - "id": 10002, - "type": 1, - "group": "task", - "layer": "Root|Task|Week", - "header": "赵长远" - }, - { - "id": 10003, - "type": 1, - "group": "sociaty", - "layer": "Root|Guild|MBtn|Btn", - "header": "赵长远" - }, - { - "id": 10004, - "type": 1, - "group": "task", - "layer": "Root|Task|Achievement", - "header": "赵长远" - }, - { - "id": 10005, - "type": 1, - "group": "mainline", - "layer": "", - "header": "梅雄风" - }, - { - "id": 10006, - "type": 1, - "group": "", - "layer": "Root|Pagoda|Challenge", - "header": "梅雄风" - }, - { - "id": 10007, - "type": 0, - "group": "", - "layer": "Root|Pagoda|Reward", - "header": "" - }, - { - "id": 10008, - "type": 2, - "group": "", - "layer": "Root|Hero|Heroup|Btn", - "header": "" - }, - { - "id": 10009, - "type": 2, - "group": "", - "layer": "Root|Hero|Awake|Btn", - "header": "" - }, - { - "id": 10010, - "type": 2, - "group": "", - "layer": "Root|Hero|Resonance|Icon|Btn", - "header": "" - }, - { - "id": 10011, - "type": 2, - "group": "", - "layer": "Root|Hero|Heroup|Btn", - "header": "" - }, - { - "id": 10012, - "type": 2, - "group": "", - "layer": "Root|Hero|Equip|Wear", - "header": "" - }, - { - "id": 10013, - "type": 2, - "group": "", - "layer": "Root|Hero|Equip|Replace", - "header": "" - }, - { - "id": 10014, - "type": 2, - "group": "", - "layer": "Root|Hero|Equip|IntensifyPage|Intensify", - "header": "" - }, - { - "id": 10015, - "type": 2, - "group": "", - "layer": "Root|Hero|Equip|EnchantPage|Enchant", - "header": "" - }, - { - "id": 10016, - "type": 2, - "group": "", - "layer": "Root|Hero|Equip|WashsPracticePage|WashsPractice", - "header": "" - }, - { - "id": 10017, - "type": 1, - "group": "", - "layer": "Root|Head|Horoscope|Water|Icon|Btn", - "header": "" - }, - { - "id": 10018, - "type": 1, - "group": "", - "layer": "Root|Recruit|Btn", - "header": "" - }, - { - "id": 10019, - "type": 1, - "group": "", - "layer": "Root|Arena|Btn", - "header": "" - }, - { - "id": 10020, - "type": 1, - "group": "", - "layer": "Root|Gourmet|Order|OrderBtn", - "header": "" - }, - { - "id": 10021, - "type": 1, - "group": "", - "layer": "Root|Gourmet|Order|UpBtn|Btn", - "header": "" - }, - { - "id": 10022, - "type": 1, - "group": "", - "layer": "Root|Gourmet|OrderReceive|Btn", - "header": "" - }, - { - "id": 10023, - "type": 1, - "group": "", - "layer": "Root|KungFu|Pillar|Btn", - "header": "" - }, - { - "id": 10024, - "type": 1, - "group": "", - "layer": "Root|KungFu|Up|Btn", - "header": "" - }, - { - "id": 10025, - "type": 1, - "group": "", - "layer": "Root|KungFu|Pillar|ReceiveBtn", - "header": "" - }, - { - "id": 10026, - "type": 2, - "group": "", - "layer": "Root|Email|Btn", - "header": "" - }, - { - "id": 10027, - "type": 1, - "group": "task", - "layer": "Root|Task|Daily|Active", - "header": "" - }, - { - "id": 10028, - "type": 1, - "group": "task", - "layer": "Root|Task|Week|Active", - "header": "" - }, - { - "id": 10029, - "type": 1, - "group": "sociaty", - "layer": "Root|Guild|Apply|Btn", - "header": "" - }, - { - "id": 10030, - "type": 1, - "group": "", - "layer": "Root|Email|UnreadBtn", - "header": "" - }, - { - "id": 10031, - "type": 1, - "group": "", - "layer": "Root|ViKingExpedition|MainPage|Btn", - "header": "" - }, - { - "id": 10032, - "type": 1, - "group": "", - "layer": "Root|Hunting|MainPage|Btn", - "header": "" - } -] \ No newline at end of file diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 95069d135..a5212e15e 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -9,7 +9,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -22,7 +22,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -35,7 +35,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -48,7 +48,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -61,7 +61,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -74,7 +74,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -87,7 +87,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -100,7 +100,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 5 + "n": 0 } }, { @@ -113,7 +113,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -126,7 +126,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -139,7 +139,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -152,7 +152,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -165,7 +165,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -178,7 +178,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -191,7 +191,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -204,7 +204,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -217,7 +217,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -230,7 +230,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 8 + "n": 0 } }, { @@ -243,7 +243,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 10 + "n": 0 } }, { @@ -256,7 +256,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 10 + "n": 0 } }, { @@ -269,7 +269,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 10 + "n": 0 } }, { @@ -282,7 +282,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 10 + "n": 0 } }, { @@ -295,7 +295,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 10 + "n": 0 } }, { @@ -308,7 +308,7 @@ "playexp": { "a": "attr", "t": "exp", - "n": 10 + "n": 0 } } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 8adb00d82..f83c35070 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -1174,7 +1174,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_33", - "text": "和阿宝对话" + "text": "和希卡普对话" }, "npc": 10310, "completetask": [ @@ -1210,7 +1210,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_34", - "text": "和邦尼兔对话" + "text": "和骇客蛛对话" }, "npc": 10320, "completetask": [ @@ -1246,7 +1246,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_35", - "text": "与邦尼兔聊聊" + "text": "和骇客蛛对话" }, "npc": 10330, "completetask": [ diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 2f202b226..efc4b200d 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -33,6 +33,9 @@ const ( hero_talentbox = "game_talentbox.json" // 天赋详细数据 game_shopitem = "game_shopitem.json" hero_skill = "game_heroskill.json" + + hero_draw = "game_drawpool.json" // 新版抽卡 + hero_cardweight = "game_drawweight.json" // 新版抽卡权重 ) // /配置管理组件 @@ -64,6 +67,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp hero_talentbox: cfg.NewGameTalentBox, game_shopitem: cfg.NewGameShopitem, hero_skill: cfg.NewGameHeroSkill, + hero_draw: cfg.NewGameDrawPool, }) this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0) configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig) @@ -103,6 +107,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } }) + this.GetHeroDrawConfigByType(1) return } @@ -395,3 +400,20 @@ func (this *configureComp) GetHeroTalentMaxLv(heroid string) (maxlv int32) { return 0 } + +// id: 1 表示普通抽 2表示阵营1 3表示阵营2 ... +func (this *configureComp) GetHeroDrawConfigByType(id int32) (data *cfg.GameDrawPoolData, err error) { + var ( + v interface{} + ) + + if v, err = this.GetConfigure(hero_draw); err == nil { + if conf, ok := v.(*cfg.GameDrawPool); ok { + if data = conf.Get(id); data != nil { + return + } + } + } + err = comm.NewNotFoundConfErr(moduleName, hero_draw, id) + return +} diff --git a/sys/configure/structs/Game.DrawPoolData.go b/sys/configure/structs/Game.DrawPoolData.go index 473cfb3ad..b2465c579 100644 --- a/sys/configure/structs/Game.DrawPoolData.go +++ b/sys/configure/structs/Game.DrawPoolData.go @@ -23,8 +23,8 @@ type GameDrawPoolData struct { N3pool string N4pool string N5pool string - B4 int32 - B6 int32 + Baodi4 int32 + Baidi5 int32 Etime int32 Permission int32 ConsumeA []*Gameatn @@ -63,8 +63,8 @@ func (_v *GameDrawPoolData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.N3pool, _ok_ = _buf["n3pool"].(string); !_ok_ { err = errors.New("n3pool error"); return } } { var _ok_ bool; if _v.N4pool, _ok_ = _buf["n4pool"].(string); !_ok_ { err = errors.New("n4pool error"); return } } { var _ok_ bool; if _v.N5pool, _ok_ = _buf["n5pool"].(string); !_ok_ { err = errors.New("n5pool error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["b4"].(float64); !_ok_ { err = errors.New("b4 error"); return }; _v.B4 = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["b6"].(float64); !_ok_ { err = errors.New("b6 error"); return }; _v.B6 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["baodi4"].(float64); !_ok_ { err = errors.New("baodi4 error"); return }; _v.Baodi4 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["baidi5"].(float64); !_ok_ { err = errors.New("baidi5 error"); return }; _v.Baidi5 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["etime"].(float64); !_ok_ { err = errors.New("etime error"); return }; _v.Etime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["permission"].(float64); !_ok_ { err = errors.New("permission error"); return }; _v.Permission = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.DrawWeight.go b/sys/configure/structs/Game.DrawWeight.go new file mode 100644 index 000000000..3d7fc277b --- /dev/null +++ b/sys/configure/structs/Game.DrawWeight.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameDrawWeight struct { + _dataMap map[int32]*GameDrawWeightData + _dataList []*GameDrawWeightData +} + +func NewGameDrawWeight(_buf []map[string]interface{}) (*GameDrawWeight, error) { + _dataList := make([]*GameDrawWeightData, 0, len(_buf)) + dataMap := make(map[int32]*GameDrawWeightData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameDrawWeightData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameDrawWeight{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameDrawWeight) GetDataMap() map[int32]*GameDrawWeightData { + return table._dataMap +} + +func (table *GameDrawWeight) GetDataList() []*GameDrawWeightData { + return table._dataList +} + +func (table *GameDrawWeight) Get(key int32) *GameDrawWeightData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.DrawWeigthData.go b/sys/configure/structs/Game.DrawWeightData.go similarity index 72% rename from sys/configure/structs/Game.DrawWeigthData.go rename to sys/configure/structs/Game.DrawWeightData.go index b35e42c75..a386094fc 100644 --- a/sys/configure/structs/Game.DrawWeigthData.go +++ b/sys/configure/structs/Game.DrawWeightData.go @@ -10,25 +10,25 @@ package cfg import "errors" -type GameDrawWeigthData struct { +type GameDrawWeightData struct { Key int32 Weight int32 } -const TypeId_GameDrawWeigthData = -1955284598 +const TypeId_GameDrawWeightData = 2007215138 -func (*GameDrawWeigthData) GetTypeId() int32 { - return -1955284598 +func (*GameDrawWeightData) GetTypeId() int32 { + return 2007215138 } -func (_v *GameDrawWeigthData)Deserialize(_buf map[string]interface{}) (err error) { +func (_v *GameDrawWeightData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } return } -func DeserializeGameDrawWeigthData(_buf map[string]interface{}) (*GameDrawWeigthData, error) { - v := &GameDrawWeigthData{} +func DeserializeGameDrawWeightData(_buf map[string]interface{}) (*GameDrawWeightData, error) { + v := &GameDrawWeightData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/Game.DrawWeigth.go b/sys/configure/structs/Game.DrawWeigth.go deleted file mode 100644 index 23c65f9cd..000000000 --- a/sys/configure/structs/Game.DrawWeigth.go +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -type GameDrawWeigth struct { - _dataMap map[int32]*GameDrawWeigthData - _dataList []*GameDrawWeigthData -} - -func NewGameDrawWeigth(_buf []map[string]interface{}) (*GameDrawWeigth, error) { - _dataList := make([]*GameDrawWeigthData, 0, len(_buf)) - dataMap := make(map[int32]*GameDrawWeigthData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGameDrawWeigthData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Key] = _v - } - } - return &GameDrawWeigth{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameDrawWeigth) GetDataMap() map[int32]*GameDrawWeigthData { - return table._dataMap -} - -func (table *GameDrawWeigth) GetDataList() []*GameDrawWeigthData { - return table._dataList -} - -func (table *GameDrawWeigth) Get(key int32) *GameDrawWeigthData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 77923f990..c4f3ebfd6 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -183,7 +183,7 @@ type Tables struct { PhotoAction *GamePhotoAction PhotoFilter *GamePhotoFilter DrawPool *GameDrawPool - DrawWeigth *GameDrawWeigth + DrawWeight *GameDrawWeight } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1223,10 +1223,10 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.DrawPool, err = NewGameDrawPool(buf) ; err != nil { return nil, err } - if buf, err = loader("game_drawweigth") ; err != nil { + if buf, err = loader("game_drawweight") ; err != nil { return nil, err } - if tables.DrawWeigth, err = NewGameDrawWeigth(buf) ; err != nil { + if tables.DrawWeight, err = NewGameDrawWeight(buf) ; err != nil { return nil, err } return tables, nil