diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 8b7b6d834..792a7079e 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -16317,7 +16317,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_494", - "text": "击败阴影战士!" + "text": "击败黑暗掠夺者!" }, "type": 187, "valid": 0, @@ -25333,14 +25333,14 @@ "filter2": [] }, { - "id": 120701254, + "id": 120701245, "rtype": 1, "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_763", - "text": "穿靴子的猫对话" + "text": "食人鱼+盖对话" }, "type": 20001, "valid": 1, @@ -25350,7 +25350,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 101188, + "NPC": 101181, "tipstxt": { "key": "", "text": "" @@ -25362,43 +25362,41 @@ "filter2": [] }, { - "id": 120701255, + "id": 120701246, "rtype": 1, "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_764", - "text": "鹤大师对话" + "key": "buried_buried_condi_tasktxt_762", + "text": "辉月等级达到2级" }, - "type": 20001, - "valid": 1, + "type": 242, + "valid": 0, "head": { "a": "attr", "t": "gold", "n": 1 }, - "Npc_event_type": 0, - "NPC": 101187, + "Npc_event_type": 1, + "NPC": 10067, "tipstxt": { "key": "", "text": "" }, - "value": 1, - "filter": [ - 10231 - ], + "value": 2, + "filter": [], "filter2": [] }, { - "id": 120701264, + "id": 120701247, "rtype": 1, "ctype": 1, "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_765", - "text": "食人鱼+盖对话" + "key": "buried_buried_condi_tasktxt_763", + "text": "找骇客蛛聊聊" }, "type": 20001, "valid": 1, @@ -25408,14 +25406,14 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 0, + "NPC": 101182, "tipstxt": { "key": "", "text": "" }, "value": 1, "filter": [ - 10232 + 10220 ], "filter2": [] }, diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index 5d20e4e6a..77d7717a6 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -85,7 +85,7 @@ }, { "id": 10401, - "drop": 16001001 + "drop": 16001002 }, { "id": 10402, @@ -93,6 +93,6 @@ }, { "id": 10403, - "drop": 16001001 + "drop": 16001002 } ] \ No newline at end of file diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 9e1b9d0d9..f63b6522d 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -7,7 +7,7 @@ 11187021 ], "subtask": [ - 11187022 + 0 ], "award": [ { @@ -45,7 +45,7 @@ 11187003 ], "subtask": [ - 11187004 + 0 ], "award": [ { @@ -83,7 +83,7 @@ 11187005 ], "subtask": [ - 11187006 + 0 ], "award": [ { @@ -121,7 +121,7 @@ 11187007 ], "subtask": [ - 11187008 + 0 ], "award": [ { @@ -159,7 +159,7 @@ 11187009 ], "subtask": [ - 11187010 + 0 ], "award": [ { @@ -197,7 +197,7 @@ 11187011 ], "subtask": [ - 11187012 + 0 ], "award": [ { @@ -235,7 +235,7 @@ 11187013 ], "subtask": [ - 11187014 + 0 ], "award": [ { @@ -273,7 +273,7 @@ 11187001 ], "subtask": [ - 11187002 + 0 ], "award": [ { @@ -311,7 +311,7 @@ 11187003 ], "subtask": [ - 11187004 + 0 ], "award": [ { @@ -349,7 +349,7 @@ 11187019 ], "subtask": [ - 11187020 + 0 ], "award": [ { @@ -387,7 +387,7 @@ 11187001 ], "subtask": [ - 11187002 + 0 ], "award": [ { diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index 2a1a8057c..b365f17cd 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -396,7 +396,7 @@ { "a": "item", "t": "16001001", - "n": 4 + "n": 1 } ] } diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index 7496cd3cd..b2e9c371a 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -5,12 +5,12 @@ "key": "gamesummary_node_name_1", "text": "冒险之旅" }, - "tabId": 2, + "tabId": 11001, "mapPos": { "x": 4195, "y": 2042 }, - "type": 1, + "type": 0, "params": "", "jumpId": 166, "introduce": { @@ -38,12 +38,12 @@ "key": "gamesummary_node_name_2", "text": "竞技场" }, - "tabId": 10, + "tabId": 11001, "mapPos": { "x": 5173, "y": 1748 }, - "type": 3, + "type": 1, "params": "", "jumpId": 10015, "introduce": { @@ -66,7 +66,7 @@ "key": "gamesummary_node_name_3", "text": "猎魂-月夜巨猩" }, - "tabId": 4, + "tabId": 11002, "mapPos": { "x": 2711, "y": 2111 @@ -104,12 +104,12 @@ "key": "gamesummary_node_name_4", "text": "猎魂-饕餮大厨" }, - "tabId": 4, + "tabId": 11002, "mapPos": { "x": 2030, "y": 980 }, - "type": 2, + "type": 3, "params": "3", "jumpId": 10025, "introduce": { @@ -142,12 +142,12 @@ "key": "gamesummary_node_name_5", "text": "猎魂-恐怖戈格" }, - "tabId": 4, + "tabId": 11002, "mapPos": { "x": 3902, "y": 470 }, - "type": 2, + "type": 4, "params": "4", "jumpId": 10026, "introduce": { @@ -180,12 +180,12 @@ "key": "gamesummary_node_name_6", "text": "猎魂-地堡恶龙" }, - "tabId": 4, + "tabId": 11003, "mapPos": { "x": 5071, "y": 1270 }, - "type": 2, + "type": 5, "params": "2", "jumpId": 10024, "introduce": { @@ -216,469 +216,22 @@ "id": 7, "name": { "key": "gamesummary_node_name_7", - "text": "维京远征-火焰泰坦" + "text": "猎魂-地堡恶龙" }, - "tabId": 3, + "tabId": 11003, "mapPos": { - "x": 2235, - "y": 626 + "x": 5071, + "y": 1270 }, - "type": 4, - "params": "", - "jumpId": 10022, + "type": 6, + "params": "2", + "jumpId": 10024, "introduce": { - "key": "gamesummary_node_introdunce_7", - "text": "火焰泰坦从海域缓缓升起,身上不断掉落着烈焰,那烈焰将大地燃烧殆尽。" + "key": "gamesummary_node_introdunce_6", + "text": "巨龙最讨厌一些不速之客擅闯城堡。累累的白骨是她给闯入者们的警示。" }, - "bg": "hkz_wftj_wjyz03", - "icon": "wjyz_img012", - "dropshow": [ - { - "a": "item", - "t": "13001001", - "n": 1 - }, - { - "a": "item", - "t": "13001002", - "n": 1 - }, - { - "a": "item", - "t": "13001003", - "n": 1 - }, - { - "a": "item", - "t": "13001004", - "n": 1 - } - ] - }, - { - "id": 8, - "name": { - "key": "gamesummary_node_name_8", - "text": "维京远征-冰霜泰坦" - }, - "tabId": 3, - "mapPos": { - "x": 2582, - "y": 180 - }, - "type": 4, - "params": "", - "jumpId": 10020, - "introduce": { - "key": "gamesummary_node_introdunce_8", - "text": "冰霜泰坦突破了极寒的冰层,冰块从他冰冷的眼中掉落,所过之处皆冻结成冰山。" - }, - "bg": "hkz_wftj_wjyz02", - "icon": "wjyz_img011", - "dropshow": [ - { - "a": "item", - "t": "13003001", - "n": 1 - }, - { - "a": "item", - "t": "13003002", - "n": 1 - }, - { - "a": "item", - "t": "13003003", - "n": 1 - }, - { - "a": "item", - "t": "13003004", - "n": 1 - } - ] - }, - { - "id": 9, - "name": { - "key": "gamesummary_node_name_9", - "text": "维京远征-森林泰坦" - }, - "tabId": 3, - "mapPos": { - "x": 3010, - "y": 574 - }, - "type": 4, - "params": "", - "jumpId": 10021, - "introduce": { - "key": "gamesummary_node_introdunce_9", - "text": "森林泰坦现身于龟裂的大地之上,她张开双臂,无数藤蔓滑落入地生根,蜿蜒千里。" - }, - "bg": "hkz_wftj_wjyz01", - "icon": "wjyz_img013", - "dropshow": [ - { - "a": "item", - "t": "13002001", - "n": 1 - }, - { - "a": "item", - "t": "13002002", - "n": 1 - }, - { - "a": "item", - "t": "13002003", - "n": 1 - }, - { - "a": "item", - "t": "13002004", - "n": 1 - } - ] - }, - { - "id": 10, - "name": { - "key": "gamesummary_node_name_10", - "text": "梦境回廊" - }, - "tabId": 5, - "mapPos": { - "x": 2342, - "y": 75 - }, - "type": 4, - "params": "", - "jumpId": 10017, - "introduce": { - "key": "gamesummary_node_introdunce_10", - "text": "梦幻与诡异兼具,这便是沙人建造的梦境回廊。是超越自我,还是沉迷其中不愿醒来?" - }, - "bg": "hkz_wftj_xht", - "icon": "hkz_tx_xht", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 11, - "name": { - "key": "gamesummary_node_name_11", - "text": "修炼塔" - }, - "tabId": 7, - "mapPos": { - "x": 5980, - "y": 1252 - }, - "type": 4, - "params": "", - "jumpId": 10004, - "introduce": { - "key": "gamesummary_node_introdunce_11", - "text": "顽石需历经千锤百炼,方可提炼成金。这里是师傅为挑战自我者而修建的地方。" - }, - "bg": "hkz_wftj_jsg", - "icon": "hkz_tx_tzt", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "panda", - "t": "10001", - "n": 1 - } - ] - }, - { - "id": 12, - "name": { - "key": "gamesummary_node_name_12", - "text": "塔岗监狱" - }, - "tabId": 8, - "mapPos": { - "x": 6700, - "y": 1700 - }, - "type": 4, - "params": "", - "jumpId": 10013, - "introduce": { - "key": "gamesummary_node_introdunce_12", - "text": "无穷无尽的试炼,越来越棘手的对手。这里是师傅为穷尽武道者而修建的地方。" - }, - "bg": "hkz_wftj_jyfb", - "icon": "hkz_tx_jyfb", - "dropshow": [ - { - "a": "item", - "t": "10000008", - "n": 1 - }, - { - "a": "item", - "t": "10000009", - "n": 1 - }, - { - "a": "item", - "t": "10000010", - "n": 1 - } - ] - }, - { - "id": 13, - "name": { - "key": "gamesummary_node_name_13", - "text": "六合塔" - }, - "tabId": 9, - "mapPos": { - "x": 7180, - "y": 2070 - }, - "type": 4, - "params": "", - "jumpId": 10018, - "introduce": { - "key": "gamesummary_node_introdunce_13", - "text": "掌握了相克的原理,以弱胜强者不在少数。这里是师傅为研究属性克制者而修建的地方。" - }, - "bg": "hkz_wftj_zyt", - "icon": "hkz_tx_zyt", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 14, - "name": { - "key": "gamesummary_node_name_14", - "text": "巨怪商队" - }, - "tabId": 12, - "mapPos": { - "x": 6631, - "y": 1050 - }, - "type": 4, - "params": "", - "jumpId": 11001, - "introduce": { - "key": "gamesummary_node_introdunce_14", - "text": "去往神秘的远方,探索未知宇宙,交易珍稀的宝藏!巨怪们踏上了列车,开始了旅途。" - }, - "bg": "hkz_wftj_jgsd", - "icon": "hkz_tx_jgsd", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 16, - "name": { - "key": "gamesummary_node_name_16", - "text": "石阵秘境" - }, - "tabId": 11, - "mapPos": { - "x": 1900, - "y": 3000 - }, - "type": 4, - "params": "", - "jumpId": 10027, - "introduce": { - "key": "gamesummary_node_introdunce_16", - "text": "史前板块运动形成的天然巨石阵迷宫,道路错综复杂,幽深莫测,似乎永无尽头。" - }, - "bg": "hkz_wftj_mj", - "icon": "hkz_tx_mj", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 18, - "name": { - "key": "gamesummary_node_name_18", - "text": "扑克对决" - }, - "tabId": 14, - "mapPos": { - "x": 4195, - "y": 2042 - }, - "type": 4, - "params": "", - "jumpId": 10061, - "introduce": { - "key": "gamesummary_node_introdunce_18", - "text": "想和伟大的大盗侠客来一场紧张刺激的扑克对决吗?" - }, - "bg": "hkz_wftj_zxgk", - "icon": "hkz_tx_zxgk", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 19, - "name": { - "key": "gamesummary_node_name_19", - "text": "缤纷乐声" - }, - "tabId": 14, - "mapPos": { - "x": 4695, - "y": 2242 - }, - "type": 4, - "params": "", - "jumpId": 10062, - "introduce": { - "key": "gamesummary_node_introdunce_20", - "text": "华丽的乐章开幕了!咦,这混音器怎么坏掉了?快帮我修一修!" - }, - "bg": "hkz_wftj_zxgk", - "icon": "hkz_tx_zxgk", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 20, - "name": { - "key": "gamesummary_node_name_20", - "text": "监狱抓捕战" - }, - "tabId": 14, - "mapPos": { - "x": 3595, - "y": 1742 - }, - "type": 4, - "params": "", - "jumpId": 10064, - "introduce": { - "key": "gamesummary_node_introdunce_21", - "text": "你是想做警长去抓捕所有的犯人?还是想当狡猾的果酱教授逃出升天?" - }, - "bg": "hkz_wftj_zxgk", - "icon": "hkz_tx_zxgk", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] - }, - { - "id": 21, - "name": { - "key": "gamesummary_node_name_21", - "text": "捕羊大赛" - }, - "tabId": 13, - "mapPos": { - "x": 2342, - "y": 75 - }, - "type": 4, - "params": "", - "jumpId": 10042, - "introduce": { - "key": "gamesummary_node_introdunce_22", - "text": "维京人的欢呼震撼天际!赶紧来加入这场捕羊的盛宴吧!" - }, - "bg": "hkz_wftj_zxgk", - "icon": "hkz_tx_zxgk", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ] + "bg": "", + "icon": "", + "dropshow": [] } ] \ No newline at end of file diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index f21ec7595..ffa0beae8 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -1,11 +1,12 @@ [ { - "tabId": 1, + "tabId": 11001, "layer": 0, "name": { "key": "gamesummary_fathernode_name_1", "text": "探险旅程" }, + "icon": "", "mapPos": { "x": -1428, "y": 399 @@ -17,12 +18,13 @@ } }, { - "tabId": 2, + "tabId": 11002, "layer": 1, "name": { "key": "gamesummary_fathernode_name_2", "text": "冒险之旅" }, + "icon": "", "mapPos": { "x": -1428, "y": 399 @@ -34,12 +36,13 @@ } }, { - "tabId": 3, + "tabId": 11003, "layer": 1, "name": { "key": "gamesummary_fathernode_name_3", "text": "维京远征" }, + "icon": "", "mapPos": { "x": -458, "y": 0 @@ -51,12 +54,13 @@ } }, { - "tabId": 4, + "tabId": 11004, "layer": 1, "name": { "key": "gamesummary_fathernode_name_4", "text": "猎魂挑战" }, + "icon": "", "mapPos": { "x": -603, "y": 142 @@ -68,12 +72,13 @@ } }, { - "tabId": 5, + "tabId": 11005, "layer": 1, "name": { "key": "gamesummary_fathernode_name_5", "text": "梦境回廊" }, + "icon": "", "mapPos": { "x": -478, "y": 0 @@ -85,12 +90,13 @@ } }, { - "tabId": 6, + "tabId": 11006, "layer": 0, "name": { "key": "gamesummary_fathernode_name_6", "text": "功夫训练" }, + "icon": "", "mapPos": { "x": -1963, "y": 442 @@ -102,12 +108,13 @@ } }, { - "tabId": 7, + "tabId": 11007, "layer": 1, "name": { "key": "gamesummary_fathernode_name_7", "text": "修炼塔" }, + "icon": "", "mapPos": { "x": -1963, "y": 442 @@ -119,12 +126,13 @@ } }, { - "tabId": 8, + "tabId": 11008, "layer": 1, "name": { "key": "gamesummary_fathernode_name_8", "text": "塔岗监狱" }, + "icon": "", "mapPos": { "x": -1963, "y": 442 @@ -136,12 +144,13 @@ } }, { - "tabId": 9, + "tabId": 11009, "layer": 1, "name": { "key": "gamesummary_fathernode_name_9", "text": "六合塔" }, + "icon": "", "mapPos": { "x": -1963, "y": 442 @@ -153,12 +162,13 @@ } }, { - "tabId": 10, + "tabId": 11010, "layer": 0, "name": { "key": "gamesummary_fathernode_name_10", "text": "竞技挑战" }, + "icon": "", "mapPos": { "x": -1463, "y": 535 @@ -170,12 +180,13 @@ } }, { - "tabId": 11, + "tabId": 11011, "layer": 0, "name": { "key": "gamesummary_fathernode_name_11", "text": "石阵秘境" }, + "icon": "", "mapPos": { "x": -316, "y": 994 @@ -187,12 +198,13 @@ } }, { - "tabId": 12, + "tabId": 11012, "layer": 0, "name": { "key": "gamesummary_fathernode_name_12", "text": "巨怪商队" }, + "icon": "", "mapPos": { "x": -1963, "y": 226 @@ -202,39 +214,5 @@ "key": "gamesummary_fathernode_usetext_12", "text": "巨怪商人们的脚步永不停歇,听说在他们那赚了足够多的瓶盖后可以有[color=#ffcc00]神秘大奖[/color]!" } - }, - { - "tabId": 13, - "layer": 0, - "name": { - "key": "gamesummary_fathernode_name_13", - "text": "捕羊大赛" - }, - "mapPos": { - "x": -458, - "y": 0 - }, - "scale": 0.4, - "usetext": { - "key": "gamesummary_fathernode_usetext_13", - "text": "维京人的欢呼震撼天际!赶紧来加入这场捕羊的盛宴吧!" - } - }, - { - "tabId": 14, - "layer": 0, - "name": { - "key": "gamesummary_fathernode_name_14", - "text": "冒险回顾" - }, - "mapPos": { - "x": -1021, - "y": 583 - }, - "scale": 0.4, - "usetext": { - "key": "gamesummary_fathernode_usetext_14", - "text": "那冒险中曾遇见的小小挑战,如今再次回到身边,想去试试吗?" - } } ] \ No newline at end of file diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index 84e40c472..e71690cbf 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -1405,7 +1405,7 @@ "interface": "", "condition": "", "followtj": "CloseMoonLevelPromote", - "followguide": 1000705, + "followguide": 0, "finger": [], "offset": { "x": 0, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 2db4d8784..7ebdca930 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -12371,7 +12371,7 @@ { "hid": "54024", "name": { - "key": "hero_main_name_54023", + "key": "hero_main_name_54024", "text": "黑暗掠夺者" }, "star": 5, @@ -12451,10 +12451,93 @@ "text": "传说中的守护者“黑暗掠夺者”,拥有不俗的战斗能力" } }, + { + "hid": "54025", + "name": { + "key": "hero_main_name_54025", + "text": "丑姐姐" + }, + "star": 5, + "color": 4, + "race": 4, + "job": 1, + "type": 2, + "ip": 1, + "sd": 1, + "handbook": -1, + "prefab": "54025", + "rotation": "0|0|0", + "revolve": 0, + "scale": [ + 1, + 1, + 1 + ], + "icon": "54025", + "vocal": "54025", + "tujing": [ + 107 + ], + "detailwindow": "effect_chezhan_daiji", + "intr": { + "key": "", + "text": "" + }, + "events": "hero_54005", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.69, + "z": 0 + }, + "capskillrule": 101, + "skill": 0, + "skill1": 0, + "skill2": 0, + "skill3": 0, + "txt": { + "key": "atlas_54025", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0, + "equiprcom": [ + 1, + 2, + 10 + ], + "angle": 0, + "deviation": 0, + "show": 2, + "herofrag": [ + { + "a": "item", + "t": "12025001", + "n": 1 + } + ], + "herofragnum": 6, + "heroskillup": [ + "10000004" + ], + "expitem": [ + { + "a": "item", + "t": "10000013", + "n": 1 + } + ], + "expitemnum": 7, + "herointr": { + "key": "hero_main_herointr_145", + "text": "传说中的守护者“丑姐姐”,拥有不俗的战斗能力" + } + }, { "hid": "51050", "name": { - "key": "hero_main_name_51050", + "key": "hero_main_name_54026", "text": "恐惧小蜘蛛" }, "star": 3, @@ -12537,7 +12620,7 @@ { "hid": "51051", "name": { - "key": "hero_main_name_51051", + "key": "hero_main_name_54027", "text": "烟火灵" }, "star": 3, @@ -12620,7 +12703,7 @@ { "hid": "51052", "name": { - "key": "hero_main_name_51052", + "key": "hero_main_name_54028", "text": "恐怖小蜘蛛" }, "star": 3, @@ -12703,7 +12786,7 @@ { "hid": "51053", "name": { - "key": "hero_main_name_51053", + "key": "hero_main_name_54029", "text": "华夫饼灵" }, "star": 3, @@ -12786,7 +12869,7 @@ { "hid": "51054", "name": { - "key": "hero_main_name_51054", + "key": "hero_main_name_54030", "text": "豚鼠灵" }, "star": 3, @@ -12869,7 +12952,7 @@ { "hid": "51055", "name": { - "key": "hero_main_name_51055", + "key": "hero_main_name_54031", "text": "卷轴灵" }, "star": 3, @@ -12952,7 +13035,7 @@ { "hid": "51056", "name": { - "key": "hero_main_name_51054", + "key": "hero_main_name_54032", "text": "叠罗汉豚鼠灵A" }, "star": 3, @@ -12981,7 +13064,7 @@ "key": "", "text": "" }, - "events": "hero_51054", + "events": "hero_51056", "cite": "", "effectstay": [], "hpspace": { @@ -12991,8 +13074,8 @@ }, "capskillrule": 101, "skill": 0, - "skill1": 151054111, - "skill2": 151054211, + "skill1": 151056111, + "skill2": 151056211, "skill3": 0, "txt": { "key": "atlas_51056", @@ -13035,7 +13118,7 @@ { "hid": "51057", "name": { - "key": "hero_main_name_51054", + "key": "hero_main_name_54033", "text": "叠罗汉豚鼠灵B" }, "star": 3, @@ -13064,7 +13147,7 @@ "key": "", "text": "" }, - "events": "hero_51054", + "events": "hero_51057", "cite": "", "effectstay": [], "hpspace": { @@ -13074,8 +13157,8 @@ }, "capskillrule": 101, "skill": 0, - "skill1": 151054111, - "skill2": 151054211, + "skill1": 151057111, + "skill2": 151057211, "skill3": 0, "txt": { "key": "atlas_51057", @@ -13118,7 +13201,7 @@ { "hid": "51100", "name": { - "key": "hero_main_name_51100", + "key": "hero_main_name_54034", "text": "大胡子村民" }, "star": 3, @@ -13201,7 +13284,7 @@ { "hid": "51101", "name": { - "key": "hero_main_name_51101", + "key": "hero_main_name_54035", "text": "蓝帽子村民" }, "star": 3, @@ -13284,7 +13367,7 @@ { "hid": "51102", "name": { - "key": "hero_main_name_51102", + "key": "hero_main_name_54036", "text": "财狼小怪" }, "star": 3, @@ -13367,7 +13450,7 @@ { "hid": "51103", "name": { - "key": "hero_main_name_51103", + "key": "hero_main_name_54037", "text": "犀牛守卫" }, "star": 3, @@ -13450,7 +13533,7 @@ { "hid": "51104", "name": { - "key": "hero_main_name_51104", + "key": "hero_main_name_54038", "text": "羊" }, "star": 3, @@ -13533,7 +13616,7 @@ { "hid": "51105", "name": { - "key": "hero_main_name_51105", + "key": "hero_main_name_54039", "text": "瘦高的警卫" }, "star": 3, @@ -13616,7 +13699,7 @@ { "hid": "51106", "name": { - "key": "hero_main_name_51106", + "key": "hero_main_name_54040", "text": "强壮的警卫" }, "star": 3, @@ -13699,7 +13782,7 @@ { "hid": "51107", "name": { - "key": "hero_main_name_51107", + "key": "hero_main_name_54041", "text": "埃雷特" }, "star": 3, @@ -13782,7 +13865,7 @@ { "hid": "51108", "name": { - "key": "hero_main_name_51108", + "key": "hero_main_name_54042", "text": "豺狼头领" }, "star": 3, @@ -13865,7 +13948,7 @@ { "hid": "51109", "name": { - "key": "hero_main_name_51109", + "key": "hero_main_name_54043", "text": "豪猪大师" }, "star": 3, @@ -13948,7 +14031,7 @@ { "hid": "51110", "name": { - "key": "hero_main_name_51110", + "key": "hero_main_name_54044", "text": "小猴子" }, "star": 3, @@ -14031,7 +14114,7 @@ { "hid": "51111", "name": { - "key": "hero_main_name_51111", + "key": "hero_main_name_54045", "text": "恐惧小蜘蛛" }, "star": 3, @@ -14114,7 +14197,7 @@ { "hid": "51112", "name": { - "key": "hero_main_name_51112", + "key": "hero_main_name_54046", "text": "烟火灵" }, "star": 3, @@ -14197,7 +14280,7 @@ { "hid": "51113", "name": { - "key": "hero_main_name_51113", + "key": "hero_main_name_54047", "text": "恐怖小蜘蛛" }, "star": 3, @@ -14280,7 +14363,7 @@ { "hid": "51114", "name": { - "key": "hero_main_name_51114", + "key": "hero_main_name_54048", "text": "华夫饼灵" }, "star": 3, @@ -14363,7 +14446,7 @@ { "hid": "51300", "name": { - "key": "hero_main_name_51300", + "key": "hero_main_name_54049", "text": "大胡子村民" }, "star": 3, @@ -14446,7 +14529,7 @@ { "hid": "51301", "name": { - "key": "hero_main_name_51301", + "key": "hero_main_name_54050", "text": "蓝帽子村民" }, "star": 3, @@ -14529,7 +14612,7 @@ { "hid": "51302", "name": { - "key": "hero_main_name_51302", + "key": "hero_main_name_54051", "text": "财狼小怪" }, "star": 3, @@ -14612,7 +14695,7 @@ { "hid": "51303", "name": { - "key": "hero_main_name_51303", + "key": "hero_main_name_54052", "text": "犀牛守卫" }, "star": 3, @@ -14695,7 +14778,7 @@ { "hid": "51304", "name": { - "key": "hero_main_name_51304", + "key": "hero_main_name_54053", "text": "羊" }, "star": 3, @@ -14778,7 +14861,7 @@ { "hid": "51305", "name": { - "key": "hero_main_name_51305", + "key": "hero_main_name_54054", "text": "瘦高的警卫" }, "star": 3, @@ -14861,7 +14944,7 @@ { "hid": "51306", "name": { - "key": "hero_main_name_51306", + "key": "hero_main_name_54055", "text": "强壮的警卫" }, "star": 3, @@ -14944,7 +15027,7 @@ { "hid": "51307", "name": { - "key": "hero_main_name_51307", + "key": "hero_main_name_54056", "text": "埃雷特" }, "star": 3, @@ -15027,7 +15110,7 @@ { "hid": "51308", "name": { - "key": "hero_main_name_51308", + "key": "hero_main_name_54057", "text": "豺狼头领" }, "star": 3, @@ -15110,7 +15193,7 @@ { "hid": "51309", "name": { - "key": "hero_main_name_51309", + "key": "hero_main_name_54058", "text": "豪猪大师" }, "star": 3, @@ -15193,7 +15276,7 @@ { "hid": "51310", "name": { - "key": "hero_main_name_51310", + "key": "hero_main_name_54059", "text": "小猴子" }, "star": 3, @@ -15276,7 +15359,7 @@ { "hid": "51311", "name": { - "key": "hero_main_name_51311", + "key": "hero_main_name_54060", "text": "恐惧小蜘蛛" }, "star": 3, @@ -15359,7 +15442,7 @@ { "hid": "51312", "name": { - "key": "hero_main_name_51312", + "key": "hero_main_name_54061", "text": "烟火灵" }, "star": 3, @@ -15442,7 +15525,7 @@ { "hid": "51313", "name": { - "key": "hero_main_name_51313", + "key": "hero_main_name_54062", "text": "恐怖小蜘蛛" }, "star": 3, @@ -15525,7 +15608,7 @@ { "hid": "51314", "name": { - "key": "hero_main_name_51314", + "key": "hero_main_name_54063", "text": "华夫饼灵" }, "star": 3, @@ -15608,7 +15691,7 @@ { "hid": "51500", "name": { - "key": "hero_main_name_51500", + "key": "hero_main_name_54064", "text": "大胡子村民" }, "star": 3, @@ -15691,7 +15774,7 @@ { "hid": "51501", "name": { - "key": "hero_main_name_51501", + "key": "hero_main_name_54065", "text": "蓝帽子村民" }, "star": 3, @@ -15774,7 +15857,7 @@ { "hid": "51502", "name": { - "key": "hero_main_name_51502", + "key": "hero_main_name_54066", "text": "财狼小怪" }, "star": 3, @@ -15857,7 +15940,7 @@ { "hid": "51503", "name": { - "key": "hero_main_name_51503", + "key": "hero_main_name_54067", "text": "犀牛守卫" }, "star": 3, @@ -15940,7 +16023,7 @@ { "hid": "51504", "name": { - "key": "hero_main_name_51504", + "key": "hero_main_name_54068", "text": "羊" }, "star": 3, @@ -16023,7 +16106,7 @@ { "hid": "51505", "name": { - "key": "hero_main_name_51505", + "key": "hero_main_name_54069", "text": "瘦高的警卫" }, "star": 3, @@ -16106,7 +16189,7 @@ { "hid": "51506", "name": { - "key": "hero_main_name_51506", + "key": "hero_main_name_54070", "text": "强壮的警卫" }, "star": 3, @@ -16189,7 +16272,7 @@ { "hid": "51507", "name": { - "key": "hero_main_name_51507", + "key": "hero_main_name_54071", "text": "埃雷特" }, "star": 3, @@ -16272,7 +16355,7 @@ { "hid": "51508", "name": { - "key": "hero_main_name_51508", + "key": "hero_main_name_54072", "text": "豺狼头领" }, "star": 3, @@ -16355,7 +16438,7 @@ { "hid": "51509", "name": { - "key": "hero_main_name_51509", + "key": "hero_main_name_54073", "text": "豪猪大师" }, "star": 3, @@ -16438,7 +16521,7 @@ { "hid": "51510", "name": { - "key": "hero_main_name_51510", + "key": "hero_main_name_54074", "text": "小猴子" }, "star": 3, @@ -16521,7 +16604,7 @@ { "hid": "51511", "name": { - "key": "hero_main_name_51511", + "key": "hero_main_name_54075", "text": "恐惧小蜘蛛" }, "star": 3, @@ -16604,7 +16687,7 @@ { "hid": "51512", "name": { - "key": "hero_main_name_51512", + "key": "hero_main_name_54076", "text": "烟火灵" }, "star": 3, @@ -16687,7 +16770,7 @@ { "hid": "51513", "name": { - "key": "hero_main_name_51513", + "key": "hero_main_name_54077", "text": "恐怖小蜘蛛" }, "star": 3, @@ -16770,7 +16853,7 @@ { "hid": "51514", "name": { - "key": "hero_main_name_51514", + "key": "hero_main_name_54078", "text": "华夫饼灵" }, "star": 3, @@ -16853,7 +16936,7 @@ { "hid": "75001", "name": { - "key": "hero_main_name_51515", + "key": "hero_main_name_54079", "text": "胡德先生" }, "star": 3, @@ -16936,7 +17019,7 @@ { "hid": "75002", "name": { - "key": "hero_main_name_51516", + "key": "hero_main_name_54080", "text": "犀牛守卫" }, "star": 3, @@ -17019,7 +17102,7 @@ { "hid": "75003", "name": { - "key": "hero_main_name_51517", + "key": "hero_main_name_54081", "text": "吉姆·普雷斯科特" }, "star": 3, @@ -17102,7 +17185,7 @@ { "hid": "75004", "name": { - "key": "hero_main_name_51518", + "key": "hero_main_name_54082", "text": "埃雷特" }, "star": 3, @@ -17185,7 +17268,7 @@ { "hid": "75005", "name": { - "key": "hero_main_name_51519", + "key": "hero_main_name_54083", "text": "史图依克" }, "star": 3, @@ -17268,7 +17351,7 @@ { "hid": "53007", "name": { - "key": "hero_main_name_53007", + "key": "hero_main_name_54084", "text": "漆黑" }, "star": 3, diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index dcff61148..b41be30e5 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -128,7 +128,7 @@ { "scene": "CombatLevelScene", "subScene": "", - "image": "ld_5v5_bg1", + "image": "ld_mh_bg_tjp", "icon": "loading_icon_gfxm", "title": { "key": "loading_Sheet1_title_10", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 4445b643d..de71ee452 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -2073,7 +2073,7 @@ "hide": 0, "destroy": 1, "progress": 1, - "stroyshow": 0, + "stroyshow": 1, "frontstoryid": 200241, "afterstoryid": 0, "maingroupName": { @@ -2154,7 +2154,7 @@ "hide": 0, "destroy": 1, "progress": 1, - "stroyshow": 0, + "stroyshow": 1, "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { @@ -2246,7 +2246,7 @@ "hide": 0, "destroy": 1, "progress": 1, - "stroyshow": 0, + "stroyshow": 1, "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { @@ -2342,7 +2342,7 @@ "hide": 0, "destroy": 1, "progress": 1, - "stroyshow": 0, + "stroyshow": 1, "frontstoryid": 200242, "afterstoryid": 0, "maingroupName": { @@ -8776,8 +8776,8 @@ 100101 ], "previoustage": 0, - "buried_type": 0, - "buried": 0, + "buried_type": 2, + "buried": 2, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8862,7 +8862,7 @@ ], "previoustage": 0, "buried_type": 2, - "buried": 2, + "buried": 1, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -9944,7 +9944,7 @@ "progress": 1, "stroyshow": 0, "frontstoryid": 201080, - "afterstoryid": 0, + "afterstoryid": 201090, "maingroupName": { "key": "", "text": "" @@ -10267,7 +10267,7 @@ "progress": 1, "stroyshow": 0, "frontstoryid": 201160, - "afterstoryid": 201170, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -10624,7 +10624,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 201261, "afterstoryid": 0, "maingroupName": { "key": "", @@ -10703,7 +10703,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 201262, "afterstoryid": 0, "maingroupName": { "key": "", @@ -11023,7 +11023,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 201311, "afterstoryid": 0, "maingroupName": { "key": "", @@ -11102,7 +11102,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 201312, "afterstoryid": 0, "maingroupName": { "key": "", @@ -11150,7 +11150,7 @@ "Episodetype": 1, "stage_param": 0, "inherit": 0, - "battle_fail": 1, + "battle_fail": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -11578,7 +11578,7 @@ "progress": 1, "stroyshow": 1, "frontstoryid": 201360, - "afterstoryid": 0, + "afterstoryid": 201370, "maingroupName": { "key": "", "text": "" @@ -11702,7 +11702,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 201390, + "frontstoryid": 201380, "afterstoryid": 0, "maingroupName": { "key": "", @@ -11945,7 +11945,7 @@ "destroy": 0, "progress": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 201400, "afterstoryid": 0, "maingroupName": { "key": "mainchapter_main_stage_maingroupName_77", diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 13fda69d3..48dfa7063 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -7173,5 +7173,285 @@ "y": 1, "z": 1 } + }, + { + "id": "54018", + "preson": "54018", + "presonshow": "54018_exhibition", + "presonstory": "54018", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54018", + "fight": "tx_js_54018", + "img": "sbkp_js_54018", + "heroimg": "hbkp_js_54018", + "portrait": "zm_img_54018", + "bust": "bust_54018", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54019", + "preson": "54019", + "presonshow": "54019_exhibition", + "presonstory": "54019", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54019", + "fight": "tx_js_54019", + "img": "sbkp_js_54019", + "heroimg": "hbkp_js_54019", + "portrait": "zm_img_54019", + "bust": "bust_54019", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54020", + "preson": "54020", + "presonshow": "54020_exhibition", + "presonstory": "54020", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54020", + "fight": "tx_js_54020", + "img": "sbkp_js_54020", + "heroimg": "hbkp_js_54020", + "portrait": "zm_img_54020", + "bust": "bust_54020", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54021", + "preson": "54021", + "presonshow": "54021_exhibition", + "presonstory": "54021", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54021", + "fight": "tx_js_54021", + "img": "sbkp_js_54021", + "heroimg": "hbkp_js_54021", + "portrait": "zm_img_54021", + "bust": "bust_54021", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54022", + "preson": "54022", + "presonshow": "54022_exhibition", + "presonstory": "54022", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54022", + "fight": "tx_js_54022", + "img": "sbkp_js_54022", + "heroimg": "hbkp_js_54022", + "portrait": "zm_img_54022", + "bust": "bust_54022", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54023", + "preson": "54023", + "presonshow": "54023_exhibition", + "presonstory": "54023", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54023", + "fight": "tx_js_54023", + "img": "sbkp_js_54023", + "heroimg": "hbkp_js_54023", + "portrait": "zm_img_54023", + "bust": "bust_54023", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54024", + "preson": "54024", + "presonshow": "54024_exhibition", + "presonstory": "54024", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54024", + "fight": "tx_js_54024", + "img": "sbkp_js_54024", + "heroimg": "hbkp_js_54024", + "portrait": "zm_img_54024", + "bust": "bust_54024", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "id": "54025", + "preson": "54025", + "presonshow": "54025_exhibition", + "presonstory": "54025", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_54025", + "fight": "tx_js_54025", + "img": "sbkp_js_54025", + "heroimg": "hbkp_js_54025", + "portrait": "zm_img_54025", + "bust": "bust_54025", + "postxyz": [ + 0, + 0, + 0 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + }, + "boxPos": { + "x": 0, + "y": 0.5, + "z": 0 + }, + "boxSize": { + "x": 1, + "y": 1, + "z": 1 + } } ] \ No newline at end of file diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 8a22c3824..8b5f6af82 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -5403,10 +5403,10 @@ }, { "Id": 102071, - "pos": 1, + "pos": 4, "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, + "IsBoss": 1, + "bossHpCnt": 4, "heroid": 55002, "star": 3, "equip": [], @@ -5463,7 +5463,7 @@ }, { "Id": 102071, - "pos": 4, + "pos": 1, "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, @@ -239753,10 +239753,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239773,10 +239773,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239793,10 +239793,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239813,10 +239813,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239833,10 +239833,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239853,10 +239853,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239873,10 +239873,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239893,10 +239893,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239914,9 +239914,9 @@ "equip": [], "newskill": [], "lv": 50, - "hppro": 10, - "atkpro": 5, - "defpro": 1, + "hppro": 100, + "atkpro": 20, + "defpro": 5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239933,10 +239933,10 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 5, "hppro": 1, "atkpro": 1, - "defpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index 114281d12..62a5a9c7e 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -143,24 +143,6 @@ "functionicon": "icon_sytj", "jumpId": 166 }, - { - "Id": 9, - "scene": "CommandScene", - "scenename": { - "key": "navigation_Sheet1_scenename_9", - "text": "指挥部" - }, - "sceneicon": "ty_qp_zhb", - "functionname": { - "key": "navigation_Sheet1_functionname_9", - "text": "星座图" - }, - "npcName": [ - "功能入口_主角星座图" - ], - "functionicon": "ty_qp_tf", - "jumpId": 171 - }, { "Id": 10, "scene": "GameMain", @@ -189,10 +171,10 @@ "sceneicon": "ty_qp_xmwg", "functionname": { "key": "navigation_Sheet1_functionname_11", - "text": "阿宝" + "text": "每日一练" }, "npcName": [ - "阿宝" + "每日一练" ], "functionicon": "ty_qp_mryj", "jumpId": 10002 @@ -286,23 +268,5 @@ ], "functionicon": "ty_qp_sj", "jumpId": 1003 - }, - { - "Id": 17, - "scene": "CommandScene", - "scenename": { - "key": "navigation_Sheet1_scenename_17", - "text": "指挥部" - }, - "sceneicon": "ty_qp_zhb", - "functionname": { - "key": "navigation_Sheet1_functionname_17", - "text": "月光护符" - }, - "npcName": [ - "功能入口_护符水晶" - ], - "functionicon": "cgt_icon_hfsj", - "jumpId": 10019 } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 4ddb77fd1..ba9d04415 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -400,7 +400,7 @@ "main": [ { "key": 3, - "param": 20012 + "param": 20030 } ], "wkqbx": 2, @@ -819,8 +819,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 3, + "param": 20130 } ], "wkqbx": 2, @@ -1155,8 +1155,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 3, + "param": 20130 } ], "wkqbx": 0, @@ -1183,8 +1183,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 3, + "param": 20140 } ], "wkqbx": 0, @@ -2276,8 +2276,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 3, + "param": 20050 } ], "wkqbx": 0, @@ -2358,7 +2358,12 @@ "key": "opencond_opencond_name_80", "text": "烹饪功能" }, - "main": [], + "main": [ + { + "key": 3, + "param": 20250 + } + ], "wkqbx": 0, "img": "ty_qp_pr", "prompt": { diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 833e29e61..6214fce0d 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1657,6 +1657,21 @@ "id": 101181, "heroid": 44004, "Levelid": 0, + "datas": [ + "GameMain", + "氛围npc-食人鱼", + "905" + ], + "event": [ + 2, + 10230 + ], + "goto": 0 + }, + { + "id": 101182, + "heroid": 44004, + "Levelid": 0, "datas": [ "CommandScene", "功能入口_主线", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index cb7f4d347..d106f5869 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -10647,6 +10647,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 253001313, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001111, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 235003011, "EmitPR": 1000, @@ -23728,7 +23752,7 @@ "Argu": [ 1, 4, - 5100 + 5500 ], "FollowSK": [], "SucFollowSK": [ @@ -23799,7 +23823,7 @@ "Argu": [ 1, 4, - 5400 + 5700 ], "FollowSK": [], "SucFollowSK": [ @@ -23824,7 +23848,7 @@ "Argu": [ 1, 4, - 5700 + 5900 ], "FollowSK": [], "SucFollowSK": [ @@ -23849,7 +23873,7 @@ "Argu": [ 1, 4, - 6000 + 6100 ], "FollowSK": [], "SucFollowSK": [ @@ -68998,5 +69022,173 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 251056111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2000 + ], + "FollowSK": [], + "SucFollowSK": [ + 251056112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251056112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 400, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251056211, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 12, + "Argu": [ + 500 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251057111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 900 + ], + "FollowSK": [], + "SucFollowSK": [ + 251057112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251057112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000092, + 300, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251057211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5000 + ], + "FollowSK": [], + "SucFollowSK": [ + 251057212 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251057212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000092, + 1000, + 2, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 1a8c3709d..a27c1abc7 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -7894,10 +7894,13 @@ "Target": 2, "ChildSkill": { "Id": [ - 253001311 + 253001311, + 253001313 ] }, - "passSkill": [], + "passSkill": [ + 253001313 + ], "Desc": { "key": "skill_skill_atk_Desc_153001311_1", "text": "对敌方发起4次攻击,每次攻击可造成攻击力75%的伤害,并附加3回合[color=#e5621b]速度下降[/color]状态。" @@ -11884,7 +11887,7 @@ "EffectFlag": 5, "Name": { "key": "skill_skill_atk_Name_124004312", - "text": "致命回旋" + "text": "连续击杀!" }, "ico": "jn_24004_3", "CorrectPos": 0, @@ -11916,7 +11919,7 @@ "EffectFlag": 5, "Name": { "key": "skill_skill_atk_Name_124004312", - "text": "致命回旋" + "text": "连续击杀!" }, "ico": "jn_24004_3", "CorrectPos": 0, @@ -11948,7 +11951,7 @@ "EffectFlag": 5, "Name": { "key": "skill_skill_atk_Name_124004312", - "text": "致命回旋" + "text": "连续击杀!" }, "ico": "jn_24004_3", "CorrectPos": 0, @@ -11980,7 +11983,7 @@ "EffectFlag": 5, "Name": { "key": "skill_skill_atk_Name_124004312", - "text": "致命回旋" + "text": "连续击杀!" }, "ico": "jn_24004_3", "CorrectPos": 0, @@ -12012,7 +12015,7 @@ "EffectFlag": 5, "Name": { "key": "skill_skill_atk_Name_124004312", - "text": "致命回旋" + "text": "连续击杀!" }, "ico": "jn_24004_3", "CorrectPos": 0, @@ -18902,7 +18905,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114005311_1", - "text": "鹤大师对敌方目标发起1次攻击,造成攻击力510%伤害并偷取目标身上存在的2个增益效果。" + "text": "鹤大师对敌方目标发起1次攻击,造成攻击力550%伤害并偷取目标身上存在的2个增益效果。" }, "buffid": [], "map": "" @@ -18936,7 +18939,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114005311_2", - "text": "伤害提升至540%。" + "text": "伤害提升至570%。" }, "buffid": [], "map": "" @@ -18970,7 +18973,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114005311_3", - "text": "伤害提升至570%。" + "text": "伤害提升至590%。" }, "buffid": [], "map": "" @@ -19004,7 +19007,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114005311_4", - "text": "伤害提升至600%。" + "text": "伤害提升至610%。" }, "buffid": [], "map": "" @@ -57200,5 +57203,133 @@ }, "buffid": [], "map": "" + }, + { + "id": 151056111, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 1, + "EffectFlag": 5, + "Name": { + "key": "skill_skill_atk_Name_151056111", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 251056111 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_151056111_1", + "text": "对敌方1个单位造成伤害,有40%概率附加1回合【眩晕】。" + }, + "buffid": [], + "map": "" + }, + { + "id": 151056211, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 4, + "EffectFlag": 10, + "Name": { + "key": "skill_skill_atk_Name_151056211", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 251056211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_151056211_1", + "text": "对友方1个单位释放,使得友方行动条增加50%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 151057111, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 1, + "EffectFlag": 5, + "Name": { + "key": "skill_skill_atk_Name_151057111", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 251057111 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_151057111_1", + "text": "对敌方1个目标造成3次90%攻击力的伤害,每次伤害有30%概率附加1层【电浆】。" + }, + "buffid": [], + "map": "" + }, + { + "id": 151057211, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 4, + "EffectFlag": 6, + "Name": { + "key": "skill_skill_atk_Name_151057211", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 251057211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_151057211_1", + "text": "对敌方全体造成1次500%攻击力的伤害,100%概率附加2层【电浆】。" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json index 2fbb92c15..dc54a447a 100644 --- a/bin/json/game_topuiconfig.json +++ b/bin/json/game_topuiconfig.json @@ -2943,5 +2943,21 @@ "n": 1 } ] + }, + { + "id": "gameplayEntry", + "subId": "", + "currencyField": [ + { + "a": "attr", + "t": "gold", + "n": 1 + }, + { + "a": "attr", + "t": "diamond", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index c07c49639..74156b01e 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -628,7 +628,7 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_14", - "text": "圣根是什么" + "text": "黄金脂是什么" }, "task_details": { "key": "worldtask_world_task_task_details_14", @@ -636,7 +636,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_14", - "text": "圣根是什么" + "text": "黄金脂是什么" }, "get_item": [], "trigger": 0, @@ -1232,15 +1232,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_28", - "text": "骇客蛛对话" + "text": "卷土重来的黑暗" }, "task_details": { "key": "worldtask_world_task_task_details_28", - "text": "骇客蛛对话" + "text": "漆黑复苏非比寻常,得赶紧回指挥部向骇客蛛报告。" }, "npctxt": { "key": "worldtask_world_task_npctxt_28", - "text": "骇客蛛对话" + "text": "向骇客蛛汇报情况" }, "get_item": [], "trigger": 0, @@ -1274,15 +1274,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_29", - "text": "提升实力1(维京远征)" + "text": "锻造委托" }, "task_details": { "key": "worldtask_world_task_task_details_29", - "text": "提升实力1(维京远征)" + "text": "为了应对漆黑的复苏这一紧急事态,提升实力尤为重要。听说铁匠铺的戈伯十分擅长锻造,去问问他吧!" }, "npctxt": { "key": "worldtask_world_task_npctxt_29", - "text": "提升实力1(维京远征)" + "text": "和戈伯聊聊" }, "get_item": [], "trigger": 0, @@ -1309,22 +1309,22 @@ "lock": 1, "lockend": 999, "ontxe": 20150, - "id_after": 20230, + "id_after": 20161, "group": 20, "exgroup": 210, "des": 2, "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_30", - "text": "提升实力2(打造装备)" + "text": "前往维京远征" }, "task_details": { "key": "worldtask_world_task_task_details_30", - "text": "提升实力2(打造装备)" + "text": "获得了趁手的武器,也得看看效果。维京地区近来屡受怪物袭击,到那里去练练手?或许还能有些别的收获!" }, "npctxt": { "key": "worldtask_world_task_npctxt_30", - "text": "提升实力2(打造装备)" + "text": "前往维京远征" }, "get_item": [], "trigger": 0, @@ -1346,38 +1346,79 @@ "module": [] }, { - "key": 20230, + "key": 20161, "opencond": "", "lock": 1, "lockend": 999, "ontxe": 20160, - "id_after": 20240, + "id_after": 20230, "group": 20, "exgroup": 210, "des": 2, "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_31", - "text": "骇客蛛对话(找鹤大师/食人鱼对话)" + "text": "辉月等级" }, "task_details": { "key": "worldtask_world_task_task_details_31", - "text": "骇客蛛对话(找鹤大师/食人鱼对话)" + "text": "辉月等级" }, "npctxt": { "key": "worldtask_world_task_npctxt_31", - "text": "骇客蛛对话(找鹤大师/食人鱼对话)" + "text": "辉月等级" + }, + "get_item": [], + "trigger": 0, + "npc": 101171, + "completetask": [ + 120701246 + ], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 2, + "tasktips": 0, + "deliver_task": 0, + "deliver_task_npc": 0, + "lock_add": 0, + "finish": [], + "finishparameter": "", + "fnishipoint": [], + "reword": [], + "module": [] + }, + { + "key": 20230, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 20161, + "id_after": 20240, + "group": 20, + "exgroup": 210, + "des": 2, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_32", + "text": "未来的道路" + }, + "task_details": { + "key": "worldtask_world_task_task_details_32", + "text": "骇客蛛似乎已经把人叫齐了,去指挥部商量商量今后的对策吧!" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_32", + "text": "找骇客蛛聊聊" }, "get_item": [], "trigger": 0, "npc": 101181, "completetask": [ - 120701254, - 120701255 + 120701247 ], "deliver_npc": 0, "taskend_removeitem": [], - "auto_accept": 0, + "auto_accept": 2, "tasktips": 0, "deliver_task": 0, "deliver_task_npc": 0, @@ -1400,24 +1441,26 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_32", - "text": "盖对话" + "key": "worldtask_world_task_task_name_33", + "text": "劳模守护者" }, "task_details": { - "key": "worldtask_world_task_task_details_32", - "text": "盖对话" + "key": "worldtask_world_task_task_details_33", + "text": "在原始人聚集地发现了一块月光原石,阿宝找了一位优秀的守护者和我一同前往,不过他现在在哪呢?" }, "npctxt": { - "key": "worldtask_world_task_npctxt_32", - "text": "盖对话" + "key": "worldtask_world_task_npctxt_33", + "text": "在中轴城内找到盖" }, "get_item": [], "trigger": 0, "npc": 101191, - "completetask": [], + "completetask": [ + 120701245 + ], "deliver_npc": 0, "taskend_removeitem": [], - "auto_accept": 0, + "auto_accept": 2, "tasktips": 0, "deliver_task": 0, "deliver_task_npc": 0, @@ -1443,15 +1486,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_33", + "key": "worldtask_world_task_task_name_34", "text": "疯狂的原始人" }, "task_details": { - "key": "worldtask_world_task_task_details_33", + "key": "worldtask_world_task_task_details_34", "text": "跟随盖来到原始人聚集地,并见到了盖的家人——瓜哥一家。不过,他们看上去似乎并不像盖说的那般友好呢……" }, "npctxt": { - "key": "worldtask_world_task_npctxt_33", + "key": "worldtask_world_task_npctxt_34", "text": "疯狂的原始人" }, "get_item": [], @@ -1485,15 +1528,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_34", + "key": "worldtask_world_task_task_name_35", "text": "家家有本难念的经" }, "task_details": { - "key": "worldtask_world_task_task_details_34", + "key": "worldtask_world_task_task_details_35", "text": "盖也真是的,怎么能这样对待自己的女朋友。不过收集月光原石的任务重要,得想办法获得他们的信任才是。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_34", + "key": "worldtask_world_task_npctxt_35", "text": "家家有本难念的经" }, "get_item": [], @@ -1527,15 +1570,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_35", + "key": "worldtask_world_task_task_name_36", "text": "瓜哥!暴走!" }, "task_details": { - "key": "worldtask_world_task_task_details_35", + "key": "worldtask_world_task_task_details_36", "text": "和盖一起弄回来了一堆大食物,这下一定能获得原始人一家的信任了吧!但万万没想到,瓜哥他居然……" }, "npctxt": { - "key": "worldtask_world_task_npctxt_35", + "key": "worldtask_world_task_npctxt_36", "text": "瓜哥!暴走!" }, "get_item": [], @@ -1569,15 +1612,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_36", + "key": "worldtask_world_task_task_name_37", "text": "月光原石在哪里" }, "task_details": { - "key": "worldtask_world_task_task_details_36", + "key": "worldtask_world_task_task_details_37", "text": "瓜哥想把我们所有人都关在洞穴里!多亏了食人鱼先生,我们才能逃出来,但月光原石要去哪里找呢?" }, "npctxt": { - "key": "worldtask_world_task_npctxt_36", + "key": "worldtask_world_task_npctxt_37", "text": "月光原石在哪里" }, "get_item": [], @@ -1611,15 +1654,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_37", + "key": "worldtask_world_task_task_name_38", "text": "前往拳猴的领地" }, "task_details": { - "key": "worldtask_world_task_task_details_37", + "key": "worldtask_world_task_task_details_38", "text": "为了找到月光原石的下落,在盖的提一下我们决定前往拳猴的居住地,看看能不能获得些线索。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_37", + "key": "worldtask_world_task_npctxt_38", "text": "前往拳猴的领地" }, "get_item": [], @@ -1653,15 +1696,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_38", + "key": "worldtask_world_task_task_name_39", "text": "拳猴的奇特语言" }, "task_details": { - "key": "worldtask_world_task_task_details_38", + "key": "worldtask_world_task_task_details_39", "text": "盖与拳猴交流,获得了月光原石的线索……" }, "npctxt": { - "key": "worldtask_world_task_npctxt_38", + "key": "worldtask_world_task_npctxt_39", "text": "拳猴的奇特语言" }, "get_item": [], @@ -1695,15 +1738,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_39", + "key": "worldtask_world_task_task_name_40", "text": "潜藏在暗影中的威胁" }, "task_details": { - "key": "worldtask_world_task_task_details_39", + "key": "worldtask_world_task_task_details_40", "text": "瓜哥醒来,发现小伊和盖都不见了!这怎么能行,原始人已经必须呆在一起!" }, "npctxt": { - "key": "worldtask_world_task_npctxt_39", + "key": "worldtask_world_task_npctxt_40", "text": "潜藏在暗影中的威胁" }, "get_item": [], @@ -1737,15 +1780,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_40", + "key": "worldtask_world_task_task_name_41", "text": "探索石阵秘境" }, "task_details": { - "key": "worldtask_world_task_task_details_40", + "key": "worldtask_world_task_task_details_41", "text": "在瓜哥的带领下,众人前往石阵秘境,然而事情似乎并没有看上去的这么简单?" }, "npctxt": { - "key": "worldtask_world_task_npctxt_40", + "key": "worldtask_world_task_npctxt_41", "text": "探索石阵秘境" }, "get_item": [], @@ -1779,15 +1822,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_41", + "key": "worldtask_world_task_task_name_42", "text": "阴影战士的阴谋" }, "task_details": { - "key": "worldtask_world_task_task_details_41", + "key": "worldtask_world_task_task_details_42", "text": "没想到这一切都是瓜哥与阴影战士的阴谋?!瓜哥,快清醒一点!" }, "npctxt": { - "key": "worldtask_world_task_npctxt_41", + "key": "worldtask_world_task_npctxt_42", "text": "阴影战士的阴谋" }, "get_item": [], @@ -1821,15 +1864,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_42", + "key": "worldtask_world_task_task_name_43", "text": "巨型猩猩怪来袭!" }, "task_details": { - "key": "worldtask_world_task_task_details_42", + "key": "worldtask_world_task_task_details_43", "text": "本以为已经将阴影战士制伏,没想到他却用暗影之力控制了巨型猩猩怪!为了原始人聚集地的安全,必须打倒它。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_42", + "key": "worldtask_world_task_npctxt_43", "text": "巨型猩猩怪来袭!" }, "get_item": [], @@ -1863,15 +1906,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_43", + "key": "worldtask_world_task_task_name_44", "text": "破除阴谋" }, "task_details": { - "key": "worldtask_world_task_task_details_43", + "key": "worldtask_world_task_task_details_44", "text": "历经千辛万苦,终于破灭了阴影战士的阴谋!赶紧回收月光原石吧!" }, "npctxt": { - "key": "worldtask_world_task_npctxt_43", + "key": "worldtask_world_task_npctxt_44", "text": "破除阴谋" }, "get_item": [], @@ -1905,15 +1948,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_44", + "key": "worldtask_world_task_task_name_45", "text": "升级设备" }, "task_details": { - "key": "worldtask_world_task_task_details_44", + "key": "worldtask_world_task_task_details_45", "text": "总算获得了月光原石,赶快回中轴城把它交给骇客蛛吧!" }, "npctxt": { - "key": "worldtask_world_task_npctxt_44", + "key": "worldtask_world_task_npctxt_45", "text": "和骇客蜘聊聊" }, "get_item": [], @@ -1968,15 +2011,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_45", + "key": "worldtask_world_task_task_name_46", "text": "堡垒风波" }, "task_details": { - "key": "worldtask_world_task_task_details_45", + "key": "worldtask_world_task_task_details_46", "text": "事情搞了一段落,接下来我们需要一些能强化力量的方法" }, "npctxt": { - "key": "worldtask_world_task_npctxt_45", + "key": "worldtask_world_task_npctxt_46", "text": "和骇客蜘聊聊" }, "get_item": [], @@ -2031,15 +2074,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_46", + "key": "worldtask_world_task_task_name_47", "text": "初遇坏蛋联盟" }, "task_details": { - "key": "worldtask_world_task_task_details_46", + "key": "worldtask_world_task_task_details_47", "text": "邦尼兔因紧急情况离开,接应坏蛋联盟的重任只能一人完成了……" }, "npctxt": { - "key": "worldtask_world_task_npctxt_46", + "key": "worldtask_world_task_npctxt_47", "text": "和骇客蜘聊聊" }, "get_item": [], @@ -2073,15 +2116,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_47", + "key": "worldtask_world_task_task_name_48", "text": "警长的阻挠" }, "task_details": { - "key": "worldtask_world_task_task_details_47", + "key": "worldtask_world_task_task_details_48", "text": "运送月光原石途中遇到坏蛋联盟死对头——警长,没办法,必须尽快通过。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_47", + "key": "worldtask_world_task_npctxt_48", "text": "和骇客蜘聊聊" }, "get_item": [], @@ -2115,15 +2158,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_48", + "key": "worldtask_world_task_task_name_49", "text": "前往卡梅洛特城堡" }, "task_details": { - "key": "worldtask_world_task_task_details_48", + "key": "worldtask_world_task_task_details_49", "text": "虽然遇到了一些意外,但并无大碍,继续向卡梅洛特城堡进发吧。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_48", + "key": "worldtask_world_task_npctxt_49", "text": "和骇客蜘聊聊" }, "get_item": [], @@ -2157,15 +2200,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_49", + "key": "worldtask_world_task_task_name_50", "text": "追击果酱教授" }, "task_details": { - "key": "worldtask_world_task_task_details_49", + "key": "worldtask_world_task_task_details_50", "text": "没想到救下的老奶奶竟是果酱教授假扮的!必须抓住他。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_49", + "key": "worldtask_world_task_npctxt_50", "text": "和骇客蜘聊聊" }, "get_item": [], @@ -2199,15 +2242,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_50", + "key": "worldtask_world_task_task_name_51", "text": "通缉果酱教授" }, "task_details": { - "key": "worldtask_world_task_task_details_50", + "key": "worldtask_world_task_task_details_51", "text": "瓦希尔指挥官发现可疑人员混入功夫塔,难道是被通缉的果酱教授?" }, "npctxt": { - "key": "worldtask_world_task_npctxt_50", + "key": "worldtask_world_task_npctxt_51", "text": "去找骇客蛛" }, "get_item": [], @@ -2257,15 +2300,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_51", + "key": "worldtask_world_task_task_name_52", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_51", + "key": "worldtask_world_task_task_details_52", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_51", + "key": "worldtask_world_task_npctxt_52", "text": "击退恐惧灵" }, "get_item": [], @@ -2320,15 +2363,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_52", + "key": "worldtask_world_task_task_name_53", "text": "冰霜泰坦难度1" }, "task_details": { - "key": "worldtask_world_task_task_details_52", + "key": "worldtask_world_task_task_details_53", "text": "冰霜泰坦难度1" }, "npctxt": { - "key": "worldtask_world_task_npctxt_52", + "key": "worldtask_world_task_npctxt_53", "text": "冰霜泰坦难度1" }, "get_item": [], @@ -2378,15 +2421,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_53", + "key": "worldtask_world_task_task_name_54", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_53", + "key": "worldtask_world_task_task_details_54", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_53", + "key": "worldtask_world_task_npctxt_54", "text": "剧情" }, "get_item": [], @@ -2439,15 +2482,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_54", + "key": "worldtask_world_task_task_name_55", "text": "6件装备+6" }, "task_details": { - "key": "worldtask_world_task_task_details_54", + "key": "worldtask_world_task_task_details_55", "text": "6件装备+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_54", + "key": "worldtask_world_task_npctxt_55", "text": "6件装备+6" }, "get_item": [], @@ -2497,15 +2540,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_55", + "key": "worldtask_world_task_task_name_56", "text": "冒险5-4通关" }, "task_details": { - "key": "worldtask_world_task_task_details_55", + "key": "worldtask_world_task_task_details_56", "text": "冒险5-4通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_55", + "key": "worldtask_world_task_npctxt_56", "text": "冒险5-4通关" }, "get_item": [], @@ -2560,15 +2603,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_56", + "key": "worldtask_world_task_task_name_57", "text": "冰霜泰坦难度2" }, "task_details": { - "key": "worldtask_world_task_task_details_56", + "key": "worldtask_world_task_task_details_57", "text": "冰霜泰坦难度2" }, "npctxt": { - "key": "worldtask_world_task_npctxt_56", + "key": "worldtask_world_task_npctxt_57", "text": "冰霜泰坦难度2" }, "get_item": [], @@ -2618,15 +2661,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_57", + "key": "worldtask_world_task_task_name_58", "text": "冒险5-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_57", + "key": "worldtask_world_task_task_details_58", "text": "冒险5-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_57", + "key": "worldtask_world_task_npctxt_58", "text": "冒险5-8通关" }, "get_item": [], @@ -2681,15 +2724,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_58", + "key": "worldtask_world_task_task_name_59", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_58", + "key": "worldtask_world_task_task_details_59", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_58", + "key": "worldtask_world_task_npctxt_59", "text": "剧情" }, "get_item": [], @@ -2737,15 +2780,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_59", + "key": "worldtask_world_task_task_name_60", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_59", + "key": "worldtask_world_task_task_details_60", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_59", + "key": "worldtask_world_task_npctxt_60", "text": "剧情" }, "get_item": [], @@ -2798,15 +2841,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_60", + "key": "worldtask_world_task_task_name_61", "text": "炼金塔5层" }, "task_details": { - "key": "worldtask_world_task_task_details_60", + "key": "worldtask_world_task_task_details_61", "text": "炼金塔5层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_60", + "key": "worldtask_world_task_npctxt_61", "text": "炼金塔5层" }, "get_item": [], @@ -2856,15 +2899,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_61", + "key": "worldtask_world_task_task_name_62", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_61", + "key": "worldtask_world_task_task_details_62", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_61", + "key": "worldtask_world_task_npctxt_62", "text": "击退恐惧灵" }, "get_item": [], @@ -2919,15 +2962,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_62", + "key": "worldtask_world_task_task_name_63", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_62", + "key": "worldtask_world_task_task_details_63", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_62", + "key": "worldtask_world_task_npctxt_63", "text": "击退恐惧灵" }, "get_item": [], @@ -2977,15 +3020,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_63", + "key": "worldtask_world_task_task_name_64", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_63", + "key": "worldtask_world_task_task_details_64", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_63", + "key": "worldtask_world_task_npctxt_64", "text": "击退恐惧灵" }, "get_item": [], @@ -3040,15 +3083,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_64", + "key": "worldtask_world_task_task_name_65", "text": "森林泰坦难度1" }, "task_details": { - "key": "worldtask_world_task_task_details_64", + "key": "worldtask_world_task_task_details_65", "text": "森林泰坦难度1" }, "npctxt": { - "key": "worldtask_world_task_npctxt_64", + "key": "worldtask_world_task_npctxt_65", "text": "森林泰坦难度1" }, "get_item": [], @@ -3098,15 +3141,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_65", + "key": "worldtask_world_task_task_name_66", "text": "主角星座觉醒3次" }, "task_details": { - "key": "worldtask_world_task_task_details_65", + "key": "worldtask_world_task_task_details_66", "text": "主角星座觉醒3次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_65", + "key": "worldtask_world_task_npctxt_66", "text": "主角星座觉醒3次" }, "get_item": [], @@ -3161,15 +3204,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_66", + "key": "worldtask_world_task_task_name_67", "text": "9件装备强化+6" }, "task_details": { - "key": "worldtask_world_task_task_details_66", + "key": "worldtask_world_task_task_details_67", "text": "9件装备强化+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_66", + "key": "worldtask_world_task_npctxt_67", "text": "9件装备强化+6" }, "get_item": [], @@ -3219,15 +3262,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_67", + "key": "worldtask_world_task_task_name_68", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_67", + "key": "worldtask_world_task_task_details_68", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_67", + "key": "worldtask_world_task_npctxt_68", "text": "击退恐惧灵" }, "get_item": [], @@ -3282,15 +3325,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_68", + "key": "worldtask_world_task_task_name_69", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_68", + "key": "worldtask_world_task_task_details_69", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_68", + "key": "worldtask_world_task_npctxt_69", "text": "击退恐惧灵" }, "get_item": [], @@ -3340,15 +3383,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_69", + "key": "worldtask_world_task_task_name_70", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_69", + "key": "worldtask_world_task_task_details_70", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_69", + "key": "worldtask_world_task_npctxt_70", "text": "剧情" }, "get_item": [], @@ -3401,15 +3444,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_70", + "key": "worldtask_world_task_task_name_71", "text": "冒险6-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_70", + "key": "worldtask_world_task_task_details_71", "text": "冒险6-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_70", + "key": "worldtask_world_task_npctxt_71", "text": "冒险6-8通关" }, "get_item": [], @@ -3459,15 +3502,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_71", + "key": "worldtask_world_task_task_name_72", "text": "森林泰坦难度2" }, "task_details": { - "key": "worldtask_world_task_task_details_71", + "key": "worldtask_world_task_task_details_72", "text": "森林泰坦难度2" }, "npctxt": { - "key": "worldtask_world_task_npctxt_71", + "key": "worldtask_world_task_npctxt_72", "text": "森林泰坦难度2" }, "get_item": [], @@ -3522,15 +3565,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_72", + "key": "worldtask_world_task_task_name_73", "text": "12件装备强化+6" }, "task_details": { - "key": "worldtask_world_task_task_details_72", + "key": "worldtask_world_task_task_details_73", "text": "12件装备强化+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_72", + "key": "worldtask_world_task_npctxt_73", "text": "12件装备强化+6" }, "get_item": [], @@ -3580,15 +3623,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_73", + "key": "worldtask_world_task_task_name_74", "text": "武馆木桩解锁3根" }, "task_details": { - "key": "worldtask_world_task_task_details_73", + "key": "worldtask_world_task_task_details_74", "text": "武馆木桩解锁3根" }, "npctxt": { - "key": "worldtask_world_task_npctxt_73", + "key": "worldtask_world_task_npctxt_74", "text": "武馆木桩解锁3根" }, "get_item": [], @@ -3643,15 +3686,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_74", + "key": "worldtask_world_task_task_name_75", "text": "炼金塔10层" }, "task_details": { - "key": "worldtask_world_task_task_details_74", + "key": "worldtask_world_task_task_details_75", "text": "炼金塔10层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_74", + "key": "worldtask_world_task_npctxt_75", "text": "炼金塔10层" }, "get_item": [], @@ -3701,15 +3744,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_75", + "key": "worldtask_world_task_task_name_76", "text": "冒险7-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_75", + "key": "worldtask_world_task_task_details_76", "text": "冒险7-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_75", + "key": "worldtask_world_task_npctxt_76", "text": "冒险7-8通关" }, "get_item": [], @@ -3764,15 +3807,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_76", + "key": "worldtask_world_task_task_name_77", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_76", + "key": "worldtask_world_task_task_details_77", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_76", + "key": "worldtask_world_task_npctxt_77", "text": "击退恐惧灵" }, "get_item": [], @@ -3822,15 +3865,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_77", + "key": "worldtask_world_task_task_name_78", "text": "击退恐惧灵" }, "task_details": { - "key": "worldtask_world_task_task_details_77", + "key": "worldtask_world_task_task_details_78", "text": "击退恐惧灵" }, "npctxt": { - "key": "worldtask_world_task_npctxt_77", + "key": "worldtask_world_task_npctxt_78", "text": "击退恐惧灵" }, "get_item": [], @@ -3885,15 +3928,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_78", + "key": "worldtask_world_task_task_name_79", "text": "穿+6的无极神功套装" }, "task_details": { - "key": "worldtask_world_task_task_details_78", + "key": "worldtask_world_task_task_details_79", "text": "穿+6的无极神功套装" }, "npctxt": { - "key": "worldtask_world_task_npctxt_78", + "key": "worldtask_world_task_npctxt_79", "text": "穿+6的无极神功套装" }, "get_item": [], @@ -3943,15 +3986,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_79", + "key": "worldtask_world_task_task_name_80", "text": "加入任意俱乐部" }, "task_details": { - "key": "worldtask_world_task_task_details_79", + "key": "worldtask_world_task_task_details_80", "text": "加入任意俱乐部" }, "npctxt": { - "key": "worldtask_world_task_npctxt_79", + "key": "worldtask_world_task_npctxt_80", "text": "加入任意俱乐部" }, "get_item": [], @@ -4006,15 +4049,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_80", + "key": "worldtask_world_task_task_name_81", "text": "森林泰坦难度3" }, "task_details": { - "key": "worldtask_world_task_task_details_80", + "key": "worldtask_world_task_task_details_81", "text": "森林泰坦难度3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_80", + "key": "worldtask_world_task_npctxt_81", "text": "森林泰坦难度3" }, "get_item": [], @@ -4064,15 +4107,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_81", + "key": "worldtask_world_task_task_name_82", "text": "森林泰坦难度4" }, "task_details": { - "key": "worldtask_world_task_task_details_81", + "key": "worldtask_world_task_task_details_82", "text": "森林泰坦难度4" }, "npctxt": { - "key": "worldtask_world_task_npctxt_81", + "key": "worldtask_world_task_npctxt_82", "text": "森林泰坦难度4" }, "get_item": [], @@ -4127,15 +4170,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_82", + "key": "worldtask_world_task_task_name_83", "text": "守护者回响解锁次数10次" }, "task_details": { - "key": "worldtask_world_task_task_details_82", + "key": "worldtask_world_task_task_details_83", "text": "守护者回响解锁次数10次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_82", + "key": "worldtask_world_task_npctxt_83", "text": "守护者回响解锁次数10次" }, "get_item": [], @@ -4185,15 +4228,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_83", + "key": "worldtask_world_task_task_name_84", "text": "守护者回响解锁次数15次" }, "task_details": { - "key": "worldtask_world_task_task_details_83", + "key": "worldtask_world_task_task_details_84", "text": "守护者回响解锁次数15次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_83", + "key": "worldtask_world_task_npctxt_84", "text": "守护者回响解锁次数15次" }, "get_item": [], @@ -4248,15 +4291,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_84", + "key": "worldtask_world_task_task_name_85", "text": "冒险8-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_84", + "key": "worldtask_world_task_task_details_85", "text": "冒险8-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_84", + "key": "worldtask_world_task_npctxt_85", "text": "冒险8-8通关" }, "get_item": [], @@ -4306,15 +4349,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_85", + "key": "worldtask_world_task_task_name_86", "text": "12件装备强化+9" }, "task_details": { - "key": "worldtask_world_task_task_details_85", + "key": "worldtask_world_task_task_details_86", "text": "12件装备强化+9" }, "npctxt": { - "key": "worldtask_world_task_npctxt_85", + "key": "worldtask_world_task_npctxt_86", "text": "12件装备强化+9" }, "get_item": [], @@ -4369,15 +4412,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_86", + "key": "worldtask_world_task_task_name_87", "text": "竞技场3胜" }, "task_details": { - "key": "worldtask_world_task_task_details_86", + "key": "worldtask_world_task_task_details_87", "text": "竞技场3胜" }, "npctxt": { - "key": "worldtask_world_task_npctxt_86", + "key": "worldtask_world_task_npctxt_87", "text": "竞技场3胜" }, "get_item": [], @@ -4427,15 +4470,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_87", + "key": "worldtask_world_task_task_name_88", "text": "森林泰坦难度5" }, "task_details": { - "key": "worldtask_world_task_task_details_87", + "key": "worldtask_world_task_task_details_88", "text": "森林泰坦难度5" }, "npctxt": { - "key": "worldtask_world_task_npctxt_87", + "key": "worldtask_world_task_npctxt_88", "text": "森林泰坦难度5" }, "get_item": [], @@ -4490,15 +4533,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_88", + "key": "worldtask_world_task_task_name_89", "text": "守护者回响解锁解锁20次" }, "task_details": { - "key": "worldtask_world_task_task_details_88", + "key": "worldtask_world_task_task_details_89", "text": "守护者回响解锁解锁20次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_88", + "key": "worldtask_world_task_npctxt_89", "text": "守护者回响解锁解锁20次" }, "get_item": [], @@ -4548,15 +4591,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_89", + "key": "worldtask_world_task_task_name_90", "text": "冒险9-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_89", + "key": "worldtask_world_task_task_details_90", "text": "冒险9-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_89", + "key": "worldtask_world_task_npctxt_90", "text": "冒险9-8通关" }, "get_item": [], @@ -4611,15 +4654,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_90", + "key": "worldtask_world_task_task_name_91", "text": "搜集12个4星装备" }, "task_details": { - "key": "worldtask_world_task_task_details_90", + "key": "worldtask_world_task_task_details_91", "text": "搜集12个4星装备" }, "npctxt": { - "key": "worldtask_world_task_npctxt_90", + "key": "worldtask_world_task_npctxt_91", "text": "搜集12个4星装备" }, "get_item": [], @@ -4669,15 +4712,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_91", + "key": "worldtask_world_task_task_name_92", "text": "炼金塔20层" }, "task_details": { - "key": "worldtask_world_task_task_details_91", + "key": "worldtask_world_task_task_details_92", "text": "炼金塔20层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_91", + "key": "worldtask_world_task_npctxt_92", "text": "炼金塔20层" }, "get_item": [], @@ -4732,15 +4775,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_92", + "key": "worldtask_world_task_task_name_93", "text": "冒险10-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_92", + "key": "worldtask_world_task_task_details_93", "text": "冒险10-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_92", + "key": "worldtask_world_task_npctxt_93", "text": "冒险10-8通关" }, "get_item": [], @@ -4790,15 +4833,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_93", + "key": "worldtask_world_task_task_name_94", "text": "森林泰坦难度6" }, "task_details": { - "key": "worldtask_world_task_task_details_93", + "key": "worldtask_world_task_task_details_94", "text": "森林泰坦难度6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_93", + "key": "worldtask_world_task_npctxt_94", "text": "森林泰坦难度6" }, "get_item": [], @@ -4853,15 +4896,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_94", + "key": "worldtask_world_task_task_name_95", "text": "18件强化+9" }, "task_details": { - "key": "worldtask_world_task_task_details_94", + "key": "worldtask_world_task_task_details_95", "text": "18件强化+9" }, "npctxt": { - "key": "worldtask_world_task_npctxt_94", + "key": "worldtask_world_task_npctxt_95", "text": "18件强化+9" }, "get_item": [], @@ -4911,15 +4954,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_95", + "key": "worldtask_world_task_task_name_96", "text": "冒险11-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_95", + "key": "worldtask_world_task_task_details_96", "text": "冒险11-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_95", + "key": "worldtask_world_task_npctxt_96", "text": "冒险11-8通关" }, "get_item": [], @@ -4974,15 +5017,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_96", + "key": "worldtask_world_task_task_name_97", "text": "守护者回响解锁25次" }, "task_details": { - "key": "worldtask_world_task_task_details_96", + "key": "worldtask_world_task_task_details_97", "text": "守护者回响解锁25次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_96", + "key": "worldtask_world_task_npctxt_97", "text": "守护者回响解锁25次" }, "get_item": [], @@ -5032,15 +5075,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_97", + "key": "worldtask_world_task_task_name_98", "text": "冒险12-3通关" }, "task_details": { - "key": "worldtask_world_task_task_details_97", + "key": "worldtask_world_task_task_details_98", "text": "冒险12-3通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_97", + "key": "worldtask_world_task_npctxt_98", "text": "冒险12-3通关" }, "get_item": [], @@ -5095,15 +5138,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_98", + "key": "worldtask_world_task_task_name_99", "text": "森林泰坦难度7" }, "task_details": { - "key": "worldtask_world_task_task_details_98", + "key": "worldtask_world_task_task_details_99", "text": "森林泰坦难度7" }, "npctxt": { - "key": "worldtask_world_task_npctxt_98", + "key": "worldtask_world_task_npctxt_99", "text": "森林泰坦难度7" }, "get_item": [], @@ -5153,15 +5196,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_99", + "key": "worldtask_world_task_task_name_100", "text": "8件任意装备强化+12" }, "task_details": { - "key": "worldtask_world_task_task_details_99", + "key": "worldtask_world_task_task_details_100", "text": "8件任意装备强化+12" }, "npctxt": { - "key": "worldtask_world_task_npctxt_99", + "key": "worldtask_world_task_npctxt_100", "text": "8件任意装备强化+12" }, "get_item": [], @@ -5216,15 +5259,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_100", + "key": "worldtask_world_task_task_name_101", "text": "冒险12-6通关" }, "task_details": { - "key": "worldtask_world_task_task_details_100", + "key": "worldtask_world_task_task_details_101", "text": "冒险12-6通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_100", + "key": "worldtask_world_task_npctxt_101", "text": "冒险12-6通关" }, "get_item": [], @@ -5274,15 +5317,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_101", + "key": "worldtask_world_task_task_name_102", "text": "竞技场获胜20次" }, "task_details": { - "key": "worldtask_world_task_task_details_101", + "key": "worldtask_world_task_task_details_102", "text": "竞技场获胜20次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_101", + "key": "worldtask_world_task_npctxt_102", "text": "竞技场获胜20次" }, "get_item": [], @@ -5337,15 +5380,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_102", + "key": "worldtask_world_task_task_name_103", "text": "冒险12-8通关" }, "task_details": { - "key": "worldtask_world_task_task_details_102", + "key": "worldtask_world_task_task_details_103", "text": "冒险12-8通关" }, "npctxt": { - "key": "worldtask_world_task_npctxt_102", + "key": "worldtask_world_task_npctxt_103", "text": "冒险12-8通关" }, "get_item": [], @@ -5395,15 +5438,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_103", + "key": "worldtask_world_task_task_name_104", "text": "冒险关卡困难1-3" }, "task_details": { - "key": "worldtask_world_task_task_details_103", + "key": "worldtask_world_task_task_details_104", "text": "冒险关卡困难1-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_103", + "key": "worldtask_world_task_npctxt_104", "text": "冒险关卡困难1-3" }, "get_item": [], @@ -5453,15 +5496,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_104", + "key": "worldtask_world_task_task_name_105", "text": "冒险关卡困难1-6" }, "task_details": { - "key": "worldtask_world_task_task_details_104", + "key": "worldtask_world_task_task_details_105", "text": "冒险关卡困难1-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_104", + "key": "worldtask_world_task_npctxt_105", "text": "冒险关卡困难1-6" }, "get_item": [], @@ -5516,15 +5559,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_105", + "key": "worldtask_world_task_task_name_106", "text": "冒险关卡困难2-3" }, "task_details": { - "key": "worldtask_world_task_task_details_105", + "key": "worldtask_world_task_task_details_106", "text": "冒险关卡困难2-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_105", + "key": "worldtask_world_task_npctxt_106", "text": "冒险关卡困难2-3" }, "get_item": [], @@ -5574,15 +5617,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_106", + "key": "worldtask_world_task_task_name_107", "text": "冒险关卡困难2-6" }, "task_details": { - "key": "worldtask_world_task_task_details_106", + "key": "worldtask_world_task_task_details_107", "text": "冒险关卡困难2-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_106", + "key": "worldtask_world_task_npctxt_107", "text": "冒险关卡困难2-6" }, "get_item": [], @@ -5637,15 +5680,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_107", + "key": "worldtask_world_task_task_name_108", "text": "冒险关卡困难3-3" }, "task_details": { - "key": "worldtask_world_task_task_details_107", + "key": "worldtask_world_task_task_details_108", "text": "冒险关卡困难3-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_107", + "key": "worldtask_world_task_npctxt_108", "text": "冒险关卡困难3-3" }, "get_item": [], @@ -5695,15 +5738,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_108", + "key": "worldtask_world_task_task_name_109", "text": "冒险关卡困难3-6" }, "task_details": { - "key": "worldtask_world_task_task_details_108", + "key": "worldtask_world_task_task_details_109", "text": "冒险关卡困难3-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_108", + "key": "worldtask_world_task_npctxt_109", "text": "冒险关卡困难3-6" }, "get_item": [], @@ -5758,15 +5801,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_109", + "key": "worldtask_world_task_task_name_110", "text": "冒险关卡困难4-3" }, "task_details": { - "key": "worldtask_world_task_task_details_109", + "key": "worldtask_world_task_task_details_110", "text": "冒险关卡困难4-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_109", + "key": "worldtask_world_task_npctxt_110", "text": "冒险关卡困难4-3" }, "get_item": [], @@ -5806,15 +5849,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_110", + "key": "worldtask_world_task_task_name_111", "text": "冒险关卡困难4-6" }, "task_details": { - "key": "worldtask_world_task_task_details_110", + "key": "worldtask_world_task_task_details_111", "text": "冒险关卡困难4-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_110", + "key": "worldtask_world_task_npctxt_111", "text": "冒险关卡困难4-6" }, "get_item": [], @@ -5854,15 +5897,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_111", + "key": "worldtask_world_task_task_name_112", "text": "冒险关卡困难5-3" }, "task_details": { - "key": "worldtask_world_task_task_details_111", + "key": "worldtask_world_task_task_details_112", "text": "冒险关卡困难5-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_111", + "key": "worldtask_world_task_npctxt_112", "text": "冒险关卡困难5-3" }, "get_item": [], @@ -5902,15 +5945,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_112", + "key": "worldtask_world_task_task_name_113", "text": "冒险关卡困难5-6" }, "task_details": { - "key": "worldtask_world_task_task_details_112", + "key": "worldtask_world_task_task_details_113", "text": "冒险关卡困难5-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_112", + "key": "worldtask_world_task_npctxt_113", "text": "冒险关卡困难5-6" }, "get_item": [], @@ -5950,15 +5993,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_113", + "key": "worldtask_world_task_task_name_114", "text": "冒险关卡困难6-3" }, "task_details": { - "key": "worldtask_world_task_task_details_113", + "key": "worldtask_world_task_task_details_114", "text": "冒险关卡困难6-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_113", + "key": "worldtask_world_task_npctxt_114", "text": "冒险关卡困难6-3" }, "get_item": [], @@ -5998,15 +6041,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_114", + "key": "worldtask_world_task_task_name_115", "text": "冒险关卡困难6-6" }, "task_details": { - "key": "worldtask_world_task_task_details_114", + "key": "worldtask_world_task_task_details_115", "text": "冒险关卡困难6-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_114", + "key": "worldtask_world_task_npctxt_115", "text": "冒险关卡困难6-6" }, "get_item": [], @@ -6046,15 +6089,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_115", + "key": "worldtask_world_task_task_name_116", "text": "冒险关卡困难7-3" }, "task_details": { - "key": "worldtask_world_task_task_details_115", + "key": "worldtask_world_task_task_details_116", "text": "冒险关卡困难7-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_115", + "key": "worldtask_world_task_npctxt_116", "text": "冒险关卡困难7-3" }, "get_item": [], @@ -6094,15 +6137,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_116", + "key": "worldtask_world_task_task_name_117", "text": "冒险关卡困难7-6" }, "task_details": { - "key": "worldtask_world_task_task_details_116", + "key": "worldtask_world_task_task_details_117", "text": "冒险关卡困难7-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_116", + "key": "worldtask_world_task_npctxt_117", "text": "冒险关卡困难7-6" }, "get_item": [], @@ -6142,15 +6185,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_117", + "key": "worldtask_world_task_task_name_118", "text": "冒险关卡困难8-3" }, "task_details": { - "key": "worldtask_world_task_task_details_117", + "key": "worldtask_world_task_task_details_118", "text": "冒险关卡困难8-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_117", + "key": "worldtask_world_task_npctxt_118", "text": "冒险关卡困难8-3" }, "get_item": [], @@ -6190,15 +6233,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_118", + "key": "worldtask_world_task_task_name_119", "text": "冒险关卡困难8-6" }, "task_details": { - "key": "worldtask_world_task_task_details_118", + "key": "worldtask_world_task_task_details_119", "text": "冒险关卡困难8-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_118", + "key": "worldtask_world_task_npctxt_119", "text": "冒险关卡困难8-6" }, "get_item": [], @@ -6238,15 +6281,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_119", + "key": "worldtask_world_task_task_name_120", "text": "冒险关卡困难9-3" }, "task_details": { - "key": "worldtask_world_task_task_details_119", + "key": "worldtask_world_task_task_details_120", "text": "冒险关卡困难9-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_119", + "key": "worldtask_world_task_npctxt_120", "text": "冒险关卡困难9-3" }, "get_item": [], @@ -6286,15 +6329,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_120", + "key": "worldtask_world_task_task_name_121", "text": "冒险关卡困难9-6" }, "task_details": { - "key": "worldtask_world_task_task_details_120", + "key": "worldtask_world_task_task_details_121", "text": "冒险关卡困难9-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_120", + "key": "worldtask_world_task_npctxt_121", "text": "冒险关卡困难9-6" }, "get_item": [], @@ -6334,15 +6377,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_121", + "key": "worldtask_world_task_task_name_122", "text": "冒险关卡困难10-3" }, "task_details": { - "key": "worldtask_world_task_task_details_121", + "key": "worldtask_world_task_task_details_122", "text": "冒险关卡困难10-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_121", + "key": "worldtask_world_task_npctxt_122", "text": "冒险关卡困难10-3" }, "get_item": [], @@ -6382,15 +6425,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_122", + "key": "worldtask_world_task_task_name_123", "text": "冒险关卡困难10-6" }, "task_details": { - "key": "worldtask_world_task_task_details_122", + "key": "worldtask_world_task_task_details_123", "text": "冒险关卡困难10-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_122", + "key": "worldtask_world_task_npctxt_123", "text": "冒险关卡困难10-6" }, "get_item": [], @@ -6430,15 +6473,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_123", + "key": "worldtask_world_task_task_name_124", "text": "冒险关卡困难11-3" }, "task_details": { - "key": "worldtask_world_task_task_details_123", + "key": "worldtask_world_task_task_details_124", "text": "冒险关卡困难11-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_123", + "key": "worldtask_world_task_npctxt_124", "text": "冒险关卡困难11-3" }, "get_item": [], @@ -6478,15 +6521,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_124", + "key": "worldtask_world_task_task_name_125", "text": "冒险关卡困难11-6" }, "task_details": { - "key": "worldtask_world_task_task_details_124", + "key": "worldtask_world_task_task_details_125", "text": "冒险关卡困难11-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_124", + "key": "worldtask_world_task_npctxt_125", "text": "冒险关卡困难11-6" }, "get_item": [], @@ -6526,15 +6569,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_125", + "key": "worldtask_world_task_task_name_126", "text": "冒险关卡困难12-3" }, "task_details": { - "key": "worldtask_world_task_task_details_125", + "key": "worldtask_world_task_task_details_126", "text": "冒险关卡困难12-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_125", + "key": "worldtask_world_task_npctxt_126", "text": "冒险关卡困难12-3" }, "get_item": [], @@ -6574,15 +6617,15 @@ "des": 2, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_126", + "key": "worldtask_world_task_task_name_127", "text": "冒险关卡困难12-6" }, "task_details": { - "key": "worldtask_world_task_task_details_126", + "key": "worldtask_world_task_task_details_127", "text": "冒险关卡困难12-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_126", + "key": "worldtask_world_task_npctxt_127", "text": "冒险关卡困难12-6" }, "get_item": [], @@ -6622,15 +6665,15 @@ "des": 5, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_127", + "key": "worldtask_world_task_task_name_128", "text": "兄弟,带一程" }, "task_details": { - "key": "worldtask_world_task_task_details_127", + "key": "worldtask_world_task_task_details_128", "text": "途中偶遇的守护者,期望我们带他前往某个城市。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_127", + "key": "worldtask_world_task_npctxt_128", "text": "兄弟,带一程" }, "get_item": [], @@ -6682,15 +6725,15 @@ "des": 5, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_128", + "key": "worldtask_world_task_task_name_129", "text": "特产不嫌多" }, "task_details": { - "key": "worldtask_world_task_task_details_128", + "key": "worldtask_world_task_task_details_129", "text": "一名守护者希望我们帮他购买一些特产,并承诺会用其他东西作为报酬。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_128", + "key": "worldtask_world_task_npctxt_129", "text": "特产不嫌多" }, "get_item": [], @@ -6742,15 +6785,15 @@ "des": 5, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_129", + "key": "worldtask_world_task_task_name_130", "text": "资助城市" }, "task_details": { - "key": "worldtask_world_task_task_details_129", + "key": "worldtask_world_task_task_details_130", "text": "如今我们稍有资产,守护者希望我们能资助一些城市,当地人会给予一些报酬。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_129", + "key": "worldtask_world_task_npctxt_130", "text": "资助城市" }, "get_item": [], @@ -6802,15 +6845,15 @@ "des": 5, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_130", + "key": "worldtask_world_task_task_name_131", "text": "雪中送炭" }, "task_details": { - "key": "worldtask_world_task_task_details_130", + "key": "worldtask_world_task_task_details_131", "text": "一些城市急需某些道具度过难关,我们或许应当帮助他们运转一下。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_130", + "key": "worldtask_world_task_npctxt_131", "text": "雪中送炭" }, "get_item": [], @@ -6862,15 +6905,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_131", + "key": "worldtask_world_task_task_name_132", "text": "悍娇虎逸闻一" }, "task_details": { - "key": "worldtask_world_task_task_details_131", + "key": "worldtask_world_task_task_details_132", "text": "悍娇虎独自一人站在武馆,看上去似乎很生气。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_131", + "key": "worldtask_world_task_npctxt_132", "text": "和悍娇虎聊聊" }, "get_item": [], @@ -6908,15 +6951,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_132", + "key": "worldtask_world_task_task_name_133", "text": "悍娇虎逸闻二" }, "task_details": { - "key": "worldtask_world_task_task_details_132", + "key": "worldtask_world_task_task_details_133", "text": "阿宝在哪儿呢,要在悍娇虎更生气之前找到才行。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_132", + "key": "worldtask_world_task_npctxt_133", "text": "找阿宝聊聊" }, "get_item": [], @@ -6954,15 +6997,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_133", + "key": "worldtask_world_task_task_name_134", "text": "悍娇虎逸闻三" }, "task_details": { - "key": "worldtask_world_task_task_details_133", + "key": "worldtask_world_task_task_details_134", "text": "找到阿宝,并把阿宝带回武馆吧。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_133", + "key": "worldtask_world_task_npctxt_134", "text": "找到阿宝" }, "get_item": [ @@ -7008,15 +7051,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_134", + "key": "worldtask_world_task_task_name_135", "text": "平先生的焦急" }, "task_details": { - "key": "worldtask_world_task_task_details_134", + "key": "worldtask_world_task_task_details_135", "text": "平先生焦急的看向武馆的方向,看上去像是遇到了什么棘手的事。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_134", + "key": "worldtask_world_task_npctxt_135", "text": "找平先生聊聊" }, "get_item": [], @@ -7054,15 +7097,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_135", + "key": "worldtask_world_task_task_name_136", "text": "队伍的集体提升" }, "task_details": { - "key": "worldtask_world_task_task_details_135", + "key": "worldtask_world_task_task_details_136", "text": "博克岛的发展有点超出预期,伙伴们需要一些特殊的帮助来快速提升实力,去武馆请教下师傅吧。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_135", + "key": "worldtask_world_task_npctxt_136", "text": "找师傅聊聊" }, "get_item": [], @@ -7102,15 +7145,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_136", + "key": "worldtask_world_task_task_name_137", "text": "驯龙小队的一天一" }, "task_details": { - "key": "worldtask_world_task_task_details_136", + "key": "worldtask_world_task_task_details_137", "text": "希卡普约着他的伙伴们一起做龙鞍,快帮他们收集制作材料吧。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_136", + "key": "worldtask_world_task_npctxt_137", "text": "和希卡普聊聊" }, "get_item": [], @@ -7150,15 +7193,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_137", + "key": "worldtask_world_task_task_name_138", "text": "驯龙小队的一天二" }, "task_details": { - "key": "worldtask_world_task_task_details_137", + "key": "worldtask_world_task_task_details_138", "text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来,得上前阻止他们。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_137", + "key": "worldtask_world_task_npctxt_138", "text": "阻止鼻涕粗" }, "get_item": [], @@ -7198,15 +7241,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_138", + "key": "worldtask_world_task_task_name_139", "text": "驯龙小队的一天三" }, "task_details": { - "key": "worldtask_world_task_task_details_138", + "key": "worldtask_world_task_task_details_139", "text": "亚丝翠情绪激动,你不能让他们互相伤害。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_138", + "key": "worldtask_world_task_npctxt_139", "text": "阻止亚丝翠" }, "get_item": [], @@ -7246,15 +7289,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_139", + "key": "worldtask_world_task_task_name_140", "text": "驯龙小队的一天四" }, "task_details": { - "key": "worldtask_world_task_task_details_139", + "key": "worldtask_world_task_task_details_140", "text": "希卡普看上去很生气。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_139", + "key": "worldtask_world_task_npctxt_140", "text": "和希卡普聊聊" }, "get_item": [], @@ -7292,15 +7335,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_140", + "key": "worldtask_world_task_task_name_141", "text": "驯龙小队的一天五" }, "task_details": { - "key": "worldtask_world_task_task_details_140", + "key": "worldtask_world_task_task_details_141", "text": "和鼻涕粗沟通,让他知道问题出在哪。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_140", + "key": "worldtask_world_task_npctxt_141", "text": "找到鼻涕粗" }, "get_item": [], @@ -7338,15 +7381,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_141", + "key": "worldtask_world_task_task_name_142", "text": "驯龙小队的一天终" }, "task_details": { - "key": "worldtask_world_task_task_details_141", + "key": "worldtask_world_task_task_details_142", "text": "为了让驯龙小队重归于好,你准备去找鼻涕粗聊聊。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_141", + "key": "worldtask_world_task_npctxt_142", "text": "让他们和好如初" }, "get_item": [], @@ -7384,15 +7427,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_142", + "key": "worldtask_world_task_task_name_143", "text": "赛龙的故事" }, "task_details": { - "key": "worldtask_world_task_task_details_142", + "key": "worldtask_world_task_task_details_143", "text": "暴芙那特和悍夫那特好像又在斗嘴了。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_142", + "key": "worldtask_world_task_npctxt_143", "text": "去找双胞胎" }, "get_item": [], @@ -7430,15 +7473,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_143", + "key": "worldtask_world_task_task_name_144", "text": "设备升级" }, "task_details": { - "key": "worldtask_world_task_task_details_143", + "key": "worldtask_world_task_task_details_144", "text": "变强的方法有很多种,冒险即将开始,铁匠铺的戈伯发来讯息有要事找我们,听说会给我们一份礼物。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_143", + "key": "worldtask_world_task_npctxt_144", "text": "和戈伯聊聊" }, "get_item": [ @@ -7484,15 +7527,15 @@ "des": 3, "icon": "25002", "task_name": { - "key": "worldtask_world_task_task_name_144", + "key": "worldtask_world_task_task_name_145", "text": "精心打造" }, "task_details": { - "key": "worldtask_world_task_task_details_144", + "key": "worldtask_world_task_task_details_145", "text": "戈伯的意思是,我们已经在锻造这一途上入门了,不过听说他有一种快捷的升级装备的路子,我们或许应该过去听听。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_144", + "key": "worldtask_world_task_npctxt_145", "text": "和戈伯聊聊" }, "get_item": [], @@ -7532,15 +7575,15 @@ "des": 3, "icon": "25003", "task_name": { - "key": "worldtask_world_task_task_name_145", + "key": "worldtask_world_task_task_name_146", "text": "精心打造" }, "task_details": { - "key": "worldtask_world_task_task_details_145", + "key": "worldtask_world_task_task_details_146", "text": "锻造一途深不见底,又是全新的考验,戈伯希望我加强训练,早日熟悉这种升级方式。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_145", + "key": "worldtask_world_task_npctxt_146", "text": "和戈伯聊聊" }, "get_item": [], @@ -7580,15 +7623,15 @@ "des": 3, "icon": "25004", "task_name": { - "key": "worldtask_world_task_task_name_146", + "key": "worldtask_world_task_task_name_147", "text": "大组织,大买卖" }, "task_details": { - "key": "worldtask_world_task_task_details_146", + "key": "worldtask_world_task_task_details_147", "text": "知道吗,沃尔夫和他的那位传奇血红爪搭档来到了中轴城,而且还有笔买卖找我们谈谈,或许该抽个时间去和他勾兑勾兑。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_146", + "key": "worldtask_world_task_npctxt_147", "text": "和沃尔夫聊聊" }, "get_item": [ @@ -7634,15 +7677,15 @@ "des": 3, "icon": "14003", "task_name": { - "key": "worldtask_world_task_task_name_147", + "key": "worldtask_world_task_task_name_148", "text": "提升等级" }, "task_details": { - "key": "worldtask_world_task_task_details_147", + "key": "worldtask_world_task_task_details_148", "text": "提升等级" }, "npctxt": { - "key": "worldtask_world_task_npctxt_147", + "key": "worldtask_world_task_npctxt_148", "text": "提升等级" }, "get_item": [], @@ -7653,7 +7696,7 @@ ], "deliver_npc": 320109, "taskend_removeitem": [], - "auto_accept": 0, + "auto_accept": 2, "tasktips": 0, "deliver_task": 0, "deliver_task_npc": 0, @@ -7676,15 +7719,15 @@ "des": 3, "icon": "14003", "task_name": { - "key": "worldtask_world_task_task_name_148", + "key": "worldtask_world_task_task_name_149", "text": "突破英雄" }, "task_details": { - "key": "worldtask_world_task_task_details_148", + "key": "worldtask_world_task_task_details_149", "text": "突破英雄" }, "npctxt": { - "key": "worldtask_world_task_npctxt_148", + "key": "worldtask_world_task_npctxt_149", "text": "突破英雄" }, "get_item": [], @@ -7695,7 +7738,7 @@ ], "deliver_npc": 3001069, "taskend_removeitem": [], - "auto_accept": 0, + "auto_accept": 2, "tasktips": 0, "deliver_task": 0, "deliver_task_npc": 0, @@ -7718,15 +7761,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_149", + "key": "worldtask_world_task_task_name_150", "text": "梦中世界" }, "task_details": { - "key": "worldtask_world_task_task_details_149", + "key": "worldtask_world_task_task_details_150", "text": "邦尼兔在沙人那里,看上去十分焦急,快去看看吧。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_149", + "key": "worldtask_world_task_npctxt_150", "text": "找到邦尼兔" }, "get_item": [], @@ -7766,15 +7809,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_150", + "key": "worldtask_world_task_task_name_151", "text": "挑战与狩猎" }, "task_details": { - "key": "worldtask_world_task_task_details_150", + "key": "worldtask_world_task_task_details_151", "text": "挑战与狩猎" }, "npctxt": { - "key": "worldtask_world_task_npctxt_150", + "key": "worldtask_world_task_npctxt_151", "text": "找到沃尔特" }, "get_item": [], @@ -7814,15 +7857,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_151", + "key": "worldtask_world_task_task_name_152", "text": "公会与伙伴" }, "task_details": { - "key": "worldtask_world_task_task_details_151", + "key": "worldtask_world_task_task_details_152", "text": "公会与伙伴" }, "npctxt": { - "key": "worldtask_world_task_npctxt_151", + "key": "worldtask_world_task_npctxt_152", "text": "找到沃尔夫" }, "get_item": [], @@ -7860,15 +7903,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_152", + "key": "worldtask_world_task_task_name_153", "text": "新的挑战之路" }, "task_details": { - "key": "worldtask_world_task_task_details_152", + "key": "worldtask_world_task_task_details_153", "text": "新的挑战之路" }, "npctxt": { - "key": "worldtask_world_task_npctxt_152", + "key": "worldtask_world_task_npctxt_153", "text": "找到浣熊师傅" }, "get_item": [], @@ -7906,15 +7949,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_153", + "key": "worldtask_world_task_task_name_154", "text": "巨大的怪物们" }, "task_details": { - "key": "worldtask_world_task_task_details_153", + "key": "worldtask_world_task_task_details_154", "text": "巨大的怪物们" }, "npctxt": { - "key": "worldtask_world_task_npctxt_153", + "key": "worldtask_world_task_npctxt_154", "text": "找到戈伯" }, "get_item": [], @@ -7952,15 +7995,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_154", + "key": "worldtask_world_task_task_name_155", "text": "敲打与炉火" }, "task_details": { - "key": "worldtask_world_task_task_details_154", + "key": "worldtask_world_task_task_details_155", "text": "敲打与炉火" }, "npctxt": { - "key": "worldtask_world_task_npctxt_154", + "key": "worldtask_world_task_npctxt_155", "text": "找到戈伯" }, "get_item": [], @@ -8000,15 +8043,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_155", + "key": "worldtask_world_task_task_name_156", "text": "穿戴尝试" }, "task_details": { - "key": "worldtask_world_task_task_details_155", + "key": "worldtask_world_task_task_details_156", "text": "穿戴尝试" }, "npctxt": { - "key": "worldtask_world_task_npctxt_155", + "key": "worldtask_world_task_npctxt_156", "text": "穿戴尝试" }, "get_item": [], @@ -8048,15 +8091,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_156", + "key": "worldtask_world_task_task_name_157", "text": "秘境开启" }, "task_details": { - "key": "worldtask_world_task_task_details_156", + "key": "worldtask_world_task_task_details_157", "text": "秘境开启" }, "npctxt": { - "key": "worldtask_world_task_npctxt_156", + "key": "worldtask_world_task_npctxt_157", "text": "找到小伊" }, "get_item": [], @@ -8096,15 +8139,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_157", + "key": "worldtask_world_task_task_name_158", "text": "汤水与包子" }, "task_details": { - "key": "worldtask_world_task_task_details_157", + "key": "worldtask_world_task_task_details_158", "text": "汤水与包子" }, "npctxt": { - "key": "worldtask_world_task_npctxt_157", + "key": "worldtask_world_task_npctxt_158", "text": "找到平先生" }, "get_item": [], @@ -8142,15 +8185,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_158", + "key": "worldtask_world_task_task_name_159", "text": "伙伴需要互相理解" }, "task_details": { - "key": "worldtask_world_task_task_details_158", + "key": "worldtask_world_task_task_details_159", "text": "伙伴需要互相理解" }, "npctxt": { - "key": "worldtask_world_task_npctxt_158", + "key": "worldtask_world_task_npctxt_159", "text": "找到大大" }, "get_item": [], @@ -8188,15 +8231,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_159", + "key": "worldtask_world_task_task_name_160", "text": "邻里帮助" }, "task_details": { - "key": "worldtask_world_task_task_details_159", + "key": "worldtask_world_task_task_details_160", "text": "邻里帮助" }, "npctxt": { - "key": "worldtask_world_task_npctxt_159", + "key": "worldtask_world_task_npctxt_160", "text": "找到悍娇虎" }, "get_item": [], @@ -8234,15 +8277,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_160", + "key": "worldtask_world_task_task_name_161", "text": "一较高下" }, "task_details": { - "key": "worldtask_world_task_task_details_160", + "key": "worldtask_world_task_task_details_161", "text": "一较高下" }, "npctxt": { - "key": "worldtask_world_task_npctxt_160", + "key": "worldtask_world_task_npctxt_161", "text": "找到穿靴猫" }, "get_item": [], @@ -8280,15 +8323,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_161", + "key": "worldtask_world_task_task_name_162", "text": "波比的奖励" }, "task_details": { - "key": "worldtask_world_task_task_details_161", + "key": "worldtask_world_task_task_details_162", "text": "波比的奖励" }, "npctxt": { - "key": "worldtask_world_task_npctxt_161", + "key": "worldtask_world_task_npctxt_162", "text": "找到波比" }, "get_item": [], @@ -8326,15 +8369,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_162", + "key": "worldtask_world_task_task_name_163", "text": "资金周转" }, "task_details": { - "key": "worldtask_world_task_task_details_162", + "key": "worldtask_world_task_task_details_163", "text": "资金周转" }, "npctxt": { - "key": "worldtask_world_task_npctxt_162", + "key": "worldtask_world_task_npctxt_163", "text": "找到骇客蛛" }, "get_item": [], @@ -8372,15 +8415,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_163", + "key": "worldtask_world_task_task_name_164", "text": "商队起航" }, "task_details": { - "key": "worldtask_world_task_task_details_163", + "key": "worldtask_world_task_task_details_164", "text": "商队起航" }, "npctxt": { - "key": "worldtask_world_task_npctxt_163", + "key": "worldtask_world_task_npctxt_164", "text": "商队起航" }, "get_item": [], @@ -8418,15 +8461,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_164", + "key": "worldtask_world_task_task_name_165", "text": "挖掘潜能" }, "task_details": { - "key": "worldtask_world_task_task_details_164", + "key": "worldtask_world_task_task_details_165", "text": "挖掘潜能" }, "npctxt": { - "key": "worldtask_world_task_npctxt_164", + "key": "worldtask_world_task_npctxt_165", "text": "找到希沙窦斯" }, "get_item": [], @@ -8464,15 +8507,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_165", + "key": "worldtask_world_task_task_name_166", "text": "守护者的训练" }, "task_details": { - "key": "worldtask_world_task_task_details_165", + "key": "worldtask_world_task_task_details_166", "text": "守护者的训练" }, "npctxt": { - "key": "worldtask_world_task_npctxt_165", + "key": "worldtask_world_task_npctxt_166", "text": "找到浣熊师傅" }, "get_item": [], @@ -8510,15 +8553,15 @@ "des": 3, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_166", + "key": "worldtask_world_task_task_name_167", "text": "师傅的教诲" }, "task_details": { - "key": "worldtask_world_task_task_details_166", + "key": "worldtask_world_task_task_details_167", "text": "师傅的教诲" }, "npctxt": { - "key": "worldtask_world_task_npctxt_166", + "key": "worldtask_world_task_npctxt_167", "text": "师傅的教诲" }, "get_item": [], diff --git a/maincity_msg.pb.go b/maincity_msg.pb.go deleted file mode 100644 index 4d2152d00..000000000 --- a/maincity_msg.pb.go +++ /dev/null @@ -1,332 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.0 -// protoc v3.20.0 -// source: maincity/maincity_msg.proto - -package pb - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -//同步 无回应 -type MainCitySynchPosPeek struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Pos *DBMainCityPos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos"` -} - -func (x *MainCitySynchPosPeek) Reset() { - *x = MainCitySynchPosPeek{} - if protoimpl.UnsafeEnabled { - mi := &file_maincity_maincity_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MainCitySynchPosPeek) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MainCitySynchPosPeek) ProtoMessage() {} - -func (x *MainCitySynchPosPeek) ProtoReflect() protoreflect.Message { - mi := &file_maincity_maincity_msg_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MainCitySynchPosPeek.ProtoReflect.Descriptor instead. -func (*MainCitySynchPosPeek) Descriptor() ([]byte, []int) { - return file_maincity_maincity_msg_proto_rawDescGZIP(), []int{0} -} - -func (x *MainCitySynchPosPeek) GetPos() *DBMainCityPos { - if x != nil { - return x.Pos - } - return nil -} - -//坐标同步 -type MainCitySynchPosPush struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Pos *DBMainCityPos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos"` -} - -func (x *MainCitySynchPosPush) Reset() { - *x = MainCitySynchPosPush{} - if protoimpl.UnsafeEnabled { - mi := &file_maincity_maincity_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MainCitySynchPosPush) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MainCitySynchPosPush) ProtoMessage() {} - -func (x *MainCitySynchPosPush) ProtoReflect() protoreflect.Message { - mi := &file_maincity_maincity_msg_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MainCitySynchPosPush.ProtoReflect.Descriptor instead. -func (*MainCitySynchPosPush) Descriptor() ([]byte, []int) { - return file_maincity_maincity_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *MainCitySynchPosPush) GetPos() *DBMainCityPos { - if x != nil { - return x.Pos - } - return nil -} - -//在线用户列表请求 -type MainCityOnlinePlayerReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MainCityOnlinePlayerReq) Reset() { - *x = MainCityOnlinePlayerReq{} - if protoimpl.UnsafeEnabled { - mi := &file_maincity_maincity_msg_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MainCityOnlinePlayerReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MainCityOnlinePlayerReq) ProtoMessage() {} - -func (x *MainCityOnlinePlayerReq) ProtoReflect() protoreflect.Message { - mi := &file_maincity_maincity_msg_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MainCityOnlinePlayerReq.ProtoReflect.Descriptor instead. -func (*MainCityOnlinePlayerReq) Descriptor() ([]byte, []int) { - return file_maincity_maincity_msg_proto_rawDescGZIP(), []int{2} -} - -//在线用户列表请求 -type MainCityOnlinePlayerResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Uids []string `protobuf:"bytes,1,rep,name=uids,proto3" json:"uids"` -} - -func (x *MainCityOnlinePlayerResp) Reset() { - *x = MainCityOnlinePlayerResp{} - if protoimpl.UnsafeEnabled { - mi := &file_maincity_maincity_msg_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MainCityOnlinePlayerResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MainCityOnlinePlayerResp) ProtoMessage() {} - -func (x *MainCityOnlinePlayerResp) ProtoReflect() protoreflect.Message { - mi := &file_maincity_maincity_msg_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MainCityOnlinePlayerResp.ProtoReflect.Descriptor instead. -func (*MainCityOnlinePlayerResp) Descriptor() ([]byte, []int) { - return file_maincity_maincity_msg_proto_rawDescGZIP(), []int{3} -} - -func (x *MainCityOnlinePlayerResp) GetUids() []string { - if x != nil { - return x.Uids - } - return nil -} - -var File_maincity_maincity_msg_proto protoreflect.FileDescriptor - -var file_maincity_maincity_msg_proto_rawDesc = []byte{ - 0x0a, 0x1b, 0x6d, 0x61, 0x69, 0x6e, 0x63, 0x69, 0x74, 0x79, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x63, - 0x69, 0x74, 0x79, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x6d, - 0x61, 0x69, 0x6e, 0x63, 0x69, 0x74, 0x79, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x63, 0x69, 0x74, 0x79, - 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x38, 0x0a, 0x14, 0x4d, 0x61, 0x69, - 0x6e, 0x43, 0x69, 0x74, 0x79, 0x53, 0x79, 0x6e, 0x63, 0x68, 0x50, 0x6f, 0x73, 0x50, 0x65, 0x65, - 0x6b, 0x12, 0x20, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, - 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x43, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x73, 0x52, 0x03, - 0x70, 0x6f, 0x73, 0x22, 0x38, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x43, 0x69, 0x74, 0x79, 0x53, - 0x79, 0x6e, 0x63, 0x68, 0x50, 0x6f, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x03, 0x70, - 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, - 0x6e, 0x43, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x73, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x19, 0x0a, - 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x43, 0x69, 0x74, 0x79, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, - 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x2e, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, - 0x43, 0x69, 0x74, 0x79, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x04, 0x75, 0x69, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_maincity_maincity_msg_proto_rawDescOnce sync.Once - file_maincity_maincity_msg_proto_rawDescData = file_maincity_maincity_msg_proto_rawDesc -) - -func file_maincity_maincity_msg_proto_rawDescGZIP() []byte { - file_maincity_maincity_msg_proto_rawDescOnce.Do(func() { - file_maincity_maincity_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_maincity_maincity_msg_proto_rawDescData) - }) - return file_maincity_maincity_msg_proto_rawDescData -} - -var file_maincity_maincity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_maincity_maincity_msg_proto_goTypes = []interface{}{ - (*MainCitySynchPosPeek)(nil), // 0: MainCitySynchPosPeek - (*MainCitySynchPosPush)(nil), // 1: MainCitySynchPosPush - (*MainCityOnlinePlayerReq)(nil), // 2: MainCityOnlinePlayerReq - (*MainCityOnlinePlayerResp)(nil), // 3: MainCityOnlinePlayerResp - (*DBMainCityPos)(nil), // 4: DBMainCityPos -} -var file_maincity_maincity_msg_proto_depIdxs = []int32{ - 4, // 0: MainCitySynchPosPeek.pos:type_name -> DBMainCityPos - 4, // 1: MainCitySynchPosPush.pos:type_name -> DBMainCityPos - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name -} - -func init() { file_maincity_maincity_msg_proto_init() } -func file_maincity_maincity_msg_proto_init() { - if File_maincity_maincity_msg_proto != nil { - return - } - file_maincity_maincity_db_proto_init() - if !protoimpl.UnsafeEnabled { - file_maincity_maincity_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MainCitySynchPosPeek); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_maincity_maincity_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MainCitySynchPosPush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_maincity_maincity_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MainCityOnlinePlayerReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_maincity_maincity_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MainCityOnlinePlayerResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_maincity_maincity_msg_proto_rawDesc, - NumEnums: 0, - NumMessages: 4, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_maincity_maincity_msg_proto_goTypes, - DependencyIndexes: file_maincity_maincity_msg_proto_depIdxs, - MessageInfos: file_maincity_maincity_msg_proto_msgTypes, - }.Build() - File_maincity_maincity_msg_proto = out.File - file_maincity_maincity_msg_proto_rawDesc = nil - file_maincity_maincity_msg_proto_goTypes = nil - file_maincity_maincity_msg_proto_depIdxs = nil -} diff --git a/modules/catchbugs/api_info.go b/modules/catchbugs/api_info.go index eaa9f329c..034f81a42 100644 --- a/modules/catchbugs/api_info.go +++ b/modules/catchbugs/api_info.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" ) @@ -14,6 +15,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.CatchbugsInfoR func (this *apiComp) Info(session comm.IUserSession, req *pb.CatchbugsInfoReq) (errdata *pb.ErrorData) { var ( info *pb.DBCatchBugs + conf *cfg.GameCatchbugStageData err error ) if errdata = this.InfoCheck(session, req); errdata != nil { @@ -27,16 +29,24 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CatchbugsInfoReq) ( return } if !utils.IsSameWeek(info.Weektime) { + if conf, err = this.module.configure.getNextGameCatchbugStage(info.Level); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + info.Level = conf.Id info.Integral = 0 info.Weekaward = make(map[int32]bool) info.Weektime = configure.Now().Unix() this.module.model.Change(session.GetUserId(), map[string]interface{}{ + "level": info.Level, "integral": info.Integral, "weekaward": info.Weekaward, "weektime": info.Weektime, }) } - session.SendMsg(string(this.module.GetType()), "info", &pb.CatchbugsInfoResp{Info: info}) return } diff --git a/modules/catchbugs/api_passlevel.go b/modules/catchbugs/api_passlevel.go index 99bb0c88d..30907cc98 100644 --- a/modules/catchbugs/api_passlevel.go +++ b/modules/catchbugs/api_passlevel.go @@ -48,11 +48,9 @@ func (this *apiComp) PassLevel(session comm.IUserSession, req *pb.CatchbugsPassL info.Integral += conf.Points info.Accruedintegral += conf.Points - info.Level[req.Level] = true this.module.model.Change(session.GetUserId(), map[string]interface{}{ "integral": info.Integral, "accruedintegral": info.Accruedintegral, - "level": info.Level, }) session.SendMsg(string(this.module.GetType()), "passlevel", &pb.CatchbugsPassLevelResp{Level: req.Level, Integral: conf.Points, Card: card}) return diff --git a/modules/catchbugs/configure.go b/modules/catchbugs/configure.go index 45b64f74f..8a5027215 100644 --- a/modules/catchbugs/configure.go +++ b/modules/catchbugs/configure.go @@ -88,3 +88,26 @@ func (this *configureComp) getGameCatchbugStage(id int32) (conf *cfg.GameCatchbu } return } + +// 获取奖励列表 +func (this *configureComp) getNextGameCatchbugStage(id int32) (conf *cfg.GameCatchbugStageData, err error) { + var ( + v interface{} + confs []*cfg.GameCatchbugStageData + ) + if v, err = this.GetConfigure(game_catchbugstage); err != nil { + return + } + confs = v.(*cfg.GameCatchbugStage).GetDataList() + if id == 0 || confs[len(confs)-1].Id == id { + conf = v.(*cfg.GameCatchbugStage).GetDataList()[0] + return + } + for i, v := range confs { + if v.Id == id { + conf = confs[i+1] + return + } + } + return +} diff --git a/modules/catchbugs/model.go b/modules/catchbugs/model.go index 696793f01..fc83e4072 100644 --- a/modules/catchbugs/model.go +++ b/modules/catchbugs/model.go @@ -40,7 +40,6 @@ func (this *modelComp) getModel(uid string) (info *pb.DBCatchBugs, err error) { Books: make(map[int32]int32), Weekaward: make(map[int32]bool), Allaward: make(map[int32]bool), - Level: make(map[int32]bool), } err = this.Add(uid, info) } diff --git a/modules/mainline/api_receiveaward.go b/modules/mainline/api_receiveaward.go index 94671fbc5..654574b10 100644 --- a/modules/mainline/api_receiveaward.go +++ b/modules/mainline/api_receiveaward.go @@ -19,6 +19,7 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec award *pb.DBMainlineAward chapterconf *cfg.GameMainChapterData awardConfs []*cfg.GameMainStarrewardData + confs []*cfg.GameMainStageData awardid int32 awardConf *cfg.GameMainStarrewardData reward []*pb.UserAtno @@ -88,7 +89,15 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec } return } - + if confs, err = this.module.configure.getGroupGameMainStageData(req.Chapter, req.Group); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: fmt.Sprintf("group:%d no found", req.Group), + } + return + } + awardid = confs[0].Challengeward } if award.Award == nil { award.Award = make(map[int32]int32) @@ -115,6 +124,7 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec if v.Starnum == req.Stage { ok = true awardConf = v + break } } diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go index 99a1a1851..3fa5eb381 100644 --- a/modules/mainline/comp_configure.go +++ b/modules/mainline/comp_configure.go @@ -302,3 +302,22 @@ func (this *configureComp) getGameMainBossData(id int32) (conf *cfg.GameMainBoss } return } + +func (this *configureComp) getGroupGameMainStageData(chapter, groupid int32) (confs []*cfg.GameMainStageData, err error) { + this.lock.Lock() + chapterMap := this.chapterMap + this.lock.Unlock() + if chapter, ok := chapterMap[chapter]; ok { + for _, v := range chapter { + if v.GroupId == groupid { + confs = append(confs, v) + } + } + } + if confs == nil { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainstage, groupid) + this.module.Errorln(err) + return + } + return +} diff --git a/pb/catchbugs_db.pb.go b/pb/catchbugs_db.pb.go index 729f4d72c..b26293005 100644 --- a/pb/catchbugs_db.pb.go +++ b/pb/catchbugs_db.pb.go @@ -33,8 +33,8 @@ type DBCatchBugs struct { Books map[int32]int32 `protobuf:"bytes,5,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴 Weekaward map[int32]bool `protobuf:"bytes,6,rep,name=weekaward,proto3" json:"weekaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周奖励 Allaward map[int32]bool `protobuf:"bytes,7,rep,name=allaward,proto3" json:"allaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //累计奖励 - Level map[int32]bool `protobuf:"bytes,8,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //通关信息 - Weektime int64 `protobuf:"varint,9,opt,name=weektime,proto3" json:"weektime"` //周时长 + Level int32 `protobuf:"varint,8,opt,name=level,proto3" json:"level"` //本期管卡 + Weektime int64 `protobuf:"varint,9,opt,name=weektime,proto3" json:"weektime"` //周期事件 } func (x *DBCatchBugs) Reset() { @@ -118,11 +118,11 @@ func (x *DBCatchBugs) GetAllaward() map[int32]bool { return nil } -func (x *DBCatchBugs) GetLevel() map[int32]bool { +func (x *DBCatchBugs) GetLevel() int32 { if x != nil { return x.Level } - return nil + return 0 } func (x *DBCatchBugs) GetWeektime() int64 { @@ -473,7 +473,7 @@ var File_catchbugs_catchbugs_db_proto protoreflect.FileDescriptor var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, - 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd1, 0x04, 0x0a, 0x0b, 0x44, + 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, @@ -491,77 +491,72 @@ var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{ 0x61, 0x6c, 0x6c, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x41, 0x6c, 0x6c, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61, 0x6c, 0x6c, 0x61, - 0x77, 0x61, 0x72, 0x64, 0x12, 0x2d, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x08, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, - 0x73, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, - 0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x1a, - 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x57, 0x65, 0x65, - 0x6b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x6c, 0x6c, 0x61, 0x77, - 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, + 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, + 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, + 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x1a, 0x3c, 0x0a, 0x0e, 0x57, 0x65, 0x65, 0x6b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, - 0x0a, 0x10, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, - 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, - 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0xfd, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, - 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, - 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, - 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, - 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, - 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x61, - 0x63, 0x63, 0x72, 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x61, 0x63, 0x63, 0x72, 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, - 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, - 0x6e, 0x63, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, - 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, - 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x12, - 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, - 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, - 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x1a, 0x38, 0x0a, 0x0a, - 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, - 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, - 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, - 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, - 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, - 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, - 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, - 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, - 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, - 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, - 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, - 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, - 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, - 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, - 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, + 0x0a, 0x0d, 0x41, 0x6c, 0x6c, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x10, 0x44, + 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0xfd, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, + 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, + 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, + 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x72, + 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0f, 0x61, 0x63, 0x63, 0x72, 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, + 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, + 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, + 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, + 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x12, 0x16, 0x0a, 0x06, + 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, + 0x69, 0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x0a, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, + 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, + 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, + 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, + 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, + 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, + 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, + 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, + 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, + 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, + 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, + 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, + 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, + 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, + 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, + 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, + 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, + 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -576,7 +571,7 @@ func file_catchbugs_catchbugs_db_proto_rawDescGZIP() []byte { return file_catchbugs_catchbugs_db_proto_rawDescData } -var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{ (*DBCatchBugs)(nil), // 0: DBCatchBugs (*DBCatchBugsRules)(nil), // 1: DBCatchBugsRules @@ -586,27 +581,25 @@ var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{ nil, // 5: DBCatchBugs.BooksEntry nil, // 6: DBCatchBugs.WeekawardEntry nil, // 7: DBCatchBugs.AllawardEntry - nil, // 8: DBCatchBugs.LevelEntry - nil, // 9: DBCatchBugsPlayer.BooksEntry - (*BaseUserInfo)(nil), // 10: BaseUserInfo + nil, // 8: DBCatchBugsPlayer.BooksEntry + (*BaseUserInfo)(nil), // 9: BaseUserInfo } var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{ 5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry 6, // 1: DBCatchBugs.weekaward:type_name -> DBCatchBugs.WeekawardEntry 7, // 2: DBCatchBugs.allaward:type_name -> DBCatchBugs.AllawardEntry - 8, // 3: DBCatchBugs.level:type_name -> DBCatchBugs.LevelEntry - 10, // 4: DBCatchBugsPlayer.info:type_name -> BaseUserInfo - 9, // 5: DBCatchBugsPlayer.books:type_name -> DBCatchBugsPlayer.BooksEntry - 1, // 6: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules - 2, // 7: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer - 2, // 8: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer - 3, // 9: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard - 3, // 10: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 9, // 3: DBCatchBugsPlayer.info:type_name -> BaseUserInfo + 8, // 4: DBCatchBugsPlayer.books:type_name -> DBCatchBugsPlayer.BooksEntry + 1, // 5: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules + 2, // 6: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer + 2, // 7: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer + 3, // 8: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard + 3, // 9: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_catchbugs_catchbugs_db_proto_init() } @@ -683,7 +676,7 @@ func file_catchbugs_catchbugs_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_catchbugs_catchbugs_db_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 9, NumExtensions: 0, NumServices: 0, },