Skip to content

Commit

Permalink
fix: 预防性修复 Scrimmage
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dissectum
Dissectum committed Sep 19, 2023
1 parent 60368ba commit 30769fd
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 47 deletions.
2 changes: 1 addition & 1 deletion assets/Resource/Base/pipeline/Club.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
]
},
"Sub_Goto_Club_Partial": {
"doc": "这个 json 同时是前往一个位置的最小单元实例，NowLoading 需要和 Goto 的父级绑定（TODO：每次出现场景变化的时候均为使用 Goto 之后，同个场景的任务尽可能使用 Sub 并列）（需要更改的文件有 Buttons Cafe Campaign Club Commissions Mailbox Scrimmage StartUp TacticalChallenge）。非业务类的弹窗则尽可能由 ProcessingNotice 处理",
"doc": "这个 json 同时是前往一个位置的最小单元实例，NowLoading 需要和 Goto 的父级绑定（TODO：每次出现场景变化的时候均为使用 Goto 之后，同个场景的任务尽可能使用 Sub 并列）（需要更改的文件有 Buttons Cafe Campaign Club Mailbox StartUp TacticalChallenge）。非业务类的弹窗则尽可能由 ProcessingNotice 处理",
"is_sub": true,
"inverse": true,
"recognition": "OCR",
Expand Down
120 changes: 77 additions & 43 deletions assets/Resource/Base/pipeline/Scrimmage.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"Scrimmage": {
"next": [
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Scrimmage_Partial",
"Sub_Check_TrinityTickets",
"Sub_Check_GehennaTickets",
"Sub_Check_MillenniumTickets",
"Sub_Check_TrinityTicket",
"Sub_Check_GehennaTicket",
"Sub_Check_MillenniumTicket",
"Stop"
]
},
Expand All @@ -15,10 +16,9 @@
"text": "AcademySelect",
"roi": [ 630, 125, 650, 70 ],
"next": [
"AcademySelectFlag_Partial",
"Click_ScrimmageButton_Partial",
"ScrimmageFlag_Partial",
"Sub_Wait_NowLoading_Partial",
"Click_ScrimmageButton_Partial",
"Sub_Goto_Campaign"
]
},
Expand All @@ -37,89 +37,123 @@
"Click_BackButton"
]
},
"AcademySelectFlag_Partial": {
"recognition": "OCR",
"text": "AcademySelect",
"roi": [ 630, 125, 650, 70 ]
"Start_SweepMission_OnScrimmage": {
"next": [
"Start_SweepMission_Partial",
"Sub_Click_EnterButton_OnClearedMission_Partial",
"StopOnException"
]
},
"Sub_Check_TrinityTickets": {
"Sub_Check_TrinityTicket": {
"is_sub": true,
"inverse": true,
"times_limit": 2,
"times_limit": 5,
"recognition": "OCR",
"text": "0/2",
"roi": [ 680, 210, 600, 136 ],
"next": [
"Click_Trinity_Partial"
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Trinity_Partial",
"Start_SweepMission_OnScrimmage"
],
"runout_next": [
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Scrimmage_Partial",
"Sub_Check_GehennaTickets",
"Sub_Check_MillenniumTickets",
"Sub_Check_GehennaTicket",
"Sub_Check_MillenniumTicket",
"StopTask"
]
},
"Sub_Check_GehennaTickets": {
"Sub_Goto_Trinity_Partial": {
"is_sub": true,
"inverse": true,
"times_limit": 2,
"recognition": "OCR",
"text": "0/2",
"roi": [ 680, 346, 600, 136 ],
"text": "Trinity",
"roi": [ 90, 130, 530, 85 ],
"next": [
"Click_Gehenna_Partial"
],
"runout_next": [
"Sub_Goto_Scrimmage_Partial",
"Sub_Check_MillenniumTickets",
"StopTask"
"Click_Trinity_Partial",
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Bounty_Partial"
]
},
"Sub_Check_MillenniumTickets": {
"Click_Trinity_Partial": {
"recognition": "OCR",
"text": "Trinity",
"roi": [ 680, 210, 600, 136 ],
"action": "Click",
"post_delay": 1500
},
"Sub_Check_GehennaTicket": {
"is_sub": true,
"inverse": true,
"times_limit": 2,
"times_limit": 5,
"recognition": "OCR",
"text": "0/2",
"roi": [ 680, 482, 600, 136 ],
"roi": [ 680, 346, 600, 136 ],
"next": [
"Click_Millennium_Partial"
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Gehenna_Partial",
"Start_SweepMission_OnScrimmage"
],
"runout_next": [
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Scrimmage_Partial",
"Sub_Check_MillenniumTicket",
"StopTask"
]
},
"Click_Trinity_Partial": {
"Sub_Goto_Gehenna_Partial": {
"is_sub": true,
"inverse": true,
"recognition": "OCR",
"text": "Trinity",
"roi": [ 680, 210, 600, 136 ],
"action": "Click",
"text": "Gehenna",
"roi": [ 90, 130, 530, 85 ],
"next": [
"Start_SweepMission_Partial",
"Sub_Click_EnterButton_OnClearedMission_Partial",
"Stop"
"Click_Gehenna_Partial",
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Bounty_Partial"
]
},
"Click_Gehenna_Partial": {
"recognition": "OCR",
"text": "Gehenna",
"roi": [ 680, 346, 600, 136 ],
"action": "Click",
"post_delay": 1500
},
"Sub_Check_MillenniumTicket": {
"is_sub": true,
"inverse": true,
"times_limit": 5,
"recognition": "OCR",
"text": "0/2",
"roi": [ 680, 482, 600, 136 ],
"next": [
"Start_SweepMission_Partial",
"Sub_Click_EnterButton_OnClearedMission_Partial",
"Stop"
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Millennium_Partial",
"Start_SweepMission_OnScrimmage"
],
"runout_next": [
"StopTask"
]
},
"Sub_Goto_Millennium_Partial": {
"is_sub": true,
"inverse": true,
"recognition": "OCR",
"text": "Millennium",
"roi": [ 90, 130, 530, 85 ],
"next": [
"Click_Millennium_Partial",
"Sub_Wait_NowLoading_Partial",
"Sub_Goto_Bounty_Partial"
]
},
"Click_Millennium_Partial": {
"recognition": "OCR",
"text": "Millennium",
"roi": [ 680, 482, 600, 136 ],
"action": "Click",
"next": [
"Start_SweepMission_Partial",
"Sub_Click_EnterButton_OnClearedMission_Partial",
"Stop"
]
"post_delay": 1500
}
}
15 changes: 12 additions & 3 deletions assets/Resource/EN/pipeline/OCRPartialTasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,22 +269,31 @@
"Scrimmage"
]
},
"AcademySelectFlag_Partial": {
"Sub_Goto_Trinity_Partial": {
"text": [
"Academy Select",
"AcademySelect"
"Trinity"
]
},
"Click_Trinity_Partial": {
"text": [
"Trinity"
]
},
"Sub_Goto_Gehenna_Partial": {
"text": [
"Gehenna"
]
},
"Click_Gehenna_Partial": {
"text": [
"Gehenna"
]
},
"Sub_Goto_Millennium_Partial": {
"text": [
"Millennium"
]
},
"Click_Millennium_Partial": {
"text": [
"Millennium"
Expand Down

0 comments on commit 30769fd

Please sign in to comment.