diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index baca56d31..4c83b50ee 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -21250,7 +21250,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_723", - "text": "击退恐惧灵蜘蛛" + "text": "击退恐惧灵" }, "type": 70, "valid": 0, @@ -21667,7 +21667,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_738", - "text": "通关冒险之旅第一章" + "text": "找到解毒剂" }, "type": 61, "valid": 1, diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index 1fd650bec..7c3dffcdd 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -1,102 +1,6 @@ [ { "key": 1, - "id": "20030003", - "type": 1, - "interact": 1, - "exp": 200, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 2003000311, - "group": 0 - }, - { - "key": 3, - "id": "20030003", - "type": 2, - "interact": 1, - "exp": 200, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 2003000321, - "group": 0 - }, - { - "key": 4, - "id": "20030003", - "type": 2, - "interact": 2, - "exp": 200, - "time": 1, - "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012001", - "n": 1 - } - ], - "bubble": 2003000322, - "group": 0 - }, - { - "key": 5, - "id": "20030003", - "type": 2, - "interact": 3, - "exp": 200, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 2003000323, - "group": 0 - }, - { - "key": 6, - "id": "20030003", - "type": 2, - "interact": 4, - "exp": 100, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 2003000324, - "group": 0 - }, - { - "key": 7, - "id": "20030003", - "type": 3, - "interact": 1, - "exp": 200, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 2003000331, - "group": 0 - }, - { - "key": 8, - "id": "20030003", - "type": 3, - "interact": 2, - "exp": 300, - "time": 1, - "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012002", - "n": 1 - } - ], - "bubble": 2003000332, - "group": 0 - }, - { - "key": 9, "id": "20030001", "type": 1, "interact": 1, @@ -108,7 +12,7 @@ "group": 0 }, { - "key": 11, + "key": 2, "id": "20030001", "type": 2, "interact": 1, @@ -120,41 +24,23 @@ "group": 0 }, { - "key": 12, + "key": 3, "id": "20030001", "type": 2, "interact": 2, "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012001", - "n": 1 - } - ], + "deplete": [], "bubble": 2003000122, "group": 0 }, { - "key": 13, - "id": "20030001", - "type": 2, - "interact": 3, - "exp": 200, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 2003000123, - "group": 0 - }, - { - "key": 14, + "key": 4, "id": "20030001", "type": 2, "interact": 4, - "exp": 100, + "exp": 200, "time": 1, "cd": 0, "deplete": [], @@ -162,7 +48,7 @@ "group": 0 }, { - "key": 15, + "key": 5, "id": "20030001", "type": 3, "interact": 1, @@ -174,25 +60,31 @@ "group": 0 }, { - "key": 16, + "key": 6, "id": "20030001", "type": 3, "interact": 2, - "exp": 300, + "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012002", - "n": 1 - } - ], + "deplete": [], "bubble": 2003000132, "group": 0 }, { - "key": 17, + "key": 7, + "id": "20030001", + "type": 3, + "interact": 4, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000134, + "group": 0 + }, + { + "key": 8, "id": "20030002", "type": 1, "interact": 1, @@ -204,7 +96,7 @@ "group": 0 }, { - "key": 18, + "key": 9, "id": "20030002", "type": 2, "interact": 1, @@ -216,7 +108,7 @@ "group": 0 }, { - "key": 19, + "key": 10, "id": "20030002", "type": 3, "interact": 1, @@ -228,21 +120,111 @@ "group": 0 }, { - "key": 20, + "key": 11, "id": "20030002", "type": 3, "interact": 2, - "exp": 300, + "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012002", - "n": 1 - } - ], + "deplete": [], "bubble": 2003000232, "group": 0 + }, + { + "key": 12, + "id": "20030002", + "type": 3, + "interact": 4, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000234, + "group": 0 + }, + { + "key": 13, + "id": "20030003", + "type": 1, + "interact": 1, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000311, + "group": 0 + }, + { + "key": 14, + "id": "20030003", + "type": 2, + "interact": 1, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000321, + "group": 0 + }, + { + "key": 15, + "id": "20030003", + "type": 2, + "interact": 2, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000322, + "group": 0 + }, + { + "key": 16, + "id": "20030003", + "type": 2, + "interact": 4, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000324, + "group": 0 + }, + { + "key": 17, + "id": "20030003", + "type": 3, + "interact": 1, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000331, + "group": 0 + }, + { + "key": 18, + "id": "20030003", + "type": 3, + "interact": 2, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000332, + "group": 0 + }, + { + "key": 19, + "id": "20030003", + "type": 3, + "interact": 4, + "exp": 200, + "time": 1, + "cd": 0, + "deplete": [], + "bubble": 2003000334, + "group": 0 } ] \ No newline at end of file diff --git a/bin/json/game_gameid.json b/bin/json/game_gameid.json index fb99c79e9..077ae0dac 100644 --- a/bin/json/game_gameid.json +++ b/bin/json/game_gameid.json @@ -44,27 +44,27 @@ "type": 2 }, { - "id": 20002, - "type": 2 + "id": 30001, + "type": 3 }, { - "id": 20003, - "type": 2 + "id": 30002, + "type": 3 }, { - "id": 20004, - "type": 2 + "id": 30003, + "type": 3 }, { - "id": 20005, - "type": 2 + "id": 30004, + "type": 3 }, { - "id": 20006, - "type": 2 + "id": 30005, + "type": 3 }, { - "id": 20007, - "type": 2 + "id": 30006, + "type": 3 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 44f1ac46e..7d3c75a92 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -851,7 +851,7 @@ "n": 200 }, "dragon_interaction": 15, - "dialogueclickcd": 0.5, + "dialogueclickcd": 1, "doragon_item": "24012003", "sign_account": 28 } diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 3045db456..e5588ab15 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -70,7 +70,7 @@ "prefix": "bingo:Iamyoudad" }, { - "id": 17, + "id": 8, "type": 1, "text": { "key": "GM_GM_text_8", @@ -80,7 +80,7 @@ "prefix": "bingo:lv,{0}" }, { - "id": 18, + "id": 9, "type": 1, "text": { "key": "GM_GM_text_9", @@ -90,7 +90,7 @@ "prefix": "" }, { - "id": 19, + "id": 10, "type": 1, "text": { "key": "GM_GM_text_10", @@ -100,7 +100,7 @@ "prefix": "bingo:attr,gold,{0}" }, { - "id": 20, + "id": 11, "type": 1, "text": { "key": "GM_GM_text_11", @@ -110,7 +110,7 @@ "prefix": "bingo:attr,diamond,{0}" }, { - "id": 21, + "id": 12, "type": 1, "text": { "key": "GM_GM_text_12", @@ -120,7 +120,7 @@ "prefix": "bingo:viplv,{0}" }, { - "id": 22, + "id": 13, "type": 1, "text": { "key": "GM_GM_text_13", @@ -130,7 +130,7 @@ "prefix": "bingo:itemtype,{0}" }, { - "id": 23, + "id": 14, "type": 1, "text": { "key": "GM_GM_text_14", @@ -140,7 +140,7 @@ "prefix": "bingo:recharge,{0}" }, { - "id": 24, + "id": 15, "type": 1, "text": { "key": "GM_GM_text_15", @@ -150,7 +150,7 @@ "prefix": "bingo:cleanitem" }, { - "id": 25, + "id": 16, "type": 1, "text": { "key": "GM_GM_text_16", @@ -160,7 +160,7 @@ "prefix": "无" }, { - "id": 26, + "id": 17, "type": 1, "text": { "key": "GM_GM_text_17", @@ -170,7 +170,7 @@ "prefix": "bingo:chat,{0}" }, { - "id": 27, + "id": 18, "type": 1, "text": { "key": "GM_GM_text_18", @@ -180,7 +180,7 @@ "prefix": "无" }, { - "id": 29, + "id": 19, "type": 1, "text": { "key": "GM_GM_text_20", @@ -190,7 +190,7 @@ "prefix": "bingo:allequip" }, { - "id": 8, + "id": 20, "type": 2, "text": { "key": "GM_GM_text_21", @@ -200,7 +200,7 @@ "prefix": "bingo:sociatyexp,{0}" }, { - "id": 9, + "id": 21, "type": 2, "text": { "key": "GM_GM_text_22", @@ -210,7 +210,7 @@ "prefix": "bingo:sociatyactivity,{0}" }, { - "id": 10, + "id": 22, "type": 2, "text": { "key": "GM_GM_text_23", @@ -220,7 +220,7 @@ "prefix": "bingo:moon,{0}" }, { - "id": 11, + "id": 23, "type": 2, "text": { "key": "GM_GM_text_24", @@ -230,7 +230,7 @@ "prefix": "bingo:arena,{0}" }, { - "id": 12, + "id": 24, "type": 2, "text": { "key": "GM_GM_text_25", @@ -240,7 +240,7 @@ "prefix": "bingo:mainline,{0}" }, { - "id": 13, + "id": 25, "type": 2, "text": { "key": "GM_GM_text_26", @@ -250,7 +250,7 @@ "prefix": "bingo:pataid,{0}" }, { - "id": 15, + "id": 26, "type": 2, "text": { "key": "GM_GM_text_28", @@ -260,7 +260,7 @@ "prefix": "bingo:worldtask,{0}" }, { - "id": 16, + "id": 27, "type": 2, "text": { "key": "GM_GM_text_29", @@ -270,7 +270,7 @@ "prefix": "bingo:{0}" }, { - "id": 30, + "id": 28, "type": 3, "text": { "key": "GM_GM_text_30", @@ -280,7 +280,7 @@ "prefix": "bingo:{0}" }, { - "id": 31, + "id": 29, "type": 1, "text": { "key": "GM_GM_text_31", @@ -290,7 +290,7 @@ "prefix": "bingo:cleannpc" }, { - "id": 32, + "id": 30, "type": 1, "text": { "key": "GM_GM_text_32", @@ -300,7 +300,7 @@ "prefix": "bingo:jx" }, { - "id": 33, + "id": 31, "type": 1, "text": { "key": "GM_GM_text_33", @@ -310,7 +310,7 @@ "prefix": "bingo:godlike" }, { - "id": 34, + "id": 32, "type": 1, "text": { "key": "GM_GM_text_34", @@ -320,7 +320,7 @@ "prefix": "bingo:race,{}" }, { - "id": 35, + "id": 33, "type": 1, "text": { "key": "GM_GM_text_35", @@ -330,7 +330,7 @@ "prefix": "bingo:item,10000035,{0}" }, { - "id": 36, + "id": 34, "type": 2, "text": { "key": "GM_GM_text_36", @@ -340,7 +340,7 @@ "prefix": "bingo:smithypro" }, { - "id": 37, + "id": 35, "type": 2, "text": { "key": "GM_GM_text_37", @@ -350,7 +350,7 @@ "prefix": "bingo:smithyatlas" }, { - "id": 38, + "id": 36, "type": 2, "text": { "key": "GM_GM_text_38", @@ -360,7 +360,7 @@ "prefix": "bingo:newmail" }, { - "id": 39, + "id": 37, "type": 2, "text": { "key": "GM_GM_text_39", @@ -370,7 +370,7 @@ "prefix": "bingo:buried,{0}" }, { - "id": 40, + "id": 38, "type": 2, "text": { "key": "GM_GM_text_40", @@ -380,7 +380,7 @@ "prefix": "bingo:groumet" }, { - "id": 41, + "id": 39, "type": 2, "text": { "key": "GM_GM_text_41", @@ -390,7 +390,7 @@ "prefix": "bingo:library" }, { - "id": 42, + "id": 40, "type": 1, "text": { "key": "GM_GM_text_42", @@ -400,7 +400,7 @@ "prefix": "bingo:mts,20030001,{0}" }, { - "id": 43, + "id": 41, "type": 1, "text": { "key": "GM_GM_text_43", @@ -410,7 +410,7 @@ "prefix": "bingo:mts,20030002,{0}" }, { - "id": 44, + "id": 42, "type": 1, "text": { "key": "GM_GM_text_44", @@ -420,7 +420,7 @@ "prefix": "bingo:mts,20030003,{0}" }, { - "id": 45, + "id": 43, "type": 1, "text": { "key": "GM_GM_text_45", @@ -430,17 +430,7 @@ "prefix": "bingo:opencond" }, { - "id": 46, - "type": 4, - "text": { - "key": "GM_GM_text_46", - "text": "武馆" - }, - "data": "137", - "prefix": "" - }, - { - "id": 47, + "id": 44, "type": 4, "text": { "key": "GM_GM_text_47", @@ -450,37 +440,17 @@ "prefix": "" }, { - "id": 48, + "id": 45, "type": 4, "text": { "key": "GM_GM_text_48", - "text": "前往守护者装备" + "text": "前往守护者（需拥有守护者）" }, "data": "102", "prefix": "" }, { - "id": 49, - "type": 4, - "text": { - "key": "GM_GM_text_49", - "text": "前往守护者强化" - }, - "data": "103", - "prefix": "" - }, - { - "id": 50, - "type": 4, - "text": { - "key": "GM_GM_text_50", - "text": "前往守护者觉醒" - }, - "data": "104", - "prefix": "" - }, - { - "id": 51, + "id": 46, "type": 4, "text": { "key": "GM_GM_text_51", @@ -490,7 +460,7 @@ "prefix": "" }, { - "id": 52, + "id": 47, "type": 4, "text": { "key": "GM_GM_text_52", @@ -500,7 +470,7 @@ "prefix": "" }, { - "id": 53, + "id": 48, "type": 4, "text": { "key": "GM_GM_text_53", @@ -510,17 +480,7 @@ "prefix": "" }, { - "id": 54, - "type": 4, - "text": { - "key": "GM_GM_text_54", - "text": "前往心魔之塔" - }, - "data": "120", - "prefix": "" - }, - { - "id": 55, + "id": 49, "type": 4, "text": { "key": "GM_GM_text_55", @@ -530,17 +490,7 @@ "prefix": "" }, { - "id": 56, - "type": 4, - "text": { - "key": "GM_GM_text_56", - "text": "前往守护者详情" - }, - "data": "127", - "prefix": "" - }, - { - "id": 57, + "id": 50, "type": 4, "text": { "key": "GM_GM_text_57", @@ -550,7 +500,7 @@ "prefix": "" }, { - "id": 58, + "id": 51, "type": 4, "text": { "key": "GM_GM_text_58", @@ -560,7 +510,7 @@ "prefix": "" }, { - "id": 59, + "id": 52, "type": 4, "text": { "key": "GM_GM_text_59", @@ -570,7 +520,7 @@ "prefix": "" }, { - "id": 60, + "id": 53, "type": 4, "text": { "key": "GM_GM_text_60", @@ -580,7 +530,7 @@ "prefix": "" }, { - "id": 61, + "id": 54, "type": 4, "text": { "key": "GM_GM_text_61", @@ -590,17 +540,17 @@ "prefix": "" }, { - "id": 62, + "id": 55, "type": 4, "text": { "key": "GM_GM_text_62", - "text": "前往守护者回响" + "text": "前往守护者回响（需拥有守护者）" }, "data": "155", "prefix": "" }, { - "id": 63, + "id": 56, "type": 4, "text": { "key": "GM_GM_text_63", @@ -610,17 +560,17 @@ "prefix": "" }, { - "id": 64, + "id": 57, "type": 4, "text": { "key": "GM_GM_text_64", - "text": "热销" + "text": "前往购物中心" }, "data": "165", "prefix": "" }, { - "id": 65, + "id": 58, "type": 4, "text": { "key": "GM_GM_text_65", @@ -630,7 +580,7 @@ "prefix": "" }, { - "id": 66, + "id": 59, "type": 4, "text": { "key": "GM_GM_text_66", @@ -640,7 +590,7 @@ "prefix": "" }, { - "id": 67, + "id": 60, "type": 4, "text": { "key": "GM_GM_text_67", @@ -650,17 +600,7 @@ "prefix": "" }, { - "id": 68, - "type": 4, - "text": { - "key": "GM_GM_text_68", - "text": "前往旧时光" - }, - "data": "169", - "prefix": "" - }, - { - "id": 69, + "id": 61, "type": 4, "text": { "key": "GM_GM_text_69", @@ -670,7 +610,7 @@ "prefix": "" }, { - "id": 70, + "id": 62, "type": 4, "text": { "key": "GM_GM_text_70", @@ -680,17 +620,17 @@ "prefix": "" }, { - "id": 71, + "id": 63, "type": 4, "text": { "key": "GM_GM_text_71", - "text": "打开俱乐部boss" + "text": "打开俱乐部boss（需加入公会）" }, "data": "172", "prefix": "" }, { - "id": 72, + "id": 64, "type": 4, "text": { "key": "GM_GM_text_72", @@ -700,7 +640,7 @@ "prefix": "" }, { - "id": 73, + "id": 65, "type": 4, "text": { "key": "GM_GM_text_73", @@ -710,7 +650,7 @@ "prefix": "" }, { - "id": 74, + "id": 66, "type": 4, "text": { "key": "GM_GM_text_74", @@ -720,7 +660,7 @@ "prefix": "" }, { - "id": 75, + "id": 67, "type": 4, "text": { "key": "GM_GM_text_75", @@ -730,7 +670,7 @@ "prefix": "" }, { - "id": 76, + "id": 68, "type": 4, "text": { "key": "GM_GM_text_76", @@ -740,27 +680,17 @@ "prefix": "" }, { - "id": 77, + "id": 69, "type": 4, "text": { "key": "GM_GM_text_77", - "text": "打开图鉴" + "text": "打开装备图鉴" }, "data": "1004", "prefix": "" }, { - "id": 78, - "type": 4, - "text": { - "key": "GM_GM_text_78", - "text": "寻找木人桩" - }, - "data": "10001", - "prefix": "" - }, - { - "id": 79, + "id": 70, "type": 4, "text": { "key": "GM_GM_text_79", @@ -770,7 +700,7 @@ "prefix": "" }, { - "id": 80, + "id": 71, "type": 4, "text": { "key": "GM_GM_text_80", @@ -780,7 +710,7 @@ "prefix": "" }, { - "id": 81, + "id": 72, "type": 4, "text": { "key": "GM_GM_text_81", @@ -790,7 +720,7 @@ "prefix": "" }, { - "id": 82, + "id": 73, "type": 4, "text": { "key": "GM_GM_text_82", @@ -800,7 +730,7 @@ "prefix": "" }, { - "id": 83, + "id": 74, "type": 4, "text": { "key": "GM_GM_text_83", @@ -810,27 +740,27 @@ "prefix": "" }, { - "id": 84, + "id": 75, "type": 4, "text": { "key": "GM_GM_text_84", - "text": "打开图鉴" + "text": "打开武馆图鉴" }, "data": "10009", "prefix": "" }, { - "id": 85, + "id": 76, "type": 4, "text": { "key": "GM_GM_text_85", - "text": "查看周常任务" + "text": "查看竞技场周常任务" }, "data": "904", "prefix": "" }, { - "id": 86, + "id": 77, "type": 4, "text": { "key": "GM_GM_text_86", @@ -840,17 +770,7 @@ "prefix": "" }, { - "id": 87, - "type": 4, - "text": { - "key": "GM_GM_text_87", - "text": "前往守护者" - }, - "data": "906", - "prefix": "" - }, - { - "id": 88, + "id": 78, "type": 4, "text": { "key": "GM_GM_text_88", @@ -860,7 +780,7 @@ "prefix": "" }, { - "id": 89, + "id": 79, "type": 4, "text": { "key": "GM_GM_text_89", @@ -870,17 +790,7 @@ "prefix": "" }, { - "id": 90, - "type": 4, - "text": { - "key": "GM_GM_text_90", - "text": "前往俱乐部内部场景" - }, - "data": "11005", - "prefix": "" - }, - { - "id": 91, + "id": 80, "type": 4, "text": { "key": "GM_GM_text_91", @@ -890,87 +800,7 @@ "prefix": "" }, { - "id": 92, - "type": 4, - "text": { - "key": "GM_GM_text_92", - "text": "前往月光原石商铺" - }, - "data": "11007", - "prefix": "" - }, - { - "id": 93, - "type": 4, - "text": { - "key": "GM_GM_text_93", - "text": "前往友情商铺" - }, - "data": "11008", - "prefix": "" - }, - { - "id": 94, - "type": 4, - "text": { - "key": "GM_GM_text_94", - "text": "前往俱乐部商铺" - }, - "data": "11009", - "prefix": "" - }, - { - "id": 95, - "type": 4, - "text": { - "key": "GM_GM_text_95", - "text": "前往特殊商铺" - }, - "data": "11010", - "prefix": "" - }, - { - "id": 96, - "type": 4, - "text": { - "key": "GM_GM_text_96", - "text": "前往铁匠商铺" - }, - "data": "11011", - "prefix": "" - }, - { - "id": 97, - "type": 4, - "text": { - "key": "GM_GM_text_97", - "text": "前往维京远征" - }, - "data": "11012", - "prefix": "" - }, - { - "id": 98, - "type": 4, - "text": { - "key": "GM_GM_text_98", - "text": "进入梦境回廊" - }, - "data": "10013", - "prefix": "" - }, - { - "id": 99, - "type": 4, - "text": { - "key": "GM_GM_text_99", - "text": "竞技场" - }, - "data": "10015", - "prefix": "" - }, - { - "id": 100, + "id": 81, "type": 4, "text": { "key": "GM_GM_text_100", @@ -980,7 +810,7 @@ "prefix": "" }, { - "id": 101, + "id": 82, "type": 4, "text": { "key": "GM_GM_text_101", @@ -990,97 +820,27 @@ "prefix": "" }, { - "id": 102, + "id": 83, "type": 4, "text": { "key": "GM_GM_text_102", - "text": "打开月光护符" + "text": "打开月光护符（需拥有守护者）" }, "data": "10019", "prefix": "" }, { - "id": 103, - "type": 4, - "text": { - "key": "GM_GM_text_103", - "text": "前往维京远征" - }, - "data": "10020", - "prefix": "" - }, - { - "id": 104, - "type": 4, - "text": { - "key": "GM_GM_text_104", - "text": "前往维京远征" - }, - "data": "10021", - "prefix": "" - }, - { - "id": 105, - "type": 4, - "text": { - "key": "GM_GM_text_105", - "text": "前往维京远征" - }, - "data": "10022", - "prefix": "" - }, - { - "id": 106, - "type": 4, - "text": { - "key": "GM_GM_text_106", - "text": "前往猎魂副本" - }, - "data": "10023", - "prefix": "" - }, - { - "id": 107, - "type": 4, - "text": { - "key": "GM_GM_text_107", - "text": "前往猎魂副本" - }, - "data": "10024", - "prefix": "" - }, - { - "id": 108, - "type": 4, - "text": { - "key": "GM_GM_text_108", - "text": "前往猎魂副本" - }, - "data": "10025", - "prefix": "" - }, - { - "id": 109, - "type": 4, - "text": { - "key": "GM_GM_text_109", - "text": "前往石阵秘境" - }, - "data": "10026", - "prefix": "" - }, - { - "id": 110, + "id": 84, "type": 4, "text": { "key": "GM_GM_text_110", - "text": "" + "text": "前往石阵秘境" }, "data": "10027", "prefix": "" }, { - "id": 111, + "id": 85, "type": 4, "text": { "key": "GM_GM_text_111", @@ -1090,7 +850,7 @@ "prefix": "" }, { - "id": 112, + "id": 86, "type": 4, "text": { "key": "GM_GM_text_112", @@ -1100,37 +860,7 @@ "prefix": "" }, { - "id": 113, - "type": 4, - "text": { - "key": "GM_GM_text_113", - "text": "通行证" - }, - "data": "10030", - "prefix": "" - }, - { - "id": 114, - "type": 4, - "text": { - "key": "GM_GM_text_114", - "text": "推送礼包" - }, - "data": "10031", - "prefix": "" - }, - { - "id": 115, - "type": 4, - "text": { - "key": "GM_GM_text_115", - "text": "月梦战令购买等级弹窗" - }, - "data": "10032", - "prefix": "" - }, - { - "id": 116, + "id": 87, "type": 4, "text": { "key": "GM_GM_text_116", @@ -1140,7 +870,7 @@ "prefix": "" }, { - "id": 117, + "id": 88, "type": 4, "text": { "key": "GM_GM_text_117", @@ -1150,7 +880,7 @@ "prefix": "" }, { - "id": 118, + "id": 89, "type": 4, "text": { "key": "GM_GM_text_118", @@ -1160,7 +890,7 @@ "prefix": "" }, { - "id": 119, + "id": 90, "type": 4, "text": { "key": "GM_GM_text_119", @@ -1170,73 +900,13 @@ "prefix": "" }, { - "id": 120, - "type": 4, + "id": 91, + "type": 2, "text": { - "key": "GM_GM_text_120", - "text": "限定招募" + "key": "GM_GM_text_127", + "text": "修改公会boos等级" }, - "data": "10037", - "prefix": "" - }, - { - "id": 121, - "type": 4, - "text": { - "key": "GM_GM_text_121", - "text": "阵营招募" - }, - "data": "10038", - "prefix": "" - }, - { - "id": 122, - "type": 4, - "text": { - "key": "GM_GM_text_122", - "text": "许愿招募" - }, - "data": "10039", - "prefix": "" - }, - { - "id": 123, - "type": 4, - "text": { - "key": "GM_GM_text_123", - "text": "体力购买" - }, - "data": "10040", - "prefix": "" - }, - { - "id": 124, - "type": 4, - "text": { - "key": "GM_GM_text_124", - "text": "" - }, - "data": "10041", - "prefix": "" - }, - { - "id": 125, - "type": 4, - "text": { - "key": "GM_GM_text_125", - "text": "" - }, - "data": "10042", - "prefix": "" - }, - { - "id": 126, - "type": 4, - "text": { - "key": "GM_GM_text_126", - "text": "前往主线关卡界面" - }, - "data": "10043", - "prefix": "" + "data": "1", + "prefix": "bingo:sociatybooslv,{0}" } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index bf208d630..ce9395dae 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -15756,5 +15756,83 @@ "key": "hero_main_herointr_201", "text": "传说中的守护者“史图依克”,拥有不俗的战斗能力" } + }, + { + "hid": "53007", + "name": { + "key": "hero_main_name_53007", + "text": "巨型蜘蛛" + }, + "star": 3, + "color": 2, + "race": 1, + "job": 1, + "type": 2, + "ip": 1, + "sd": 1, + "handbook": -1, + "prefab": "51050", + "rotation": "0|0|0", + "revolve": 0, + "icon": "51050", + "vocal": "51050", + "tujing": [ + 107 + ], + "detailwindow": "effect_xunlong_daiji", + "intr": { + "key": "", + "text": "" + }, + "events": "hero_51050", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.69, + "z": 0 + }, + "capskillrule": 101, + "skill": 0, + "skill1": 153007111, + "skill2": 153007211, + "skill3": 0, + "txt": { + "key": "atlas_53007", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0, + "equiprcom": [ + 1, + 2, + 10 + ], + "angle": 0, + "deviation": 0, + "show": 2, + "herofrag": [ + { + "a": "item", + "t": "12025001", + "n": 6 + } + ], + "herofragnum": 6, + "heroskillup": [ + "10000004" + ], + "expitem": [ + { + "a": "item", + "t": "10000011", + "n": 1 + } + ], + "expitemnum": 7, + "herointr": { + "key": "hero_main_herointr_202", + "text": "传说中的守护者“巨型蜘蛛”,拥有不俗的战斗能力" + } } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 7996ad5d1..1ac3f178c 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -20014,5 +20014,143 @@ } ], "gm": 1 + }, + { + "id": "24012010", + "name": { + "key": "item_item_name_411", + "text": "龙之花" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_24012010", + "intr": { + "key": "item_item_intr_413", + "text": "" + }, + "describe": { + "key": "item_item_describe_413", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_411", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 + }, + { + "id": "24012011", + "name": { + "key": "item_item_name_412", + "text": "与龙之花结合的鱼" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_24012011", + "intr": { + "key": "item_item_intr_414", + "text": "" + }, + "describe": { + "key": "item_item_describe_414", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_412", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 + }, + { + "id": "24012012", + "name": { + "key": "item_item_name_413", + "text": "龙遗香" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_24012012", + "intr": { + "key": "item_item_intr_415", + "text": "" + }, + "describe": { + "key": "item_item_describe_415", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_413", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index 3c98d9e49..690445f34 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -178,5 +178,15 @@ "key": "loading_Sheet1_prompt_18", "text": "俱乐部是大家一起快乐玩耍的好地方。" } + }, + { + "id": 1019, + "scene": "GameMain", + "image": "ld_mh_bg01", + "icon": "loading_icon_gfxm", + "prompt": { + "key": "loading_Sheet1_prompt_19", + "text": "波比的花园需要记得每周浇灌哦。" + } } ] \ No newline at end of file diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json index 243f2d927..2f31a13c7 100644 --- a/bin/json/game_mainchapter.json +++ b/bin/json/game_mainchapter.json @@ -41,7 +41,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_14003" }, { @@ -86,7 +86,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -131,7 +131,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -176,7 +176,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -221,7 +221,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -266,7 +266,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -311,7 +311,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -356,7 +356,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -401,7 +401,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -446,7 +446,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -491,7 +491,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" }, { @@ -536,7 +536,7 @@ "models": [ 25001 ], - "bosspng": "mainboss1", + "bosspng": "zxgq_boss_001", "image": "zx_cjsp_img_44005" } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index f016ca33a..d79d6daf6 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -37,7 +37,7 @@ "destroy": 1, "progress": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200010, "afterstoryid": 0, "maingroupName": { "key": "", @@ -109,7 +109,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200030, "afterstoryid": 0, "maingroupName": { "key": "", @@ -221,7 +221,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200050, "afterstoryid": 0, "maingroupName": { "key": "", @@ -295,7 +295,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200060, "afterstoryid": 0, "maingroupName": { "key": "", @@ -506,7 +506,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101021 ], "helphero": [], "banhero": [], @@ -741,8 +741,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 200070, + "afterstoryid": 200080, "maingroupName": { "key": "", "text": "" @@ -792,7 +792,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101031 ], "helphero": [], "banhero": [], @@ -853,8 +853,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 200090, + "afterstoryid": 200120, "maingroupName": { "key": "", "text": "" @@ -905,8 +905,10 @@ "key": "", "text": "" }, - "venturetype": 0, - "ventureavatar": [], + "venturetype": 1, + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -947,9 +949,21 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -982,8 +996,6 @@ "Person/24004/24004_q.prefab" ], "scene_effect": [ - "Effect/Skill/Common/effect_screen_smoke.prefab", - "huo", "miwu" ], "scene_effectfilter": "", @@ -1001,7 +1013,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200150, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1077,7 +1089,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200170, "afterstoryid": 0, "maingroupName": { "key": "mainchapter_main_stage_maingroupName_1", @@ -1128,7 +1140,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101041 ], "helphero": [], "banhero": [], @@ -1191,7 +1203,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200190, "afterstoryid": 0, "maingroupName": { "key": "mainchapter_main_stage_maingroupName_1", @@ -1242,7 +1254,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101051 ], "helphero": [], "banhero": [], @@ -1356,7 +1368,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101061 ], "helphero": [], "banhero": [], @@ -1395,10 +1407,8 @@ "key": "", "text": "" }, - "venturetype": 1, - "ventureavatar": [ - "Person/24004/24004_q.prefab" - ], + "venturetype": 0, + "ventureavatar": [], "scene_effect": [ "Effect/Skill/Common/effect_screen_smoke.prefab", "huo", @@ -1420,7 +1430,7 @@ "progress": 1, "stroyshow": 0, "frontstoryid": 0, - "afterstoryid": 0, + "afterstoryid": 200200, "maingroupName": { "key": "mainchapter_main_stage_maingroupName_2", "text": "与埃雷特交战！" @@ -1470,7 +1480,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101071 ], "helphero": [], "banhero": [], @@ -1504,13 +1514,15 @@ "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, - "venturemodel": "Person/53001/53001_q.prefab", + "venturemodel": "", "bubbletalk": { "key": "", "text": "" }, - "venturetype": 0, - "ventureavatar": [], + "venturetype": 1, + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ "Effect/Skill/Common/effect_screen_smoke.prefab", "huo", @@ -1531,7 +1543,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200210, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1578,7 +1590,7 @@ "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, - "venturemodel": "", + "venturemodel": "Person/53001/53001_q_evil.prefab", "bubbletalk": { "key": "", "text": "" @@ -1603,7 +1615,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200230, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1675,7 +1687,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200250, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1719,7 +1731,7 @@ "previoustage": 0, "Episodetype": 3, "stage_param": 0, - "venturemodelspeed": 0, + "venturemodelspeed": 9, "venturemodelscale": 2, "move_type": 1, "venturemodel": "Person/mount/54021_q.prefab", @@ -1794,7 +1806,7 @@ "previoustage": 0, "Episodetype": 5, "stage_param": 10001, - "venturemodelspeed": 0, + "venturemodelspeed": 9, "venturemodelscale": 2, "move_type": 1, "venturemodel": "Person/mount/54021_q.prefab", @@ -1823,7 +1835,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200260, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1875,11 +1887,78 @@ "key": "", "text": "" }, - "venturetype": 2, - "ventureavatar": [ - "player", - "Person/24004/24004_q.prefab" + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": 0, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 0, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "", + "text": "" + }, + "animation": [], + "hide": 0, + "destroy": 1, + "progress": 1, + "stroyshow": 0, + "frontstoryid": 200270, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "mainlineName": { + "key": "mainchapter_main_stage_mainlineName_1", + "text": "1-1" + }, + "title": { + "key": "mainchapter_main_stage_title_1", + "text": "原始人洞穴" + }, + "desc": { + "key": "mainchapter_main_stage_desc_1", + "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, + { + "id": 1100122, + "chapterid": 11001, + "group_id": 100120, + "previous_group_id": [ + 100119 ], + "previoustage": 0, + "Episodetype": 1, + "stage_param": 0, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -1897,7 +1976,7 @@ "progress": 1, "stroyshow": 0, "frontstoryid": 0, - "afterstoryid": 0, + "afterstoryid": 200280, "maingroupName": { "key": "", "text": "" @@ -1947,7 +2026,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 101081 ], "helphero": [], "banhero": [], @@ -1968,79 +2047,6 @@ ], "challengeward": 0 }, - { - "id": 1100122, - "chapterid": 11001, - "group_id": 100120, - "previous_group_id": [ - 100119 - ], - "previoustage": 0, - "Episodetype": 1, - "stage_param": 0, - "venturemodelspeed": 0, - "venturemodelscale": 0, - "move_type": 0, - "venturemodel": "", - "bubbletalk": { - "key": "", - "text": "" - }, - "venturetype": 2, - "ventureavatar": [ - "player", - "Person/24004/24004_q.prefab" - ], - "scene_effect": [], - "scene_effectfilter": "", - "is_near": 0, - "openlevel": 1, - "EditorStage": 0, - "herocolor": 0, - "heroimg": "zxgq_qp_icon_gth", - "bubbletext": { - "key": "", - "text": "" - }, - "animation": [], - "hide": 0, - "destroy": 1, - "progress": 1, - "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, - "maingroupName": { - "key": "", - "text": "" - }, - "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" - }, - "title": { - "key": "mainchapter_main_stage_title_1", - "text": "原始人洞穴" - }, - "desc": { - "key": "mainchapter_main_stage_desc_1", - "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" - }, - "exp": 0, - "hero_exp": 0, - "ps_consume": [], - "ps_mg": [], - "firstaward": [], - "lotteryward": 0, - "commonaward": [], - "BattleReadyID": 0, - "FormatList": [], - "helphero": [], - "banhero": [], - "star": [], - "star_type": [], - "star_value": [], - "challengeward": 0 - }, { "id": 1100123, "chapterid": 11001, @@ -2051,7 +2057,7 @@ "previoustage": 0, "Episodetype": 3, "stage_param": 0, - "venturemodelspeed": 0, + "venturemodelspeed": 9, "venturemodelscale": 2, "move_type": 1, "venturemodel": "Person/mount/54021_q.prefab", @@ -2059,8 +2065,11 @@ "key": "", "text": "" }, - "venturetype": 0, - "ventureavatar": [], + "venturetype": 2, + "ventureavatar": [ + "player", + "Person/24004/24004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -2150,8 +2159,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 200310, + "afterstoryid": 200320, "maingroupName": { "key": "", "text": "" @@ -2201,7 +2210,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 102011 ], "helphero": [], "banhero": [], @@ -2258,7 +2267,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200330, "afterstoryid": 0, "maingroupName": { "key": "", @@ -2309,7 +2318,7 @@ ], "BattleReadyID": 204, "FormatList": [ - 101011 + 102021 ], "helphero": [], "banhero": [], @@ -2366,8 +2375,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 200340, + "afterstoryid": 200360, "maingroupName": { "key": "", "text": "" @@ -2436,7 +2445,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200370, "afterstoryid": 0, "maingroupName": { "key": "", @@ -2487,7 +2496,7 @@ ], "BattleReadyID": 10500003, "FormatList": [ - 302013 + 102041 ], "helphero": [], "banhero": [], @@ -2518,7 +2527,7 @@ "previoustage": 0, "Episodetype": 3, "stage_param": 0, - "venturemodelspeed": 0, + "venturemodelspeed": 9, "venturemodelscale": 2, "move_type": 1, "venturemodel": "Person/mount/54021_q.prefab", @@ -2617,7 +2626,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200390, "afterstoryid": 0, "maingroupName": { "key": "", @@ -2687,7 +2696,7 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 200400, "afterstoryid": 0, "maingroupName": { "key": "", diff --git a/bin/json/game_model.json b/bin/json/game_model.json index a8abb840a..3a4595b2d 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -7033,5 +7033,40 @@ "y": 1, "z": 1 } + }, + { + "id": "53007", + "preson": "51050", + "presonshow": "51050_exhibition", + "presonstory": "51050", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_51050", + "fight": "tx_js_51050", + "img": "sbkp_js_51050", + "heroimg": "hbkp_js_51050", + "portrait": "zm_img_51050", + "bust": "bust_51050", + "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 120c375d2..f3acf0211 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -305,14 +305,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 34008, + "heroid": 51006, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": 1.09, - "atkpro": 0.79, - "defpro": 0.7, + "hppro": 0.89, + "atkpro": 1.3, + "defpro": 0.78, "skill1": 1, "skill2": 1, "skill3": 1, @@ -325,14 +325,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51006, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.89, + "atkpro": 1.3, + "defpro": 0.78, "skill1": 1, "skill2": 1, "skill3": 1, @@ -345,14 +345,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51006, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.89, + "atkpro": 1.3, + "defpro": 0.78, "skill1": 1, "skill2": 1, "skill3": 1, @@ -625,14 +625,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 24008, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.73, + "atkpro": 1.09, + "defpro": 0.62, "skill1": 1, "skill2": 1, "skill3": 1, @@ -645,14 +645,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 34008, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.92, + "atkpro": 0.79, + "defpro": 0.71, "skill1": 1, "skill2": 1, "skill3": 1, @@ -905,14 +905,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53001, + "heroid": -1, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": 1.33, - "atkpro": 1.3, - "defpro": 0.8, + "hppro": -1, + "atkpro": -1, + "defpro": -1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -925,14 +925,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51002, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.88, + "atkpro": 1.1, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -945,14 +945,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51003, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.96, + "atkpro": 1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -965,14 +965,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.77, + "atkpro": 1.3, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -985,14 +985,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.77, + "atkpro": 1.3, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1205,14 +1205,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53001, + "heroid": -1, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": 1.35, - "atkpro": 1.3, - "defpro": 0.81, + "hppro": -1, + "atkpro": -1, + "defpro": -1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1225,14 +1225,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51002, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.9, + "atkpro": 1.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1245,14 +1245,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51003, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.98, + "atkpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1265,14 +1265,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.78, + "atkpro": 1.3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1285,14 +1285,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 3, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.78, + "atkpro": 1.3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1525,14 +1525,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51002, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.91, + "atkpro": 1.1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1545,14 +1545,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51003, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.99, + "atkpro": 1, + "defpro": 0.82, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1565,14 +1565,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.79, + "atkpro": 1.3, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1585,14 +1585,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.79, + "atkpro": 1.3, + "defpro": 0.54, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1805,14 +1805,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 53001, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 20, + "atkpro": 2, + "defpro": 0.87, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1825,14 +1825,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51002, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.21, + "atkpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -1845,14 +1845,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51003, "star": 3, "equip": [], "newskill": [], "lv": 4, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.21, + "atkpro": 1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2105,14 +2105,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 55007, + "heroid": 53001, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": 2.12, - "atkpro": 2, - "defpro": 0.75, + "hppro": 0.98, + "atkpro": 0.3, + "defpro": 0, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2125,14 +2125,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51002, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.13, + "atkpro": 0.3, + "defpro": 0, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2145,14 +2145,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51003, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.22, + "atkpro": 0.3, + "defpro": 0, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2405,14 +2405,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 44005, + "heroid": -1, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": 1.07, - "atkpro": 0.84, - "defpro": 0.69, + "hppro": -1, + "atkpro": -1, + "defpro": -1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2425,14 +2425,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 33002, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": 0.84, - "atkpro": 1.04, - "defpro": 0.6, + "hppro": 0.83, + "atkpro": 1.3, + "defpro": 0.86, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2445,14 +2445,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.83, + "atkpro": 1.3, + "defpro": 0.86, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2465,14 +2465,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.83, + "atkpro": 1.3, + "defpro": 0.86, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2485,14 +2485,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 5, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.83, + "atkpro": 1.3, + "defpro": 0.86, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2705,14 +2705,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51012, + "heroid": -1, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": -1, + "atkpro": -1, + "defpro": -1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2725,14 +2725,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.84, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2745,14 +2745,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.84, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2765,14 +2765,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51012, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": 0.84, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -2785,14 +2785,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.84, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3005,14 +3005,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51012, + "heroid": -1, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": -1, + "atkpro": -1, + "defpro": -1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3025,14 +3025,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51012, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": 0.85, + "atkpro": 1.3, + "defpro": 0.89, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3045,14 +3045,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51012, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": 0.85, + "atkpro": 1.3, + "defpro": 0.89, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3065,14 +3065,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51012, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": 0.85, + "atkpro": 1.3, + "defpro": 0.89, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3085,14 +3085,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 6, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.85, + "atkpro": 1.3, + "defpro": 0.89, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3305,14 +3305,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.04, + "atkpro": 1.3, + "defpro": 0.9, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3325,14 +3325,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.04, + "atkpro": 1.3, + "defpro": 0.9, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3363,16 +3363,16 @@ "Id": 102041, "pos": 4, "captainId": 0, - "IsBoss": 0, + "IsBoss": 1, "bossHpCnt": 0, - "heroid": -1, + "heroid": 55007, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 5, + "atkpro": 0.6, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3405,14 +3405,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3425,14 +3425,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3445,14 +3445,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3465,14 +3465,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3485,14 +3485,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3505,14 +3505,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3525,14 +3525,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3545,14 +3545,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3565,14 +3565,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -3585,14 +3585,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 7, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 0.7, + "atkpro": 1.3, + "defpro": 0.88, "skill1": 1, "skill2": 1, "skill3": 1, @@ -5105,14 +5105,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 8, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.08, + "atkpro": 1.3, + "defpro": 0.94, "skill1": 1, "skill2": 1, "skill3": 1, @@ -5125,14 +5125,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 8, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.08, + "atkpro": 1.3, + "defpro": 0.94, "skill1": 1, "skill2": 1, "skill3": 1, @@ -5145,14 +5145,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 8, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.08, + "atkpro": 1.3, + "defpro": 0.94, "skill1": 1, "skill2": 1, "skill3": 1, @@ -6925,14 +6925,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 11, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.17, + "atkpro": 1.43, + "defpro": 1.11, "skill1": 1, "skill2": 1, "skill3": 1, @@ -6945,14 +6945,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 11, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.17, + "atkpro": 1.43, + "defpro": 1.11, "skill1": 1, "skill2": 1, "skill3": 1, @@ -6965,14 +6965,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], "lv": 11, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.17, + "atkpro": 1.43, + "defpro": 1.11, "skill1": 1, "skill2": 1, "skill3": 1, @@ -6985,14 +6985,14 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], "lv": 11, - "hppro": -1, - "atkpro": -1, - "defpro": -1, + "hppro": 1.17, + "atkpro": 1.43, + "defpro": 1.11, "skill1": 1, "skill2": 1, "skill3": 1, @@ -232445,7 +232445,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], @@ -232625,7 +232625,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], @@ -232645,7 +232645,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], @@ -232665,7 +232665,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 24004, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], @@ -232685,7 +232685,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], @@ -232705,7 +232705,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51050, + "heroid": -1, "star": 3, "equip": [], "newskill": [], @@ -232745,7 +232745,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51050, "star": 3, "equip": [], "newskill": [], @@ -232765,7 +232765,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], @@ -232785,7 +232785,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51052, "star": 3, "equip": [], "newskill": [], diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 99975a112..037ed8a79 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -496,14 +496,16 @@ }, { "id": 10038, - "heroid": 0, + "heroid": 24004, "Levelid": 0, "datas": [ "GameMain", + "熊猫_圣桃树_常驻", "901" ], "event": [ - 0 + 2, + 10130 ], "goto": 0 }, @@ -556,12 +558,12 @@ "Levelid": 0, "datas": [ "GameMain", - "20020_熊猫_船甲板", + "熊猫_圣桃树_常驻", "901" ], "event": [ 2, - 10150 + 10130 ], "goto": 0 }, @@ -576,7 +578,7 @@ ], "event": [ 2, - 10160 + 10140 ], "goto": 0 }, @@ -586,12 +588,12 @@ "Levelid": 0, "datas": [ "GameMain", - "20020_熊猫_船甲板", + "功能入口-招募", "901" ], "event": [ 2, - 10162 + 10142 ], "goto": 0 }, @@ -601,12 +603,12 @@ "Levelid": 0, "datas": [ "GameMain", - "功能入口-招募", + "邦尼兔_圣桃树_面对无牙仔", "901" ], "event": [ 2, - 10170 + 10151 ], "goto": 0 }, @@ -631,7 +633,7 @@ "Levelid": 0, "datas": [ "GameMain", - "熊猫_圣桃树_面对无牙仔", + "20040_坠落希卡普", "901" ], "event": [ @@ -893,7 +895,7 @@ ], "event": [ 2, - 10202 + 10201 ], "goto": 0 }, @@ -914,7 +916,7 @@ }, { "id": 10108, - "heroid": 0, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -923,7 +925,7 @@ ], "event": [ 2, - 10230 + 10203 ], "goto": 0 }, @@ -932,39 +934,43 @@ "heroid": 44004, "Levelid": 0, "datas": [ - "CommandScene", - "功能入口_主线", + "GameMain", + "20110_熊猫", "905" ], "event": [ 2, - 10244 + 10205 ], "goto": 0 }, { "id": 10114, - "heroid": 0, + "heroid": 44004, "Levelid": 0, "datas": [ "GameMain", + "漆黑", "901" ], "event": [ - 0 + 1, + 107 ], "goto": 0 }, { "id": 10118, - "heroid": 0, + "heroid": 44004, "Levelid": 0, "datas": [ "GameMain", + "20110_熊猫", "901" ], "event": [ - 0 + 2, + 10206 ], "goto": 0 }, diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index c38ad1149..3220293a1 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -24098,7 +24098,7 @@ "need": [ { "a": "attr", - "t": "guildcoin", + "t": "diamond", "n": 50 } ], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index d07abf9c7..8760302ef 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -57970,7 +57970,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - 2, + 1, 2, 50 ], @@ -59948,7 +59948,7 @@ 390001115, 1000, 1, - 1 + 3 ], "FollowSK": [], "SucFollowSK": [], @@ -61433,5 +61433,119 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 253007111, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 253007211, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 253007212, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 32, + "Argu": [ + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 255007511, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000080, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 255007512, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000081, + 1000, + 1, + -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 640da6ef8..c34c375c3 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -21667,7 +21667,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155007311_1", - "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的25%。" + "text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。" }, "buffid": [], "map": "" @@ -21697,7 +21697,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155007312_1", - "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%。" + "text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。" }, "buffid": [], "map": "" @@ -39017,7 +39017,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_914005432_1", - "text": "3技能攻击没有增益效果的目标时附加1回合【无法获得增益】" + "text": "3技能攻击没有增益效果的目标时延长1回合【无法获得增益】" }, "buffid": [], "map": "" @@ -46904,5 +46904,127 @@ }, "buffid": [], "map": "" + }, + { + "id": 153007111, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_153007111", + "text": "" + }, + "ico": "jn_51050_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 253007111 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_153007111_1", + "text": "攻击敌方全体目标。" + }, + "buffid": [], + "map": "" + }, + { + "id": 153007211, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_153007211", + "text": "" + }, + "ico": "jn_51050_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 0, + "CD": 0, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 253007211 + ] + }, + "passSkill": [ + 253007211 + ], + "Desc": { + "key": "skill_skill_atk_Desc_153007211_1", + "text": "尽可能的复活死亡的队友。" + }, + "buffid": [], + "map": "" + }, + { + "id": 155007511, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_155007511", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 5, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 255007511 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_155007511_1", + "text": "冰霜泰坦剧情对峙" + }, + "buffid": [], + "map": "" + }, + { + "id": 155007512, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_155007512", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 5, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 255007512 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_155007512_1", + "text": "冰霜泰坦剧情血量降低" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 727603545..93c029d90 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -2858,6 +2858,7 @@ }, "BuffType": 43, "EffectArgu": [ + 100, 500 ], "BufParNum": 1, @@ -2992,8 +2993,8 @@ }, "BuffType": 20, "EffectArgu": [ - 21, - -250 + 111, + 250 ], "BufParNum": 1, "RelyCheckArgu": [], @@ -3026,6 +3027,7 @@ }, "BuffType": 33, "EffectArgu": [ + 0, 500 ], "BufParNum": 1, @@ -3123,6 +3125,7 @@ }, "BuffType": 33, "EffectArgu": [ + 0, 1000 ], "BufParNum": 1, @@ -3155,6 +3158,7 @@ }, "BuffType": 33, "EffectArgu": [ + 0, 200 ], "BufParNum": 1, @@ -3249,6 +3253,7 @@ }, "BuffType": 33, "EffectArgu": [ + 0, 1000 ], "BufParNum": 1, @@ -3508,6 +3513,7 @@ }, "BuffType": 33, "EffectArgu": [ + 0, 100 ], "BufParNum": 1, @@ -3571,8 +3577,8 @@ }, "BuffType": 20, "EffectArgu": [ - 21, - -300 + 111, + 300 ], "BufParNum": 1, "RelyCheckArgu": [], @@ -4261,6 +4267,7 @@ }, "BuffType": 33, "EffectArgu": [ + 0, 50 ], "BufParNum": 1, @@ -8394,7 +8401,7 @@ }, "BuffType": 33, "EffectArgu": [ - 3, + 0, 100 ], "BufParNum": 1, @@ -10517,7 +10524,7 @@ }, "BuffType": 33, "EffectArgu": [ - 3, + 0, 50 ], "BufParNum": 1, @@ -10925,7 +10932,7 @@ }, "BuffType": 33, "EffectArgu": [ - 3, + 0, 300, 500 ], @@ -11046,5 +11053,71 @@ "buffeffect": "", "buffpos": "", "forbidFloat": 0 + }, + { + "Id": 391000080, + "Name": { + "key": "skill_skill_buff_Name_391000080", + "text": "[color=#37d8a9]殊死较量[/color] " + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000080", + "text": "生命最低降为1。" + }, + "BuffType": 23, + "EffectArgu": [ + 1 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000081, + "Name": { + "key": "skill_skill_buff_Name_391000081", + "text": "[color=#e5621b]最大生命值上限下降[/color] " + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000081", + "text": "最大生命值上限下降。" + }, + "BuffType": 20, + "EffectArgu": [ + 111, + 500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 1, + 6 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": true, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 6fee16096..02dcb4f02 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -8758,5 +8758,25 @@ "Callback": [ 914003314 ] + }, + { + "Id": 453007211, + "When": 15, + "FromCheck": "", + "TargetCheck": "Target=1", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 253007212 + ] } ] \ No newline at end of file diff --git a/bin/json/game_trainlv.json b/bin/json/game_trainlv.json index 0ffc3898c..406cadf49 100644 --- a/bin/json/game_trainlv.json +++ b/bin/json/game_trainlv.json @@ -9,7 +9,7 @@ "reward": [] }, { - "key": 6, + "key": 2, "id": "20030001", "type": 2, "lv": 2, @@ -17,62 +17,62 @@ "etime": 51, "reward": [] }, + { + "key": 3, + "id": "20030001", + "type": 3, + "lv": 3, + "exp": 300, + "etime": 52, + "reward": [] + }, + { + "key": 4, + "id": "20030001", + "type": 3, + "lv": 4, + "exp": 400, + "etime": 53, + "reward": [] + }, + { + "key": 5, + "id": "20030001", + "type": 3, + "lv": 5, + "exp": 500, + "etime": 54, + "reward": [] + }, + { + "key": 6, + "id": "20030001", + "type": 3, + "lv": 6, + "exp": 600, + "etime": 55, + "reward": [] + }, { "key": 7, "id": "20030001", "type": 3, - "lv": 3, - "exp": 300, - "etime": 52, + "lv": 7, + "exp": 700, + "etime": 56, "reward": [] }, { "key": 8, "id": "20030001", "type": 3, - "lv": 4, - "exp": 400, - "etime": 53, - "reward": [] - }, - { - "key": 9, - "id": "20030001", - "type": 3, - "lv": 5, - "exp": 500, - "etime": 54, - "reward": [] - }, - { - "key": 10, - "id": "20030001", - "type": 3, - "lv": 6, - "exp": 600, - "etime": 55, - "reward": [] - }, - { - "key": 11, - "id": "20030001", - "type": 3, - "lv": 7, - "exp": 700, - "etime": 56, - "reward": [] - }, - { - "key": 12, - "id": "20030001", - "type": 3, "lv": 8, "exp": 0, "etime": 57, "reward": [] }, { - "key": 14, + "key": 9, "id": "20030002", "type": 1, "lv": 1, @@ -81,7 +81,7 @@ "reward": [] }, { - "key": 15, + "key": 10, "id": "20030002", "type": 2, "lv": 2, @@ -89,62 +89,62 @@ "etime": 51, "reward": [] }, + { + "key": 11, + "id": "20030002", + "type": 3, + "lv": 3, + "exp": 300, + "etime": 52, + "reward": [] + }, + { + "key": 12, + "id": "20030002", + "type": 3, + "lv": 4, + "exp": 400, + "etime": 53, + "reward": [] + }, + { + "key": 13, + "id": "20030002", + "type": 3, + "lv": 5, + "exp": 500, + "etime": 54, + "reward": [] + }, + { + "key": 14, + "id": "20030002", + "type": 3, + "lv": 6, + "exp": 600, + "etime": 55, + "reward": [] + }, + { + "key": 15, + "id": "20030002", + "type": 3, + "lv": 7, + "exp": 700, + "etime": 56, + "reward": [] + }, { "key": 16, "id": "20030002", "type": 3, - "lv": 3, - "exp": 300, - "etime": 52, - "reward": [] - }, - { - "key": 17, - "id": "20030002", - "type": 3, - "lv": 4, - "exp": 400, - "etime": 53, - "reward": [] - }, - { - "key": 18, - "id": "20030002", - "type": 3, - "lv": 5, - "exp": 500, - "etime": 54, - "reward": [] - }, - { - "key": 19, - "id": "20030002", - "type": 3, - "lv": 6, - "exp": 600, - "etime": 55, - "reward": [] - }, - { - "key": 20, - "id": "20030002", - "type": 3, - "lv": 7, - "exp": 700, - "etime": 56, - "reward": [] - }, - { - "key": 21, - "id": "20030002", - "type": 3, "lv": 8, "exp": 0, "etime": 57, "reward": [] }, { - "key": 22, + "key": 17, "id": "20030003", "type": 1, "lv": 1, @@ -153,7 +153,7 @@ "reward": [] }, { - "key": 23, + "key": 18, "id": "20030003", "type": 2, "lv": 2, @@ -162,7 +162,7 @@ "reward": [] }, { - "key": 24, + "key": 19, "id": "20030003", "type": 2, "lv": 3, @@ -171,7 +171,7 @@ "reward": [] }, { - "key": 25, + "key": 20, "id": "20030003", "type": 2, "lv": 4, @@ -180,39 +180,48 @@ "reward": [] }, { - "key": 26, + "key": 21, "id": "20030003", - "type": 2, + "type": 3, "lv": 5, "exp": 500, "etime": 54, "reward": [] }, { - "key": 27, + "key": 22, "id": "20030003", - "type": 2, + "type": 3, "lv": 6, "exp": 600, "etime": 55, "reward": [] }, { - "key": 28, + "key": 23, "id": "20030003", - "type": 2, + "type": 3, "lv": 7, "exp": 700, "etime": 56, "reward": [] }, { - "key": 29, + "key": 24, "id": "20030003", "type": 3, "lv": 8, - "exp": 0, + "exp": 800, "etime": 57, "reward": [] + }, + { + "key": 25, + "id": "20030003", + "type": 3, + "lv": 9, + "exp": 0, + "etime": 58, + "reward": [] } ] \ No newline at end of file diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 8e36ea6e1..d8d3bf478 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -32,9 +32,9 @@ { "id": 103, "FormatList": [ - 700012 + 700013 ], - "BattleReadyID": 202, + "BattleReadyID": 126, "EventList": [], "playexp": { "a": "attr", @@ -65,7 +65,9 @@ 700015 ], "BattleReadyID": 203, - "EventList": [], + "EventList": [ + 203 + ], "playexp": { "a": "attr", "t": "exp", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index e8ecf7996..e7a287aa0 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -55,7 +55,7 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_3", - "text": "和阿宝交流感受" + "text": "不详的来客" }, "task_details": { "key": "worldtask_world_task_task_details_3", @@ -63,7 +63,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_3", - "text": "离开指挥部" + "text": "这里是?" }, "get_item": [], "trigger": 0, @@ -98,7 +98,7 @@ "icon": "25002", "task_name": { "key": "worldtask_world_task_task_name_4", - "text": "采集调查" + "text": "遭遇战余波" }, "task_details": { "key": "worldtask_world_task_task_details_4", @@ -136,14 +136,14 @@ "lock": 1, "lockend": 999, "ontxe": 20020, - "id_after": 20040, + "id_after": 20041, "group": 10, "exgroup": 210, "des": 2, "icon": "25003", "task_name": { "key": "worldtask_world_task_task_name_5", - "text": "你就是邦尼兔？" + "text": "邦尼兔的\"交流\"方式" }, "task_details": { "key": "worldtask_world_task_task_details_5", @@ -169,49 +169,11 @@ "a": "attr", "t": "gold", "n": 8200 - } - ], - "module": [] - }, - { - "key": 20040, - "opencond": "", - "lock": 1, - "lockend": 999, - "ontxe": 20030, - "id_after": 20041, - "group": 10, - "exgroup": 210, - "des": 2, - "icon": "25004", - "task_name": { - "key": "worldtask_world_task_task_name_6", - "text": "再战邦尼兔" - }, - "task_details": { - "key": "worldtask_world_task_task_details_6", - "text": "邦尼兔依旧不服气，获取只有通过他的方式，才能让对方认可我们。" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_6", - "text": "再次挑战邦尼兔" - }, - "get_item": [], - "trigger": 0, - "npc": 10040, - "completetask": [ - 12070040 - ], - "deliver_npc": 0, - "taskend_removeitem": [], - "auto_accept": 1, - "tasktips": 0, - "lock_add": 0, - "reword": [ + }, { - "a": "attr", - "t": "gold", - "n": 8200 + "a": "hero", + "t": "24004", + "n": 1 } ], "module": [] @@ -221,7 +183,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20040, + "ontxe": 20030, "id_after": 20042, "group": 10, "exgroup": 210, @@ -251,9 +213,9 @@ "completetask": [ 12070041 ], - "deliver_npc": 0, + "deliver_npc": 100418, "taskend_removeitem": [], - "auto_accept": 1, + "auto_accept": 0, "tasktips": 0, "lock_add": 0, "reword": [ @@ -362,22 +324,22 @@ "lock": 1, "lockend": 999, "ontxe": 20050, - "id_after": 20230, + "id_after": 20110, "group": 10, "exgroup": 210, "des": 2, "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_11", - "text": "进一步询问" + "text": "前往博克岛" }, "task_details": { "key": "worldtask_world_task_task_details_11", - "text": "在骇客蛛和阿宝的鼓励下，决定前往疯狂原始人世界调查月光原石的去向。" + "text": "在菲奥娜和阿宝的建议下，决定前往博克岛寻找解毒剂的原料。" }, "npctxt": { "key": "worldtask_world_task_npctxt_11", - "text": "开启冒险吧！" + "text": "回复菲奥娜" }, "get_item": [], "trigger": 0, @@ -424,6 +386,49 @@ ], "module": [] }, + { + "key": 20110, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 20100, + "id_after": 20230, + "group": 10, + "exgroup": 210, + "des": 2, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_12", + "text": "更深沉的黑暗" + }, + "task_details": { + "key": "worldtask_world_task_task_details_12", + "text": "一个危险的存在降临于圣桃树下，我不知道对方究竟是谁，但邦尼兔的神态告诉我，来人的棘手程度或许并不亚于在博克岛上遇到的诸多强敌，甚至更加危险。" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_12", + "text": "前往圣桃树" + }, + "get_item": [], + "trigger": 0, + "npc": 10110, + "completetask": [ + 12070230 + ], + "deliver_npc": 10118, + "taskend_removeitem": [], + "auto_accept": 0, + "tasktips": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 8200 + } + ], + "module": [] + }, { "key": 20230, "opencond": "",