diff --git a/bin/json/game_annulartask_library.json b/bin/json/game_annulartask_library.json index 9610ab6ba..b8c8be03d 100644 --- a/bin/json/game_annulartask_library.json +++ b/bin/json/game_annulartask_library.json @@ -80,22 +80,13 @@ "itemwt": 400, "min": 0 }, - { - "id": 10, - "assembleid": 60000030, - "lvstart": 1, - "lvend": 999, - "itemid": 1260, - "itemwt": 300, - "min": 0 - }, { "id": 11, "assembleid": 60000030, "lvstart": 1, "lvend": 999, "itemid": 1310, - "itemwt": 300, + "itemwt": 600, "min": 0 }, { diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index a4b8ec75a..ad8536796 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -24474,7 +24474,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_864", + "key": "buried_buried_condi_tasktxt_866", "text": "备用埋点" }, "type": 43, @@ -24628,7 +24628,7 @@ "t": "gold", "n": 1 }, - "NPC": 300111, + "NPC": 320111, "value": 1, "filter": [ 31, diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index 1166ef868..c6791052e 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -22,11 +22,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030001", @@ -51,11 +53,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030001", @@ -80,11 +84,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 10, - "csubtime": 10 + "csubtime": 10, + "energyrecover": 100, + "maxenergy": 100 }, { "id": "20030002", @@ -109,11 +115,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030002", @@ -138,11 +146,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030002", @@ -167,11 +177,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030003", @@ -196,11 +208,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030003", @@ -225,11 +239,13 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 }, { "id": "20030003", @@ -254,10 +270,12 @@ "hp": 7, "moderate": 10, "sprint": 200, + "sprinttime": 3000, "acceleration": 100, "deceleration": 100, - "itemsprint": 100, "caddtime": 0, - "csubtime": 0 + "csubtime": 0, + "energyrecover": 0, + "maxenergy": 100 } ] \ No newline at end of file diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index cdd6d6fca..bbbeb1d48 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -368,5 +368,15 @@ }, "data": "", "prefix": "bingo:buried,{0}" + }, + { + "id": 40, + "type": 2, + "text": { + "key": "GM_GM_text_40", + "text": "解锁食物图鉴" + }, + "data": "", + "prefix": "bingo:groumet" } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 6c271c773..78cd323a6 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -16124,7 +16124,7 @@ "img": "item_18000004", "intr": { "key": "item_item_intr_329", - "text": "竞技场挑战券每144分钟恢复一张,是进入竞技场的凭证。" + "text": "竞技场挑战券每120分钟恢复一张,是进入竞技场的凭证。" }, "describe": { "key": "item_item_describe_329", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 2082d126b..769bb1655 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -6120,7 +6120,7 @@ ], "event": [ 10, - 10004 + 10005 ], "goto": 0 }, diff --git a/bin/json/game_searchitemall.json b/bin/json/game_searchitemall.json index 7f14b8774..12d17a28b 100644 --- a/bin/json/game_searchitemall.json +++ b/bin/json/game_searchitemall.json @@ -5,13 +5,9 @@ "pointnum": 1, "point": [ 1, - 2, - 3, - 4 + 2 ], "pointweight": [ - 2000, - 2000, 2000, 2000 ] @@ -21,14 +17,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 5, - 6, - 7, - 8 + 3, + 4 ], "pointweight": [ - 2000, - 2000, 2000, 2000 ] @@ -38,14 +30,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 9, - 10, - 11, - 12 + 5, + 6 ], "pointweight": [ - 2000, - 2000, 2000, 2000 ] @@ -55,14 +43,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 1, - 2, - 3, - 4 + 7, + 8 ], "pointweight": [ - 2000, - 2000, 2000, 2000 ] @@ -72,14 +56,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 5, - 6, - 7, - 8 + 9, + 10 ], "pointweight": [ - 2000, - 2000, 2000, 2000 ] diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 2173c758f..3096e16f6 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -18990,10 +18990,10 @@ 4, 4800 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 243001313 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -19015,10 +19015,10 @@ 4, 5100 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 243001313 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -19040,10 +19040,10 @@ 4, 5400 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 243001313 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -19065,10 +19065,10 @@ 4, 5800 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 243001313 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29371,7 +29371,7 @@ 500, 1, 11, - 150 + 18 ], "FollowSK": [ 214002312 @@ -29425,7 +29425,7 @@ 600, 1, 11, - 150 + 18 ], "FollowSK": [ 214002312 @@ -29455,7 +29455,7 @@ 700, 1, 11, - 150 + 18 ], "FollowSK": [ 214002312 @@ -29485,7 +29485,7 @@ 800, 1, 11, - 150 + 18 ], "FollowSK": [ 214002312 @@ -29515,7 +29515,7 @@ 900, 1, 11, - 150 + 18 ], "FollowSK": [ 214002312 diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index bfbe0d2a4..d29d57c4f 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -5686,7 +5686,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20010, + "ontxe": 20240, "id_after": 0, "group": 320, "exgroup": 310, @@ -5729,7 +5729,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20010, + "ontxe": 20370, "id_after": 0, "group": 320, "exgroup": 310, @@ -5772,7 +5772,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20010, + "ontxe": 20230, "id_after": 0, "group": 320, "exgroup": 310, @@ -5813,7 +5813,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20010, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -5854,7 +5854,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 99999, + "ontxe": 21190, "id_after": 0, "group": 320, "exgroup": 310, @@ -5895,7 +5895,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 99999, + "ontxe": 21190, "id_after": 320161, "group": 320, "exgroup": 310, @@ -5981,7 +5981,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 99999, + "ontxe": 21190, "id_after": 0, "group": 320, "exgroup": 310, @@ -6437,6 +6437,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6490,6 +6495,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6543,6 +6553,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6596,6 +6611,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6649,6 +6669,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6702,6 +6727,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6755,6 +6785,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6808,6 +6843,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6861,6 +6901,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6914,6 +6959,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -6967,6 +7017,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7020,6 +7075,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7073,6 +7133,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7126,6 +7191,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7179,6 +7249,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7232,6 +7307,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7285,6 +7365,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7338,6 +7423,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7391,6 +7481,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7444,6 +7539,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7497,6 +7597,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7550,6 +7655,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7603,6 +7713,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7656,6 +7771,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7709,6 +7829,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7762,6 +7887,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7815,6 +7945,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7866,6 +8001,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7919,6 +8059,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -7970,6 +8115,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -8023,6 +8173,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -8074,6 +8229,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -8127,6 +8287,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -8180,6 +8345,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -8231,6 +8401,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": [] @@ -8284,6 +8459,11 @@ "a": "attr", "t": "diamond", "n": 10 + }, + { + "a": "attr", + "t": "exp", + "n": 300 } ], "module": []