Skip to content

Commit

Permalink
refactor: update pipleline for maa framework v1.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
dongwlin committed Dec 11, 2024
1 parent 57896cf commit fa3cbd4
Show file tree
Hide file tree
Showing 27 changed files with 50 additions and 79 deletions.
1 change: 0 additions & 1 deletion assets/resource/pipeline/armada/armada.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Armada": {
"next": [
"ArmadaPageFlag",
Expand Down
5 changes: 2 additions & 3 deletions assets/resource/pipeline/armada/commissions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Commissions": {
"next": [
"CommissionsPageFlag",
Expand Down Expand Up @@ -49,7 +48,7 @@
},
"AcceptNewCommission": {
"recognition": "OCR",
"text": [
"expected": [
"接受"
],
"roi": [
Expand Down Expand Up @@ -150,7 +149,7 @@
},
"CommossionLimit": {
"recognition": "OCR",
"text": [
"expected": [
"回收委托次数已经耗尽"
],
"roi": [
Expand Down
3 changes: 1 addition & 2 deletions assets/resource/pipeline/armada/contributions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Contributions": {
"next": [
"ContributionsPageFlag",
Expand Down Expand Up @@ -27,7 +26,7 @@
"ClaimedContributionRewards_3700",
"ClaimedContributionRewards_2500",
"ClaimedContributionRewards_1200",
"ClaimedContributionRewards_0"
"ClaimedContributionRewards_0"
]
},
"ClaimContributionRewards_0": {
Expand Down
3 changes: 1 addition & 2 deletions assets/resource/pipeline/awards.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../pipeline.schema.json",
"Awards": {
"next": [
"MissionsPageFlag",
Expand All @@ -11,7 +10,7 @@
},
"MissionsPageFlag": {
"recognition": "OCR",
"text": "作战任务",
"expected": "作战任务",
"roi": [
0,
60,
Expand Down
1 change: 0 additions & 1 deletion assets/resource/pipeline/close_bh3.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../pipeline.schema.json",
"CloseBH3": {
"action": "StopApp"
}
Expand Down
1 change: 0 additions & 1 deletion assets/resource/pipeline/combat/combat.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"$schema": "../../pipeline.schema.json",
"Combating": {}
}
18 changes: 8 additions & 10 deletions assets/resource/pipeline/combat/universal_mirage.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"UniversalMirage": {
"next": [
"UniversalMiragePageFlag",
Expand Down Expand Up @@ -76,7 +75,6 @@
100,
80,
50

],
"end": [
400,
Expand Down Expand Up @@ -105,7 +103,7 @@
},
"SelectUniversalMirageStageF2": {
"recognition": "OCR",
"text": "2",
"expected": "2",
"roi": [
200,
80,
Expand All @@ -120,7 +118,7 @@
},
"SelectUniversalMirageStageF5": {
"recognition": "OCR",
"text": "5",
"expected": "5",
"roi": [
200,
80,
Expand All @@ -135,7 +133,7 @@
},
"UniversalMirageStageF2Flag": {
"recognition": "OCR",
"text": "第2层",
"expected": "第2层",
"roi": [
765,
18,
Expand All @@ -152,7 +150,7 @@
},
"UniversalMirageStageF5Flag": {
"recognition": "OCR",
"text": "第5层",
"expected": "第5层",
"roi": [
765,
18,
Expand Down Expand Up @@ -219,7 +217,7 @@
},
"UniversalMirageNoneInviteOfMirage": {
"recognition": "OCR",
"text": "虚境挑战书不足",
"expected": "虚境挑战书不足",
"roi": [
362,
287,
Expand All @@ -241,7 +239,7 @@
},
"UniversalMirageCombatFinish": {
"recognition": "OCR",
"text": "战斗耗时",
"expected": "战斗耗时",
"roi": [
738,
360,
Expand Down Expand Up @@ -276,7 +274,7 @@
},
"UniversalMirageNoneTimeSwirlPasses": {
"recognition": "OCR",
"text": "您的时序通行证数量不足",
"expected": "您的时序通行证数量不足",
"roi": [
234,
286,
Expand All @@ -289,7 +287,7 @@
},
"UniversalMirageQuit": {
"recognition": "OCR",
"text": "退出",
"expected": "退出",
"roi": [
360,
551,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"UniversalMirageCombatGeneric": {
"recognition": "TemplateMatch",
"template": "Combat/UniversalMirage/UniversalMirageStageStart.png",
Expand Down
5 changes: 2 additions & 3 deletions assets/resource/pipeline/dorm/dorm.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Dorm": {
"next": [
"Sub_ConfirmDormUpdate",
Expand All @@ -12,7 +11,7 @@
},
"DormPageFlag": {
"recognition": "OCR",
"text": "家园小队",
"expected": "家园小队",
"roi": [
28,
589,
Expand Down Expand Up @@ -84,7 +83,7 @@
},
"APMax": {
"recognition": "OCR",
"text": "已经达到体力上限",
"expected": "已经达到体力上限",
"roi": [
461,
289,
Expand Down
13 changes: 6 additions & 7 deletions assets/resource/pipeline/dorm/errands.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Errands": {
"next": [
"ErrandsPageFlag",
Expand Down Expand Up @@ -45,7 +44,7 @@
},
"ErrandsCompleted": {
"recognition": "OCR",
"text": [
"expected": [
"完成"
],
"roi": [
Expand Down Expand Up @@ -81,7 +80,7 @@
},
"ErrandsNeed": {
"recognition": "OCR",
"text": [
"expected": [
"需要"
],
"roi": [
Expand All @@ -98,7 +97,7 @@
"ErrandsNoNeed": {
"inverse": true,
"recognition": "OCR",
"text": [
"expected": [
"需要"
],
"roi": [
Expand Down Expand Up @@ -130,7 +129,7 @@
},
"NoEligibleRoles": {
"recognition": "OCR",
"text": [
"expected": [
"没有找到",
"合适的",
"推荐女武神"
Expand Down Expand Up @@ -163,7 +162,7 @@
},
"NotEnoughRefreshes": {
"recognition": "OCR",
"text": [
"expected": [
"今日剩余",
"刷新次数不足"
],
Expand Down Expand Up @@ -226,7 +225,7 @@
},
"NotEnoughRiceBalls": {
"recognition": "OCR",
"text": [
"expected": [
"饭团不足",
"无法排遣",
"请稍后尝试"
Expand Down
21 changes: 10 additions & 11 deletions assets/resource/pipeline/dorm/expeditions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Expeditions": {
"next": [
"ExpeditionsPageFlag",
Expand All @@ -10,7 +9,7 @@
},
"ExpeditionsPageFlag": {
"recognition": "OCR",
"text": "今日远征可用体力",
"expected": "今日远征可用体力",
"roi": [
33,
62,
Expand Down Expand Up @@ -51,7 +50,7 @@
},
"FragmentCompleted": {
"recognition": "OCR",
"text": [
"expected": [
"完成远征"
],
"roi": [
Expand Down Expand Up @@ -102,7 +101,7 @@
},
"MaterialCompleted": {
"recognition": "OCR",
"text": [
"expected": [
"完成远征"
],
"roi": [
Expand All @@ -121,7 +120,7 @@
},
"MaterialNoCompleted": {
"recognition": "OCR",
"text": [
"expected": [
"完成远征"
],
"roi": [
Expand Down Expand Up @@ -155,7 +154,7 @@
},
"SelectFirstExpeditions": {
"recognition": "OCR",
"text": [
"expected": [
"开始远征"
],
"roi": [
Expand All @@ -175,7 +174,7 @@
"NoIdleExpeditions": {
"inverse": true,
"recognition": "OCR",
"text": [
"expected": [
"开始远征"
],
"roi": [
Expand Down Expand Up @@ -261,7 +260,7 @@
},
"NotMeetingExplorationRequirements": {
"recognition": "OCR",
"text": "不满足探险要求",
"expected": "不满足探险要求",
"roi": [
388,
287,
Expand All @@ -275,7 +274,7 @@
},
"ExpeditionsConsumptionLimit": {
"recognition": "OCR",
"text": [
"expected": [
"已达到",
"今日远征作战",
"消耗体力上限"
Expand All @@ -289,7 +288,7 @@
},
"ExpeditionsNotEnoughAP": {
"recognition": "OCR",
"text": [
"expected": [
"所需体力不足"
],
"roi": [
Expand Down Expand Up @@ -326,7 +325,7 @@
},
"ExpeditionsNotEnoughNumberOfLevels": {
"recognition": "OCR",
"text": [
"expected": [
"所需关卡次数不足"
],
"roi": [
Expand Down
5 changes: 2 additions & 3 deletions assets/resource/pipeline/material_event.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../pipeline.schema.json",
"MaterialEvent": {
"next": [
"MaterialEventFlag",
Expand Down Expand Up @@ -79,7 +78,7 @@
},
"MaterialEventNotEnoughAP": {
"recognition": "OCR",
"text": [
"expected": [
"没有足够体力"
],
"roi": [
Expand Down Expand Up @@ -116,7 +115,7 @@
},
"MaterialEventNoneLevelsToLITE": {
"recognition": "OCR",
"text": "没有可减负的关卡",
"expected": "没有可减负的关卡",
"roi": [
457,
283,
Expand Down
3 changes: 1 addition & 2 deletions assets/resource/pipeline/navigation/armada_navigation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Sub_EnterCommissionsPage": {
"is_sub": true,
"recognition": "TemplateMatch",
Expand All @@ -12,7 +11,7 @@
],
"action": "Click"
},
"Sub_EnterContributionsPage":{
"Sub_EnterContributionsPage": {
"is_sub": true,
"recognition": "TemplateMatch",
"template": "Navigation/Armada/EnterArmadaContribution.png",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Sub_EnterMaterialExpeditionPage": {
"is_sub": true,
"recognition": "TemplateMatch",
Expand Down
1 change: 0 additions & 1 deletion assets/resource/pipeline/navigation/attack_navigation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "../../pipeline.schema.json",
"Sub_EnterAttackEventPage": {
"is_sub": true,
"recognition": "TemplateMatch",
Expand Down
Loading

0 comments on commit fa3cbd4

Please sign in to comment.