From c23e4f3ccadfd7b85675cfcbba206cd5f34ba2ef Mon Sep 17 00:00:00 2001 From: Uranium <1244958054@qq.com> Date: Sun, 15 Sep 2024 01:25:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A8=A1=E6=8B=9F=E5=86=9B?= =?UTF-8?q?=E6=BC=94=E6=A3=80=E6=B5=8B=E5=88=B0=E6=88=98=E5=8A=9B=E8=BF=87?= =?UTF-8?q?=E9=AB=98=E6=97=B6=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/rehearsal.json | 57 +++++++++++++++++--- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/assets/resource/base/pipeline/rehearsal.json b/assets/resource/base/pipeline/rehearsal.json index 903de45..b02c886 100644 --- a/assets/resource/base/pipeline/rehearsal.json +++ b/assets/resource/base/pipeline/rehearsal.json @@ -5,7 +5,7 @@ "Sub_StartUp" ] }, - "Sortie":{ + "Sortie": { "recognition": "OCR", "text": [ "出击" @@ -19,7 +19,7 @@ "action": "Click", "next_doc": "Set in code." }, - "Simulation":{ + "Simulation": { "recognition": "OCR", "text": [ "模拟军演" @@ -36,7 +36,7 @@ "Simulation" ] }, - "Competitions":{ + "Competitions": { "recognition": "OCR", "text": [ "模拟军演" @@ -55,11 +55,54 @@ 20 ], "next": [ - "Competitions_OpponentSelect", + "Competitions_RefreshOpponent", "Competitions" ] }, - "Competitions_OpponentSelect":{ + "Competitions_RefreshOpponent": { + "recognition": "OCR", + "text": [ + "1", + "2", + "3", + "4", + "5" + ], + "roi": [ + 341, + 315, + 23, + 29 + ], + "action": "Click", + "target": [ + 1070, + 110, + 165, + 42 + ], + "next": [ + "Competitions_RefreshLimit", + "Competitions_RefreshOpponent", + "Competitions_OpponentSelect" + ] + }, + "Competitions_RefreshLimit": { + "recognition": "OCR", + "text": [ + "操作" + ], + "roi": [ + 542, + 342, + 206, + 35 + ], + "next": [ + "Competitions_OpponentSelect" + ] + }, + "Competitions_OpponentSelect": { "recognition": "OCR", "text": [ "积分" @@ -83,7 +126,7 @@ "Competitions_OpponentSelect" ] }, - "Competitions_NoOpponentSelect":{ + "Competitions_NoOpponentSelect": { "recognition": "OCR", "text": [ "模拟次数购买" @@ -99,7 +142,7 @@ "StartUp" ] }, - "Competitions_Challenge":{ + "Competitions_Challenge": { "recognition": "OCR", "text": [ "挑战" From b56735e6da8135abeeb166aaa8626a1a110d90e9 Mon Sep 17 00:00:00 2001 From: Uranium <1244958054@qq.com> Date: Sun, 15 Sep 2024 11:17:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=A7=A3=E8=80=A6=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=94=BE=E5=85=A5utils.jso?= =?UTF-8?q?n=E4=B8=AD=EF=BC=8C=E5=A4=8F=E6=B4=BB=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/interface.json | 28 ++-- assets/resource/base/pipeline/combat.json | 51 +++--- assets/resource/base/pipeline/rehearsal.json | 130 +++++---------- assets/resource/base/pipeline/summer.json | 155 +++++++++++++----- assets/resource/base/pipeline/utils.json | 47 ++++++ .../resource/base/pipeline/weekinstance.json | 16 +- 6 files changed, 249 insertions(+), 178 deletions(-) create mode 100644 assets/resource/base/pipeline/utils.json diff --git a/assets/interface.json b/assets/interface.json index bed1b89..c437c1d 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -42,10 +42,10 @@ }, { "name": "模拟军演", - "entry": "Rehearsal", + "entry": "模拟军演", "param": { - "Sortie": { - "next": "Simulation" + "首页_出击": { + "next": "模拟军演_入口" } } }, @@ -64,7 +64,7 @@ "name": "周本", "entry": "WeekInstance", "param": { - "Sortie": { + "首页_出击": { "next": "ActivityExploration" } }, @@ -89,7 +89,7 @@ { "name": "技能书", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -106,7 +106,7 @@ { "name": "星币", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -123,7 +123,7 @@ { "name": "经验书", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -140,7 +140,7 @@ { "name": "遗余之谱(异星灰域商店币)", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -157,7 +157,7 @@ { "name": "芯片_物攻振奋", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -174,7 +174,7 @@ { "name": "芯片_能量金刚", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -191,7 +191,7 @@ { "name": "芯片_切割集中", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -208,7 +208,7 @@ { "name": "模块_气象山脉", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -225,7 +225,7 @@ { "name": "模块_灭刃乐团", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { @@ -242,7 +242,7 @@ { "name": "模块_不朽虫洞", "param": { - "Sortie": { + "首页_出击": { "next": "DailyExplore_Entry" }, "DailyExplore_Entry": { diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index 1c5fe01..e6b37d6 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -1,11 +1,11 @@ { "DailyExplore": { "next": [ - "Sortie", + "首页_出击", "Sub_StartUp" ] }, - "DailyExplore_Entry":{ + "DailyExplore_Entry": { "recognition": "OCR", "text": [ "每日探索" @@ -19,7 +19,7 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_ReAc":{ + "DailyExplore_ReAc": { "recognition": "OCR", "text": [ "资源采集" @@ -33,7 +33,7 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_ReAc_Skill":{ + "DailyExplore_ReAc_Skill": { "recognition": "OCR", "text": [ "技能磨砺" @@ -49,7 +49,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ReAc_Money":{ + "DailyExplore_ReAc_Money": { "recognition": "OCR", "text": [ "星币开采" @@ -65,7 +65,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ReAc_Experience":{ + "DailyExplore_ReAc_Experience": { "recognition": "OCR", "text": [ "技术解析" @@ -81,7 +81,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ReAc_Token":{ + "DailyExplore_ReAc_Token": { "recognition": "OCR", "text": [ "荒墟拾遗" @@ -97,7 +97,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_LevelSelect":{ + "DailyExplore_LevelSelect": { "recognition": "OCR", "text_doc": "Set in code.", "roi": [ @@ -111,7 +111,7 @@ "DailyExplore_MopUp" ] }, - "DailyExplore_MopUp":{ + "DailyExplore_MopUp": { "recognition": "OCR", "text": [ "扫荡" @@ -128,7 +128,7 @@ "DailyExplore_MopUp" ] }, - "DailyExplore_MopUpStart":{ + "DailyExplore_MopUpStart": { "recognition": "OCR", "text": [ "开始战斗" @@ -142,12 +142,12 @@ "action": "Click", "next": [ "DailyExplore_MopUpDoubleMarkup", - "DailyExplore_MopUpAwards", - "DailyExplore_NoFuel", + "DailyExplore_MopUpAwards", + "DailyExplore_NoFuel", "DailyExplore_MopUpStart" ] }, - "DailyExplore_NoFuel":{ + "DailyExplore_NoFuel": { "recognition": "OCR", "text": [ "燃料补给" @@ -169,7 +169,7 @@ "StartUp" ] }, - "DailyExplore_MopUpAwards":{ + "DailyExplore_MopUpAwards": { "recognition": "OCR", "text": [ "扫荡奖励" @@ -187,7 +187,7 @@ "DailyExplore_MopUpAwards" ] }, - "DailyExplore_LevelUp":{ + "DailyExplore_LevelUp": { "is_sub": true, "recognition": "TemplateMatch", "template": "Combat/DailyExplore_LevelUp.png", @@ -199,7 +199,7 @@ ], "action": "Click" }, - "DailyExplore_MopUpDoubleMarkup":{ + "DailyExplore_MopUpDoubleMarkup": { "is_sub": true, "recognition": "OCR", "text": [ @@ -212,10 +212,9 @@ 100 ], "action": "Click", - "next": [ - ] + "next": [] }, - "DailyExplore_ChEm":{ + "DailyExplore_ChEm": { "recognition": "OCR", "text": [ "芯片嵌合" @@ -229,7 +228,7 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_ChEm_1":{ + "DailyExplore_ChEm_1": { "recognition": "OCR", "text": [ "鼓军嵌合" @@ -245,7 +244,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ChEm_2":{ + "DailyExplore_ChEm_2": { "recognition": "OCR", "text": [ "光" @@ -261,7 +260,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ChEm_3":{ + "DailyExplore_ChEm_3": { "recognition": "OCR", "text": [ "注" @@ -277,7 +276,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_UpAc":{ + "DailyExplore_UpAc": { "recognition": "OCR", "text": [ "跃升行动" @@ -291,7 +290,7 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_UpAc_1":{ + "DailyExplore_UpAc_1": { "recognition": "OCR", "text": [ "自然" @@ -307,7 +306,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_UpAc_2":{ + "DailyExplore_UpAc_2": { "recognition": "OCR", "text": [ "人造" @@ -323,7 +322,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_UpAc_3":{ + "DailyExplore_UpAc_3": { "recognition": "OCR", "text": [ "生命" diff --git a/assets/resource/base/pipeline/rehearsal.json b/assets/resource/base/pipeline/rehearsal.json index b02c886..97dfccb 100644 --- a/assets/resource/base/pipeline/rehearsal.json +++ b/assets/resource/base/pipeline/rehearsal.json @@ -1,27 +1,13 @@ { - "Rehearsal": { + "模拟军演": { "next": [ - "Sortie", + "首页_出击", "Sub_StartUp" ] }, - "Sortie": { + "模拟军演_入口": { "recognition": "OCR", - "text": [ - "出击" - ], - "roi": [ - 1058, - 159, - 212, - 123 - ], - "action": "Click", - "next_doc": "Set in code." - }, - "Simulation": { - "recognition": "OCR", - "text": [ + "expected": [ "模拟军演" ], "roi": [ @@ -32,13 +18,13 @@ ], "action": "Click", "next": [ - "Competitions", - "Simulation" + "模拟军演_二级入口", + "模拟军演_入口" ] }, - "Competitions": { + "模拟军演_二级入口": { "recognition": "OCR", - "text": [ + "expected": [ "模拟军演" ], "roi": [ @@ -55,13 +41,14 @@ 20 ], "next": [ - "Competitions_RefreshOpponent", - "Competitions" + "模拟军演_刷新对手", + "模拟军演_选择对手", + "模拟军演_二级入口" ] }, - "Competitions_RefreshOpponent": { + "模拟军演_刷新对手": { "recognition": "OCR", - "text": [ + "expected": [ "1", "2", "3", @@ -82,14 +69,14 @@ 42 ], "next": [ - "Competitions_RefreshLimit", - "Competitions_RefreshOpponent", - "Competitions_OpponentSelect" + "模拟军演_刷新上线", + "模拟军演_刷新对手", + "模拟军演_选择对手" ] }, - "Competitions_RefreshLimit": { + "模拟军演_刷新上线": { "recognition": "OCR", - "text": [ + "expected": [ "操作" ], "roi": [ @@ -99,12 +86,12 @@ 35 ], "next": [ - "Competitions_OpponentSelect" + "模拟军演_选择对手" ] }, - "Competitions_OpponentSelect": { + "模拟军演_选择对手": { "recognition": "OCR", - "text": [ + "expected": [ "积分" ], "roi": [ @@ -121,14 +108,15 @@ 40 ], "next": [ - "Competitions_Challenge", - "Competitions_NoOpponentSelect", - "Competitions_OpponentSelect" + "模拟军演_开始挑战", + "模拟军演_无挑战次数", + "模拟军演_刷新对手", + "模拟军演_选择对手" ] }, - "Competitions_NoOpponentSelect": { + "模拟军演_无挑战次数": { "recognition": "OCR", - "text": [ + "expected": [ "模拟次数购买" ], "roi": [ @@ -142,9 +130,9 @@ "StartUp" ] }, - "Competitions_Challenge": { + "模拟军演_开始挑战": { "recognition": "OCR", - "text": [ + "expected": [ "挑战" ], "roi": [ @@ -155,42 +143,11 @@ ], "action": "Click", "next": [ - "Competitions_Combating", - "Competitions_Challenge" + "模拟军演_战斗中", + "模拟军演_开始挑战" ] }, - "Combat_Doublespeed": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "Combat/Combat_Doublespeed.png", - "roi": [ - 973, - 30, - 95, - 57 - ], - "threshold": 0.9, - "action": "Click", - "target": [ - 1012, - 52, - 10, - 10 - ] - }, - "Combat_Auto": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "Combat/Combat_Auto.png", - "roi": [ - 1069, - 27, - 105, - 59 - ], - "action": "Click" - }, - "Competitions_Combating": { + "模拟军演_战斗中": { "recognition": "TemplateMatch", "template": "Combat/Combat_Combating.png", "roi": [ @@ -200,15 +157,15 @@ 59 ], "next": [ - "Combat_Auto", - "Combat_Doublespeed", - "Competitions_CombatEnd", - "Competitions_Combating" + "战斗_自动战斗", + "战斗_启用二倍速", + "模拟军演_战斗中_战斗结束", + "模拟军演_战斗中" ] }, - "Competitions_CombatEnd": { + "模拟军演_战斗中_战斗结束": { "recognition": "OCR", - "text": [ + "expected": [ "等级" ], "roi": [ @@ -220,15 +177,16 @@ "action": "Click", "next": [ "Sub_GetItems", - "Sub_RehearsalUpGrade", - "Competitions_OpponentSelect", - "Competitions_CombatEnd" + "模拟军演_阶段提升", + "模拟军演_刷新对手", + "模拟军演_选择对手", + "模拟军演_战斗中_战斗结束" ] }, - "Sub_RehearsalUpGrade": { + "模拟军演_阶段提升": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "提升", "新的", "阶段" diff --git a/assets/resource/base/pipeline/summer.json b/assets/resource/base/pipeline/summer.json index 4b27452..497bbba 100644 --- a/assets/resource/base/pipeline/summer.json +++ b/assets/resource/base/pipeline/summer.json @@ -1,11 +1,11 @@ { - "SummerActivities": { + "夏活": { "next": [ - "SummerActivities_Entry", + "夏活_入口", "Sub_StartUp" ] }, - "SummerActivities_Entry": { + "夏活_入口": { "recognition": "OCR", "action": "Click", "expected": "夏日", @@ -17,9 +17,12 @@ 123 ] ], - "next": "SummerActivities_DailyTicket" + "next": [ + "夏活_任务奖励入口", + "夏活_入口" + ] }, - "SummerActivities_DailyTicket": { + "夏活_任务奖励入口": { "recognition": "OCR", "action": "Click", "expected": "海", @@ -31,9 +34,9 @@ 117 ] ], - "next": "SummerActivities_AllReward" + "next": "夏活_任务奖励_点击领取" }, - "SummerActivities_AllReward": { + "夏活_任务奖励_点击领取": { "recognition": "OCR", "action": "Click", "expected": "领取", @@ -45,10 +48,51 @@ 44 ] ], - "next": "SummerActivities_Back" + "next": [ + "夏活_任务奖励_奖励弹框", + "夏活_任务奖励_领取完成", + "夏活_任务奖励_点击领取" + ] }, - "SummerActivities_Back": { - "recognition": "DirectHit", + "夏活_任务奖励_奖励弹框": { + "recognition": "OCR", + "action": "Click", + "expected": "获得物品", + "roi": [ + [ + 527, + 160, + 214, + 68 + ] + ], + "next": [ + "夏活_任务奖励_领取完成", + "夏活_任务奖励_奖励弹框" + ] + }, + "夏活_任务奖励_领取完成": { + "recognition": "OCR", + "expected": "已完成", + "roi": [ + [ + 1051, + 210, + 105, + 41 + ] + ], + "next": "夏活_任务奖励_返回" + }, + "夏活_任务奖励_返回": { + "recognition": "OCR", + "expected": "任务奖励", + "roi": [ + 132, + 90, + 151, + 52 + ], "action": "Click", "target": [ 44, @@ -56,10 +100,20 @@ 120, 32 ], - "next": "SummerActivities_Start" + "next": [ + "夏活_进入关卡", + "夏活_任务奖励_返回" + ] }, - "SummerActivities_Start": { - "recognition": "DirectHit", + "夏活_进入关卡": { + "recognition": "OCR", + "expected": "夏日", + "roi": [ + 268, + 191, + 199, + 65 + ], "action": "Click", "target": [ 905, @@ -67,9 +121,12 @@ 198, 104 ], - "next": "SummerActivities_Difficulty" + "next": [ + "夏活_关卡_难度选择", + "夏活_进入关卡" + ] }, - "SummerActivities_Difficulty": { + "夏活_关卡_难度选择": { "recognition": "OCR", "action": "Click", "expected": "困难", @@ -82,11 +139,11 @@ ] ], "next": [ - "SummerActivities_Level", - "SummerActivities_Difficulty" + "夏活_关卡_选择关卡", + "夏活_关卡_难度选择" ] }, - "SummerActivities_Level": { + "夏活_关卡_选择关卡": { "recognition": "OCR", "action": "Click", "expected": "海", @@ -99,13 +156,13 @@ ] ], "next": [ - "SummerActivities_Sweep", - "SummerActivities_Level" + "夏活_扫荡", + "夏活_关卡_选择关卡" ] }, - "SummerActivities_Sweep": { + "夏活_扫荡": { "recognition": "OCR", - "text": [ + "expected": [ "扫荡" ], "roi": [ @@ -116,13 +173,13 @@ ], "action": "Click", "next": [ - "SummerActivities_MopUpStart", - "SummerActivities_Sweep" + "夏活_扫荡开始", + "夏活_扫荡" ] }, - "SummerActivities_MopUpAwards": { + "夏活_扫荡奖励": { "recognition": "OCR", - "text": [ + "expected": [ "扫荡奖励" ], "roi": [ @@ -133,14 +190,26 @@ ], "action": "Click", "next": [ - "DailyExplore_LevelUp", - "SummerActivities_Sweep", - "SummerActivities_MopUpAwards" + "夏活_扫荡升级", + "夏活_扫荡", + "夏活_扫荡奖励" ] }, - "SummerActivities_MopUpStart": { + "夏活_扫荡升级": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Combat/DailyExplore_LevelUp.png", + "roi": [ + 540, + 242, + 207, + 91 + ], + "action": "Click" + }, + "夏活_扫荡开始": { "recognition": "OCR", - "text": [ + "expected": [ "开始战斗" ], "roi": [ @@ -151,17 +220,17 @@ ], "action": "Click", "next": [ - "SummerActivities_MopUpDoubleMarkup", - "SummerActivities_Sweep", - "SummerActivities_MopUpAwards", - "SummerActivities_NoTicket", - "SummerActivities_MopUpStart" + "夏活_扫荡双倍标记", + "夏活_扫荡", + "夏活_扫荡奖励", + "夏活_无票券", + "夏活_扫荡开始" ] }, - "SummerActivities_MopUpDoubleMarkup": { + "夏活_扫荡双倍标记": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "开启" ], "roi": [ @@ -170,12 +239,11 @@ 252, 100 ], - "action": "Click", - "next": [] + "action": "Click" }, - "SummerActivities_NoTicket": { + "夏活_无票券": { "recognition": "OCR", - "text": [ + "expected": [ "取消" ], "roi": [ @@ -184,7 +252,6 @@ 107, 35 ], - "action": "Click", - "next": [] + "action": "Click" } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/utils.json b/assets/resource/base/pipeline/utils.json new file mode 100644 index 0000000..d3345ab --- /dev/null +++ b/assets/resource/base/pipeline/utils.json @@ -0,0 +1,47 @@ +{ + "战斗_自动战斗": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Combat/Combat_Auto.png", + "roi": [ + 1069, + 27, + 105, + 59 + ], + "action": "Click" + }, + "战斗_启用二倍速": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Combat/Combat_Doublespeed.png", + "roi": [ + 973, + 30, + 95, + 57 + ], + "threshold": 0.9, + "action": "Click", + "target": [ + 1012, + 52, + 10, + 10 + ] + }, + "首页_出击": { + "recognition": "OCR", + "expected": [ + "出击" + ], + "roi": [ + 1058, + 159, + 212, + 123 + ], + "action": "Click", + "next_doc": "Set in code." + } +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/weekinstance.json b/assets/resource/base/pipeline/weekinstance.json index 9e61064..1987ad8 100644 --- a/assets/resource/base/pipeline/weekinstance.json +++ b/assets/resource/base/pipeline/weekinstance.json @@ -1,7 +1,7 @@ { "WeekInstance": { "next": [ - "Sortie", + "首页_出击", "Sub_StartUp" ] }, @@ -495,8 +495,8 @@ 59 ], "next": [ - "Combat_Auto", - "Combat_Doublespeed", + "战斗_自动战斗", + "战斗_启用二倍速", "ActivityExploration_CombatEnd1", "ActivityExploration_Combating1" ] @@ -529,8 +529,8 @@ 59 ], "next": [ - "Combat_Auto", - "Combat_Doublespeed", + "战斗_自动战斗", + "战斗_启用二倍速", "ActivityExploration_CombatEnd2", "ActivityExploration_Combating2" ] @@ -564,8 +564,8 @@ ], "next": [ "Sub_GetItems", - "Combat_Auto", - "Combat_Doublespeed", + "战斗_自动战斗", + "战斗_启用二倍速", "ActivityExploration_CombatEnd3", "ActivityExploration_Combating3" ] @@ -620,4 +620,4 @@ 40 ] } -} +} \ No newline at end of file