diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index d790151ee..4ada9f907 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -1426,5 +1426,17 @@ "key": "bubblegroup_bubblegroup_Text_Bubble_119", "text": "哧溜,吧唧吧唧" } + }, + { + "KeyId": 120, + "GroupID": 2003000233, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_120", + "text": "探查结果显示……我们找到了,吧?" + } } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 92b1bd2a1..400e4d871 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -37963,7 +37963,7 @@ "rtype": 1, "ctype": 1, "notify": [ - "moonlevel" + "moonlv" ], "type_sp": 1, "tasktxt": { @@ -37994,7 +37994,7 @@ "rtype": 1, "ctype": 1, "notify": [ - "moonlevel" + "moonlv" ], "type_sp": 1, "tasktxt": { @@ -38025,7 +38025,7 @@ "rtype": 1, "ctype": 1, "notify": [ - "moonlevel" + "moonlv" ], "type_sp": 1, "tasktxt": { @@ -38056,7 +38056,7 @@ "rtype": 1, "ctype": 1, "notify": [ - "moonlevel" + "moonlv" ], "type_sp": 1, "tasktxt": { diff --git a/bin/json/game_effect.json b/bin/json/game_effect.json index 0c8b9deeb..31a6d1401 100644 --- a/bin/json/game_effect.json +++ b/bin/json/game_effect.json @@ -53,28 +53,28 @@ }, { "key": "asked_option_left_in", - "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_1.prefab" - }, - { - "key": "asked_option_left_show", - "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_2.prefab" - }, - { - "key": "asked_option_left_out", - "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_3.prefab" - }, - { - "key": "asked_option_right_in", "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_bule_1.prefab" }, { - "key": "asked_option_right_show", + "key": "asked_option_left_show", "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_bule_2.prefab" }, { - "key": "asked_option_right_out", + "key": "asked_option_left_out", "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_bule_3.prefab" }, + { + "key": "asked_option_right_in", + "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_1.prefab" + }, + { + "key": "asked_option_right_show", + "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_2.prefab" + }, + { + "key": "asked_option_right_out", + "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_3.prefab" + }, { "key": "effect_ui_baozha", "path": "Spine/effect_ui_baozha.prefab" diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index d7d8051e4..852122c3d 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -120,7 +120,7 @@ "startPar": "", "parameter": "", "interface": "", - "condition": "funcopen_hero", + "condition": "", "followtj": "OpenHeroCard", "followguide": 1000202, "finger": [ @@ -1005,7 +1005,7 @@ "startPar": "", "parameter": "", "interface": "", - "condition": "vikingexpedition_experience", + "condition": "funcopen_vikingexpedition_experience", "followtj": "", "followguide": 1000802, "finger": [ @@ -1158,7 +1158,7 @@ "startPar": "", "parameter": "", "interface": "", - "condition": "worldtasksubfinish_20112", + "condition": "worldtaskexit_submit_20110", "followtj": "", "followguide": 1000902, "finger": [ @@ -1200,7 +1200,7 @@ "followtj": "", "followguide": 1000903, "finger": [ - "mainline", + "mainlineinfo", "btn0$" ], "offset": { @@ -1238,8 +1238,8 @@ "followtj": "", "followguide": 1000904, "finger": [ - "WorldPointDetailsPopup", - "gotoBtn$" + "mainlinefragment", + "fragment_01$" ], "offset": { "x": 0, @@ -1273,11 +1273,125 @@ "parameter": "", "interface": "", "condition": "", + "followtj": "CloseItemPopup", + "followguide": 1000905, + "finger": [], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000905, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", "followtj": "", - "followguide": 0, + "followguide": 1000906, "finger": [ - "RacePagodaWindow", - "upbtn$" + "mainline", + "btn_shopping$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000906, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000907, + "finger": [ + "store", + "list_menu", + "3" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000907, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000908, + "finger": [ + "store", + "list$", + "0", + "clickArea" ], "offset": { "x": 0, @@ -1302,5 +1416,345 @@ "skip": 0, "skipgroup": 0, "reward": [] + }, + { + "id": 1000908, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000909, + "finger": [ + "store", + "btn_buy$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 5000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000909, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "CloseItemPopup", + "followguide": 1000910, + "finger": [], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000910, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000911, + "finger": [ + "store", + "btn_back$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000911, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000912, + "finger": [ + "mainline", + "btn_card$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "1000104", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000912, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000913, + "finger": [ + "herocard", + "tablist$", + "2" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "1000104", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000913, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000914, + "finger": [ + "herocard", + "btn_wear$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "1000104", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000914, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000915, + "finger": [ + "herocard", + "equipPos0$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "1000104", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000915, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000916, + "finger": [ + "heroequip", + "bt_strengthen$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "1000104", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000916, + "group": 9, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 1000917, + "finger": [ + "EquipIntensifyView", + "u_btn_intensift$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index fe8f91906..2d226d4f4 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -21435,7 +21435,7 @@ { "id": "10000040", "name": { - "key": "item_item_name_434", + "key": "item_item_name_435", "text": "辉月盾" }, "usetype": 1, @@ -21459,15 +21459,15 @@ "upper_limit": 0, "img": "item_10000037", "intr": { - "key": "item_item_intr_436", + "key": "item_item_intr_437", "text": "" }, "describe": { - "key": "item_item_describe_436", + "key": "item_item_describe_437", "text": "" }, "dialogue": { - "key": "item_item_dialogue_434", + "key": "item_item_dialogue_435", "text": "" }, "sale": [], diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 1e1564c03..88a55df98 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -233807,12 +233807,12 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 24004, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.5, "skill1": 1, @@ -233827,12 +233827,12 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51010, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.5, "skill1": 1, @@ -233847,12 +233847,12 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51010, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.5, "skill1": 1, @@ -233867,12 +233867,12 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51011, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.5, "skill1": 1, @@ -233887,12 +233887,12 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": -1, + "heroid": 51011, "star": 3, "equip": [], "newskill": [], "lv": 2, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.5, "skill1": 1, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 6f4665287..ef0e0bb2e 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -147,8 +147,8 @@ }, "main": [ { - "key": 3, - "param": 20034 + "key": 2, + "param": 1101016 } ], "wkqbx": 2, @@ -1992,12 +1992,12 @@ "id": "vikingexpedition_experience", "name": { "key": "opencond_opencond_name_71", - "text": "梦境回廊" + "text": "塔岗监狱" }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1101012 } ], "wkqbx": 0, @@ -2772,8 +2772,8 @@ }, "main": [ { - "key": 1, - "param": 4 + "key": 2, + "param": 1101016 } ], "wkqbx": 2, @@ -2801,7 +2801,7 @@ "main": [ { "key": 1, - "param": 5 + "param": 10 } ], "wkqbx": 2, @@ -2829,7 +2829,7 @@ "main": [ { "key": 1, - "param": 6 + "param": 11 } ], "wkqbx": 2, @@ -2857,7 +2857,7 @@ "main": [ { "key": 1, - "param": 7 + "param": 12 } ], "wkqbx": 2, @@ -2885,7 +2885,7 @@ "main": [ { "key": 1, - "param": 8 + "param": 13 } ], "wkqbx": 2, @@ -2913,7 +2913,7 @@ "main": [ { "key": 1, - "param": 9 + "param": 14 } ], "wkqbx": 2, @@ -2941,7 +2941,7 @@ "main": [ { "key": 1, - "param": 10 + "param": 15 } ], "wkqbx": 2, @@ -2969,7 +2969,7 @@ "main": [ { "key": 1, - "param": 11 + "param": 16 } ], "wkqbx": 2, @@ -2997,7 +2997,7 @@ "main": [ { "key": 2, - "param": 1101030 + "param": 1101037 } ], "wkqbx": 0, @@ -3053,7 +3053,7 @@ "main": [ { "key": 2, - "param": 1101005 + "param": 1101012 } ], "wkqbx": 2, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index a34bcded1..984c3d54f 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -421,7 +421,7 @@ }, { "id": 10020, - "heroid": 44004, + "heroid": 25001, "Levelid": 0, "datas": [ "GameMain", @@ -601,7 +601,7 @@ }, { "id": 200331, - "heroid": 45001, + "heroid": 25001, "Levelid": 0, "datas": [ "GameMain", @@ -646,7 +646,7 @@ }, { "id": 200341, - "heroid": 45001, + "heroid": 35006, "Levelid": 0, "datas": [ "GameMain", @@ -670,7 +670,7 @@ ], "event": [ 2, - 10151 + 10142 ], "goto": 0 }, @@ -700,7 +700,7 @@ ], "event": [ 2, - 10180 + 10151 ], "goto": 0 }, @@ -715,7 +715,7 @@ ], "event": [ 2, - 10200 + 10180 ], "goto": 0 }, @@ -738,7 +738,7 @@ ], "event": [ 2, - 10201 + 10200 ], "goto": 0 }, @@ -957,7 +957,7 @@ ], "event": [ 2, - 102033 + 10200 ], "goto": 0 }, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 552a6c05e..f8ab7075b 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -12,7 +12,7 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_1", - "text": "月中人的传承到底在哪里" + "text": "月中人的传承在哪?" }, "task_details": { "key": "worldtask_world_task_task_details_1", @@ -20,7 +20,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_1", - "text": "难道世界就没有救世主存在吗" + "text": "救世主真的存在吗?" }, "get_item": [], "trigger": 0, @@ -54,7 +54,7 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_2", - "text": "触摸月光原石" + "text": "月光原石是什么?" }, "task_details": { "key": "worldtask_world_task_task_details_2", @@ -62,7 +62,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_2", - "text": "去看看月光原石吧。" + "text": "去看看月光原石吧!" }, "get_item": [], "trigger": 0, @@ -102,11 +102,11 @@ }, "task_details": { "key": "worldtask_world_task_task_details_3", - "text": "中轴城几乎被黑沙笼罩,没想到黑暗的力量居然找到了这里。在见乌龟大师之前,先解决这些麻烦吧。" + "text": "中轴城几乎被黑沙笼罩,没想到黑暗的力量居然找到了这里。得赶紧消灭他们,是时候展现神龙大侠的力量了!" }, "npctxt": { "key": "worldtask_world_task_npctxt_3", - "text": "顺便展示盖世大侠的强大" + "text": "见识功夫熊猫的实力" }, "get_item": [], "trigger": 0, @@ -185,11 +185,11 @@ }, "task_details": { "key": "worldtask_world_task_task_details_5", - "text": "据说扫地就能成就钢铁般的灵魂?\n“加油,大概也就扫九个世纪吧!”\n什么?!\n我是谁,我在哪儿,我该……打扫?好吧,这好歹我目前唯一感到亲切熟悉的事情。" + "text": "扫地就能成就钢铁般的灵魂?这让我想到在遥远东方的国度的“扫地僧”。\n打扫?打扫!好吧,这好歹我目前唯一感到亲切熟悉的事情。" }, "npctxt": { "key": "worldtask_world_task_npctxt_5", - "text": "说不定有意外惊喜哦" + "text": "会有意外收获么?" }, "get_item": [], "trigger": 0, @@ -233,7 +233,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_6", - "text": "打扫过程中竟意外收获一根神奇的树枝!不过更重要的收获是我有了一位并肩作战的伙伴——阿宝。" + "text": "打扫过程中竟意外收获一根神奇的树枝!听阿宝说它有着非凡的力量,去找乌龟大师看看吧!" }, "npctxt": { "key": "worldtask_world_task_npctxt_6", @@ -267,11 +267,6 @@ "a": "attr", "t": "diamond", "n": 20 - }, - { - "a": "hero", - "t": "25001", - "n": 1 } ], "module": [] @@ -293,7 +288,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_7", - "text": "乌龟大师说:“我们称之为开始的往往意味着结束 而宣告结束也就是着手开始。”\n难怪阿宝总说大师说话玄乎,真的很难懂啊!" + "text": "乌龟大师说:“我们称之为开始的往往意味着结束 而宣告结束也就是着手开始。”难怪阿宝总说大师说话玄乎,真的很难懂啊!" }, "npctxt": { "key": "worldtask_world_task_npctxt_7", @@ -432,8 +427,8 @@ "n": 1 }, { - "a": "item", - "t": "10000001", + "a": "hero", + "t": "24004", "n": 1 } ], @@ -568,7 +563,7 @@ ], "deliver_npc": 0, "taskend_removeitem": [], - "auto_accept": 1, + "auto_accept": 2, "tasktips": 0, "deliver_task": 1, "lock_add": 1,