From 700a2ce7341ea5b485f7493edfc0d2c318462807 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Sep 2023 16:19:28 +0800 Subject: [PATCH] update --- bin/json/game_buzkashimount.json | 18 +- bin/json/game_dragonplay.json | 160 +----- bin/json/game_gameid.json | 70 +++ bin/json/game_gameklotski.json | 532 ++++++++++++++++++++ bin/json/game_initial.json | 4 +- bin/json/game_itemlink.json | 19 +- bin/json/game_mainstage.json | 838 +++++++++++++++++++++---------- bin/json/game_opencond.json | 9 +- bin/json/game_skillafteratk.json | 177 ++++--- bin/json/game_skillatk.json | 43 +- bin/json/game_skillpassive.json | 23 +- bin/json/game_topuiconfig.json | 13 +- bin/json/game_trainlv.json | 42 +- modules/dragon/api_train.go | 4 +- 14 files changed, 1413 insertions(+), 539 deletions(-) create mode 100644 bin/json/game_gameid.json create mode 100644 bin/json/game_gameklotski.json diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index 8d076c501..b1b018812 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -13,7 +13,7 @@ "Color": 5, "Img": "tx_by_54101", "access": [ - 10036 + 10041 ], "model": "", "controller": "", @@ -45,7 +45,7 @@ "Color": 5, "Img": "tx_by_54101", "access": [ - 10036 + 10041 ], "model": "", "controller": "", @@ -77,7 +77,7 @@ "Color": 5, "Img": "tx_by_54101", "access": [ - 10036 + 10041 ], "model": "54101_3", "controller": "Person/mount/10000M_54101.controller", @@ -109,7 +109,7 @@ "Color": 3, "Img": "tx_by_54102", "access": [ - 10036 + 10041 ], "model": "", "controller": "", @@ -141,7 +141,7 @@ "Color": 3, "Img": "tx_by_54102", "access": [ - 10036 + 10041 ], "model": "", "controller": "", @@ -173,7 +173,7 @@ "Color": 3, "Img": "tx_by_54102", "access": [ - 10036 + 10041 ], "model": "54102_3", "controller": "Person/mount/10000M_54101.controller", @@ -205,7 +205,7 @@ "Color": 3, "Img": "tx_by_54103", "access": [ - 10036 + 10041 ], "model": "54103_1", "controller": "Person/mount/10000M_54101.controller", @@ -237,7 +237,7 @@ "Color": 3, "Img": "tx_by_54103", "access": [ - 10036 + 10041 ], "model": "54103_2", "controller": "Person/mount/10000M_54101.controller", @@ -269,7 +269,7 @@ "Color": 3, "Img": "tx_by_54103", "access": [ - 10036 + 10041 ], "model": "54103_3", "controller": "Person/mount/10000M_54101.controller", diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index 9090d77ef..aae415714 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -7,13 +7,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -25,13 +19,7 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -43,13 +31,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -61,13 +43,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -79,13 +55,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -97,13 +67,7 @@ "exp": 100, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -115,13 +79,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -133,13 +91,7 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -151,13 +103,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -169,13 +115,7 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -187,13 +127,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -205,13 +139,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -223,13 +151,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -241,13 +163,7 @@ "exp": 100, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -259,13 +175,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -277,13 +187,7 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -295,13 +199,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -313,13 +211,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 2 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -331,13 +223,7 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 3 - } - ], + "deplete": [], "bubble": 14005, "group": 0 }, @@ -349,13 +235,7 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [ - { - "a": "attr", - "t": "gold", - "n": 4 - } - ], + "deplete": [], "bubble": 14005, "group": 0 } diff --git a/bin/json/game_gameid.json b/bin/json/game_gameid.json new file mode 100644 index 000000000..fb99c79e9 --- /dev/null +++ b/bin/json/game_gameid.json @@ -0,0 +1,70 @@ +[ + { + "id": 10001, + "type": 1 + }, + { + "id": 10002, + "type": 1 + }, + { + "id": 10003, + "type": 1 + }, + { + "id": 10004, + "type": 1 + }, + { + "id": 10005, + "type": 1 + }, + { + "id": 10006, + "type": 1 + }, + { + "id": 10007, + "type": 1 + }, + { + "id": 10008, + "type": 1 + }, + { + "id": 10009, + "type": 1 + }, + { + "id": 10010, + "type": 1 + }, + { + "id": 20001, + "type": 2 + }, + { + "id": 20002, + "type": 2 + }, + { + "id": 20003, + "type": 2 + }, + { + "id": 20004, + "type": 2 + }, + { + "id": 20005, + "type": 2 + }, + { + "id": 20006, + "type": 2 + }, + { + "id": 20007, + "type": 2 + } +] \ No newline at end of file diff --git a/bin/json/game_gameklotski.json b/bin/json/game_gameklotski.json new file mode 100644 index 000000000..e99142774 --- /dev/null +++ b/bin/json/game_gameklotski.json @@ -0,0 +1,532 @@ +[ + { + "id": 10001, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 4, + "v": 0 + }, + { + "k": 4, + "v": 4 + }, + { + "k": 14, + "v": 1 + }, + { + "k": 20, + "v": 2 + }, + { + "k": 23, + "v": 4 + } + ], + "finish": 26 + }, + { + "id": 10002, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10003, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10004, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10005, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10006, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10007, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10008, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10009, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + }, + { + "id": 10010, + "chequer": { + "k": 6, + "v": 6 + }, + "start": 2, + "blockstype": [ + { + "k": 2, + "v": 3 + }, + { + "k": 3, + "v": 1 + }, + { + "k": 10, + "v": 1 + }, + { + "k": 12, + "v": 1 + }, + { + "k": 3, + "v": 2 + }, + { + "k": 15, + "v": 3 + }, + { + "k": 17, + "v": 3 + }, + { + "k": 18, + "v": 1 + }, + { + "k": 24, + "v": 2 + }, + { + "k": 27, + "v": 3 + }, + { + "k": 29, + "v": 3 + } + ], + "finish": 26 + } +] \ No newline at end of file diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index e99af4f66..303671e61 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -35,7 +35,7 @@ { "a": "mts", "t": "20030001", - "n": 21 + "n": 3 } ] }, @@ -65,7 +65,7 @@ { "a": "mts", "t": "20030002", - "n": 21 + "n": 3 } ] }, diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index 9165a131f..99734a61b 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -516,7 +516,7 @@ "text": "获取体力" }, "desc": { - "key": "itemlink_itemlink_desc_30", + "key": "itemlink_itemlink_desc_31", "text": "打开购买使用体力" }, "jumpid": 10040, @@ -525,5 +525,22 @@ "text": "打开" }, "icon": "icon_zm" + }, + { + "id": 10041, + "title": { + "key": "itemlink_itemlink_title_32", + "text": "活动获取" + }, + "desc": { + "key": "itemlink_itemlink_desc_32", + "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_mainstage.json b/bin/json/game_mainstage.json index 152378c6a..9b224c254 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -855,7 +855,7 @@ 100109 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 4, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -886,8 +886,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_1", + "text": "打败猎龙团！" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_1", @@ -958,6 +958,330 @@ { "id": 1100111, "chapterid": 11001, + "group_id": 100110, + "previous_group_id": [ + 100109 + ], + "previoustage": 1100110, + "Episodetype": 4, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 1, + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], + "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": "mainchapter_main_stage_maingroupName_1", + "text": "打败猎龙团！" + }, + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 300, + "ps_consume": [ + { + "a": "attr", + "t": "ps", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } + ], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "lotteryward": 17110110, + "commonaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "BattleReadyID": 204, + "FormatList": [ + 101011 + ], + "helphero": [], + "banhero": [], + "star": [ + 1, + 1, + 1 + ], + "star_type": [ + 1, + 2, + 2 + ], + "star_value": [ + 0, + 2, + 1 + ], + "challengeward": 0 + }, + { + "id": 1100112, + "chapterid": 11001, + "group_id": 100110, + "previous_group_id": [ + 100109 + ], + "previoustage": 1100111, + "Episodetype": 4, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 1, + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], + "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": "mainchapter_main_stage_maingroupName_1", + "text": "打败猎龙团！" + }, + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 300, + "ps_consume": [ + { + "a": "attr", + "t": "ps", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } + ], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "lotteryward": 17110110, + "commonaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "BattleReadyID": 204, + "FormatList": [ + 101011 + ], + "helphero": [], + "banhero": [], + "star": [ + 1, + 1, + 1 + ], + "star_type": [ + 1, + 2, + 2 + ], + "star_value": [ + 0, + 2, + 1 + ], + "challengeward": 0 + }, + { + "id": 1100113, + "chapterid": 11001, + "group_id": 100110, + "previous_group_id": [ + 100109 + ], + "previoustage": 1100112, + "Episodetype": 4, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 1, + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], + "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": "mainchapter_main_stage_maingroupName_2", + "text": "与埃雷特交战！" + }, + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 300, + "ps_consume": [ + { + "a": "attr", + "t": "ps", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } + ], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "lotteryward": 17110110, + "commonaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "BattleReadyID": 204, + "FormatList": [ + 101011 + ], + "helphero": [], + "banhero": [], + "star": [ + 1, + 1, + 1 + ], + "star_type": [ + 1, + 2, + 2 + ], + "star_value": [ + 0, + 2, + 1 + ], + "challengeward": 0 + }, + { + "id": 1100114, + "chapterid": 11001, "group_id": 100111, "previous_group_id": [ 100110 @@ -1024,7 +1348,7 @@ "challengeward": 0 }, { - "id": 1100112, + "id": 1100115, "chapterid": 11001, "group_id": 100112, "previous_group_id": [ @@ -1092,7 +1416,7 @@ "challengeward": 0 }, { - "id": 1100113, + "id": 1100116, "chapterid": 11001, "group_id": 100113, "previous_group_id": [ @@ -1103,7 +1427,7 @@ "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, - "venturemodel": "Person/mount/gronckle_xiao.prefab", + "venturemodel": "Person/mount/54021_q.prefab", "bubbletalk": { "key": "", "text": "" @@ -1159,261 +1483,87 @@ "star_value": [], "challengeward": 0 }, - { - "id": 1100114, - "chapterid": 11001, - "group_id": 100114, - "previous_group_id": [ - 100113 - ], - "previoustage": 0, - "Episodetype": 3, - "venturemodelspeed": 0, - "venturemodelscale": 2, - "move_type": 1, - "venturemodel": "Person/mount/gronckle_xiao.prefab", - "bubbletalk": { - "key": "", - "text": "" - }, - "venturetype": 0, - "ventureavatar": [], - "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": "", - "text": "" - }, - "title": { - "key": "", - "text": "" - }, - "desc": { - "key": "", - "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": 1100115, - "chapterid": 11001, - "group_id": 100115, - "previous_group_id": [ - 100114 - ], - "previoustage": 0, - "Episodetype": 1, - "venturemodelspeed": 0, - "venturemodelscale": 2, - "move_type": 1, - "venturemodel": "Person/mount/gronckle_xiao.prefab", - "bubbletalk": { - "key": "", - "text": "" - }, - "venturetype": 0, - "ventureavatar": [], - "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": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], - "helphero": [], - "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], - "challengeward": 0 - }, - { - "id": 1100116, - "chapterid": 11001, - "group_id": 100116, - "previous_group_id": [ - 100115 - ], - "previoustage": 0, - "Episodetype": 3, - "venturemodelspeed": 0, - "venturemodelscale": 2, - "move_type": 1, - "venturemodel": "Person/mount/gronckle_xiao.prefab", - "bubbletalk": { - "key": "", - "text": "" - }, - "venturetype": 0, - "ventureavatar": [], - "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": 1100117, "chapterid": 11001, - "group_id": 100117, + "group_id": 100114, "previous_group_id": [ - 100116 + 100113 + ], + "previoustage": 0, + "Episodetype": 3, + "venturemodelspeed": 0, + "venturemodelscale": 2, + "move_type": 1, + "venturemodel": "Person/mount/54021_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "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": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "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": 1100118, + "chapterid": 11001, + "group_id": 100115, + "previous_group_id": [ + 100114 ], "previoustage": 0, "Episodetype": 1, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, - "venturemodel": "Person/mount/gronckle_xiao.prefab", + "venturemodel": "Person/mount/54021_q.prefab", "bubbletalk": { "key": "", "text": "" @@ -1508,7 +1658,181 @@ "challengeward": 0 }, { - "id": 1100118, + "id": 1100119, + "chapterid": 11001, + "group_id": 100116, + "previous_group_id": [ + 100115 + ], + "previoustage": 0, + "Episodetype": 3, + "venturemodelspeed": 0, + "venturemodelscale": 2, + "move_type": 1, + "venturemodel": "Person/mount/54021_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "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": 1100120, + "chapterid": 11001, + "group_id": 100117, + "previous_group_id": [ + 100116 + ], + "previoustage": 0, + "Episodetype": 1, + "venturemodelspeed": 0, + "venturemodelscale": 2, + "move_type": 1, + "venturemodel": "Person/mount/54021_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "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": 300, + "ps_consume": [ + { + "a": "attr", + "t": "ps", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } + ], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "lotteryward": 17110110, + "commonaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "BattleReadyID": 204, + "FormatList": [ + 101011 + ], + "helphero": [], + "banhero": [], + "star": [ + 1, + 1, + 1 + ], + "star_type": [ + 1, + 2, + 2 + ], + "star_value": [ + 0, + 2, + 1 + ], + "challengeward": 0 + }, + { + "id": 1100121, "chapterid": 11001, "group_id": 100118, "previous_group_id": [ @@ -1614,7 +1938,7 @@ "challengeward": 0 }, { - "id": 1100119, + "id": 1100122, "chapterid": 11001, "group_id": 100119, "previous_group_id": [ @@ -1720,7 +2044,7 @@ "challengeward": 0 }, { - "id": 1100120, + "id": 1100123, "chapterid": 11001, "group_id": 100120, "previous_group_id": [ @@ -1731,7 +2055,7 @@ "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, - "venturemodel": "Person/mount/gronckle_xiao.prefab", + "venturemodel": "Person/mount/54021_q.prefab", "bubbletalk": { "key": "", "text": "" @@ -1788,7 +2112,7 @@ "challengeward": 0 }, { - "id": 1100121, + "id": 1100124, "chapterid": 11001, "group_id": 100121, "previous_group_id": [ @@ -1856,7 +2180,7 @@ "challengeward": 0 }, { - "id": 1100122, + "id": 1100125, "chapterid": 11001, "group_id": 100122, "previous_group_id": [], diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 2056d9266..aa547a86c 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -1650,7 +1650,7 @@ "main": [ { "key": 1, - "param": 30 + "param": 70 } ], "wkqbx": 0, @@ -1876,7 +1876,12 @@ "key": "opencond_opencond_name_83", "text": "无极塔" }, - "main": [], + "main": [ + { + "key": 1, + "param": 1 + } + ], "wkqbx": 0, "kqbx": 0, "img": "", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 6b1fbf2ac..f86658cfc 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -894,7 +894,7 @@ "Argu": [ 1, 4, - 1500 + 1800 ], "FollowSK": [], "SucFollowSK": [ @@ -943,7 +943,7 @@ "Argu": [ 1, 4, - 1500 + 1800 ], "FollowSK": [], "SucFollowSK": [ @@ -992,7 +992,7 @@ "Argu": [ 1, 4, - 1500 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -1162,7 +1162,8 @@ ], "FollowSK": [], "SucFollowSK": [ - 235002312 + 235002312, + 235002313 ], "FailFollowSK": [], "MustHit": false, @@ -1182,14 +1183,11 @@ "Type": 8, "Argu": [ 3, - 0, 1, 800 ], "FollowSK": [], - "SucFollowSK": [ - 235002313 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -1237,7 +1235,8 @@ ], "FollowSK": [], "SucFollowSK": [ - 235002322 + 235002322, + 235002313 ], "FailFollowSK": [], "MustHit": false, @@ -1261,9 +1260,7 @@ 800 ], "FollowSK": [], - "SucFollowSK": [ - 235002313 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -1287,7 +1284,8 @@ ], "FollowSK": [], "SucFollowSK": [ - 235002332 + 235002332, + 235002313 ], "FailFollowSK": [], "MustHit": false, @@ -1311,9 +1309,7 @@ 900 ], "FollowSK": [], - "SucFollowSK": [ - 235002313 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -1337,7 +1333,8 @@ ], "FollowSK": [], "SucFollowSK": [ - 235002342 + 235002342, + 235002313 ], "FailFollowSK": [], "MustHit": false, @@ -1361,9 +1358,7 @@ 900 ], "FollowSK": [], - "SucFollowSK": [ - 235002313 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -1387,7 +1382,8 @@ ], "FollowSK": [], "SucFollowSK": [ - 235002352 + 235002352, + 235002313 ], "FailFollowSK": [], "MustHit": false, @@ -1411,9 +1407,7 @@ 1000 ], "FollowSK": [], - "SucFollowSK": [ - 235002313 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -18668,7 +18662,7 @@ "Type": 3, "Argu": [ 390001007, - 1000, + 800, 1, 2 ], @@ -18692,7 +18686,7 @@ "Type": 3, "Argu": [ 390001401, - 1000, + 800, 1, 2 ], @@ -19863,7 +19857,7 @@ "Type": 3, "Argu": [ 390001006, - 750, + 500, 1, 2 ], @@ -20288,7 +20282,7 @@ 390001105, 1000, 1, - 2 + 1 ], "FollowSK": [], "SucFollowSK": [], @@ -25629,7 +25623,7 @@ "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 2, "Argu": [ @@ -29534,7 +29528,7 @@ "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -29558,13 +29552,13 @@ "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 2, "Argu": [ 414002212, - 1, - 1 + -1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -29581,13 +29575,36 @@ "From": 1, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 2, "Argu": [ 414002213, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 214002214, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 5, + "Argu": [ 1, - 1 + 2, + 100 ], "FollowSK": [], "SucFollowSK": [], @@ -29612,8 +29629,8 @@ 4, 500, 1, - 11, - 18 + 18, + 150 ], "FollowSK": [ 214002312 @@ -29666,8 +29683,8 @@ 4, 600, 1, - 11, - 18 + 18, + 150 ], "FollowSK": [ 214002312 @@ -29696,8 +29713,8 @@ 4, 700, 1, - 11, - 18 + 18, + 150 ], "FollowSK": [ 214002312 @@ -29726,8 +29743,8 @@ 4, 800, 1, - 11, - 18 + 18, + 150 ], "FollowSK": [ 214002312 @@ -29756,8 +29773,8 @@ 4, 900, 1, - 11, - 18 + 18, + 150 ], "FollowSK": [ 214002312 @@ -34420,9 +34437,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 100, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=0", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ 500 ] @@ -34447,9 +34464,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 100, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=0", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ 500 ] @@ -34474,9 +34491,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 100, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=0", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ 500 ] @@ -34501,9 +34518,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 100, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=0", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ 500 ] @@ -34528,9 +34545,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 100, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=0", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ 500 ] @@ -34596,10 +34613,10 @@ 1, 1000 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 235004213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -34633,7 +34650,7 @@ { "Id": 235004311, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -34650,17 +34667,17 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 102, + "DpsRevisiType": 101, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ - 100 + 1000 ] }, { "Id": 235004321, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -34677,17 +34694,17 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 102, + "DpsRevisiType": 101, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ - 100 + 1000 ] }, { "Id": 235004331, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -34704,17 +34721,17 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 102, + "DpsRevisiType": 101, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ - 100 + 1000 ] }, { "Id": 235004341, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -34731,17 +34748,17 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 102, + "DpsRevisiType": 101, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ - 100 + 1000 ] }, { "Id": 235004351, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -34758,11 +34775,11 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 102, + "DpsRevisiType": 101, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ - 100 + 1000 ] }, { @@ -34783,11 +34800,11 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 102, + "DpsRevisiType": 101, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=3", "RevisiParams": [ - 100 + 1000 ] }, { diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 9797cf141..9052aed7f 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -560,7 +560,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_135002111_2", - "text": "第二段伤害提升至170%。" + "text": "伤害提升至250%。" }, "buffid": [], "map": "" @@ -622,7 +622,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_135002111_4", - "text": "第二段伤害提升至200%。" + "text": "伤害提升至280%。" }, "buffid": [], "map": "" @@ -684,7 +684,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_135002111_6", - "text": "第二段伤害提升至230%。" + "text": "伤害提升至310%。" }, "buffid": [], "map": "" @@ -19842,7 +19842,9 @@ 224001112 ] }, - "passSkill": [], + "passSkill": [ + 224001112 + ], "Desc": { "key": "skill_skill_atk_Desc_124001111_1", "text": "警长对敌方1个目标进行射击，造成攻击力300%的伤害，若成功击杀目标，则获得额外回合。" @@ -19873,7 +19875,9 @@ 224001112 ] }, - "passSkill": [], + "passSkill": [ + 224001112 + ], "Desc": { "key": "skill_skill_atk_Desc_124001111_2", "text": "伤害提升至325%。" @@ -19904,7 +19908,9 @@ 224001112 ] }, - "passSkill": [], + "passSkill": [ + 224001112 + ], "Desc": { "key": "skill_skill_atk_Desc_124001111_3", "text": "伤害提升至350%。" @@ -19935,7 +19941,9 @@ 224001112 ] }, - "passSkill": [], + "passSkill": [ + 224001112 + ], "Desc": { "key": "skill_skill_atk_Desc_124001111_4", "text": "伤害提升至375%。" @@ -19966,7 +19974,9 @@ 224001112 ] }, - "passSkill": [], + "passSkill": [ + 224001112 + ], "Desc": { "key": "skill_skill_atk_Desc_124001111_5", "text": "伤害提升至400%。" @@ -22373,10 +22383,13 @@ 214002213 ] }, - "passSkill": [], + "passSkill": [ + 214002212, + 214002213 + ], "Desc": { "key": "skill_skill_atk_Desc_114002211_1", - "text": "攻击时为目标附加1回合[color=#37d8a9]仇视[/color] 。己方除自身外任意目标遭到携带该标记的目标攻击时，自身有60%概率进行反击攻击者；自身受击时有15%概率使用嚣张气焰反击，并为自身回复最大生命值10%的生命。" + "text": "攻击时为目标附加1回合[color=#e5621b]仇视[/color] 。己方除自身外任意目标遭到携带该标记的目标攻击时，自身有60%概率进行反击攻击者；自身受击时有15%概率使用回旋踢反击，并为自身回复最大生命值10%的生命。" }, "buffid": [ 390001426 @@ -22386,7 +22399,7 @@ { "id": 114002311, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_114002311", @@ -26038,7 +26051,7 @@ { "id": 135004111, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_135004111", @@ -26212,7 +26225,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_135004211_1", - "text": "黛安·福克斯顿自身行动前，驱散随机1名敌方目标的1个增益状态，有100%概率清除其所有增益状态，优先选择拥有增益状态目标。" + "text": "黛安·福克斯顿自身行动前，驱散随机1名敌方目标的1个增益状态，有70%概率清除其所有增益状态，优先选择拥有增益状态目标。" }, "buffid": [], "map": "" @@ -26220,7 +26233,7 @@ { "id": 135004311, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_135004311", @@ -26242,7 +26255,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_135004311_1", - "text": "黛安·福克斯顿对敌方1个目标造成攻击力650%的伤害，并对敌方所有目标造成攻击力30%的伤害。若目标身上无增益状态，则无视目标100%防御，目标身上的每个增益状态将对应减少无视防御的效果。" + "text": "黛安·福克斯顿对敌方所有目标造成攻击力650%的伤害，并对敌方所有目标造成攻击力30%的伤害。若目标身上无增益状态，则无视目标100%防御。" }, "buffid": [], "map": "" diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 934754cc4..534fc53b2 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1256,7 +1256,7 @@ { "Id": 433003211, "When": 16, - "FromCheck": "Target=1", + "FromCheck": "Target=4", "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", @@ -1762,7 +1762,7 @@ "Id": 424001111, "When": 15, "FromCheck": "Target=3", - "TargetCheck": "Target=2", + "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "SkillID=224001111", "BuffCheck": "", @@ -2280,8 +2280,12 @@ "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 1, - "Callback": [] + "MaxEmitTimesInRound": 99, + "Callback": [ + 1, + 1000, + 214002214 + ] }, { "Id": 414002212, @@ -2295,19 +2299,20 @@ "AddCon": [], "PasPr": 150, "PasCorrection": 0, - "Type": "CallSkillPas", + "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 1, + "MaxEmitTimesInRound": 99, "Callback": [ - 114002311 + 1, + 1000 ] }, { "Id": 414002213, "When": 12, "FromCheck": "Target=2,HasBuff=390001426", - "TargetCheck": "Target=1", + "TargetCheck": "Target=4", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -2315,7 +2320,7 @@ "AddCon": [], "PasPr": 600, "PasCorrection": 0, - "Type": "CallSkillPas", + "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, "MaxEmitTimesInRound": 1, diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json index 828b9933c..87af1343d 100644 --- a/bin/json/game_topuiconfig.json +++ b/bin/json/game_topuiconfig.json @@ -932,7 +932,18 @@ { "id": "PersonalInformation", "subId": "", - "currencyField": [] + "currencyField": [ + { + "a": "attr", + "t": "gold", + "n": 1 + }, + { + "a": "attr", + "t": "diamond", + "n": 1 + } + ] }, { "id": "PlayerNameTip", diff --git a/bin/json/game_trainlv.json b/bin/json/game_trainlv.json index f6abcaa73..144651962 100644 --- a/bin/json/game_trainlv.json +++ b/bin/json/game_trainlv.json @@ -4,7 +4,7 @@ "id": "20030001", "type": 1, "lv": 1, - "exp": 1000, + "exp": 100, "etime": 0, "reward": [] }, @@ -13,7 +13,7 @@ "id": "20030001", "type": 2, "lv": 2, - "exp": 600, + "exp": 200, "etime": 0, "reward": [] }, @@ -22,7 +22,7 @@ "id": "20030001", "type": 3, "lv": 3, - "exp": 2000, + "exp": 300, "etime": 0, "reward": [] }, @@ -31,7 +31,7 @@ "id": "20030001", "type": 3, "lv": 4, - "exp": 3000, + "exp": 400, "etime": 0, "reward": [] }, @@ -40,7 +40,7 @@ "id": "20030001", "type": 3, "lv": 5, - "exp": 4000, + "exp": 500, "etime": 0, "reward": [] }, @@ -49,7 +49,7 @@ "id": "20030001", "type": 3, "lv": 6, - "exp": 5000, + "exp": 600, "etime": 0, "reward": [] }, @@ -58,7 +58,7 @@ "id": "20030001", "type": 3, "lv": 7, - "exp": 6000, + "exp": 700, "etime": 0, "reward": [] }, @@ -76,7 +76,7 @@ "id": "20030002", "type": 1, "lv": 1, - "exp": 1000, + "exp": 100, "etime": 0, "reward": [] }, @@ -85,7 +85,7 @@ "id": "20030002", "type": 2, "lv": 2, - "exp": 600, + "exp": 200, "etime": 0, "reward": [] }, @@ -94,7 +94,7 @@ "id": "20030002", "type": 3, "lv": 3, - "exp": 2000, + "exp": 300, "etime": 0, "reward": [] }, @@ -103,7 +103,7 @@ "id": "20030002", "type": 3, "lv": 4, - "exp": 3000, + "exp": 400, "etime": 0, "reward": [] }, @@ -112,7 +112,7 @@ "id": "20030002", "type": 3, "lv": 5, - "exp": 4000, + "exp": 500, "etime": 0, "reward": [] }, @@ -121,7 +121,7 @@ "id": "20030002", "type": 3, "lv": 6, - "exp": 5000, + "exp": 600, "etime": 0, "reward": [] }, @@ -130,7 +130,7 @@ "id": "20030002", "type": 3, "lv": 7, - "exp": 6000, + "exp": 700, "etime": 0, "reward": [] }, @@ -148,7 +148,7 @@ "id": "20030003", "type": 1, "lv": 1, - "exp": 1000, + "exp": 100, "etime": 0, "reward": [] }, @@ -157,7 +157,7 @@ "id": "20030003", "type": 2, "lv": 2, - "exp": 600, + "exp": 200, "etime": 0, "reward": [] }, @@ -166,7 +166,7 @@ "id": "20030003", "type": 3, "lv": 3, - "exp": 2000, + "exp": 300, "etime": 0, "reward": [] }, @@ -175,7 +175,7 @@ "id": "20030003", "type": 3, "lv": 4, - "exp": 3000, + "exp": 400, "etime": 0, "reward": [] }, @@ -184,7 +184,7 @@ "id": "20030003", "type": 3, "lv": 5, - "exp": 4000, + "exp": 500, "etime": 0, "reward": [] }, @@ -193,7 +193,7 @@ "id": "20030003", "type": 3, "lv": 6, - "exp": 5000, + "exp": 600, "etime": 0, "reward": [] }, @@ -202,7 +202,7 @@ "id": "20030003", "type": 3, "lv": 7, - "exp": 6000, + "exp": 700, "etime": 0, "reward": [] }, diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go index e335b19f3..f1370f218 100644 --- a/modules/dragon/api_train.go +++ b/modules/dragon/api_train.go @@ -87,8 +87,8 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e curLv = dragon.Lv } else { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DataNotFound, - Title: pb.ErrorCode_DataNotFound.ToString(), + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return