From 74aad51512f65857835f581bd2517a6f243254d8 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 1 Aug 2022 17:41:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=81=93=E5=85=B7=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/LocalizeConfig_CN.json | 232 ++++- bin/json/LocalizeConfig_EN.json | 234 +++++- bin/json/LocalizeConfig_TW.json | 232 ++++- bin/json/game_activereward.json | 172 ++++ bin/json/game_equip.json | 792 ++++++++++++++++-- bin/json/game_extservers.json | 24 +- bin/json/game_initial.json | 24 +- bin/json/game_item.json | 84 +- bin/json/game_language.json | 326 +++++++ bin/json/game_model.json | 22 +- bin/json/game_newhero.json | 56 +- bin/json/game_newskill.json | 590 ++++++++++--- bin/json/game_propsgroup.json | 133 ++- bin/json/game_propsgrouplist.json | 37 + bin/json/game_skillatk.json | 590 ++++++++++--- bin/json/game_ui.json | 42 +- modules/equipment/modelEquipment.go | 2 +- modules/items/api_useItem.go | 30 +- modules/items/configure.go | 35 +- modules/items/core.go | 28 + sys/configure/structs/Tables.go | 14 + sys/configure/structs/game.equipData.go | 19 + sys/configure/structs/game.extserversData.go | 4 +- sys/configure/structs/game.language.go | 42 + sys/configure/structs/game.languageData.go | 25 + sys/configure/structs/game.newSkillData.go | 2 +- sys/configure/structs/game.propsgroup.go | 2 +- sys/configure/structs/game.propsgroupData.go | 38 +- sys/configure/structs/game.propsgrouplist.go | 42 + .../structs/game.propsgrouplistData.go | 40 + sys/configure/structs/game.skillAtkData.go | 2 +- 31 files changed, 3387 insertions(+), 528 deletions(-) create mode 100644 bin/json/game_activereward.json create mode 100644 bin/json/game_language.json create mode 100644 bin/json/game_propsgrouplist.json create mode 100644 sys/configure/structs/game.language.go create mode 100644 sys/configure/structs/game.languageData.go create mode 100644 sys/configure/structs/game.propsgrouplist.go create mode 100644 sys/configure/structs/game.propsgrouplistData.go diff --git a/bin/json/LocalizeConfig_CN.json b/bin/json/LocalizeConfig_CN.json index 47d1118a8..ed415054a 100644 --- a/bin/json/LocalizeConfig_CN.json +++ b/bin/json/LocalizeConfig_CN.json @@ -3088,35 +3088,35 @@ "text_cn": "基础效果抵抗" }, { - "key": "hero_star_10001", + "key": "hero_star_1", "text_cn": "优秀" }, { - "key": "hero_star_10002", + "key": "hero_star_2", "text_cn": "稀有" }, { - "key": "hero_star_10003", + "key": "hero_star_3", "text_cn": "史诗" }, { - "key": "hero_star_10004", + "key": "hero_star_4", "text_cn": "传说" }, { - "key": "hero_color_10013", + "key": "hero_color_1", "text_cn": "优秀" }, { - "key": "hero_color_10014", + "key": "hero_color_2", "text_cn": "稀有" }, { - "key": "hero_color_10015", + "key": "hero_color_3", "text_cn": "史诗" }, { - "key": "hero_color_10016", + "key": "hero_color_4", "text_cn": "传说" }, { @@ -3138,5 +3138,221 @@ { "key": "hero_job_10021", "text_cn": "材料" + }, + { + "key": "itemdesc_10001", + "text_cn": "使用后可以强化英雄" + }, + { + "key": "itemdesc_10002", + "text_cn": "一块测试功能的石头，他可能是某个不能使用的活动道具" + }, + { + "key": "itemdesc_10003", + "text_cn": "集齐50个碎片合成阿宝" + }, + { + "key": "itemdesc_10004", + "text_cn": "可以在以下道具中选择任选1个" + }, + { + "key": "itemdesc_10005", + "text_cn": "可以在以下道具中随机获取1个" + }, + { + "key": "itemdesc_10006", + "text_cn": "打开后可以获得金币" + }, + { + "key": "itemdesc_10007", + "text_cn": "使用后获得2小时金币收益" + }, + { + "key": "itemdesc_10008", + "text_cn": "使用后获得2小时金币收益，但是他会在2分钟内消失" + }, + { + "key": "itemdesc_10009", + "text_cn": "这本魔法书被强大的魔法封印了，通过第9999关后可以开启" + }, + { + "key": "itemdesc_10010", + "text_cn": "似乎是某个失落文明的货币，暂时只有纪念意义" + }, + { + "key": "itemdesc_10011", + "text_cn": "表针一动不动，也许有人可以修好它。" + }, + { + "key": "itemdesc_10012", + "text_cn": "精致的木材，散发着淡淡的香气" + }, + { + "key": "itemdesc_10013", + "text_cn": "把它放在背包里会带来好运" + }, + { + "key": "itemdesc_10014", + "text_cn": "你登录了游戏就是冒险家，就会获得这个勋章" + }, + { + "key": "itemdesc_10015", + "text_cn": "比幸运草更幸运" + }, + { + "key": "itemdesc_10016", + "text_cn": "钻石是人造的，所以不能用来买商城的商品" + }, + { + "key": "itemname_10001", + "text_cn": "初级经验精灵" + }, + { + "key": "itemname_10002", + "text_cn": "石头" + }, + { + "key": "itemname_10003", + "text_cn": "5星阿宝碎片" + }, + { + "key": "itemname_10004", + "text_cn": "金币自选箱子" + }, + { + "key": "itemname_10005", + "text_cn": "随机金币箱子" + }, + { + "key": "itemname_10006", + "text_cn": "金币箱子" + }, + { + "key": "itemname_10007", + "text_cn": "2小时金币" + }, + { + "key": "itemname_10008", + "text_cn": "特殊2小时金币" + }, + { + "key": "itemname_10009", + "text_cn": "被封印的魔法书" + }, + { + "key": "itemname_10010", + "text_cn": "古代硬币" + }, + { + "key": "itemname_10011", + "text_cn": "坏掉的钟表" + }, + { + "key": "itemname_10012", + "text_cn": "木材" + }, + { + "key": "itemname_10013", + "text_cn": "四叶草" + }, + { + "key": "itemname_10014", + "text_cn": "冒险家勋章" + }, + { + "key": "itemname_10015", + "text_cn": "猫猫护身符" + }, + { + "key": "itemname_10016", + "text_cn": "人造钻石" + }, + { + "key": "server_10001", + "text_cn": "本地测试服" + }, + { + "key": "server_10002", + "text_cn": "外网测试服" + }, + { + "key": "skillname_190011000", + "text_cn": "阿宝队长技" + }, + { + "key": "skillname_190012000", + "text_cn": "熊猫拳" + }, + { + "key": "skillname_190013000", + "text_cn": "太极一式" + }, + { + "key": "skillname_190011003", + "text_cn": "太极零式" + }, + { + "key": "skillname_190014000", + "text_cn": "波比队长技" + }, + { + "key": "skillname_190016000", + "text_cn": "和谐音律" + }, + { + "key": "skillname_190017000", + "text_cn": "欢悦之舞" + }, + { + "key": "skillname_190018000", + "text_cn": "彩虹音符" + }, + { + "key": "tips_1001", + "text_cn": "敬请期待" + }, + { + "key": "tips_1002", + "text_cn": "暂未开放" + }, + { + "key": "nonactivated", + "text_cn": "未激活" + }, + { + "key": "activated", + "text_cn": "已激活" + }, + { + "key": "opencond_name_10001", + "text_cn": "探险" + }, + { + "key": "opencond_name_10002", + "text_cn": "英雄" + }, + { + "key": "opencond_name_10003", + "text_cn": "商店" + }, + { + "key": "opencond_name_10004", + "text_cn": "好友" + }, + { + "key": "opencond_name_10005", + "text_cn": "任务" + }, + { + "key": "opencond_prompt_10001", + "text_cn": "通关2-26开启" + }, + { + "key": "opencond_prompt_10002", + "text_cn": "暂不开启，敬请期待" + }, + { + "key": "opencond_prompt_10003", + "text_cn": "开服第2天开启且通关2-14后开启" } ] \ No newline at end of file diff --git a/bin/json/LocalizeConfig_EN.json b/bin/json/LocalizeConfig_EN.json index 41a510fe8..357e6b2d3 100644 --- a/bin/json/LocalizeConfig_EN.json +++ b/bin/json/LocalizeConfig_EN.json @@ -217,7 +217,7 @@ }, { "key": "hero_25001", - "text_en": "Bao" + "text_en": "Po" }, { "key": "hero_25002", @@ -3088,35 +3088,35 @@ "text_en": "base effect resistance" }, { - "key": "hero_star_10001", + "key": "hero_star_1", "text_en": "Excellent" }, { - "key": "hero_star_10002", + "key": "hero_star_2", "text_en": "Rare" }, { - "key": "hero_star_10003", + "key": "hero_star_3", "text_en": "Epic" }, { - "key": "hero_star_10004", + "key": "hero_star_4", "text_en": "Legend" }, { - "key": "hero_color_10013", + "key": "hero_color_1", "text_en": "Excellent" }, { - "key": "hero_color_10014", + "key": "hero_color_2", "text_en": "Rare" }, { - "key": "hero_color_10015", + "key": "hero_color_3", "text_en": "Epic" }, { - "key": "hero_color_10016", + "key": "hero_color_4", "text_en": "Legend" }, { @@ -3138,5 +3138,221 @@ { "key": "hero_job_10021", "text_en": "Material" + }, + { + "key": "itemdesc_10001", + "text_en": "Heroes can be strengthened after use" + }, + { + "key": "itemdesc_10002", + "text_en": "A stone for testing functionality, it may be an unusable activity item" + }, + { + "key": "itemdesc_10003", + "text_en": "Collect all 50 fragments to make Po" + }, + { + "key": "itemdesc_10004", + "text_en": "You can choose any one of the following items" + }, + { + "key": "itemdesc_10005", + "text_en": "You can get 1 of the following items at random" + }, + { + "key": "itemdesc_10006", + "text_en": "Open to get gold coins" + }, + { + "key": "itemdesc_10007", + "text_en": "Get 2 hours of gold coins after use" + }, + { + "key": "itemdesc_10008", + "text_en": "Gain 2 hours of gold after use, but he will disappear within 2 minutes" + }, + { + "key": "itemdesc_10009", + "text_en": "This magic book is sealed by powerful magic, it can be opened after passing level 9999" + }, + { + "key": "itemdesc_10010", + "text_en": "It seems to be the currency of a lost civilization, for the time being, it has only commemorative significance" + }, + { + "key": "itemdesc_10011", + "text_en": "The hands don\u0027t move, maybe someone can fix it." + }, + { + "key": "itemdesc_10012", + "text_en": "Delicate wood with a light aroma" + }, + { + "key": "itemdesc_10013", + "text_en": "Carrying it in a backpack will bring good luck" + }, + { + "key": "itemdesc_10014", + "text_en": "You are an adventurer when you log in to the game, and you will get this medal" + }, + { + "key": "itemdesc_10015", + "text_en": "luckier than clover" + }, + { + "key": "itemdesc_10016", + "text_en": "Diamonds are man-made, so they cannot be used to buy items in the mall" + }, + { + "key": "itemname_10001", + "text_en": "Junior Experience Wizard" + }, + { + "key": "itemname_10002", + "text_en": "Stone" + }, + { + "key": "itemname_10003", + "text_en": "5 Star Po Shard" + }, + { + "key": "itemname_10004", + "text_en": "Gold Coin Choice Box" + }, + { + "key": "itemname_10005", + "text_en": "Random Gold Coin Box" + }, + { + "key": "itemname_10006", + "text_en": "Gold coin box" + }, + { + "key": "itemname_10007", + "text_en": "2 hour coins" + }, + { + "key": "itemname_10008", + "text_en": "Special 2 Hour Coins" + }, + { + "key": "itemname_10009", + "text_en": "Sealed magic book" + }, + { + "key": "itemname_10010", + "text_en": "Ancient coins" + }, + { + "key": "itemname_10011", + "text_en": "Broken clock" + }, + { + "key": "itemname_10012", + "text_en": "Wood" + }, + { + "key": "itemname_10013", + "text_en": "Four-leaf clover" + }, + { + "key": "itemname_10014", + "text_en": "Adventurer\u0027s Medal" + }, + { + "key": "itemname_10015", + "text_en": "Cat cat amulet" + }, + { + "key": "itemname_10016", + "text_en": "Artificial diamond" + }, + { + "key": "server_10001", + "text_en": "Local test server" + }, + { + "key": "server_10002", + "text_en": "Extranet test server" + }, + { + "key": "skillname_190011000", + "text_en": "Captain Po\u0027s skills" + }, + { + "key": "skillname_190012000", + "text_en": "Panda fist" + }, + { + "key": "skillname_190013000", + "text_en": "Tai Chi Form" + }, + { + "key": "skillname_190011003", + "text_en": "Tai Chi Zero" + }, + { + "key": "skillname_190014000", + "text_en": "Captain Poppy\u0027s skills" + }, + { + "key": "skillname_190016000", + "text_en": "Harmony" + }, + { + "key": "skillname_190017000", + "text_en": "Dance of joy" + }, + { + "key": "skillname_190018000", + "text_en": "Rainbow note" + }, + { + "key": "tips_1001", + "text_en": "Stay tuned" + }, + { + "key": "tips_1002", + "text_en": "Not yet open" + }, + { + "key": "nonactivated", + "text_en": "Nonactivated" + }, + { + "key": "activated", + "text_en": "Activated" + }, + { + "key": "opencond_name_10001", + "text_en": "" + }, + { + "key": "opencond_name_10002", + "text_en": "" + }, + { + "key": "opencond_name_10003", + "text_en": "" + }, + { + "key": "opencond_name_10004", + "text_en": "" + }, + { + "key": "opencond_name_10005", + "text_en": "" + }, + { + "key": "opencond_prompt_10001", + "text_en": "" + }, + { + "key": "opencond_prompt_10002", + "text_en": "" + }, + { + "key": "opencond_prompt_10003", + "text_en": "" } ] \ No newline at end of file diff --git a/bin/json/LocalizeConfig_TW.json b/bin/json/LocalizeConfig_TW.json index 73d5b3866..f76cbd096 100644 --- a/bin/json/LocalizeConfig_TW.json +++ b/bin/json/LocalizeConfig_TW.json @@ -3088,35 +3088,35 @@ "text_tw": "" }, { - "key": "hero_star_10001", + "key": "hero_star_1", "text_tw": "" }, { - "key": "hero_star_10002", + "key": "hero_star_2", "text_tw": "" }, { - "key": "hero_star_10003", + "key": "hero_star_3", "text_tw": "" }, { - "key": "hero_star_10004", + "key": "hero_star_4", "text_tw": "" }, { - "key": "hero_color_10013", + "key": "hero_color_1", "text_tw": "" }, { - "key": "hero_color_10014", + "key": "hero_color_2", "text_tw": "" }, { - "key": "hero_color_10015", + "key": "hero_color_3", "text_tw": "" }, { - "key": "hero_color_10016", + "key": "hero_color_4", "text_tw": "" }, { @@ -3138,5 +3138,221 @@ { "key": "hero_job_10021", "text_tw": "" + }, + { + "key": "itemdesc_10001", + "text_tw": "" + }, + { + "key": "itemdesc_10002", + "text_tw": "" + }, + { + "key": "itemdesc_10003", + "text_tw": "" + }, + { + "key": "itemdesc_10004", + "text_tw": "" + }, + { + "key": "itemdesc_10005", + "text_tw": "" + }, + { + "key": "itemdesc_10006", + "text_tw": "" + }, + { + "key": "itemdesc_10007", + "text_tw": "" + }, + { + "key": "itemdesc_10008", + "text_tw": "" + }, + { + "key": "itemdesc_10009", + "text_tw": "" + }, + { + "key": "itemdesc_10010", + "text_tw": "" + }, + { + "key": "itemdesc_10011", + "text_tw": "" + }, + { + "key": "itemdesc_10012", + "text_tw": "" + }, + { + "key": "itemdesc_10013", + "text_tw": "" + }, + { + "key": "itemdesc_10014", + "text_tw": "" + }, + { + "key": "itemdesc_10015", + "text_tw": "" + }, + { + "key": "itemdesc_10016", + "text_tw": "" + }, + { + "key": "itemname_10001", + "text_tw": "" + }, + { + "key": "itemname_10002", + "text_tw": "" + }, + { + "key": "itemname_10003", + "text_tw": "" + }, + { + "key": "itemname_10004", + "text_tw": "" + }, + { + "key": "itemname_10005", + "text_tw": "" + }, + { + "key": "itemname_10006", + "text_tw": "" + }, + { + "key": "itemname_10007", + "text_tw": "" + }, + { + "key": "itemname_10008", + "text_tw": "" + }, + { + "key": "itemname_10009", + "text_tw": "" + }, + { + "key": "itemname_10010", + "text_tw": "" + }, + { + "key": "itemname_10011", + "text_tw": "" + }, + { + "key": "itemname_10012", + "text_tw": "" + }, + { + "key": "itemname_10013", + "text_tw": "" + }, + { + "key": "itemname_10014", + "text_tw": "" + }, + { + "key": "itemname_10015", + "text_tw": "" + }, + { + "key": "itemname_10016", + "text_tw": "" + }, + { + "key": "server_10001", + "text_tw": "" + }, + { + "key": "server_10002", + "text_tw": "" + }, + { + "key": "skillname_190011000", + "text_tw": "" + }, + { + "key": "skillname_190012000", + "text_tw": "" + }, + { + "key": "skillname_190013000", + "text_tw": "" + }, + { + "key": "skillname_190011003", + "text_tw": "" + }, + { + "key": "skillname_190014000", + "text_tw": "" + }, + { + "key": "skillname_190016000", + "text_tw": "" + }, + { + "key": "skillname_190017000", + "text_tw": "" + }, + { + "key": "skillname_190018000", + "text_tw": "" + }, + { + "key": "tips_1001", + "text_tw": "" + }, + { + "key": "tips_1002", + "text_tw": "" + }, + { + "key": "nonactivated", + "text_tw": "" + }, + { + "key": "activated", + "text_tw": "" + }, + { + "key": "opencond_name_10001", + "text_tw": "" + }, + { + "key": "opencond_name_10002", + "text_tw": "" + }, + { + "key": "opencond_name_10003", + "text_tw": "" + }, + { + "key": "opencond_name_10004", + "text_tw": "" + }, + { + "key": "opencond_name_10005", + "text_tw": "" + }, + { + "key": "opencond_prompt_10001", + "text_tw": "" + }, + { + "key": "opencond_prompt_10002", + "text_tw": "" + }, + { + "key": "opencond_prompt_10003", + "text_tw": "" } ] \ No newline at end of file diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json new file mode 100644 index 000000000..1deb56ed5 --- /dev/null +++ b/bin/json/game_activereward.json @@ -0,0 +1,172 @@ +[ + { + "key": 1, + "id_tag": 1, + "active": 20, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 2, + "id_tag": 1, + "active": 40, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 150 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 3, + "id_tag": 1, + "active": 60, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 200 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 4, + "id_tag": 1, + "active": 80, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 250 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 5, + "id_tag": 1, + "active": 100, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 300 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 6, + "id_tag": 2, + "active": 40, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 350 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 7, + "id_tag": 2, + "active": 80, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 400 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 8, + "id_tag": 2, + "active": 120, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 450 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 9, + "id_tag": 2, + "active": 160, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + }, + { + "key": 10, + "id_tag": 2, + "active": 200, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 550 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index 0a4022b8e..a437feec2 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -12,6 +12,7 @@ }, "pos": 1, "star": 1, + "color": 1, "leadlibrary": 10001, "addattrnum": [ 0, @@ -24,7 +25,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10002", @@ -39,6 +48,7 @@ }, "pos": 2, "star": 1, + "color": 1, "leadlibrary": 10002, "addattrnum": [ 0, @@ -51,7 +61,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10003", @@ -66,6 +84,7 @@ }, "pos": 3, "star": 1, + "color": 1, "leadlibrary": 10003, "addattrnum": [ 0, @@ -80,7 +99,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10004", @@ -95,6 +122,7 @@ }, "pos": 4, "star": 1, + "color": 1, "leadlibrary": 10004, "addattrnum": [ 1, @@ -107,7 +135,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10005", @@ -122,6 +158,7 @@ }, "pos": 5, "star": 1, + "color": 1, "leadlibrary": 10005, "addattrnum": [ 1, @@ -136,7 +173,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10006", @@ -151,6 +196,7 @@ }, "pos": 6, "star": 1, + "color": 1, "leadlibrary": 10006, "addattrnum": [ 2, @@ -163,7 +209,15 @@ 5 ], "addlibrary": 1001, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10011", @@ -178,6 +232,7 @@ }, "pos": 1, "star": 2, + "color": 2, "leadlibrary": 10011, "addattrnum": [ 0, @@ -190,7 +245,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10012", @@ -205,6 +268,7 @@ }, "pos": 2, "star": 2, + "color": 2, "leadlibrary": 10012, "addattrnum": [ 0, @@ -217,7 +281,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10013", @@ -232,6 +304,7 @@ }, "pos": 3, "star": 2, + "color": 2, "leadlibrary": 10013, "addattrnum": [ 0, @@ -246,7 +319,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10014", @@ -261,6 +342,7 @@ }, "pos": 4, "star": 2, + "color": 2, "leadlibrary": 10014, "addattrnum": [ 1, @@ -273,7 +355,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10015", @@ -288,6 +378,7 @@ }, "pos": 5, "star": 2, + "color": 2, "leadlibrary": 10015, "addattrnum": [ 1, @@ -302,7 +393,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10016", @@ -317,6 +416,7 @@ }, "pos": 6, "star": 2, + "color": 2, "leadlibrary": 10016, "addattrnum": [ 2, @@ -329,7 +429,15 @@ 5 ], "addlibrary": 1001, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10021", @@ -344,6 +452,7 @@ }, "pos": 1, "star": 3, + "color": 3, "leadlibrary": 10021, "addattrnum": [ 0, @@ -356,7 +465,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10022", @@ -371,6 +488,7 @@ }, "pos": 2, "star": 3, + "color": 3, "leadlibrary": 10022, "addattrnum": [ 0, @@ -383,7 +501,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10023", @@ -398,6 +524,7 @@ }, "pos": 3, "star": 3, + "color": 3, "leadlibrary": 10023, "addattrnum": [ 0, @@ -412,7 +539,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10024", @@ -427,6 +562,7 @@ }, "pos": 4, "star": 3, + "color": 3, "leadlibrary": 10024, "addattrnum": [ 1, @@ -439,7 +575,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10025", @@ -454,6 +598,7 @@ }, "pos": 5, "star": 3, + "color": 3, "leadlibrary": 10025, "addattrnum": [ 1, @@ -468,7 +613,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10026", @@ -483,6 +636,7 @@ }, "pos": 6, "star": 3, + "color": 3, "leadlibrary": 10026, "addattrnum": [ 2, @@ -495,7 +649,15 @@ 5 ], "addlibrary": 1001, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10031", @@ -510,6 +672,7 @@ }, "pos": 1, "star": 4, + "color": 4, "leadlibrary": 10031, "addattrnum": [ 0, @@ -522,7 +685,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10032", @@ -537,6 +708,7 @@ }, "pos": 2, "star": 4, + "color": 4, "leadlibrary": 10032, "addattrnum": [ 0, @@ -549,7 +721,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10033", @@ -564,6 +744,7 @@ }, "pos": 3, "star": 4, + "color": 4, "leadlibrary": 10033, "addattrnum": [ 0, @@ -578,7 +759,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10034", @@ -593,6 +782,7 @@ }, "pos": 4, "star": 4, + "color": 4, "leadlibrary": 10034, "addattrnum": [ 1, @@ -605,7 +795,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10035", @@ -620,6 +818,7 @@ }, "pos": 5, "star": 4, + "color": 4, "leadlibrary": 10035, "addattrnum": [ 1, @@ -634,7 +833,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10036", @@ -649,6 +856,7 @@ }, "pos": 6, "star": 4, + "color": 4, "leadlibrary": 10036, "addattrnum": [ 2, @@ -661,7 +869,15 @@ 5 ], "addlibrary": 1001, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10041", @@ -676,6 +892,7 @@ }, "pos": 1, "star": 5, + "color": 5, "leadlibrary": 10041, "addattrnum": [ 0, @@ -688,7 +905,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10042", @@ -703,6 +928,7 @@ }, "pos": 2, "star": 5, + "color": 5, "leadlibrary": 10042, "addattrnum": [ 0, @@ -715,7 +941,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10043", @@ -730,6 +964,7 @@ }, "pos": 3, "star": 5, + "color": 5, "leadlibrary": 10043, "addattrnum": [ 0, @@ -744,7 +979,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10044", @@ -759,6 +1002,7 @@ }, "pos": 4, "star": 5, + "color": 5, "leadlibrary": 10044, "addattrnum": [ 1, @@ -771,7 +1015,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10045", @@ -786,6 +1038,7 @@ }, "pos": 5, "star": 5, + "color": 5, "leadlibrary": 10045, "addattrnum": [ 1, @@ -800,7 +1053,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10046", @@ -815,6 +1076,7 @@ }, "pos": 6, "star": 5, + "color": 5, "leadlibrary": 10046, "addattrnum": [ 2, @@ -827,7 +1089,15 @@ 5 ], "addlibrary": 1001, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10051", @@ -842,6 +1112,7 @@ }, "pos": 1, "star": 6, + "color": 6, "leadlibrary": 10051, "addattrnum": [ 0, @@ -854,7 +1125,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10052", @@ -869,6 +1148,7 @@ }, "pos": 2, "star": 6, + "color": 6, "leadlibrary": 10052, "addattrnum": [ 0, @@ -881,7 +1161,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10053", @@ -896,6 +1184,7 @@ }, "pos": 3, "star": 6, + "color": 6, "leadlibrary": 10053, "addattrnum": [ 0, @@ -910,7 +1199,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10054", @@ -925,6 +1222,7 @@ }, "pos": 4, "star": 6, + "color": 6, "leadlibrary": 10054, "addattrnum": [ 1, @@ -937,7 +1235,15 @@ 20 ], "addlibrary": 1001, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10055", @@ -952,6 +1258,7 @@ }, "pos": 5, "star": 6, + "color": 6, "leadlibrary": 10055, "addattrnum": [ 1, @@ -966,7 +1273,15 @@ 10 ], "addlibrary": 1001, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "10056", @@ -981,6 +1296,7 @@ }, "pos": 6, "star": 6, + "color": 6, "leadlibrary": 10056, "addattrnum": [ 2, @@ -993,7 +1309,15 @@ 5 ], "addlibrary": 1001, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11001", @@ -1008,6 +1332,7 @@ }, "pos": 1, "star": 1, + "color": 1, "leadlibrary": 11001, "addattrnum": [ 0, @@ -1020,7 +1345,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11002", @@ -1035,6 +1368,7 @@ }, "pos": 2, "star": 1, + "color": 1, "leadlibrary": 11002, "addattrnum": [ 0, @@ -1047,7 +1381,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11003", @@ -1062,6 +1404,7 @@ }, "pos": 3, "star": 1, + "color": 1, "leadlibrary": 11003, "addattrnum": [ 0, @@ -1076,7 +1419,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11004", @@ -1091,6 +1442,7 @@ }, "pos": 4, "star": 1, + "color": 1, "leadlibrary": 11004, "addattrnum": [ 1, @@ -1103,7 +1455,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11005", @@ -1118,6 +1478,7 @@ }, "pos": 5, "star": 1, + "color": 1, "leadlibrary": 11005, "addattrnum": [ 1, @@ -1132,7 +1493,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11006", @@ -1147,6 +1516,7 @@ }, "pos": 6, "star": 1, + "color": 1, "leadlibrary": 11006, "addattrnum": [ 2, @@ -1159,7 +1529,15 @@ 5 ], "addlibrary": 1101, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11011", @@ -1174,6 +1552,7 @@ }, "pos": 1, "star": 2, + "color": 2, "leadlibrary": 11011, "addattrnum": [ 0, @@ -1186,7 +1565,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11012", @@ -1201,6 +1588,7 @@ }, "pos": 2, "star": 2, + "color": 2, "leadlibrary": 11012, "addattrnum": [ 0, @@ -1213,7 +1601,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11013", @@ -1228,6 +1624,7 @@ }, "pos": 3, "star": 2, + "color": 2, "leadlibrary": 11013, "addattrnum": [ 0, @@ -1242,7 +1639,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11014", @@ -1257,6 +1662,7 @@ }, "pos": 4, "star": 2, + "color": 2, "leadlibrary": 11014, "addattrnum": [ 1, @@ -1269,7 +1675,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11015", @@ -1284,6 +1698,7 @@ }, "pos": 5, "star": 2, + "color": 2, "leadlibrary": 11015, "addattrnum": [ 1, @@ -1298,7 +1713,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11016", @@ -1313,6 +1736,7 @@ }, "pos": 6, "star": 2, + "color": 2, "leadlibrary": 11016, "addattrnum": [ 2, @@ -1325,7 +1749,15 @@ 5 ], "addlibrary": 1101, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11021", @@ -1340,6 +1772,7 @@ }, "pos": 1, "star": 3, + "color": 3, "leadlibrary": 11021, "addattrnum": [ 0, @@ -1352,7 +1785,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11022", @@ -1367,6 +1808,7 @@ }, "pos": 2, "star": 3, + "color": 3, "leadlibrary": 11022, "addattrnum": [ 0, @@ -1379,7 +1821,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11023", @@ -1394,6 +1844,7 @@ }, "pos": 3, "star": 3, + "color": 3, "leadlibrary": 11023, "addattrnum": [ 0, @@ -1408,7 +1859,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11024", @@ -1423,6 +1882,7 @@ }, "pos": 4, "star": 3, + "color": 3, "leadlibrary": 11024, "addattrnum": [ 1, @@ -1435,7 +1895,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11025", @@ -1450,6 +1918,7 @@ }, "pos": 5, "star": 3, + "color": 3, "leadlibrary": 11025, "addattrnum": [ 1, @@ -1464,7 +1933,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11026", @@ -1479,6 +1956,7 @@ }, "pos": 6, "star": 3, + "color": 3, "leadlibrary": 11026, "addattrnum": [ 2, @@ -1491,7 +1969,15 @@ 5 ], "addlibrary": 1101, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11031", @@ -1506,6 +1992,7 @@ }, "pos": 1, "star": 4, + "color": 4, "leadlibrary": 11031, "addattrnum": [ 0, @@ -1518,7 +2005,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11032", @@ -1533,6 +2028,7 @@ }, "pos": 2, "star": 4, + "color": 4, "leadlibrary": 11032, "addattrnum": [ 0, @@ -1545,7 +2041,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11033", @@ -1560,6 +2064,7 @@ }, "pos": 3, "star": 4, + "color": 4, "leadlibrary": 11033, "addattrnum": [ 0, @@ -1574,7 +2079,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11034", @@ -1589,6 +2102,7 @@ }, "pos": 4, "star": 4, + "color": 4, "leadlibrary": 11034, "addattrnum": [ 1, @@ -1601,7 +2115,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11035", @@ -1616,6 +2138,7 @@ }, "pos": 5, "star": 4, + "color": 4, "leadlibrary": 11035, "addattrnum": [ 1, @@ -1630,7 +2153,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11036", @@ -1645,6 +2176,7 @@ }, "pos": 6, "star": 4, + "color": 4, "leadlibrary": 11036, "addattrnum": [ 2, @@ -1657,7 +2189,15 @@ 5 ], "addlibrary": 1101, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11041", @@ -1672,6 +2212,7 @@ }, "pos": 1, "star": 5, + "color": 5, "leadlibrary": 11041, "addattrnum": [ 0, @@ -1684,7 +2225,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11042", @@ -1699,6 +2248,7 @@ }, "pos": 2, "star": 5, + "color": 5, "leadlibrary": 11042, "addattrnum": [ 0, @@ -1711,7 +2261,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11043", @@ -1726,6 +2284,7 @@ }, "pos": 3, "star": 5, + "color": 5, "leadlibrary": 11043, "addattrnum": [ 0, @@ -1740,7 +2299,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11044", @@ -1755,6 +2322,7 @@ }, "pos": 4, "star": 5, + "color": 5, "leadlibrary": 11044, "addattrnum": [ 1, @@ -1767,7 +2335,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11045", @@ -1782,6 +2358,7 @@ }, "pos": 5, "star": 5, + "color": 5, "leadlibrary": 11045, "addattrnum": [ 1, @@ -1796,7 +2373,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11046", @@ -1811,6 +2396,7 @@ }, "pos": 6, "star": 5, + "color": 5, "leadlibrary": 11046, "addattrnum": [ 2, @@ -1823,7 +2409,15 @@ 5 ], "addlibrary": 1101, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11051", @@ -1838,6 +2432,7 @@ }, "pos": 1, "star": 6, + "color": 6, "leadlibrary": 11051, "addattrnum": [ 0, @@ -1850,7 +2445,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_01" + "ico": "zc_icon_01", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11052", @@ -1865,6 +2468,7 @@ }, "pos": 2, "star": 6, + "color": 6, "leadlibrary": 11052, "addattrnum": [ 0, @@ -1877,7 +2481,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_02" + "ico": "zc_icon_02", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11053", @@ -1892,6 +2504,7 @@ }, "pos": 3, "star": 6, + "color": 6, "leadlibrary": 11053, "addattrnum": [ 0, @@ -1906,7 +2519,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_03" + "ico": "zc_icon_03", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11054", @@ -1921,6 +2542,7 @@ }, "pos": 4, "star": 6, + "color": 6, "leadlibrary": 11054, "addattrnum": [ 1, @@ -1933,7 +2555,15 @@ 20 ], "addlibrary": 1101, - "ico": "zc_icon_04" + "ico": "zc_icon_04", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11055", @@ -1948,6 +2578,7 @@ }, "pos": 5, "star": 6, + "color": 6, "leadlibrary": 11055, "addattrnum": [ 1, @@ -1962,7 +2593,15 @@ 10 ], "addlibrary": 1101, - "ico": "zc_icon_05" + "ico": "zc_icon_05", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "id": "11056", @@ -1977,6 +2616,7 @@ }, "pos": 6, "star": 6, + "color": 6, "leadlibrary": 11056, "addattrnum": [ 2, @@ -1989,6 +2629,14 @@ 5 ], "addlibrary": 1101, - "ico": "zc_icon_06" + "ico": "zc_icon_06", + "use_skip": 0, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json index 775d87b8b..d76dc267b 100644 --- a/bin/json/game_extservers.json +++ b/bin/json/game_extservers.json @@ -1,10 +1,26 @@ [ { - "name": "本地测试服", - "ips": "10.0.0.9:7891" + "name": { + "key": "server_10001", + "text": "本地测试服" + }, + "ips": "10.0.0.9:7891", + "debug": true }, { - "name": "外网测试服", - "ips": "119.3.89.14:7891" + "name": { + "key": "server_10002", + "text": "外网测试服" + }, + "ips": "119.3.89.14:7891", + "debug": false + }, + { + "name": { + "key": "debug_server_01", + "text": "lw" + }, + "ips": "10.0.0.138:7891", + "debug": true } ] \ No newline at end of file diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 88dedc4c0..ecc619063 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -5,7 +5,7 @@ { "a": "hero", "t": "25001", - "n": 5 + "n": 1 } ] }, @@ -21,31 +21,11 @@ }, { "index": "3", - "var": [ - { - "a": "hero", - "t": "24003", - "n": 5 - } - ] - }, - { - "index": "4", "var": [ { "a": "hero", "t": "25004", - "n": 5 - } - ] - }, - { - "index": "5", - "var": [ - { - "a": "hero", - "t": "35002", - "n": 5 + "n": 1 } ] }, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 4147429db..3c166a170 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -79,12 +79,12 @@ }, "usetype": 1, "color": 5, - "bagtype": 2, + "bagtype": 3, "index": 2, "special_type": 0, "time": 0, "effects": "", - "box_id": 10001, + "box_id": 10002, "synthetize_num": 50, "access": 0, "use_skip": 0, @@ -120,7 +120,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 10001, + "box_id": 20001, "synthetize_num": 0, "access": 0, "use_skip": 0, @@ -156,7 +156,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 10001, + "box_id": 20002, "synthetize_num": 0, "access": 0, "use_skip": 0, @@ -169,7 +169,7 @@ "ico": "wp_icon_0001", "intr": { "key": "itemdesc_10005", - "text": "可以下一下道具中随机获取1个" + "text": "可以在以下道具中随机获取1个" }, "sale": [ { @@ -192,7 +192,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 20001, + "box_id": 20003, "synthetize_num": 0, "access": 0, "use_skip": 0, @@ -574,5 +574,77 @@ "n": 1000 } ] + }, + { + "id": "20001", + "name": { + "key": "itemname_20001", + "text": "随机英雄碎片" + }, + "usetype": 1, + "color": 5, + "bagtype": 3, + "index": 17, + "special_type": 0, + "time": 0, + "effects": "", + "box_id": 10001, + "synthetize_num": 50, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 6, + "race": 3, + "img": "wp_icon_0001", + "ico": "wp_icon_0001", + "intr": { + "key": "itemdesc_20001", + "text": "集齐50个碎片合成随机英雄" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": "20002", + "name": { + "key": "itemname_20002", + "text": "25001号碎片" + }, + "usetype": 1, + "color": 5, + "bagtype": 3, + "index": 18, + "special_type": 0, + "time": 0, + "effects": "", + "box_id": 10002, + "synthetize_num": 50, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 6, + "race": 3, + "img": "wp_icon_0001", + "ico": "wp_icon_0001", + "intr": { + "key": "itemdesc_20002", + "text": "集齐50个碎片合成25001号英雄" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_language.json b/bin/json/game_language.json new file mode 100644 index 000000000..c2c1197a4 --- /dev/null +++ b/bin/json/game_language.json @@ -0,0 +1,326 @@ +[ + { + "keycode": { + "key": "ChineseSimplified", + "text": "ChineseSimplified" + } + }, + { + "keycode": { + "key": "ChineseTraditional", + "text": "ChineseTraditional" + } + }, + { + "keycode": { + "key": "English", + "text": "English" + } + }, + { + "keycode": { + "key": "1", + "text": "1" + } + }, + { + "keycode": { + "key": "2", + "text": "2" + } + }, + { + "keycode": { + "key": "3", + "text": "3" + } + }, + { + "keycode": { + "key": "4", + "text": "4" + } + }, + { + "keycode": { + "key": "5", + "text": "5" + } + }, + { + "keycode": { + "key": "6", + "text": "6" + } + }, + { + "keycode": { + "key": "7", + "text": "7" + } + }, + { + "keycode": { + "key": "8", + "text": "8" + } + }, + { + "keycode": { + "key": "9", + "text": "9" + } + }, + { + "keycode": { + "key": "10", + "text": "10" + } + }, + { + "keycode": { + "key": "Login", + "text": "Login" + } + }, + { + "keycode": { + "key": "MomentDay1", + "text": "MomentDay1" + } + }, + { + "keycode": { + "key": "MomentDay2", + "text": "MomentDay2" + } + }, + { + "keycode": { + "key": "MomentHour1", + "text": "MomentHour1" + } + }, + { + "keycode": { + "key": "MomentHour2", + "text": "MomentHour2" + } + }, + { + "keycode": { + "key": "MomentMinutes1", + "text": "MomentMinutes1" + } + }, + { + "keycode": { + "key": "MomentMinutes2", + "text": "MomentMinutes2" + } + }, + { + "keycode": { + "key": "MomentSeconds1", + "text": "MomentSeconds1" + } + }, + { + "keycode": { + "key": "MomentSeconds2", + "text": "MomentSeconds2" + } + }, + { + "keycode": { + "key": "Tuijian", + "text": "Tuijian" + } + }, + { + "keycode": { + "key": "Juese", + "text": "Juese" + } + }, + { + "keycode": { + "key": "hero_star_1", + "text": "hero_star_1" + } + }, + { + "keycode": { + "key": "hero_star_2", + "text": "hero_star_2" + } + }, + { + "keycode": { + "key": "hero_star_3", + "text": "hero_star_3" + } + }, + { + "keycode": { + "key": "hero_star_4", + "text": "hero_star_4" + } + }, + { + "keycode": { + "key": "hero_color_1", + "text": "hero_color_1" + } + }, + { + "keycode": { + "key": "hero_color_2", + "text": "hero_color_2" + } + }, + { + "keycode": { + "key": "hero_color_3", + "text": "hero_color_3" + } + }, + { + "keycode": { + "key": "hero_color_4", + "text": "hero_color_4" + } + }, + { + "keycode": { + "key": "hero_job_10017", + "text": "hero_job_10017" + } + }, + { + "keycode": { + "key": "hero_job_10018", + "text": "hero_job_10018" + } + }, + { + "keycode": { + "key": "hero_job_10019", + "text": "hero_job_10019" + } + }, + { + "keycode": { + "key": "hero_job_10020", + "text": "hero_job_10020" + } + }, + { + "keycode": { + "key": "hero_job_10021", + "text": "hero_job_10021" + } + }, + { + "keycode": { + "key": "equip_10001", + "text": "equip_10001" + } + }, + { + "keycode": { + "key": "equip_10002", + "text": "equip_10002" + } + }, + { + "keycode": { + "key": "equip_10003", + "text": "equip_10003" + } + }, + { + "keycode": { + "key": "equip_10004", + "text": "equip_10004" + } + }, + { + "keycode": { + "key": "equip_10005", + "text": "equip_10005" + } + }, + { + "keycode": { + "key": "hero_10001", + "text": "hero_10001" + } + }, + { + "keycode": { + "key": "hero_10002", + "text": "hero_10002" + } + }, + { + "keycode": { + "key": "hero_10003", + "text": "hero_10003" + } + }, + { + "keycode": { + "key": "hero_10004", + "text": "hero_10004" + } + }, + { + "keycode": { + "key": "hero_10005", + "text": "hero_10005" + } + }, + { + "keycode": { + "key": "hero_10006", + "text": "hero_10006" + } + }, + { + "keycode": { + "key": "hero_10007", + "text": "hero_10007" + } + }, + { + "keycode": { + "key": "hero_10008", + "text": "hero_10008" + } + }, + { + "keycode": { + "key": "nonactivated", + "text": "nonactivated" + } + }, + { + "keycode": { + "key": "activated", + "text": "activated" + } + }, + { + "keycode": { + "key": "tips_1001", + "text": "tips_1001" + } + }, + { + "keycode": { + "key": "tips_1002", + "text": "tips_1002" + } + } +] \ No newline at end of file diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 0e29827a9..f96ace182 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -348,7 +348,7 @@ "id": 24003, "preson": "24003", "presonshow": "", - "ico": "tx_hhjs_24003", + "ico": "tx_js_24003", "fight": "ytx_js_24003", "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", @@ -678,7 +678,7 @@ "id": 34006, "preson": "34006", "presonshow": "", - "ico": "tx_hhjs_34006", + "ico": "tx_js_34006", "fight": "ytx_js_34006", "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", @@ -723,7 +723,7 @@ "id": 35001, "preson": "35001", "presonshow": "", - "ico": "tx_hhjs_35001", + "ico": "tx_js_35001", "fight": "ytx_js_35001", "img": "sbkp_js_35001", "heroimg": "hbkp_js_35001", @@ -738,7 +738,7 @@ "id": 35002, "preson": "35002", "presonshow": "", - "ico": "tx_hhjs_35002", + "ico": "tx_js_35002", "fight": "ytx_js_35002", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", @@ -978,7 +978,7 @@ "id": 44005, "preson": "44005", "presonshow": "", - "ico": "tx_hhjs_44005", + "ico": "tx_js_44005", "fight": "ytx_js_44005", "img": "sbkp_js_44005", "heroimg": "hbkp_js_44005", @@ -1129,10 +1129,10 @@ "preson": "43921", "presonshow": "", "ico": "tx_hhjs_35002", - "fight": "ytx_js_43921", + "fight": "ytx_js_35002", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", - "portrait": "portrait_43921", + "portrait": "portrait_35002", "postxyz": [ 0, 0, @@ -1144,10 +1144,10 @@ "preson": "44921", "presonshow": "", "ico": "tx_hhjs_35002", - "fight": "ytx_js_44921", + "fight": "ytx_js_35002", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", - "portrait": "portrait_44921", + "portrait": "portrait_35002", "postxyz": [ 0, 0, @@ -1159,10 +1159,10 @@ "preson": "45921", "presonshow": "", "ico": "tx_hhjs_35002", - "fight": "ytx_js_45921", + "fight": "ytx_js_35002", "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", - "portrait": "portrait_45921", + "portrait": "portrait_35002", "postxyz": [ 0, 0, diff --git a/bin/json/game_newhero.json b/bin/json/game_newhero.json index e0fdeb7fa..5fdc37919 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_newhero.json @@ -3305,8 +3305,8 @@ "key": "hero_51001", "text": "啵啵星人（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3349,8 +3349,8 @@ "key": "hero_51002", "text": "埃雷特手下1号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3393,8 +3393,8 @@ "key": "hero_51003", "text": "埃雷特手下2号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3437,8 +3437,8 @@ "key": "hero_51004", "text": "豺狼小怪（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3481,8 +3481,8 @@ "key": "hero_51005", "text": "犀牛守卫（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 1, "type": 5, @@ -3525,8 +3525,8 @@ "key": "hero_51006", "text": "香塔尔 杜布瓦队长手下1号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3569,8 +3569,8 @@ "key": "hero_51007", "text": "香塔尔 杜布瓦队长手下2号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3613,8 +3613,8 @@ "key": "hero_51008", "text": "香塔尔 杜布瓦队长手下3号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 1, "type": 5, @@ -3657,8 +3657,8 @@ "key": "hero_51009", "text": "香塔尔 杜布瓦队长手下4号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 1, "type": 5, @@ -3701,8 +3701,8 @@ "key": "hero_51010", "text": "警卫1号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 1, "type": 5, @@ -3745,8 +3745,8 @@ "key": "hero_51011", "text": "警卫2号（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3789,8 +3789,8 @@ "key": "hero_51012", "text": "小猴子（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 3, "type": 5, @@ -3833,8 +3833,8 @@ "key": "hero_51013", "text": "巨怪啰啰（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 1, "type": 5, @@ -3877,8 +3877,8 @@ "key": "hero_51014", "text": "博啃族宫廷守卫（新增）" }, - "star": 1, - "color": 0, + "star": 2, + "color": 1, "race": 4, "job": 1, "type": 5, diff --git a/bin/json/game_newskill.json b/bin/json/game_newskill.json index 81d63dc27..4c84647b0 100644 --- a/bin/json/game_newskill.json +++ b/bin/json/game_newskill.json @@ -1,7 +1,10 @@ [ { "Id": 190011000, - "Name": "阿宝队长技", + "Name": { + "key": "skillname_190011000", + "text": "阿宝队长技" + }, "ico": "jn_dzj_01", "act": "Skill_1", "Type": 1, @@ -70,7 +73,10 @@ }, { "Id": 190012000, - "Name": "熊猫拳", + "Name": { + "key": "skillname_190012000", + "text": "熊猫拳" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -139,7 +145,10 @@ }, { "Id": 190013000, - "Name": "太极一式", + "Name": { + "key": "skillname_190013000", + "text": "太极一式" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -208,7 +217,10 @@ }, { "Id": 190014000, - "Name": "太极零式", + "Name": { + "key": "skillname_190011003", + "text": "太极零式" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -277,7 +289,10 @@ }, { "Id": 190015000, - "Name": "波比队长技", + "Name": { + "key": "skillname_190014000", + "text": "波比队长技" + }, "ico": "jn_dzj_03", "act": "Skill_2", "Type": 1, @@ -346,7 +361,10 @@ }, { "Id": 190016000, - "Name": "和谐音律", + "Name": { + "key": "skillname_190016000", + "text": "和谐音律" + }, "ico": "jn_icon_004", "act": "Skill_3", "Type": 1, @@ -415,7 +433,10 @@ }, { "Id": 190017000, - "Name": "欢悦之舞", + "Name": { + "key": "skillname_190017000", + "text": "欢悦之舞" + }, "ico": "jn_icon_005", "act": "Skill_1", "Type": 1, @@ -484,7 +505,10 @@ }, { "Id": 190018000, - "Name": "彩虹音符", + "Name": { + "key": "skillname_190018000", + "text": "彩虹音符" + }, "ico": "jn_icon_006", "act": "Skill_2", "Type": 1, @@ -553,7 +577,10 @@ }, { "Id": 190019000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190019000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -622,7 +649,10 @@ }, { "Id": 190020000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190020000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -691,7 +721,10 @@ }, { "Id": 190021000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190021000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -760,7 +793,10 @@ }, { "Id": 190022000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190022000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -829,7 +865,10 @@ }, { "Id": 190023000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190023000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -898,7 +937,10 @@ }, { "Id": 190024000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190024000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -967,7 +1009,10 @@ }, { "Id": 190025000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190025000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -1036,7 +1081,10 @@ }, { "Id": 190026000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190026000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -1105,7 +1153,10 @@ }, { "Id": 190027000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190027000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -1174,7 +1225,10 @@ }, { "Id": 190028000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190028000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -1243,7 +1297,10 @@ }, { "Id": 190029000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190029000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -1312,7 +1369,10 @@ }, { "Id": 190030000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190030000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -1381,7 +1441,10 @@ }, { "Id": 190031000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190031000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -1450,7 +1513,10 @@ }, { "Id": 190032000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190032000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -1519,7 +1585,10 @@ }, { "Id": 190033000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190033000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -1588,7 +1657,10 @@ }, { "Id": 190034000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190034000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -1657,7 +1729,10 @@ }, { "Id": 190035000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190035000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -1726,7 +1801,10 @@ }, { "Id": 190036000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190036000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -1795,7 +1873,10 @@ }, { "Id": 190037000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190037000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -1870,7 +1951,10 @@ }, { "Id": 190038000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190038000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -1939,7 +2023,10 @@ }, { "Id": 190039000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190039000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -2008,7 +2095,10 @@ }, { "Id": 190040000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190040000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -2077,7 +2167,10 @@ }, { "Id": 190041000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190041000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -2146,7 +2239,10 @@ }, { "Id": 190042000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190042000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -2221,7 +2317,10 @@ }, { "Id": 190043000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190043000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -2290,7 +2389,10 @@ }, { "Id": 190044000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190044000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -2359,7 +2461,10 @@ }, { "Id": 190045000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190045000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -2428,7 +2533,10 @@ }, { "Id": 190046000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190046000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -2497,7 +2605,10 @@ }, { "Id": 190047000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190047000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -2572,7 +2683,10 @@ }, { "Id": 190048000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190048000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -2641,7 +2755,10 @@ }, { "Id": 190049000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190049000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -2710,7 +2827,10 @@ }, { "Id": 190050000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190050000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -2779,7 +2899,10 @@ }, { "Id": 190051000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190051000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -2848,7 +2971,10 @@ }, { "Id": 190052000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190052000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -2917,7 +3043,10 @@ }, { "Id": 190053000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190053000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -2986,7 +3115,10 @@ }, { "Id": 190054000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190054000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -3055,7 +3187,10 @@ }, { "Id": 190055000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190055000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -3124,7 +3259,10 @@ }, { "Id": 190056000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190056000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -3193,7 +3331,10 @@ }, { "Id": 190057000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190057000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -3262,7 +3403,10 @@ }, { "Id": 190058000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190058000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -3331,7 +3475,10 @@ }, { "Id": 190059000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190059000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -3400,7 +3547,10 @@ }, { "Id": 190060000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190060000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -3469,7 +3619,10 @@ }, { "Id": 190061000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190061000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -3544,7 +3697,10 @@ }, { "Id": 190062000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190062000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -3619,7 +3775,10 @@ }, { "Id": 190063000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190063000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -3688,7 +3847,10 @@ }, { "Id": 190064000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190064000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -3757,7 +3919,10 @@ }, { "Id": 190065000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190065000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -3826,7 +3991,10 @@ }, { "Id": 190066000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190066000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -3895,7 +4063,10 @@ }, { "Id": 190067000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190067000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 2, @@ -3964,7 +4135,10 @@ }, { "Id": 190068000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190068000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -4033,7 +4207,10 @@ }, { "Id": 190069000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190069000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4102,7 +4279,10 @@ }, { "Id": 190070000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190070000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4171,7 +4351,10 @@ }, { "Id": 190071000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190071000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4240,7 +4423,10 @@ }, { "Id": 190072000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190072000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4309,7 +4495,10 @@ }, { "Id": 190073000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190073000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4378,7 +4567,10 @@ }, { "Id": 190074000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190074000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4447,7 +4639,10 @@ }, { "Id": 190075000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190075000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4516,7 +4711,10 @@ }, { "Id": 190076000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190076000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4585,7 +4783,10 @@ }, { "Id": 190077000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190077000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4654,7 +4855,10 @@ }, { "Id": 190078000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190078000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4723,7 +4927,10 @@ }, { "Id": 190079000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190079000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4792,7 +4999,10 @@ }, { "Id": 190080000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190080000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4861,7 +5071,10 @@ }, { "Id": 190081000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190081000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4930,7 +5143,10 @@ }, { "Id": 190082000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190082000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4999,7 +5215,10 @@ }, { "Id": 190083000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190083000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -5068,7 +5287,10 @@ }, { "Id": 190084000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190084000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -5137,7 +5359,10 @@ }, { "Id": 190085000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190085000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -5206,7 +5431,10 @@ }, { "Id": 190086000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190086000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -5275,7 +5503,10 @@ }, { "Id": 100012100, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_100012100", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -5350,7 +5581,10 @@ }, { "Id": 100022100, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_100022100", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 2, @@ -5431,7 +5665,10 @@ }, { "Id": 100092100, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_100092100", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 2, @@ -5506,7 +5743,10 @@ }, { "Id": 100102100, - "Name": "梦扣扣", + "Name": { + "key": "skillname_100102100", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 2, @@ -5605,7 +5845,10 @@ }, { "Id": 100162100, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_100162100", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -5680,7 +5923,10 @@ }, { "Id": 100191100, - "Name": "猫猫威慑", + "Name": { + "key": "skillname_100191100", + "text": "猫猫威慑" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -5755,7 +6001,10 @@ }, { "Id": 100192100, - "Name": "猫猫推理", + "Name": { + "key": "skillname_100192100", + "text": "猫猫推理" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 2, @@ -5836,7 +6085,10 @@ }, { "Id": 100193100, - "Name": "烙印", + "Name": { + "key": "skillname_100193100", + "text": "烙印" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -5885,7 +6137,10 @@ }, { "Id": 100622100, - "Name": "烙印", + "Name": { + "key": "skillname_100622100", + "text": "烙印" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -5954,7 +6209,10 @@ }, { "Id": 100626100, - "Name": "烙印", + "Name": { + "key": "skillname_100626100", + "text": "烙印" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -6023,7 +6281,10 @@ }, { "Id": 190087000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190087000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6092,7 +6353,10 @@ }, { "Id": 190087001, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190087001", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6161,7 +6425,10 @@ }, { "Id": 190087002, - "Name": "梦之防护", + "Name": { + "key": "skillname_190087002", + "text": "梦之防护" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6230,7 +6497,10 @@ }, { "Id": 190087003, - "Name": "护盾检测", + "Name": { + "key": "skillname_190087003", + "text": "护盾检测" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6299,7 +6569,10 @@ }, { "Id": 190087004, - "Name": "护盾击破检测", + "Name": { + "key": "skillname_190087004", + "text": "护盾击破检测" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6368,7 +6641,10 @@ }, { "Id": 110011, - "Name": "熊猫拳", + "Name": { + "key": "skillname_110011", + "text": "熊猫拳" + }, "ico": "skillicon_001", "act": "Skill_1", "Type": 0, @@ -6437,7 +6713,10 @@ }, { "Id": 110012, - "Name": "太极一式", + "Name": { + "key": "skillname_110012", + "text": "太极一式" + }, "ico": "skillicon_002", "act": "Skill_2", "Type": 0, @@ -6506,7 +6785,10 @@ }, { "Id": 110013, - "Name": "太极零式", + "Name": { + "key": "skillname_110013", + "text": "太极零式" + }, "ico": "skillicon_003", "act": "Skill_3", "Type": 0, @@ -6575,7 +6857,10 @@ }, { "Id": 110031, - "Name": "和谐音律", + "Name": { + "key": "skillname_110031", + "text": "和谐音律" + }, "ico": "skillicon_004", "act": "Skill_1", "Type": 1, @@ -6644,7 +6929,10 @@ }, { "Id": 110032, - "Name": "欢悦之舞", + "Name": { + "key": "skillname_110032", + "text": "欢悦之舞" + }, "ico": "skillicon_005", "act": "Skill_2", "Type": 1, @@ -6713,7 +7001,10 @@ }, { "Id": 110033, - "Name": "彩虹音符", + "Name": { + "key": "skillname_110033", + "text": "彩虹音符" + }, "ico": "skillicon_006", "act": "Skill_3", "Type": 1, @@ -6782,7 +7073,10 @@ }, { "Id": 110171, - "Name": "冰霜之语", + "Name": { + "key": "skillname_110171", + "text": "冰霜之语" + }, "ico": "skillicon_010", "act": "Skill_1", "Type": 1, @@ -6851,7 +7145,10 @@ }, { "Id": 110172, - "Name": "寒冰之力", + "Name": { + "key": "skillname_110172", + "text": "寒冰之力" + }, "ico": "skillicon_011", "act": "Skill_2", "Type": 1, @@ -6920,7 +7217,10 @@ }, { "Id": 110173, - "Name": "极寒领域", + "Name": { + "key": "skillname_110173", + "text": "极寒领域" + }, "ico": "skillicon_012", "act": "Skill_3", "Type": 1, @@ -6989,7 +7289,10 @@ }, { "Id": 110181, - "Name": "梦·呓语", + "Name": { + "key": "skillname_110181", + "text": "梦·呓语" + }, "ico": "skillicon_013", "act": "Skill_1", "Type": 0, @@ -7058,7 +7361,10 @@ }, { "Id": 110182, - "Name": "梦·愉悦", + "Name": { + "key": "skillname_110182", + "text": "梦·愉悦" + }, "ico": "skillicon_014", "act": "Skill_2", "Type": 1, @@ -7127,7 +7433,10 @@ }, { "Id": 110183, - "Name": "梦·创世", + "Name": { + "key": "skillname_110183", + "text": "梦·创世" + }, "ico": "skillicon_015", "act": "Skill_3", "Type": 1, @@ -7196,7 +7505,10 @@ }, { "Id": 110091, - "Name": "一往无前", + "Name": { + "key": "skillname_110091", + "text": "一往无前" + }, "ico": "skillicon_007", "act": "Skill_1", "Type": 1, @@ -7265,7 +7577,10 @@ }, { "Id": 110092, - "Name": "无所畏惧", + "Name": { + "key": "skillname_110092", + "text": "无所畏惧" + }, "ico": "skillicon_008", "act": "Skill_2", "Type": 1, @@ -7334,7 +7649,10 @@ }, { "Id": 110093, - "Name": "自由之往", + "Name": { + "key": "skillname_110093", + "text": "自由之往" + }, "ico": "skillicon_009", "act": "Skill_3", "Type": 1, @@ -7403,7 +7721,10 @@ }, { "Id": 110111, - "Name": "点到为止", + "Name": { + "key": "skillname_110111", + "text": "点到为止" + }, "ico": "skillicon_001", "act": "Skill_1", "Type": 1, @@ -7472,7 +7793,10 @@ }, { "Id": 110112, - "Name": "聚·心神", + "Name": { + "key": "skillname_110112", + "text": "聚·心神" + }, "ico": "skillicon_002", "act": "Skill_2", "Type": 0, @@ -7541,7 +7865,10 @@ }, { "Id": 110113, - "Name": "上·善若水", + "Name": { + "key": "skillname_110113", + "text": "上·善若水" + }, "ico": "skillicon_003", "act": "Skill_3", "Type": 0, @@ -7610,7 +7937,10 @@ }, { "Id": 440051, - "Name": "蛮之力", + "Name": { + "key": "skillname_440051", + "text": "蛮之力" + }, "ico": "skillicon_001", "act": "Skill_1", "Type": 1, @@ -7679,7 +8009,10 @@ }, { "Id": 440052, - "Name": "蛮力横扫", + "Name": { + "key": "skillname_440052", + "text": "蛮力横扫" + }, "ico": "skillicon_002", "act": "Skill_2", "Type": 1, @@ -7748,7 +8081,10 @@ }, { "Id": 440053, - "Name": "蛮力冲撞", + "Name": { + "key": "skillname_440053", + "text": "蛮力冲撞" + }, "ico": "skillicon_003", "act": "Skill_3", "Type": 1, @@ -7817,7 +8153,10 @@ }, { "Id": 110081, - "Name": "猛虎爪", + "Name": { + "key": "skillname_110081", + "text": "猛虎爪" + }, "ico": "skillicon_007", "act": "Skill_1", "Type": 0, @@ -7886,7 +8225,10 @@ }, { "Id": 110082, - "Name": "胜者为王", + "Name": { + "key": "skillname_110082", + "text": "胜者为王" + }, "ico": "skillicon_008", "act": "Skill_2", "Type": 1, @@ -7955,7 +8297,10 @@ }, { "Id": 110083, - "Name": "霸·猎杀时刻", + "Name": { + "key": "skillname_110083", + "text": "霸·猎杀时刻" + }, "ico": "skillicon_009", "act": "Skill_3", "Type": 0, @@ -8024,7 +8369,10 @@ }, { "Id": 150051, - "Name": "狮子铁拳", + "Name": { + "key": "skillname_150051", + "text": "狮子铁拳" + }, "ico": "skillicon_013", "act": "Skill_1", "Type": 0, @@ -8093,7 +8441,10 @@ }, { "Id": 150052, - "Name": "净化烟火", + "Name": { + "key": "skillname_150052", + "text": "净化烟火" + }, "ico": "skillicon_014", "act": "Skill_2", "Type": 1, @@ -8162,7 +8513,10 @@ }, { "Id": 150053, - "Name": "这是我的主场！", + "Name": { + "key": "skillname_150053", + "text": "这是我的主场！" + }, "ico": "skillicon_015", "act": "Skill_3", "Type": 1, diff --git a/bin/json/game_propsgroup.json b/bin/json/game_propsgroup.json index 73fa22492..c05cf1b2d 100644 --- a/bin/json/game_propsgroup.json +++ b/bin/json/game_propsgroup.json @@ -1,45 +1,102 @@ [ { - "group": 10001, - "star": 0, - "prize": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "gold", - "n": 2000 - }, - { - "a": "attr", - "t": "gold", - "n": 3000 - } - ], - "p": [ - 1000, - 1000, - 1000 - ] + "key": 10001, + "star": 5, + "prize": { + "a": "hero", + "t": "15001", + "n": 1 + }, + "p": 1000 }, { - "group": 20001, + "key": 10002, + "star": 5, + "prize": { + "a": "hero", + "t": "25001", + "n": 1 + }, + "p": 1000 + }, + { + "key": 10003, + "star": 4, + "prize": { + "a": "hero", + "t": "25001", + "n": 1 + }, + "p": 1000 + }, + { + "key": 10004, + "star": 4, + "prize": { + "a": "hero", + "t": "25001", + "n": 1 + }, + "p": 1000 + }, + { + "key": 20001, "star": 0, - "prize": [ - { - "a": "attr", - "t": "gold", - "n": 4000 - }, - { - "a": "attr", - "t": "gold", - "n": 5000 - } - ], - "p": [] + "prize": { + "a": "attr", + "t": "gold", + "n": 2000 + }, + "p": 1000 + }, + { + "key": 20002, + "star": 0, + "prize": { + "a": "attr", + "t": "diamond", + "n": 3000 + }, + "p": 1000 + }, + { + "key": 20003, + "star": 0, + "prize": { + "a": "attr", + "t": "gold", + "n": 2000 + }, + "p": 1000 + }, + { + "key": 20004, + "star": 0, + "prize": { + "a": "attr", + "t": "diamond", + "n": 3000 + }, + "p": 1000 + }, + { + "key": 20005, + "star": 0, + "prize": { + "a": "attr", + "t": "gold", + "n": 2000 + }, + "p": 1000 + }, + { + "key": 20006, + "star": 0, + "prize": { + "a": "attr", + "t": "diamond", + "n": 3000 + }, + "p": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_propsgrouplist.json b/bin/json/game_propsgrouplist.json new file mode 100644 index 000000000..d7e994de5 --- /dev/null +++ b/bin/json/game_propsgrouplist.json @@ -0,0 +1,37 @@ +[ + { + "group": 10001, + "id": [ + 10001, + 10002, + 10003 + ] + }, + { + "group": 10002, + "id": [ + 10004 + ] + }, + { + "group": 20001, + "id": [ + 20001, + 20002 + ] + }, + { + "group": 20002, + "id": [ + 20003, + 20004 + ] + }, + { + "group": 20003, + "id": [ + 20005, + 20006 + ] + } +] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 81d63dc27..4c84647b0 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -1,7 +1,10 @@ [ { "Id": 190011000, - "Name": "阿宝队长技", + "Name": { + "key": "skillname_190011000", + "text": "阿宝队长技" + }, "ico": "jn_dzj_01", "act": "Skill_1", "Type": 1, @@ -70,7 +73,10 @@ }, { "Id": 190012000, - "Name": "熊猫拳", + "Name": { + "key": "skillname_190012000", + "text": "熊猫拳" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -139,7 +145,10 @@ }, { "Id": 190013000, - "Name": "太极一式", + "Name": { + "key": "skillname_190013000", + "text": "太极一式" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -208,7 +217,10 @@ }, { "Id": 190014000, - "Name": "太极零式", + "Name": { + "key": "skillname_190011003", + "text": "太极零式" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -277,7 +289,10 @@ }, { "Id": 190015000, - "Name": "波比队长技", + "Name": { + "key": "skillname_190014000", + "text": "波比队长技" + }, "ico": "jn_dzj_03", "act": "Skill_2", "Type": 1, @@ -346,7 +361,10 @@ }, { "Id": 190016000, - "Name": "和谐音律", + "Name": { + "key": "skillname_190016000", + "text": "和谐音律" + }, "ico": "jn_icon_004", "act": "Skill_3", "Type": 1, @@ -415,7 +433,10 @@ }, { "Id": 190017000, - "Name": "欢悦之舞", + "Name": { + "key": "skillname_190017000", + "text": "欢悦之舞" + }, "ico": "jn_icon_005", "act": "Skill_1", "Type": 1, @@ -484,7 +505,10 @@ }, { "Id": 190018000, - "Name": "彩虹音符", + "Name": { + "key": "skillname_190018000", + "text": "彩虹音符" + }, "ico": "jn_icon_006", "act": "Skill_2", "Type": 1, @@ -553,7 +577,10 @@ }, { "Id": 190019000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190019000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -622,7 +649,10 @@ }, { "Id": 190020000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190020000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -691,7 +721,10 @@ }, { "Id": 190021000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190021000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -760,7 +793,10 @@ }, { "Id": 190022000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190022000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -829,7 +865,10 @@ }, { "Id": 190023000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190023000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -898,7 +937,10 @@ }, { "Id": 190024000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190024000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -967,7 +1009,10 @@ }, { "Id": 190025000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190025000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -1036,7 +1081,10 @@ }, { "Id": 190026000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190026000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -1105,7 +1153,10 @@ }, { "Id": 190027000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190027000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -1174,7 +1225,10 @@ }, { "Id": 190028000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190028000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -1243,7 +1297,10 @@ }, { "Id": 190029000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190029000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -1312,7 +1369,10 @@ }, { "Id": 190030000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190030000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -1381,7 +1441,10 @@ }, { "Id": 190031000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190031000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -1450,7 +1513,10 @@ }, { "Id": 190032000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190032000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -1519,7 +1585,10 @@ }, { "Id": 190033000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190033000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -1588,7 +1657,10 @@ }, { "Id": 190034000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190034000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -1657,7 +1729,10 @@ }, { "Id": 190035000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190035000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -1726,7 +1801,10 @@ }, { "Id": 190036000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190036000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -1795,7 +1873,10 @@ }, { "Id": 190037000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190037000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -1870,7 +1951,10 @@ }, { "Id": 190038000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190038000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -1939,7 +2023,10 @@ }, { "Id": 190039000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190039000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -2008,7 +2095,10 @@ }, { "Id": 190040000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190040000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -2077,7 +2167,10 @@ }, { "Id": 190041000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190041000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -2146,7 +2239,10 @@ }, { "Id": 190042000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190042000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -2221,7 +2317,10 @@ }, { "Id": 190043000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190043000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -2290,7 +2389,10 @@ }, { "Id": 190044000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190044000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -2359,7 +2461,10 @@ }, { "Id": 190045000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190045000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -2428,7 +2533,10 @@ }, { "Id": 190046000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190046000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -2497,7 +2605,10 @@ }, { "Id": 190047000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190047000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -2572,7 +2683,10 @@ }, { "Id": 190048000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190048000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -2641,7 +2755,10 @@ }, { "Id": 190049000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190049000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -2710,7 +2827,10 @@ }, { "Id": 190050000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190050000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -2779,7 +2899,10 @@ }, { "Id": 190051000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190051000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -2848,7 +2971,10 @@ }, { "Id": 190052000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190052000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -2917,7 +3043,10 @@ }, { "Id": 190053000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190053000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -2986,7 +3115,10 @@ }, { "Id": 190054000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190054000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -3055,7 +3187,10 @@ }, { "Id": 190055000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190055000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_3", "Type": 1, @@ -3124,7 +3259,10 @@ }, { "Id": 190056000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190056000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -3193,7 +3331,10 @@ }, { "Id": 190057000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190057000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, @@ -3262,7 +3403,10 @@ }, { "Id": 190058000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190058000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, @@ -3331,7 +3475,10 @@ }, { "Id": 190059000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190059000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_1", "Type": 1, @@ -3400,7 +3547,10 @@ }, { "Id": 190060000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190060000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -3469,7 +3619,10 @@ }, { "Id": 190061000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190061000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 1, @@ -3544,7 +3697,10 @@ }, { "Id": 190062000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190062000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -3619,7 +3775,10 @@ }, { "Id": 190063000, - "Name": "梦扣扣", + "Name": { + "key": "skillname_190063000", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 1, @@ -3688,7 +3847,10 @@ }, { "Id": 190064000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190064000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -3757,7 +3919,10 @@ }, { "Id": 190065000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190065000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_1", "Type": 1, @@ -3826,7 +3991,10 @@ }, { "Id": 190066000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190066000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, @@ -3895,7 +4063,10 @@ }, { "Id": 190067000, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_190067000", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 2, @@ -3964,7 +4135,10 @@ }, { "Id": 190068000, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_190068000", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -4033,7 +4207,10 @@ }, { "Id": 190069000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190069000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4102,7 +4279,10 @@ }, { "Id": 190070000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190070000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4171,7 +4351,10 @@ }, { "Id": 190071000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190071000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4240,7 +4423,10 @@ }, { "Id": 190072000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190072000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4309,7 +4495,10 @@ }, { "Id": 190073000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190073000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4378,7 +4567,10 @@ }, { "Id": 190074000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190074000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4447,7 +4639,10 @@ }, { "Id": 190075000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190075000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4516,7 +4711,10 @@ }, { "Id": 190076000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190076000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4585,7 +4783,10 @@ }, { "Id": 190077000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190077000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4654,7 +4855,10 @@ }, { "Id": 190078000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190078000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4723,7 +4927,10 @@ }, { "Id": 190079000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190079000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4792,7 +4999,10 @@ }, { "Id": 190080000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190080000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -4861,7 +5071,10 @@ }, { "Id": 190081000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190081000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -4930,7 +5143,10 @@ }, { "Id": 190082000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190082000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -4999,7 +5215,10 @@ }, { "Id": 190083000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190083000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -5068,7 +5287,10 @@ }, { "Id": 190084000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190084000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -5137,7 +5359,10 @@ }, { "Id": 190085000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190085000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -5206,7 +5431,10 @@ }, { "Id": 190086000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190086000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, @@ -5275,7 +5503,10 @@ }, { "Id": 100012100, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_100012100", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 2, @@ -5350,7 +5581,10 @@ }, { "Id": 100022100, - "Name": "梦妖姥姥", + "Name": { + "key": "skillname_100022100", + "text": "梦妖姥姥" + }, "ico": "jn_icon_002", "act": "Skill_3", "Type": 2, @@ -5431,7 +5665,10 @@ }, { "Id": 100092100, - "Name": "梦龙闪耀", + "Name": { + "key": "skillname_100092100", + "text": "梦龙闪耀" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 2, @@ -5506,7 +5743,10 @@ }, { "Id": 100102100, - "Name": "梦扣扣", + "Name": { + "key": "skillname_100102100", + "text": "梦扣扣" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 2, @@ -5605,7 +5845,10 @@ }, { "Id": 100162100, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_100162100", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -5680,7 +5923,10 @@ }, { "Id": 100191100, - "Name": "猫猫威慑", + "Name": { + "key": "skillname_100191100", + "text": "猫猫威慑" + }, "ico": "jn_icon_003", "act": "Skill_1", "Type": 1, @@ -5755,7 +6001,10 @@ }, { "Id": 100192100, - "Name": "猫猫推理", + "Name": { + "key": "skillname_100192100", + "text": "猫猫推理" + }, "ico": "dzjn_icon_001", "act": "Skill_2", "Type": 2, @@ -5836,7 +6085,10 @@ }, { "Id": 100193100, - "Name": "烙印", + "Name": { + "key": "skillname_100193100", + "text": "烙印" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 1, @@ -5885,7 +6137,10 @@ }, { "Id": 100622100, - "Name": "烙印", + "Name": { + "key": "skillname_100622100", + "text": "烙印" + }, "ico": "jn_icon_001", "act": "Skill_1", "Type": 2, @@ -5954,7 +6209,10 @@ }, { "Id": 100626100, - "Name": "烙印", + "Name": { + "key": "skillname_100626100", + "text": "烙印" + }, "ico": "jn_icon_001", "act": "Skill_2", "Type": 1, @@ -6023,7 +6281,10 @@ }, { "Id": 190087000, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190087000", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6092,7 +6353,10 @@ }, { "Id": 190087001, - "Name": "梦之贪婪", + "Name": { + "key": "skillname_190087001", + "text": "梦之贪婪" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6161,7 +6425,10 @@ }, { "Id": 190087002, - "Name": "梦之防护", + "Name": { + "key": "skillname_190087002", + "text": "梦之防护" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6230,7 +6497,10 @@ }, { "Id": 190087003, - "Name": "护盾检测", + "Name": { + "key": "skillname_190087003", + "text": "护盾检测" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6299,7 +6569,10 @@ }, { "Id": 190087004, - "Name": "护盾击破检测", + "Name": { + "key": "skillname_190087004", + "text": "护盾击破检测" + }, "ico": "jn_icon_001", "act": "Skill_3", "Type": 2, @@ -6368,7 +6641,10 @@ }, { "Id": 110011, - "Name": "熊猫拳", + "Name": { + "key": "skillname_110011", + "text": "熊猫拳" + }, "ico": "skillicon_001", "act": "Skill_1", "Type": 0, @@ -6437,7 +6713,10 @@ }, { "Id": 110012, - "Name": "太极一式", + "Name": { + "key": "skillname_110012", + "text": "太极一式" + }, "ico": "skillicon_002", "act": "Skill_2", "Type": 0, @@ -6506,7 +6785,10 @@ }, { "Id": 110013, - "Name": "太极零式", + "Name": { + "key": "skillname_110013", + "text": "太极零式" + }, "ico": "skillicon_003", "act": "Skill_3", "Type": 0, @@ -6575,7 +6857,10 @@ }, { "Id": 110031, - "Name": "和谐音律", + "Name": { + "key": "skillname_110031", + "text": "和谐音律" + }, "ico": "skillicon_004", "act": "Skill_1", "Type": 1, @@ -6644,7 +6929,10 @@ }, { "Id": 110032, - "Name": "欢悦之舞", + "Name": { + "key": "skillname_110032", + "text": "欢悦之舞" + }, "ico": "skillicon_005", "act": "Skill_2", "Type": 1, @@ -6713,7 +7001,10 @@ }, { "Id": 110033, - "Name": "彩虹音符", + "Name": { + "key": "skillname_110033", + "text": "彩虹音符" + }, "ico": "skillicon_006", "act": "Skill_3", "Type": 1, @@ -6782,7 +7073,10 @@ }, { "Id": 110171, - "Name": "冰霜之语", + "Name": { + "key": "skillname_110171", + "text": "冰霜之语" + }, "ico": "skillicon_010", "act": "Skill_1", "Type": 1, @@ -6851,7 +7145,10 @@ }, { "Id": 110172, - "Name": "寒冰之力", + "Name": { + "key": "skillname_110172", + "text": "寒冰之力" + }, "ico": "skillicon_011", "act": "Skill_2", "Type": 1, @@ -6920,7 +7217,10 @@ }, { "Id": 110173, - "Name": "极寒领域", + "Name": { + "key": "skillname_110173", + "text": "极寒领域" + }, "ico": "skillicon_012", "act": "Skill_3", "Type": 1, @@ -6989,7 +7289,10 @@ }, { "Id": 110181, - "Name": "梦·呓语", + "Name": { + "key": "skillname_110181", + "text": "梦·呓语" + }, "ico": "skillicon_013", "act": "Skill_1", "Type": 0, @@ -7058,7 +7361,10 @@ }, { "Id": 110182, - "Name": "梦·愉悦", + "Name": { + "key": "skillname_110182", + "text": "梦·愉悦" + }, "ico": "skillicon_014", "act": "Skill_2", "Type": 1, @@ -7127,7 +7433,10 @@ }, { "Id": 110183, - "Name": "梦·创世", + "Name": { + "key": "skillname_110183", + "text": "梦·创世" + }, "ico": "skillicon_015", "act": "Skill_3", "Type": 1, @@ -7196,7 +7505,10 @@ }, { "Id": 110091, - "Name": "一往无前", + "Name": { + "key": "skillname_110091", + "text": "一往无前" + }, "ico": "skillicon_007", "act": "Skill_1", "Type": 1, @@ -7265,7 +7577,10 @@ }, { "Id": 110092, - "Name": "无所畏惧", + "Name": { + "key": "skillname_110092", + "text": "无所畏惧" + }, "ico": "skillicon_008", "act": "Skill_2", "Type": 1, @@ -7334,7 +7649,10 @@ }, { "Id": 110093, - "Name": "自由之往", + "Name": { + "key": "skillname_110093", + "text": "自由之往" + }, "ico": "skillicon_009", "act": "Skill_3", "Type": 1, @@ -7403,7 +7721,10 @@ }, { "Id": 110111, - "Name": "点到为止", + "Name": { + "key": "skillname_110111", + "text": "点到为止" + }, "ico": "skillicon_001", "act": "Skill_1", "Type": 1, @@ -7472,7 +7793,10 @@ }, { "Id": 110112, - "Name": "聚·心神", + "Name": { + "key": "skillname_110112", + "text": "聚·心神" + }, "ico": "skillicon_002", "act": "Skill_2", "Type": 0, @@ -7541,7 +7865,10 @@ }, { "Id": 110113, - "Name": "上·善若水", + "Name": { + "key": "skillname_110113", + "text": "上·善若水" + }, "ico": "skillicon_003", "act": "Skill_3", "Type": 0, @@ -7610,7 +7937,10 @@ }, { "Id": 440051, - "Name": "蛮之力", + "Name": { + "key": "skillname_440051", + "text": "蛮之力" + }, "ico": "skillicon_001", "act": "Skill_1", "Type": 1, @@ -7679,7 +8009,10 @@ }, { "Id": 440052, - "Name": "蛮力横扫", + "Name": { + "key": "skillname_440052", + "text": "蛮力横扫" + }, "ico": "skillicon_002", "act": "Skill_2", "Type": 1, @@ -7748,7 +8081,10 @@ }, { "Id": 440053, - "Name": "蛮力冲撞", + "Name": { + "key": "skillname_440053", + "text": "蛮力冲撞" + }, "ico": "skillicon_003", "act": "Skill_3", "Type": 1, @@ -7817,7 +8153,10 @@ }, { "Id": 110081, - "Name": "猛虎爪", + "Name": { + "key": "skillname_110081", + "text": "猛虎爪" + }, "ico": "skillicon_007", "act": "Skill_1", "Type": 0, @@ -7886,7 +8225,10 @@ }, { "Id": 110082, - "Name": "胜者为王", + "Name": { + "key": "skillname_110082", + "text": "胜者为王" + }, "ico": "skillicon_008", "act": "Skill_2", "Type": 1, @@ -7955,7 +8297,10 @@ }, { "Id": 110083, - "Name": "霸·猎杀时刻", + "Name": { + "key": "skillname_110083", + "text": "霸·猎杀时刻" + }, "ico": "skillicon_009", "act": "Skill_3", "Type": 0, @@ -8024,7 +8369,10 @@ }, { "Id": 150051, - "Name": "狮子铁拳", + "Name": { + "key": "skillname_150051", + "text": "狮子铁拳" + }, "ico": "skillicon_013", "act": "Skill_1", "Type": 0, @@ -8093,7 +8441,10 @@ }, { "Id": 150052, - "Name": "净化烟火", + "Name": { + "key": "skillname_150052", + "text": "净化烟火" + }, "ico": "skillicon_014", "act": "Skill_2", "Type": 1, @@ -8162,7 +8513,10 @@ }, { "Id": 150053, - "Name": "这是我的主场！", + "Name": { + "key": "skillname_150053", + "text": "这是我的主场！" + }, "ico": "skillicon_015", "act": "Skill_3", "Type": 1, diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json index aa5c1088b..117762088 100644 --- a/bin/json/game_ui.json +++ b/bin/json/game_ui.json @@ -203,30 +203,6 @@ "comname": "back_up", "des": "临时展示界面-左上按钮返回" }, - { - "id": "methodandway_equip", - "file": "EquipMethodAndWayWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "tips/tips", - "packagename": "tips", - "comname": "equipMethodAndWayTips", - "des": "装备获取途径界面（临时）" - }, - { - "id": "skillinfo", - "file": "SkillInfoWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "tips/tips", - "packagename": "tips", - "comname": "skillInfoTips", - "des": "技能信息界面（临时）" - }, { "id": "generaltips", "file": "GeneralTipsWindow", @@ -533,7 +509,7 @@ "unloadpkg": 5, "loadtype": 1, "full": 0, - "blur": 0, + "blur": 1, "package": "roledetails/roledetails", "packagename": "roledetails", "comname": "roleupgrade", @@ -558,7 +534,7 @@ "loadtype": 0, "full": 0, "blur": 1, - "package": "n", + "package": "roledetails/roledetails", "packagename": "roledetails", "comname": "role_grow", "des": "英雄图鉴属性弹窗" @@ -653,7 +629,7 @@ "unloadpkg": 3, "loadtype": 1, "full": 0, - "blur": 0, + "blur": 1, "package": "tips/tips", "packagename": "tips", "comname": "GeneralItem", @@ -694,5 +670,17 @@ "packagename": "roledetails", "comname": "skillnametips3", "des": "队长技描述提示框" + }, + { + "id": "equistrengthen", + "file": "EquiStrengthenWindow", + "unloadpkg": 3, + "loadtype": 1, + "full": 0, + "blur": 0, + "package": "roledetails/roledetails", + "packagename": "roledetails", + "comname": "equistrengthen", + "des": "装备强化" } ] \ No newline at end of file diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index 6371cf711..8c2a60dd1 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -207,7 +207,7 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ return } //检索出未使用的词条 - for _, v := range sattr { + for _, v := range temp { iskeep := false for _, v1 := range equipment.AdverbEntry { if v.Key == v1.Id { diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index a93a0fe2d..03204cb63 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - "math/rand" - "time" "google.golang.org/protobuf/proto" ) @@ -24,7 +22,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) err error item *pb.DB_UserItemData itemcf *cfg.Game_itemData - prop *cfg.Game_propsgroupData + prop []*cfg.Game_propsgroupData ) if code = this.UseitemCheck(session, req); code != pb.ErrorCode_Success { return @@ -50,7 +48,8 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) if code = this.module.AddItemforGrid(&comm.ModuleCallSource{}, session, req.GridId, -1*itemcf.SynthetizeNum*int32(req.Amount), true); code != pb.ErrorCode_Success { return } - if code = this.module.ModuleHero.GetSpecifiedHero(session, prop.Prize[0].T, prop.Star, 0, int32(req.Amount)); code != pb.ErrorCode_Success { + sale := RandomProps(prop) + if code = this.module.ModuleHero.GetSpecifiedHero(session, sale.Prize.T, sale.Star, 0, int32(req.Amount)); code != pb.ErrorCode_Success { return } case 4: //自选宝箱 @@ -61,11 +60,18 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) if code = this.module.AddItemforGrid(&comm.ModuleCallSource{}, session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { return } - if int(req.Select) >= len(prop.Prize) { + var sale *cfg.Game_atn + for _, v := range prop { + if v.Key == req.Select { + sale = v.Prize + } + } + if sale == nil { + this.module.Errorf("no found target sale:%v", req.Select) code = pb.ErrorCode_ReqParameterError return } - sale := prop.Prize[req.Select] + sale.N = sale.N * int32(req.Amount) if code = this.module.DispenseRes(session, []*cfg.Game_atn{sale}, true); code != pb.ErrorCode_Success { return @@ -75,9 +81,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) code = pb.ErrorCode_ConfigNoFound return } - r := rand.New(rand.NewSource(time.Now().Unix())) - index := r.Perm(len(prop.Prize))[0] - sale := prop.Prize[index] + sale := RandomProps(prop).Prize sale.N = sale.N * int32(req.Amount) if code = this.module.AddItemforGrid(&comm.ModuleCallSource{}, session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { return @@ -90,10 +94,10 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) code = pb.ErrorCode_ConfigNoFound return } - sale := make([]*cfg.Game_atn, len(prop.Prize)) - for i, v := range prop.Prize { - sale[i] = v - sale[i].N = v.N * int32(req.Amount) + sale := make([]*cfg.Game_atn, len(prop)) + for i, v := range prop { + sale[i] = v.Prize + sale[i].N = v.Prize.N * int32(req.Amount) } if code = this.module.AddItemforGrid(&comm.ModuleCallSource{}, session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { return diff --git a/modules/items/configure.go b/modules/items/configure.go index 728596e8f..a18ddb3df 100644 --- a/modules/items/configure.go +++ b/modules/items/configure.go @@ -10,8 +10,9 @@ import ( ) const ( - game_item = "game_item.json" - game_propsgroup = "game_propsgroup.json" + game_item = "game_item.json" + game_propsgroup = "game_propsgroup.json" + game_propsgrouplist = "game_propsgrouplist.json" ) ///背包配置管理组件 @@ -26,6 +27,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp this.module = module.(*Items) err = this.LoadConfigure(game_item, cfg.NewGame_item) err = this.LoadConfigure(game_propsgroup, cfg.NewGame_propsgroup) + err = this.LoadConfigure(game_propsgrouplist, cfg.NewGame_propsgrouplist) return } @@ -91,20 +93,35 @@ func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtyp } //获取道具礼包组 -func (this *ConfigureComp) GetPropsgroupConfigure(id int32) (item *cfg.Game_propsgroupData, err error) { +func (this *ConfigureComp) GetPropsgroupConfigure(gid int32) (result []*cfg.Game_propsgroupData, err error) { var ( - v interface{} - ok bool + v interface{} + group *cfg.Game_propsgrouplistData ) + if v, err = this.GetConfigure(game_propsgrouplist); err != nil { + this.module.Errorf("err:%v", err) + return + } + result = make([]*cfg.Game_propsgroupData, 0) + if group, ok := v.(*cfg.Game_propsgrouplist).GetDataMap()[gid]; !ok { + err = fmt.Errorf("no found Game_propsgrouplist group:%d", group) + return + } if v, err = this.GetConfigure(game_propsgroup); err != nil { this.module.Errorf("err:%v", err) return - } else { - if item, ok = v.(*cfg.Game_propsgroup).GetDataMap()[id]; !ok { - err = fmt.Errorf("no found item:%d configure", id) - this.module.Errorf("err:%v", err) + } + for _, id := range group.Id { + if temp, ok := v.(*cfg.Game_propsgroup).GetDataMap()[id]; !ok { + err = fmt.Errorf("no found Game_propsgroup id:%d", v) return + } else { + result = append(result, temp) } } + if len(result) == 0 { + err = fmt.Errorf("no found itemConfigure group:%d", group) + this.module.Errorf("err:%v", err) + } return } diff --git a/modules/items/core.go b/modules/items/core.go index 2bd04c3a3..ef36a9f67 100644 --- a/modules/items/core.go +++ b/modules/items/core.go @@ -1,8 +1,11 @@ package items import ( + "crypto/rand" "errors" "go_dreamfactory/lego/core" + cfg "go_dreamfactory/sys/configure/structs" + "math/big" ) const ( //Redis @@ -22,3 +25,28 @@ var ( PackGridNumUpper = errors.New("grid amount upper!") //背包格子达到上限 GirdAmountUpper = errors.New("grid amount upper!") //格子容量达到上限 ) + +//随机权重宝箱 +func RandomProps(group []*cfg.Game_propsgroupData) (prop *cfg.Game_propsgroupData) { + if group == nil || len(group) == 0 { + return + } + var ( + totle int64 + curr int64 + temp int64 + ) + for _, v := range group { + totle += int64(v.P) + } + n, _ := rand.Int(rand.Reader, big.NewInt(totle)) + curr = n.Int64() + for _, v := range group { + temp += int64(v.P) + if curr <= temp { + prop = v + return + } + } + return +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 07f647873..20fbb96ad 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -69,6 +69,8 @@ type Tables struct { propsgroup *Game_propsgroup facemod *Game_facemod msgdistrib *Game_msgdistrib + language *Game_language + propsgrouplist *Game_propsgrouplist } func NewTables(loader JsonLoader) (*Tables, error) { @@ -418,5 +420,17 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.msgdistrib, err = NewGame_msgdistrib(buf) ; err != nil { return nil, err } + if buf, err = loader("game_language") ; err != nil { + return nil, err + } + if tables.language, err = NewGame_language(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_propsgrouplist") ; err != nil { + return nil, err + } + if tables.propsgrouplist, err = NewGame_propsgrouplist(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go index 7b41ebe2d..004ba8db1 100644 --- a/sys/configure/structs/game.equipData.go +++ b/sys/configure/structs/game.equipData.go @@ -17,11 +17,14 @@ type Game_equipData struct { Suitintr string Pos int32 Star int32 + Color int32 Leadlibrary int32 Addattrnum []int32 Addattrnump []int32 Addlibrary int32 Ico string + UseSkip int32 + Sale []*Game_atn } func (Game_equipData) GetTypeId() int { @@ -36,6 +39,7 @@ func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err err {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["suitintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suitintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suitintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["leadlibrary"].(float64); !_ok_ { err = errors.New("leadlibrary error"); return }; _v.Leadlibrary = int32(_tempNum_) } { var _arr_ []interface{} @@ -67,5 +71,20 @@ func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["addlibrary"].(float64); !_ok_ { err = errors.New("addlibrary error"); return }; _v.Addlibrary = int32(_tempNum_) } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["use_skip"].(float64); !_ok_ { err = errors.New("use_skip error"); return }; _v.UseSkip = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["sale"].([]interface{}); !_ok_ { err = errors.New("sale error"); return } + + _v.Sale = make([]*Game_atn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_atn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } + _v.Sale = append(_v.Sale, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.extserversData.go b/sys/configure/structs/game.extserversData.go index d5eea37bd..1520210de 100644 --- a/sys/configure/structs/game.extserversData.go +++ b/sys/configure/structs/game.extserversData.go @@ -13,6 +13,7 @@ import "errors" type Game_extserversData struct { Name string Ips string + Debug bool } func (Game_extserversData) GetTypeId() int { @@ -21,7 +22,8 @@ func (Game_extserversData) GetTypeId() int { func NewGame_extserversData(_buf map[string]interface{}) (_v *Game_extserversData, err error) { _v = &Game_extserversData{} - { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Ips, _ok_ = _buf["ips"].(string); !_ok_ { err = errors.New("ips error"); return } } + { var _ok_ bool; if _v.Debug, _ok_ = _buf["debug"].(bool); !_ok_ { err = errors.New("debug error"); return } } return } diff --git a/sys/configure/structs/game.language.go b/sys/configure/structs/game.language.go new file mode 100644 index 000000000..3d081116d --- /dev/null +++ b/sys/configure/structs/game.language.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 Game_language struct { + _dataMap map[string]*Game_languageData + _dataList []*Game_languageData +} + +func NewGame_language(_buf []map[string]interface{}) (*Game_language, error) { + _dataList := make([]*Game_languageData, 0, len(_buf)) + dataMap := make(map[string]*Game_languageData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_languageData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Keycode] = _v + } + } + return &Game_language{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_language) GetDataMap() map[string]*Game_languageData { + return table._dataMap +} + +func (table *Game_language) GetDataList() []*Game_languageData { + return table._dataList +} + +func (table *Game_language) Get(key string) *Game_languageData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.languageData.go b/sys/configure/structs/game.languageData.go new file mode 100644 index 000000000..037c1c1b8 --- /dev/null +++ b/sys/configure/structs/game.languageData.go @@ -0,0 +1,25 @@ + +//------------------------------------------------------------------------------ +// +// 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 + +import "errors" + +type Game_languageData struct { + Keycode string +} + +func (Game_languageData) GetTypeId() int { + return -1436621922 +} + +func NewGame_languageData(_buf map[string]interface{}) (_v *Game_languageData, err error) { + _v = &Game_languageData{} + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["keycode"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Keycode error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Keycode, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} diff --git a/sys/configure/structs/game.newSkillData.go b/sys/configure/structs/game.newSkillData.go index a056f7b72..d246644d3 100644 --- a/sys/configure/structs/game.newSkillData.go +++ b/sys/configure/structs/game.newSkillData.go @@ -34,7 +34,7 @@ func (Game_newSkillData) GetTypeId() int { func NewGame_newSkillData(_buf map[string]interface{}) (_v *Game_newSkillData, err error) { _v = &Game_newSkillData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; if _v.Name, _ok_ = _buf["Name"].(string); !_ok_ { err = errors.New("Name error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } diff --git a/sys/configure/structs/game.propsgroup.go b/sys/configure/structs/game.propsgroup.go index 2d3c2889c..795a2758c 100644 --- a/sys/configure/structs/game.propsgroup.go +++ b/sys/configure/structs/game.propsgroup.go @@ -21,7 +21,7 @@ func NewGame_propsgroup(_buf []map[string]interface{}) (*Game_propsgroup, error) return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Group] = _v + dataMap[_v.Key] = _v } } return &Game_propsgroup{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.propsgroupData.go b/sys/configure/structs/game.propsgroupData.go index dcde9ce55..7cdb33dd8 100644 --- a/sys/configure/structs/game.propsgroupData.go +++ b/sys/configure/structs/game.propsgroupData.go @@ -11,10 +11,10 @@ package cfg import "errors" type Game_propsgroupData struct { - Group int32 + Key int32 Star int32 - Prize []*Game_atn - P []int32 + Prize *Game_atn + P int32 } func (Game_propsgroupData) GetTypeId() int { @@ -23,35 +23,9 @@ func (Game_propsgroupData) GetTypeId() int { func NewGame_propsgroupData(_buf map[string]interface{}) (_v *Game_propsgroupData, err error) { _v = &Game_propsgroupData{} - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } + { 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["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["prize"].([]interface{}); !_ok_ { err = errors.New("prize error"); return } - - _v.Prize = make([]*Game_atn, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *Game_atn - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } - _v.Prize = append(_v.Prize, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["p"].([]interface{}); !_ok_ { err = errors.New("p error"); return } - - _v.P = make([]int32, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } - _v.P = append(_v.P, _list_v_) - } - } - + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["prize"].(map[string]interface{}); !_ok_ { err = errors.New("prize error"); return }; if _v.Prize, err = NewGame_atn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.propsgrouplist.go b/sys/configure/structs/game.propsgrouplist.go new file mode 100644 index 000000000..1626388f5 --- /dev/null +++ b/sys/configure/structs/game.propsgrouplist.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 Game_propsgrouplist struct { + _dataMap map[int32]*Game_propsgrouplistData + _dataList []*Game_propsgrouplistData +} + +func NewGame_propsgrouplist(_buf []map[string]interface{}) (*Game_propsgrouplist, error) { + _dataList := make([]*Game_propsgrouplistData, 0, len(_buf)) + dataMap := make(map[int32]*Game_propsgrouplistData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_propsgrouplistData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Group] = _v + } + } + return &Game_propsgrouplist{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_propsgrouplist) GetDataMap() map[int32]*Game_propsgrouplistData { + return table._dataMap +} + +func (table *Game_propsgrouplist) GetDataList() []*Game_propsgrouplistData { + return table._dataList +} + +func (table *Game_propsgrouplist) Get(key int32) *Game_propsgrouplistData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.propsgrouplistData.go b/sys/configure/structs/game.propsgrouplistData.go new file mode 100644 index 000000000..938271bee --- /dev/null +++ b/sys/configure/structs/game.propsgrouplistData.go @@ -0,0 +1,40 @@ + +//------------------------------------------------------------------------------ +// +// 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 + +import "errors" + +type Game_propsgrouplistData struct { + Group int32 + Id []int32 +} + +func (Game_propsgrouplistData) GetTypeId() int { + return -835013389 +} + +func NewGame_propsgrouplistData(_buf map[string]interface{}) (_v *Game_propsgrouplistData, err error) { + _v = &Game_propsgrouplistData{} + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["id"].([]interface{}); !_ok_ { err = errors.New("id error"); return } + + _v.Id = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Id = append(_v.Id, _list_v_) + } + } + + return +} diff --git a/sys/configure/structs/game.skillAtkData.go b/sys/configure/structs/game.skillAtkData.go index d68ee9d7f..4fa805a9a 100644 --- a/sys/configure/structs/game.skillAtkData.go +++ b/sys/configure/structs/game.skillAtkData.go @@ -34,7 +34,7 @@ func (Game_skillAtkData) GetTypeId() int { func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, err error) { _v = &Game_skillAtkData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; if _v.Name, _ok_ = _buf["Name"].(string); !_ok_ { err = errors.New("Name error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) }