diff --git a/assets/interface.json b/assets/interface.json index bed1b89..3ffd6f9 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -38,14 +38,14 @@ }, { "name": "夏日活动", - "entry": "SummerActivities" + "entry": "夏活" }, { "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/awards.json b/assets/resource/base/pipeline/awards.json index ed8d628..98fcdc2 100644 --- a/assets/resource/base/pipeline/awards.json +++ b/assets/resource/base/pipeline/awards.json @@ -8,7 +8,7 @@ "Sub_StartUp" ] }, - "Mail":{ + "Mail": { "recognition": "ColorMatch", "roi": [ 254, @@ -34,7 +34,7 @@ "Mail" ] }, - "Mail_Receive":{ + "Mail_Receive": { "recognition": "ColorMatch", "roi": [ 230, @@ -93,7 +93,7 @@ "DailyTask" ] }, - "DailyTask_Receive0":{ + "DailyTask_Receive0": { "recognition": "ColorMatch", "roi": [ 23, @@ -146,7 +146,7 @@ "DailyTask_Receive2" ] }, - "DailyTask_Receive2":{ + "DailyTask_Receive2": { "recognition": "ColorMatch", "roi": [ 23, @@ -233,9 +233,9 @@ "BattlePass" ] }, - "BattlePass_ReceiveMission":{ + "BattlePass_ReceiveMission": { "recognition": "OCR", - "text": [ + "expected": [ "任务" ], "roi": [ @@ -278,7 +278,7 @@ "BattlePass_ReceiveDailyMissionGet" ] }, - "BattlePass_ReceiveWeeklyMission":{ + "BattlePass_ReceiveWeeklyMission": { "recognition": "ColorMatch", "roi": [ 197, @@ -333,7 +333,7 @@ "BattlePass_ReceiveWeeklyMissionGet" ] }, - "BattlePass_ReceiveMonthlyMission":{ + "BattlePass_ReceiveMonthlyMission": { "recognition": "ColorMatch", "roi": [ 195, @@ -388,9 +388,9 @@ "BattlePass_ReceiveMonthlyMissionGet" ] }, - "BattlePass_MissionExist":{ + "BattlePass_MissionExist": { "recognition": "OCR", - "text": [ + "expected": [ "本期任务" ], "roi": [ diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index 1c5fe01..208801c 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -1,13 +1,13 @@ { "DailyExplore": { "next": [ - "Sortie", + "首页_出击", "Sub_StartUp" ] }, - "DailyExplore_Entry":{ + "DailyExplore_Entry": { "recognition": "OCR", - "text": [ + "expected": [ "每日探索" ], "roi": [ @@ -19,9 +19,9 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_ReAc":{ + "DailyExplore_ReAc": { "recognition": "OCR", - "text": [ + "expected": [ "资源采集" ], "roi": [ @@ -33,9 +33,9 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_ReAc_Skill":{ + "DailyExplore_ReAc_Skill": { "recognition": "OCR", - "text": [ + "expected": [ "技能磨砺" ], "roi": [ @@ -49,9 +49,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ReAc_Money":{ + "DailyExplore_ReAc_Money": { "recognition": "OCR", - "text": [ + "expected": [ "星币开采" ], "roi": [ @@ -65,9 +65,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ReAc_Experience":{ + "DailyExplore_ReAc_Experience": { "recognition": "OCR", - "text": [ + "expected": [ "技术解析" ], "roi": [ @@ -81,9 +81,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ReAc_Token":{ + "DailyExplore_ReAc_Token": { "recognition": "OCR", - "text": [ + "expected": [ "荒墟拾遗" ], "roi": [ @@ -97,7 +97,7 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_LevelSelect":{ + "DailyExplore_LevelSelect": { "recognition": "OCR", "text_doc": "Set in code.", "roi": [ @@ -111,9 +111,9 @@ "DailyExplore_MopUp" ] }, - "DailyExplore_MopUp":{ + "DailyExplore_MopUp": { "recognition": "OCR", - "text": [ + "expected": [ "扫荡" ], "roi": [ @@ -128,9 +128,9 @@ "DailyExplore_MopUp" ] }, - "DailyExplore_MopUpStart":{ + "DailyExplore_MopUpStart": { "recognition": "OCR", - "text": [ + "expected": [ "开始战斗" ], "roi": [ @@ -142,14 +142,14 @@ "action": "Click", "next": [ "DailyExplore_MopUpDoubleMarkup", - "DailyExplore_MopUpAwards", - "DailyExplore_NoFuel", + "DailyExplore_MopUpAwards", + "DailyExplore_NoFuel", "DailyExplore_MopUpStart" ] }, - "DailyExplore_NoFuel":{ + "DailyExplore_NoFuel": { "recognition": "OCR", - "text": [ + "expected": [ "燃料补给" ], "roi": [ @@ -169,9 +169,9 @@ "StartUp" ] }, - "DailyExplore_MopUpAwards":{ + "DailyExplore_MopUpAwards": { "recognition": "OCR", - "text": [ + "expected": [ "扫荡奖励" ], "roi": [ @@ -187,7 +187,7 @@ "DailyExplore_MopUpAwards" ] }, - "DailyExplore_LevelUp":{ + "DailyExplore_LevelUp": { "is_sub": true, "recognition": "TemplateMatch", "template": "Combat/DailyExplore_LevelUp.png", @@ -199,10 +199,10 @@ ], "action": "Click" }, - "DailyExplore_MopUpDoubleMarkup":{ + "DailyExplore_MopUpDoubleMarkup": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "开启" ], "roi": [ @@ -212,12 +212,11 @@ 100 ], "action": "Click", - "next": [ - ] + "next": [] }, - "DailyExplore_ChEm":{ + "DailyExplore_ChEm": { "recognition": "OCR", - "text": [ + "expected": [ "芯片嵌合" ], "roi": [ @@ -229,9 +228,9 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_ChEm_1":{ + "DailyExplore_ChEm_1": { "recognition": "OCR", - "text": [ + "expected": [ "鼓军嵌合" ], "roi": [ @@ -245,9 +244,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ChEm_2":{ + "DailyExplore_ChEm_2": { "recognition": "OCR", - "text": [ + "expected": [ "光" ], "roi": [ @@ -261,9 +260,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_ChEm_3":{ + "DailyExplore_ChEm_3": { "recognition": "OCR", - "text": [ + "expected": [ "注" ], "roi": [ @@ -277,9 +276,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_UpAc":{ + "DailyExplore_UpAc": { "recognition": "OCR", - "text": [ + "expected": [ "跃升行动" ], "roi": [ @@ -291,9 +290,9 @@ "action": "Click", "next_doc": "Set in code." }, - "DailyExplore_UpAc_1":{ + "DailyExplore_UpAc_1": { "recognition": "OCR", - "text": [ + "expected": [ "自然" ], "roi": [ @@ -307,9 +306,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_UpAc_2":{ + "DailyExplore_UpAc_2": { "recognition": "OCR", - "text": [ + "expected": [ "人造" ], "roi": [ @@ -323,9 +322,9 @@ "DailyExplore_LevelSelect" ] }, - "DailyExplore_UpAc_3":{ + "DailyExplore_UpAc_3": { "recognition": "OCR", - "text": [ + "expected": [ "生命" ], "roi": [ diff --git a/assets/resource/base/pipeline/infrastructures.json b/assets/resource/base/pipeline/infrastructures.json index fbb9ed3..a4746a8 100644 --- a/assets/resource/base/pipeline/infrastructures.json +++ b/assets/resource/base/pipeline/infrastructures.json @@ -13,9 +13,9 @@ "Sub_StartUp" ] }, - "Base_Deal":{ + "Base_Deal": { "recognition": "OCR", - "text": [ + "expected": [ "基地" ], "roi": [ @@ -30,9 +30,9 @@ "Base_Deal" ] }, - "Base":{ + "Base": { "recognition": "OCR", - "text": [ + "expected": [ "基地" ], "roi": [ @@ -49,7 +49,7 @@ "Base" ] }, - "Infr_收取资源":{ + "Infr_收取资源": { "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Recourse.png", "roi": [ @@ -64,9 +64,9 @@ "Infr_驻员状况" ] }, - "Infr_驻员状况":{ + "Infr_驻员状况": { "recognition": "OCR", - "text": [ + "expected": [ "驻员", "状况" ], @@ -83,9 +83,9 @@ "Infr_驻员状况" ] }, - "Infr_驻员预设1":{ + "Infr_驻员预设1": { "recognition": "OCR", - "text": [ + "expected": [ "驻员", "预设" ], @@ -101,9 +101,9 @@ "Infr_驻员预设2" ] }, - "Infr_驻员预设2":{ + "Infr_驻员预设2": { "recognition": "OCR", - "text": [ + "expected": [ "驻员", "预设" ], @@ -119,9 +119,9 @@ "Infr_驻员预设3" ] }, - "Infr_驻员预设3":{ + "Infr_驻员预设3": { "recognition": "OCR", - "text": [ + "expected": [ "驻员", "预设" ], @@ -153,10 +153,10 @@ "Infr_BackButton" ] }, - "Infr_使用":{ + "Infr_使用": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "使用" ], "roi": [ @@ -167,9 +167,9 @@ ], "action": "Click" }, - "Infr_GetResources":{ + "Infr_GetResources": { "recognition": "OCR", - "text": [ + "expected": [ "收取资源" ], "roi": [ @@ -185,9 +185,9 @@ "Infr_GetResources" ] }, - "Infr_GetAll":{ + "Infr_GetAll": { "recognition": "OCR", - "text": [ + "expected": [ "全部收取" ], "roi": [ @@ -203,7 +203,7 @@ "Sub_BackButton" ] }, - "Infr_Occupancy":{ + "Infr_Occupancy": { "recognition": "ColorMatch", "roi": [ 678, @@ -229,9 +229,9 @@ "Infr_Occupancy" ] }, - "Infr_Substitute1":{ + "Infr_Substitute1": { "recognition": "OCR", - "text": [ + "expected": [ "设施详情" ], "roi": [ @@ -252,7 +252,7 @@ "Infr_Substitute1" ] }, - "Infr_Substitute1_0":{ + "Infr_Substitute1_0": { "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Substitute1.png", "roi": [ @@ -267,7 +267,7 @@ "Infr_Substitute1_1" ] }, - "Infr_Substitute1_1":{ + "Infr_Substitute1_1": { "action": "Click", "target": [ 950, @@ -279,7 +279,7 @@ "Infr_Substitute1_2" ] }, - "Infr_Substitute1_2":{ + "Infr_Substitute1_2": { "action": "Click", "target": [ 1110, @@ -291,7 +291,7 @@ "Infr_Substitute1_3" ] }, - "Infr_Substitute1_3":{ + "Infr_Substitute1_3": { "action": "Click", "target": [ 473, @@ -303,7 +303,7 @@ "Infr_Substitute1_4" ] }, - "Infr_Substitute1_4":{ + "Infr_Substitute1_4": { "action": "Click", "target": [ 625, @@ -315,7 +315,7 @@ "Infr_Substitute1_5" ] }, - "Infr_Substitute1_5":{ + "Infr_Substitute1_5": { "action": "Click", "target": [ 780, @@ -329,10 +329,10 @@ "Sub_BackButton" ] }, - "Infr_SubstituteComfirm":{ + "Infr_SubstituteComfirm": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "确定" ], "roi": [ @@ -343,9 +343,9 @@ ], "action": "Click" }, - "Infr_Substitute2":{ + "Infr_Substitute2": { "recognition": "OCR", - "text": [ + "expected": [ "设施详情" ], "roi": [ @@ -366,7 +366,7 @@ "Infr_Substitute2" ] }, - "Infr_Substitute2_0":{ + "Infr_Substitute2_0": { "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Substitute1.png", "roi": [ @@ -381,7 +381,7 @@ "Infr_Substitute2_1" ] }, - "Infr_Substitute2_1":{ + "Infr_Substitute2_1": { "action": "Click", "target": [ 950, @@ -393,7 +393,7 @@ "Infr_Substitute2_2" ] }, - "Infr_Substitute2_2":{ + "Infr_Substitute2_2": { "action": "Click", "target": [ 1110, @@ -405,7 +405,7 @@ "Infr_Substitute2_3" ] }, - "Infr_Substitute2_3":{ + "Infr_Substitute2_3": { "action": "Click", "target": [ 473, @@ -417,7 +417,7 @@ "Infr_Substitute2_4" ] }, - "Infr_Substitute2_4":{ + "Infr_Substitute2_4": { "action": "Click", "target": [ 625, @@ -429,7 +429,7 @@ "Infr_Substitute2_5" ] }, - "Infr_Substitute2_5":{ + "Infr_Substitute2_5": { "action": "Click", "target": [ 780, @@ -443,9 +443,9 @@ "Sub_BackButton" ] }, - "Infr_Substitute3":{ + "Infr_Substitute3": { "recognition": "OCR", - "text": [ + "expected": [ "设施详情" ], "roi": [ @@ -466,7 +466,7 @@ "Infr_Substitute3" ] }, - "Infr_Substitute3_0":{ + "Infr_Substitute3_0": { "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Substitute1.png", "roi": [ @@ -481,7 +481,7 @@ "Infr_Substitute3_1" ] }, - "Infr_Substitute3_1":{ + "Infr_Substitute3_1": { "action": "Click", "target": [ 473, @@ -493,7 +493,7 @@ "Infr_Substitute3_2" ] }, - "Infr_Substitute3_2":{ + "Infr_Substitute3_2": { "action": "Click", "target": [ 625, @@ -505,7 +505,7 @@ "Infr_Substitute3_3" ] }, - "Infr_Substitute3_3":{ + "Infr_Substitute3_3": { "action": "Click", "target": [ 789, @@ -517,7 +517,7 @@ "Infr_Substitute3_4" ] }, - "Infr_Substitute3_4":{ + "Infr_Substitute3_4": { "action": "Click", "target": [ 950, @@ -529,7 +529,7 @@ "Infr_Substitute3_5" ] }, - "Infr_Substitute3_5":{ + "Infr_Substitute3_5": { "action": "Click", "target": [ 1100, @@ -541,7 +541,7 @@ "Infr_Substitute4_0" ] }, - "Infr_Substitute4_0":{ + "Infr_Substitute4_0": { "action": "Swipe", "begin": [ 890, @@ -560,7 +560,7 @@ "Infr_Substitute4_1" ] }, - "Infr_Substitute4_1":{ + "Infr_Substitute4_1": { "action": "Click", "target": [ 473, @@ -572,7 +572,7 @@ "Infr_Substitute4_2" ] }, - "Infr_Substitute4_2":{ + "Infr_Substitute4_2": { "action": "Click", "target": [ 625, @@ -584,7 +584,7 @@ "Infr_Substitute4_3" ] }, - "Infr_Substitute4_3":{ + "Infr_Substitute4_3": { "action": "Click", "target": [ 789, @@ -596,7 +596,7 @@ "Infr_Substitute4_4" ] }, - "Infr_Substitute4_4":{ + "Infr_Substitute4_4": { "action": "Click", "target": [ 950, @@ -608,7 +608,7 @@ "Infr_Substitute4_5" ] }, - "Infr_Substitute4_5":{ + "Infr_Substitute4_5": { "action": "Click", "target": [ 1100, @@ -623,9 +623,9 @@ "Sub_BackButton" ] }, - "Infr_Exit":{ + "Infr_Exit": { "recognition": "OCR", - "text": [ + "expected": [ "研发中心" ], "roi": [ @@ -638,7 +638,7 @@ "StartUp" ] }, - "Infr_Deal":{ + "Infr_Deal": { "enabled": false, "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Deal.png", @@ -654,7 +654,7 @@ "Infr_DealSelf" ] }, - "Infr_DealDefaltYes":{ + "Infr_DealDefaltYes": { "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Deal.png", "roi": [ @@ -982,9 +982,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf01":{ + "Infr_DealSelf01": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1008,9 +1008,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf02":{ + "Infr_DealSelf02": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1033,9 +1033,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf03":{ + "Infr_DealSelf03": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1057,9 +1057,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf04":{ + "Infr_DealSelf04": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1080,9 +1080,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf05":{ + "Infr_DealSelf05": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1102,9 +1102,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf06":{ + "Infr_DealSelf06": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1123,9 +1123,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf07":{ + "Infr_DealSelf07": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1143,9 +1143,9 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf08":{ + "Infr_DealSelf08": { "recognition": "OCR", - "text": [ + "expected": [ "X120000" ], "roi": [ @@ -1162,10 +1162,10 @@ "Infr_DealNextFriends" ] }, - "Infr_DealSelf1_Yes":{ + "Infr_DealSelf1_Yes": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "是否确认提交订单" ], "roi": [ @@ -1182,10 +1182,10 @@ 36 ] }, - "Infr_DealSelf1_No":{ + "Infr_DealSelf1_No": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "订单兑换", "是否进行合成" ], @@ -1226,7 +1226,7 @@ }, "Infr_DealNextFriends1": { "recognition": "OCR", - "text": [ + "expected": [ "好友列表" ], "roi": [ @@ -1242,9 +1242,9 @@ "Infr_DealNextFriends_Visit0" ] }, - "Infr_DealNextFriends_Visit0":{ + "Infr_DealNextFriends_Visit0": { "recognition": "OCR", - "text": [ + "expected": [ "拜访" ], "roi": [ @@ -1258,7 +1258,7 @@ "Infr_DealSelf" ] }, - "Infr_DealNextFriends_VisitNext":{ + "Infr_DealNextFriends_VisitNext": { "recognition": "TemplateMatch", "template": "InfrastructureS/Infr_DealNextFriends_VisitNext.png", "roi": [ @@ -1279,7 +1279,7 @@ "Infr_DealSelf" ] }, - "Infr_DealNextFriends_Swipe":{ + "Infr_DealNextFriends_Swipe": { "is_sub": true, "recognition": "ColorMatch", "roi": [ @@ -1315,7 +1315,7 @@ ], "duration": 1000 }, - "Infr_DealNextFriends_End":{ + "Infr_DealNextFriends_End": { "recognition": "ColorMatch", "roi": [ 1035, @@ -1339,4 +1339,4 @@ "StartUp" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/rehearsal.json b/assets/resource/base/pipeline/rehearsal.json index 903de45..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,57 @@ 20 ], "next": [ - "Competitions_OpponentSelect", - "Competitions" + "模拟军演_刷新对手", + "模拟军演_选择对手", + "模拟军演_二级入口" ] }, - "Competitions_OpponentSelect":{ + "模拟军演_刷新对手": { "recognition": "OCR", - "text": [ + "expected": [ + "1", + "2", + "3", + "4", + "5" + ], + "roi": [ + 341, + 315, + 23, + 29 + ], + "action": "Click", + "target": [ + 1070, + 110, + 165, + 42 + ], + "next": [ + "模拟军演_刷新上线", + "模拟军演_刷新对手", + "模拟军演_选择对手" + ] + }, + "模拟军演_刷新上线": { + "recognition": "OCR", + "expected": [ + "操作" + ], + "roi": [ + 542, + 342, + 206, + 35 + ], + "next": [ + "模拟军演_选择对手" + ] + }, + "模拟军演_选择对手": { + "recognition": "OCR", + "expected": [ "积分" ], "roi": [ @@ -78,14 +108,15 @@ 40 ], "next": [ - "Competitions_Challenge", - "Competitions_NoOpponentSelect", - "Competitions_OpponentSelect" + "模拟军演_开始挑战", + "模拟军演_无挑战次数", + "模拟军演_刷新对手", + "模拟军演_选择对手" ] }, - "Competitions_NoOpponentSelect":{ + "模拟军演_无挑战次数": { "recognition": "OCR", - "text": [ + "expected": [ "模拟次数购买" ], "roi": [ @@ -99,9 +130,9 @@ "StartUp" ] }, - "Competitions_Challenge":{ + "模拟军演_开始挑战": { "recognition": "OCR", - "text": [ + "expected": [ "挑战" ], "roi": [ @@ -112,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": [ @@ -157,15 +157,15 @@ 59 ], "next": [ - "Combat_Auto", - "Combat_Doublespeed", - "Competitions_CombatEnd", - "Competitions_Combating" + "战斗_自动战斗", + "战斗_启用二倍速", + "模拟军演_战斗中_战斗结束", + "模拟军演_战斗中" ] }, - "Competitions_CombatEnd": { + "模拟军演_战斗中_战斗结束": { "recognition": "OCR", - "text": [ + "expected": [ "等级" ], "roi": [ @@ -177,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/shopping.json b/assets/resource/base/pipeline/shopping.json index c4ba528..b6be594 100644 --- a/assets/resource/base/pipeline/shopping.json +++ b/assets/resource/base/pipeline/shopping.json @@ -9,9 +9,9 @@ "Sub_StartUp" ] }, - "Shop":{ + "Shop": { "recognition": "OCR", - "text": [ + "expected": [ "补给站" ], "roi": [ @@ -26,9 +26,9 @@ "Shop" ] }, - "DailyGift":{ + "DailyGift": { "recognition": "OCR", - "text": [ + "expected": [ "礼包" ], "roi": [ @@ -43,7 +43,7 @@ "DailyGift" ] }, - "DailyGiftYes":{ + "DailyGiftYes": { "recognition": "TemplateMatch", "template": "StartUp/NoForFree.png", "roi": [ @@ -57,9 +57,9 @@ "NoForFree" ] }, - "ForFree":{ + "ForFree": { "recognition": "OCR", - "text": [ + "expected": [ "免费" ], "roi": [ @@ -74,7 +74,7 @@ "ForFree" ] }, - "NoForFree":{ + "NoForFree": { "recognition": "TemplateMatch", "template": "StartUp/NoForFree.png", "roi": [ @@ -87,9 +87,9 @@ "StartUp" ] }, - "Purchase":{ + "Purchase": { "recognition": "OCR", - "text": [ + "expected": [ "购买" ], "roi": [ @@ -107,4 +107,4 @@ "NoForFree" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json index 35979b3..7107cbe 100644 --- a/assets/resource/base/pipeline/startup.json +++ b/assets/resource/base/pipeline/startup.json @@ -48,7 +48,7 @@ }, "Downloading": { "recognition": "OCR", - "text": [ + "expected": [ "下载" ], "roi": [ @@ -64,7 +64,7 @@ }, "StartGame": { "recognition": "OCR", - "text": [ + "expected": [ "开始游戏" ], "roi": [ @@ -84,7 +84,7 @@ "Sub_Comfirm": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "确认" ], "roi": [ @@ -98,7 +98,7 @@ "Sub_Cancel": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "取消" ], "roi": [ @@ -123,7 +123,7 @@ }, "SignIn": { "recognition": "OCR", - "text": [ + "expected": [ "签到" ], "roi": [ @@ -146,7 +146,7 @@ "Sub_GetItems": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "获得物品" ], "roi": [ @@ -172,7 +172,10 @@ "Sub_HomeButton": { "is_sub": true, "recognition": "TemplateMatch", - "template": ["StartUp/HomeButton.png","StartUp/HomeButton1.png"], + "template": [ + "StartUp/HomeButton.png", + "StartUp/HomeButton1.png" + ], "roi": [ 180, 10, @@ -183,7 +186,7 @@ }, "HomeFlag1": { "recognition": "OCR", - "text": [ + "expected": [ "补给站" ], "roi": [ @@ -227,4 +230,4 @@ "package": "com.megagame.crosscore/com.megagame.crosscore.extend.PhoneUtilActivity" }, "Stop": {} -} +} \ No newline at end of file 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..2f495a6 100644 --- a/assets/resource/base/pipeline/weekinstance.json +++ b/assets/resource/base/pipeline/weekinstance.json @@ -1,13 +1,13 @@ { "WeekInstance": { "next": [ - "Sortie", + "首页_出击", "Sub_StartUp" ] }, "ActivityExploration": { "recognition": "OCR", - "text": [ + "expected": [ "活动探索" ], "roi": [ @@ -25,7 +25,7 @@ }, "ActivityExploration_1": { "recognition": "OCR", - "text": [ + "expected": [ "碎星虚影" ], "roi": [ @@ -43,7 +43,7 @@ }, "ActivityExploration_2": { "recognition": "OCR", - "text": [ + "expected": [ "戈里刻虚影" ], "roi": [ @@ -61,7 +61,7 @@ }, "ActivityExploration_3": { "recognition": "OCR", - "text": [ + "expected": [ "虚影阿瑞斯" ], "roi": [ @@ -78,7 +78,7 @@ }, "ActivityExploration_第五关": { "recognition": "OCR", - "text": [ + "expected": [ "虚影宙斯" ], "roi": [ @@ -95,7 +95,7 @@ }, "ActivityExploration_Exist": { "recognition": "OCR", - "text": [ + "expected": [ "600/600", "6007600", "6001600" @@ -116,7 +116,7 @@ }, "ActivityExploration_Start": { "recognition": "OCR", - "text": [ + "expected": [ "开始战斗" ], "roi": [ @@ -135,7 +135,7 @@ }, "ActivityExploration_第五关Start": { "recognition": "OCR", - "text": [ + "expected": [ "开始战斗" ], "roi": [ @@ -155,7 +155,7 @@ "ActivityExploration_Comfirm": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "开启" ], "roi": [ @@ -192,7 +192,7 @@ }, "ActivityExploration_Start_1": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ @@ -209,7 +209,7 @@ }, "ActivityExploration_第五关Start_1": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ @@ -226,7 +226,7 @@ }, "ActivityExploration_Step_1": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -249,7 +249,7 @@ }, "ActivityExploration_第五关Step_1": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -272,7 +272,7 @@ }, "ActivityExploration_Step_2": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -296,7 +296,7 @@ }, "ActivityExploration_第五关Step_2": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -319,7 +319,7 @@ }, "ActivityExploration_Step_3": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -407,7 +407,7 @@ }, "ActivityExploration_Step_4": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -463,7 +463,7 @@ }, "ActivityExploration_Step_5": { "recognition": "OCR", - "text": [ + "expected": [ "行动" ], "roi": [ @@ -495,15 +495,15 @@ 59 ], "next": [ - "Combat_Auto", - "Combat_Doublespeed", + "战斗_自动战斗", + "战斗_启用二倍速", "ActivityExploration_CombatEnd1", "ActivityExploration_Combating1" ] }, "ActivityExploration_CombatEnd1": { "recognition": "OCR", - "text": [ + "expected": [ "等级" ], "roi": [ @@ -529,15 +529,15 @@ 59 ], "next": [ - "Combat_Auto", - "Combat_Doublespeed", + "战斗_自动战斗", + "战斗_启用二倍速", "ActivityExploration_CombatEnd2", "ActivityExploration_Combating2" ] }, "ActivityExploration_CombatEnd2": { "recognition": "OCR", - "text": [ + "expected": [ "等级" ], "roi": [ @@ -564,15 +564,15 @@ ], "next": [ "Sub_GetItems", - "Combat_Auto", - "Combat_Doublespeed", + "战斗_自动战斗", + "战斗_启用二倍速", "ActivityExploration_CombatEnd3", "ActivityExploration_Combating3" ] }, "ActivityExploration_CombatEnd3": { "recognition": "OCR", - "text": [ + "expected": [ "等级" ], "roi": [ @@ -620,4 +620,4 @@ 40 ] } -} +} \ No newline at end of file