From 11c1c89958fb97045444ac69e8cbfba43aed144c Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 1 Dec 2023 14:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_asklibrary.json | 12 +- bin/json/game_bubblegroup.json | 24 +++ bin/json/game_buriedcondi.json | 6 +- bin/json/game_buzkashimount.json | 6 +- bin/json/game_combatbox.json | 2 +- bin/json/game_combatlevel.json | 38 +++++ bin/json/game_fightglobalevent.json | 2 +- bin/json/game_gamesummarytab.json | 2 +- bin/json/game_guide.json | 246 ++++++++++++++++++--------- bin/json/game_item.json | 41 +++++ bin/json/game_itemlink.json | 17 ++ bin/json/game_loading.json | 60 ++++++- bin/json/game_lottery.json | 2 +- bin/json/game_mail.json | 20 +-- bin/json/game_mainstage.json | 34 ++-- bin/json/game_model.json | 35 ++++ bin/json/game_monkeyreward.json | 6 +- bin/json/game_monsterformat.json | 252 ++++++++++++++++++++++++++-- bin/json/game_puggsyisland.json | 12 +- bin/json/game_skillafteratk.json | 70 ++++++-- bin/json/game_skillatk.json | 107 +++++++++++- bin/json/game_skillbuff.json | 89 ++++++---- bin/json/game_skillpassive.json | 10 +- bin/json/game_tipstxtmain.json | 10 +- bin/json/game_topuiconfig.json | 16 ++ bin/json/game_treasuremap.json | 20 ++- bin/json/game_worldbattle.json | 10 -- bin/json/game_worldtask.json | 8 +- 28 files changed, 919 insertions(+), 238 deletions(-) diff --git a/bin/json/game_asklibrary.json b/bin/json/game_asklibrary.json index ca34f5bea..a13e0ecab 100644 --- a/bin/json/game_asklibrary.json +++ b/bin/json/game_asklibrary.json @@ -67,23 +67,23 @@ "type": 1, "topic": { "key": "ask_ask_library_topic_03", - "text": "匹诺曹穿的内裤是什么样式?" + "text": "匹诺曹的良心是什么?" }, "planA": { "key": "ask_ask_library_planA_03", - "text": "男式平角裤" + "text": "一颗心" }, "planB": { "key": "ask_ask_library_planB_03", - "text": "男式三角裤" + "text": "一瓶药水" }, "planC": { "key": "ask_ask_library_planC_03", - "text": "女式三角裤" + "text": "一位仙女" }, "planD": { "key": "ask_ask_library_planD_03", - "text": "女式丁字裤" + "text": "一只蟋蟀" }, "weight": 1000, "pic": "", @@ -447,7 +447,7 @@ }, "planB": { "key": "ask_ask_library_planB_15", - "text": "Pornhub" + "text": "Netflix" }, "planC": { "key": "ask_ask_library_planC_15", diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index 24b32c3df..204b95f24 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -1510,5 +1510,29 @@ "key": "bubblegroup_bubblegroup_Text_Bubble_126", "text": "无牙仔,往……中轴城飞……" } + }, + { + "KeyId": 127, + "GroupID": 20030237, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_127", + "text": "扫地?不是吧?" + } + }, + { + "KeyId": 128, + "GroupID": 20030238, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_128", + "text": "上一次被他安排去扫地的扫了九百年。" + } } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 7992c2370..3f0da327d 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -25109,7 +25109,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_755", - "text": "击败阴影战士" + "text": "击败黑暗掠夺者" }, "type": 61, "valid": 1, @@ -25138,7 +25138,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_756", - "text": "抵御泰坦进攻" + "text": "打倒冰霜泰坦" }, "type": 61, "valid": 1, @@ -25225,7 +25225,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_759", - "text": "回去找骇客蛛" + "text": "向骇客蛛汇报情况" }, "type": 61, "valid": 1, diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index 7c2feb3b1..7b7a2a5b7 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -13,7 +13,7 @@ "Color": 5, "Img": "tx_by_54101_3", "access": [ - 10041 + 10042 ], "showmodel": "54101_3_exhibition", "model": "54101_3", @@ -45,7 +45,7 @@ "Color": 5, "Img": "tx_by_54101_3", "access": [ - 10041 + 10042 ], "showmodel": "54101_3_exhibition", "model": "54101_3", @@ -77,7 +77,7 @@ "Color": 5, "Img": "tx_by_54101_3", "access": [ - 10041 + 10042 ], "showmodel": "54101_3_exhibition", "model": "54101_3", diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index c25940dbc..5d20e4e6a 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -89,7 +89,7 @@ }, { "id": 10402, - "drop": 16001001 + "drop": 16001002 }, { "id": 10403, diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index e1694bf47..9e1b9d0d9 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -378,5 +378,43 @@ "debrisitemid": 11187020, "scenemusic": "scenemusic_leveldemo_fcamer_1_10", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10" + }, + { + "id": 10011, + "scene": "leveldemo_island_1", + "levelname": "Save the holy tree", + "maintask": [ + 11187001 + ], + "subtask": [ + 11187002 + ], + "award": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + }, + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], + "profectaward": [ + { + "a": "attr", + "t": "diamond", + "n": 500 + }, + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], + "debrisitemid": 11187002, + "scenemusic": "scenemusic_leveldemo_fcamer_1_8", + "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" } ] \ No newline at end of file diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json index b9a067272..caf521c25 100644 --- a/bin/json/game_fightglobalevent.json +++ b/bin/json/game_fightglobalevent.json @@ -856,7 +856,7 @@ }, "When": 20, "FromCheck": "Side=2", - "TargetCheck": "Side=1,Hpproless=300", + "TargetCheck": "Side=1,HeroID=24004,Hpproless=300", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index cffd0e2a4..cb5ffacc6 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -132,7 +132,7 @@ "scale": 0.4, "usetext": { "key": "gamesummary_fathernode_usetext_8", - "text": "周而复始,始而复终,[color=#ffcc00]每隔十五天[/color]开启的森严监狱。" + "text": "周而复始,始而复终。惩罚永无止境的森严监狱,专用来关押穷凶极恶之徒。" } }, { diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index d8a240f9d..36f55764c 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -126,57 +126,15 @@ "reward": [] }, { - "id": 1000201, + "id": 1000203, "group": 2, "type": 3, "startPar": "", "parameter": "", "interface": "", - "condition": "worldtaskexit_accept_20035", - "followtj": "", - "followguide": 1000202, - "finger": [ - "taskDedailsPopup", - "btn_star$" - ], - "offset": { - "x": 0, - "y": 0 - }, - "fingerTime": 0, - "objSize": { - "x": 0, - "y": 0 - }, - "objOffset": { - "x": 0, - "y": 0 - }, - "txt": "1000106", - "txtoffset": { - "x": 0, - "y": 0 - }, - "speakerface": 0, - "sound": "", - "mask": 0, - "lock": 0, - "uishow": 0, - "skiptime": 10000, - "skip": 0, - "skipgroup": 0, - "reward": [] - }, - { - "id": 1000202, - "group": 2, - "type": 3, - "startPar": "", - "parameter": "", - "interface": "", - "condition": "", + "condition": "funcopen_hero", "followtj": "OpenHeroCard", - "followguide": 1000203, + "followguide": 1000204, "finger": [ "maininterface", "btn_card$" @@ -210,7 +168,7 @@ "reward": [] }, { - "id": 1000203, + "id": 1000204, "group": 2, "type": 3, "startPar": "", @@ -218,7 +176,7 @@ "interface": "", "condition": "", "followtj": "", - "followguide": 1000204, + "followguide": 1000205, "finger": [ "herocard", "upbtn$" @@ -252,7 +210,7 @@ "reward": [] }, { - "id": 1000204, + "id": 1000205, "group": 2, "type": 3, "startPar": "", @@ -260,7 +218,7 @@ "interface": "", "condition": "", "followtj": "", - "followguide": 1000205, + "followguide": 1000206, "finger": [ "herocard", "roleinformation$.upgrade materials$.list_select", @@ -296,7 +254,7 @@ "reward": [] }, { - "id": 1000205, + "id": 1000206, "group": 2, "type": 3, "startPar": "", @@ -623,7 +581,7 @@ }, "txt": "1000109", "txtoffset": { - "x": 0, + "x": -100, "y": 0 }, "speakerface": 0, @@ -1246,7 +1204,7 @@ "x": 0, "y": 0 }, - "fingerTime": 0.5, + "fingerTime": 1, "objSize": { "x": 0, "y": 0 @@ -1383,7 +1341,7 @@ }, "txt": "1000136", "txtoffset": { - "x": 0, + "x": 200, "y": 0 }, "speakerface": 0, @@ -1490,8 +1448,8 @@ "parameter": "", "interface": "", "condition": "", - "followtj": "", - "followguide": 0, + "followtj": "CloseItemPopup", + "followguide": 1000704, "finger": [ "moonLevelWindow", "btn_promote$" @@ -1525,19 +1483,16 @@ "reward": [] }, { - "id": 1000801, - "group": 8, + "id": 1000704, + "group": 7, "type": 3, "startPar": "", "parameter": "", "interface": "", - "condition": "funcopen_vikingexpedition_experience", - "followtj": "", - "followguide": 1000802, - "finger": [ - "mainline", - "btn_integration$" - ], + "condition": "", + "followtj": "CloseMoonLevelPromote", + "followguide": 1000705, + "finger": [], "offset": { "x": 0, "y": 0 @@ -1551,15 +1506,15 @@ "x": 0, "y": 0 }, - "txt": "1000140", + "txt": "", "txtoffset": { "x": 0, "y": 0 }, "speakerface": 0, "sound": "", - "mask": 0, - "lock": 0, + "mask": 1, + "lock": 1, "uishow": 0, "skiptime": 0, "skip": 0, @@ -1567,19 +1522,18 @@ "reward": [] }, { - "id": 1000802, - "group": 8, + "id": 1000705, + "group": 7, "type": 3, "startPar": "", "parameter": "", "interface": "", "condition": "", "followtj": "", - "followguide": 1000803, + "followguide": 1000706, "finger": [ - "gameSummary", - "list$", - "9" + "moonLevelWindow", + "backbtn$" ], "offset": { "x": 0, @@ -1610,15 +1564,143 @@ "reward": [] }, { - "id": 1000803, - "group": 8, + "id": 1000706, + "group": 7, "type": 3, "startPar": "", "parameter": "", "interface": "", "condition": "", "followtj": "", - "followguide": 1000804, + "followguide": 1000707, + "finger": [ + "mainline", + "btn_exploration airship$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "1000140", + "txtoffset": { + "x": 0, + "y": 0 + }, + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000707, + "group": 7, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000708, + "finger": [ + "gameSummary", + "list$", + "5" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "txtoffset": { + "x": 0, + "y": 0 + }, + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000708, + "group": 7, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000709, + "finger": [ + "gameSummary", + "list$", + "7" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "txtoffset": { + "x": 0, + "y": 0 + }, + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000709, + "group": 7, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000710, "finger": [ "WorldPointDetailsPopup", "gotoBtn$" @@ -1627,7 +1709,7 @@ "x": 0, "y": 0 }, - "fingerTime": 0.5, + "fingerTime": 1, "objSize": { "x": 0, "y": 0 @@ -1652,8 +1734,8 @@ "reward": [] }, { - "id": 1000804, - "group": 8, + "id": 1000710, + "group": 7, "type": 3, "startPar": "", "parameter": "", @@ -1662,8 +1744,8 @@ "followtj": "", "followguide": 0, "finger": [ - "RacePagodaWindow", - "upbtn$" + "bossdungeon", + "btn_start$" ], "offset": { "x": 0, @@ -2061,7 +2143,7 @@ }, "txt": "1000144", "txtoffset": { - "x": 0, + "x": -50, "y": 0 }, "speakerface": 0, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index ab0eb2b88..3a73926f1 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -21472,5 +21472,46 @@ }, "sale": [], "gm": 0 + }, + { + "id": "24012015", + "name": { + "key": "item_item_name_436", + "text": "石阵旁的藏宝图" + }, + "usetype": 0, + "color": 0, + "bagtype": 0, + "index": 0, + "special_type": 0, + "hold": 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_50013001", + "intr": { + "key": "item_item_intr_438", + "text": "隐藏于博客岛的藏宝图,已经是一个完整宝藏示意图。" + }, + "describe": { + "key": "item_item_describe_438", + "text": "在山的那边,海的那边,有一张……藏宝图?" + }, + "dialogue": { + "key": "item_item_dialogue_436", + "text": "【雕像之间的小秘密~】" + }, + "sale": [], + "gm": 0 } ] \ No newline at end of file diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index 99734a61b..17eb5a8ce 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -542,5 +542,22 @@ "text": "立即前往" }, "icon": "icon_zm" + }, + { + "id": 10042, + "title": { + "key": "itemlink_itemlink_title_33", + "text": "主线获取" + }, + "desc": { + "key": "itemlink_itemlink_desc_33", + "text": "通关主线第一章后获取" + }, + "jumpid": 0, + "btnTitle": { + "key": "itemlink_itemlink_button_1", + "text": "立即前往" + }, + "icon": "icon_zm" } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index def5f4507..dcc28a543 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -132,11 +132,11 @@ "icon": "loading_icon_gfxm", "title": { "key": "loading_Sheet1_title_10", - "text": "「关卡编辑器」" + "text": "「冰岛龙穴」" }, "prompt": { "key": "loading_Sheet1_prompt_10", - "text": "穿越时间地图,重温过去那些精彩瞬间,获得新的战斗经验。" + "text": "冰岛内部隐藏的溶洞区域,听说这里里面好像有些……宝藏?" } }, { @@ -474,5 +474,61 @@ "key": "loading_Sheet1_prompt_34", "text": "星辰之下,飞驰的列车在各区间自由穿梭着。" } + }, + { + "id": 1035, + "scene": "StonehengeScene1", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "title": { + "key": "loading_Sheet1_title_35", + "text": "「石阵秘境」" + }, + "prompt": { + "key": "loading_Sheet1_prompt_35", + "text": "石阵秘境" + } + }, + { + "id": 1036, + "scene": "StonehengeScene2", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "title": { + "key": "loading_Sheet1_title_36", + "text": "「石阵秘境」" + }, + "prompt": { + "key": "loading_Sheet1_prompt_36", + "text": "石阵秘境" + } + }, + { + "id": 1037, + "scene": "StonehengeScene3", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "title": { + "key": "loading_Sheet1_title_37", + "text": "「石阵秘境」" + }, + "prompt": { + "key": "loading_Sheet1_prompt_37", + "text": "石阵秘境" + } + }, + { + "id": 1038, + "scene": "StonehengeScene4", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "title": { + "key": "loading_Sheet1_title_38", + "text": "「石阵秘境」" + }, + "prompt": { + "key": "loading_Sheet1_prompt_38", + "text": "石阵秘境" + } } ] \ No newline at end of file diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index 15f38c99c..04b5684f5 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -90559,7 +90559,7 @@ "groupwt": 1, "groupid": 1001, "subtype": 1, - "groupnum": 4, + "groupnum": 1, "itemid": { "a": "item", "t": "16001001", diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json index 276acafe5..733d15d7b 100644 --- a/bin/json/game_mail.json +++ b/bin/json/game_mail.json @@ -5,7 +5,7 @@ "key": "mail_mail_title_1", "text": "俱乐部解散" }, - "postmark": "yj_icon_yc_mfjl", + "postmark": "yj_icon_yc_xlgs", "recipient": { "key": "mail_mail_recipient_1", "text": "通知:" @@ -225,7 +225,7 @@ "key": "mail_mail_title_11", "text": "走过路过,不要错过!" }, - "postmark": "yj_icon_yc_mfjl", + "postmark": "yj_icon_yc_gfxm", "recipient": { "key": "mail_mail_recipient_11", "text": "各位新老顾客朋友们:" @@ -245,19 +245,9 @@ "n": 1000 }, { - "a": "item", - "t": "10000008", - "n": 10 - }, - { - "a": "item", - "t": "10000009", - "n": 10 - }, - { - "a": "item", - "t": "10000010", - "n": 5 + "a": "attr", + "t": "gold", + "n": 100000 } ], "duration": 720 diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 34e362551..83fc24564 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -454,7 +454,7 @@ }, { "a": "item", - "t": "24012012", + "t": "24012015", "n": 1 } ], @@ -1537,7 +1537,7 @@ "herocolor": 0, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_13", + "key": "main_stage_bubbletext_14", "text": "不要再抵抗了,愚蠢的人们!" }, "animation": [], @@ -2403,12 +2403,12 @@ "text": "1-23" }, "title": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_title_29", + "text": "埃雷特的计划" }, "desc": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_desc_15", + "text": "与阴影同行,却试图颠覆阴影。可是,黑暗真的是如此简单吗?" }, "exp": 0, "hero_exp": 300, @@ -2776,7 +2776,7 @@ "text": "埃雷特的计划" }, "desc": { - "key": "mainchapter_main_stage_desc_8", + "key": "mainchapter_main_stage_desc_19", "text": "未能宣之于口的秘密,是否还有机会告知他人?" }, "exp": 0, @@ -2981,7 +2981,7 @@ "text": "龙卷暗影" }, "desc": { - "key": "mainchapter_main_stage_desc_9", + "key": "mainchapter_main_stage_desc_21", "text": "黑色龙卷昭示着厄运,与厄运同行无疑是恐惧灵的狂欢!" }, "exp": 0, @@ -3261,7 +3261,7 @@ "text": "泰坦危机" }, "desc": { - "key": "mainchapter_main_stage_desc_11", + "key": "mainchapter_main_stage_desc_24", "text": "愤怒吧,嘶吼吧,不该被唤醒的远古造物在这一刻无人能敌!!" }, "exp": 0, @@ -3306,7 +3306,9 @@ 101122, 101123 ], - "helphero": [], + "helphero": [ + "24004" + ], "banhero": [], "star": [ 1, @@ -8821,8 +8823,8 @@ 100101 ], "previoustage": 0, - "buried_type": 0, - "buried": 0, + "buried_type": 2, + "buried": 2, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8884,7 +8886,7 @@ { "a": "item", "t": "10000001", - "n": 1 + "n": 5 } ], "lotteryward": 0, @@ -8988,7 +8990,7 @@ "chapterid": 11001, "group_id": 100165, "previous_group_id": [ - 100101 + 100160 ], "previoustage": 0, "buried_type": 0, @@ -9078,7 +9080,7 @@ "chapterid": 11001, "group_id": 100166, "previous_group_id": [ - 100101 + 100160 ], "previoustage": 0, "buried_type": 0, @@ -9168,7 +9170,7 @@ "chapterid": 11001, "group_id": 100167, "previous_group_id": [ - 100101 + 100160 ], "previoustage": 0, "buried_type": 0, diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 3a4595b2d..8e92eee0c 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -5039,6 +5039,41 @@ "z": 1 } }, + { + "id": "51054", + "preson": "51054", + "presonshow": "51054_exhibition", + "presonstory": "51054", + "presondraw": "", + "height": 1, + "weight": 1, + "ico": "tx_js_51054", + "fight": "tx_js_51054", + "img": "sbkp_js_51054", + "heroimg": "hbkp_js_51054", + "portrait": "zm_img_51054", + "bust": "bust_51054", + "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": "51100", "preson": "51002", diff --git a/bin/json/game_monkeyreward.json b/bin/json/game_monkeyreward.json index dc23a082c..5c704f78c 100644 --- a/bin/json/game_monkeyreward.json +++ b/bin/json/game_monkeyreward.json @@ -3,7 +3,7 @@ "key": 1001, "chapter": 1, "type": 1, - "starnum": 3, + "starnum": 5, "reward": [ { "a": "item", @@ -16,7 +16,7 @@ "key": 1002, "chapter": 1, "type": 1, - "starnum": 6, + "starnum": 10, "reward": [ { "a": "item", @@ -29,7 +29,7 @@ "key": 1003, "chapter": 1, "type": 1, - "starnum": 9, + "starnum": 15, "reward": [ { "a": "item", diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 75ba883a3..397f873be 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -3373,7 +3373,7 @@ ], "lv": 7, "hppro": 30, - "atkpro": 0.8, + "atkpro": 1.4, "defpro": 3, "skill1": 1, "skill2": 1, @@ -239248,7 +239248,7 @@ "IsBoss": 0, "bossHpCnt": 0, "heroid": 25001, - "star": 3, + "star": 4, "equip": [], "newskill": [], "lv": 1, @@ -239348,13 +239348,13 @@ "IsBoss": 0, "bossHpCnt": 0, "heroid": 25001, - "star": 3, + "star": 4, "equip": [], "newskill": [], "lv": 1, "hppro": 1.5, - "atkpro": 0.6, - "defpro": 0.6, + "atkpro": 0.5, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239368,12 +239368,12 @@ "IsBoss": 0, "bossHpCnt": 0, "heroid": 44006, - "star": 3, + "star": 4, "equip": [], "newskill": [], "lv": 1, "hppro": 1, - "atkpro": 1, + "atkpro": 0.8, "defpro": 1, "skill1": 1, "skill2": 1, @@ -239388,12 +239388,12 @@ "IsBoss": 0, "bossHpCnt": 0, "heroid": 14005, - "star": 3, + "star": 4, "equip": [], "newskill": [], "lv": 1, "hppro": 1, - "atkpro": 1, + "atkpro": 1.2, "defpro": 1, "skill1": 1, "skill2": 1, @@ -239408,12 +239408,12 @@ "IsBoss": 0, "bossHpCnt": 0, "heroid": 24005, - "star": 3, + "star": 4, "equip": [], "newskill": [], "lv": 1, "hppro": 1, - "atkpro": 1, + "atkpro": 0.8, "defpro": 1, "skill1": 1, "skill2": 1, @@ -239590,13 +239590,33 @@ "IsBoss": 0, "bossHpCnt": 0, "heroid": 35002, - "star": 5, + "star": 4, "equip": [], "newskill": [], - "lv": 10, - "hppro": 1, - "atkpro": 0.8, - "defpro": 1, + "lv": 5, + "hppro": 1.2, + "atkpro": 1.5, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 140, + "modelsize": 1 + }, + { + "Id": 720021, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 4, + "equip": [], + "newskill": [], + "lv": 5, + "hppro": 1.2, + "atkpro": 1.5, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -239723,6 +239743,206 @@ "speed": 140, "modelsize": 1 }, + { + "Id": 720024, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720024, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720024, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720024, + "pos": 4, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720024, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720025, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720025, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720025, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, + { + "Id": 720025, + "pos": 4, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 34004, + "star": 4, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 87, + "modelsize": 1 + }, + { + "Id": 720025, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 90, + "modelsize": 1 + }, { "Id": 800001, "pos": 1, diff --git a/bin/json/game_puggsyisland.json b/bin/json/game_puggsyisland.json index d3ad7efcd..035887400 100644 --- a/bin/json/game_puggsyisland.json +++ b/bin/json/game_puggsyisland.json @@ -16,7 +16,7 @@ "key": "guild_guild_boss_boss_name_1", "text": "航行抵达伯克岛" }, - "scene": 10008, + "scene": 10011, "png": [] }, { @@ -36,7 +36,7 @@ "key": "guild_guild_boss_boss_name_2", "text": "航行抵达战栗海岸" }, - "scene": 10008, + "scene": 10011, "png": [] }, { @@ -56,7 +56,7 @@ "key": "guild_guild_boss_boss_name_3", "text": "航行抵达西西伯利亚" }, - "scene": 10008, + "scene": 10011, "png": [] }, { @@ -76,7 +76,7 @@ "key": "guild_guild_boss_boss_name_4", "text": "航行抵达巴尔干半岛" }, - "scene": 10008, + "scene": 10011, "png": [] }, { @@ -96,7 +96,7 @@ "key": "guild_guild_boss_boss_name_5", "text": "航行抵达新加坡海峡" }, - "scene": 10008, + "scene": 10011, "png": [] }, { @@ -116,7 +116,7 @@ "key": "guild_guild_boss_boss_name_6", "text": "航行抵达马奇洛" }, - "scene": 10008, + "scene": 10011, "png": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 314693048..2d80bc5fe 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -13749,7 +13749,7 @@ "Argu": [ 1, 1, - 3, + 11, 1000 ], "FollowSK": [], @@ -28669,10 +28669,10 @@ 4, 3500 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 255001112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -28784,10 +28784,10 @@ 4, 6000 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 255001312 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -28833,10 +28833,10 @@ 4, 5000 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 255005112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -30709,7 +30709,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, @@ -30735,7 +30735,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, @@ -30761,7 +30761,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, @@ -30787,7 +30787,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, @@ -30813,7 +30813,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, @@ -64253,7 +64253,7 @@ "RevisiParams": [] }, { - "Id": 253007212, + "Id": 253007311, "EmitPR": 1000, "From": 13, "Where": [], @@ -67012,5 +67012,49 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 251054111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 4, + "Type": 1, + "Argu": [ + 1, + 4, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 251054211, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 12, + "Argu": [ + 200 + ], + "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 c9330d5d7..5a95aac46 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -49180,12 +49180,12 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_153007111", - "text": "" + "text": "邪恶镰刀" }, - "ico": "jn_51050_1", + "ico": "jn_35003_1", "CorrectPos": 0, "IsMelee": 0, - "act": "Skill_3", + "act": "Skill_1", "Type": 1, "CD": 0, "Where": [], @@ -49212,7 +49212,7 @@ "key": "skill_skill_atk_Name_153007211", "text": "" }, - "ico": "jn_51050_2", + "ico": "jn_35003_3", "CorrectPos": 0, "IsMelee": 0, "act": "", @@ -49222,14 +49222,45 @@ "Target": 0, "ChildSkill": { "Id": [ - 253007211, - 253007213 + 253007211 + ] + }, + "passSkill": [ + 253007211 + ], + "Desc": { + "key": "skill_skill_atk_Desc_153007211_1", + "text": "攻击后复活队友" + }, + "buffid": [], + "map": "" + }, + { + "id": 153007212, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_153007212", + "text": "复活吧我的阴影战士们!" + }, + "ico": "jn_35003_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 0, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 253007311 ] }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_153007211_1", - "text": "尽可能的复活死亡的队友。" + "key": "skill_skill_atk_Desc_153007212_1", + "text": "攻击后复活队友" }, "buffid": [], "map": "" @@ -51974,5 +52005,65 @@ }, "buffid": [], "map": "" + }, + { + "id": 151054111, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_151054111", + "text": "" + }, + "ico": "jn_51054_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 251054111 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_151054111_1", + "text": "对单个敌人造成伤害。" + }, + "buffid": [], + "map": "" + }, + { + "id": 151054211, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_151054211", + "text": "" + }, + "ico": "jn_51054_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 251054211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_151054211_1", + "text": "己方行动条提升20%。" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 54b17b5c5..b36fc3e55 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -18,7 +18,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -52,7 +53,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -86,7 +88,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -120,7 +123,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -154,7 +158,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -366,7 +371,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -400,7 +406,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -501,7 +508,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -534,7 +542,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, @@ -757,7 +766,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, @@ -793,7 +803,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -855,7 +866,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, @@ -918,7 +930,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, @@ -951,7 +964,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, @@ -1115,7 +1129,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -1151,7 +1166,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -1182,7 +1198,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, @@ -1218,7 +1235,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -1284,7 +1302,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -1315,7 +1334,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -1351,7 +1371,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -1387,7 +1408,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -3128,7 +3150,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -3229,7 +3252,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -3263,7 +3287,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -3531,7 +3556,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -3629,7 +3655,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": true, @@ -3729,7 +3756,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3, + 1, 0 ], "AddEffect": false, @@ -4000,7 +4027,8 @@ "CoexistCheckArgu": [], "Effect": [ 3, - 7 + 7, + 11 ], "AddEffect": false, "RemoveType": true, @@ -8360,7 +8388,8 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 3, + 11 ], "AddEffect": false, "RemoveType": false, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index e5ca44250..e8b641131 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -8760,9 +8760,9 @@ }, { "Id": 453007211, - "When": 15, - "FromCheck": "", - "TargetCheck": "Target=4", + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -8773,9 +8773,9 @@ "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 0, + "MaxEmitTimesInRound": 1, "Callback": [ - 253007212 + 153007212 ] }, { diff --git a/bin/json/game_tipstxtmain.json b/bin/json/game_tipstxtmain.json index afa21b3d7..fbf9cb62c 100644 --- a/bin/json/game_tipstxtmain.json +++ b/bin/json/game_tipstxtmain.json @@ -3,15 +3,15 @@ "id": 1, "topname": { "key": "tipstxt_tipstxt_main_topname_01", - "text": "第一章" + "text": "驯龙篇--第一幕" }, "name": { "key": "tipstxt_tipstxt_main_name_01", - "text": "第一幕" + "text": "小嗝嗝要嗝屁了" }, "txt": { "key": "tipstxt_tipstxt_main_txt_01", - "text": "小嗝嗝要狗带了!(救了他将来或许有好事发生?)" + "text": "如果救活他,他会送条龙报答我吗?" }, "map": "" }, @@ -19,11 +19,11 @@ "id": 20109, "topname": { "key": "tipstxt_tipstxt_main_topname_02", - "text": "第一章" + "text": "驯龙篇--第二幕" }, "name": { "key": "tipstxt_tipstxt_main_name_02", - "text": "第二幕" + "text": "生存与毁灭" }, "txt": { "key": "tipstxt_tipstxt_main_txt_02", diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json index 615dc67a3..491d709da 100644 --- a/bin/json/game_topuiconfig.json +++ b/bin/json/game_topuiconfig.json @@ -2911,5 +2911,21 @@ "n": 1 } ] + }, + { + "id": "eliminationmodel", + "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_treasuremap.json b/bin/json/game_treasuremap.json index 6ac3db2c1..f12959947 100644 --- a/bin/json/game_treasuremap.json +++ b/bin/json/game_treasuremap.json @@ -60,25 +60,31 @@ }, "describe": { "key": "treasuremap_map_desribe_1", - "text": "在博克岛到处搜索找到的藏宝图,如今终于拼成了一个,上面标记着只在博客岛的宝藏,跟随着藏宝图好好寻找吧!" + "text": "在博克岛到处搜索找到的藏宝图,已经分裂成了碎片,极其碎片才能促使宝藏出现。上面标记着只在博客岛的宝藏,集齐后跟随着藏宝图好好寻找吧!" } }, { "id": 2, - "pic": "cbt_sp01_00", - "type": 1, - "unlock": [], + "pic": "cbt_sp02_00", + "type": 2, + "unlock": [ + { + "a": "item", + "t": "24012015", + "n": 1 + } + ], "name": { "key": "treasuremap_map_name_2", - "text": "" + "text": "石阵旁的藏宝图" }, "explain": { "key": "treasuremap_map_explain_2", - "text": "" + "text": "所以,这么大一张图就丢在这路边吗?" }, "describe": { "key": "treasuremap_map_desribe_2", - "text": "" + "text": "雕像与雕像之间,好像藏着小秘密~要试着去找找吗?" } } ] \ No newline at end of file diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 75c92c246..fa44c0b7e 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -19,11 +19,6 @@ "t": "gold", "n": 10000 }, - { - "a": "item", - "t": "10000008", - "n": 3 - }, { "a": "attr", "t": "diamond", @@ -51,11 +46,6 @@ "t": "gold", "n": 10000 }, - { - "a": "item", - "t": "10000008", - "n": 3 - }, { "a": "attr", "t": "diamond", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 5350287a1..357c97782 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -246,7 +246,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_6", - "text": "和阿宝聊聊" + "text": "和乌龟大师聊聊" }, "get_item": [], "trigger": 0, @@ -353,7 +353,7 @@ { "a": "item", "t": "10000008", - "n": 3 + "n": 1 }, { "a": "attr", @@ -1156,7 +1156,7 @@ "auto_accept": 2, "tasktips": 0, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 35002, "lock_add": 0, "finish": [], "finishparameter": "", @@ -1198,7 +1198,7 @@ "auto_accept": 2, "tasktips": 0, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 24004, "lock_add": 0, "finish": [], "finishparameter": "",