Skip to content

Commit

Permalink
适配新的赛季及新UI&加了部分流程的结束条件。
Browse files Browse the repository at this point in the history
  • Loading branch information
hxdnshx committed Nov 16, 2023
1 parent 0ee5363 commit 7267316
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 14 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 21 additions & 2 deletions assets/resource/pipeline/craftmodule.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@
"pre_wait_freezes": 1500,
"next": [
"EnoughPt",
"NoEnoughPt",
"Sub_Limbus_Startup"
]
},
"NoEnoughPt": {
"recognition": "TemplateMatch",
"template": "limbus_template/daily/NoEnergy.png",
"roi": [
292, 607, 61, 113
],
"action": "DoNothing"
},
"EnoughPt": {
"recognition": "TemplateMatch",
"threshold": 0.92,
Expand All @@ -16,7 +25,8 @@
"action": "Click",
"next": [
"SelectAll",
"EnoughPt"
"ConfirmCraft",
"CancelCraft"
]
},
"SelectAll": {
Expand All @@ -27,7 +37,8 @@
],
"action": "Click",
"next": [
"ConfirmCraft"
"ConfirmCraft",
"CancelCraft"
]
},
"ConfirmCraft": {
Expand All @@ -37,6 +48,14 @@
600,462,188,149
],
"action": "Click"
},
"CancelCraft": {
"recognition": "TemplateMatch",
"template": "limbus_template/daily/CancelCraft.png",
"roi": [
424, 465, 124, 136
],
"action": "Click"
}

}
28 changes: 23 additions & 5 deletions assets/resource/pipeline/daily.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"next": [
"PartySelectBtn",
"PartyHelpBtn",
"Sub_DiffSelect",
"Sub_LvLSelBattleBtn",
"Sub_ThreadBattleBtn",
"Sub_ThreadLuxcavationBtn",
Expand All @@ -25,6 +26,7 @@
"EndBattleConfirm",
"Sub_SkipConfirmBtn",
"Sub_SkipBtn",
"Sub_DiffSelect",
"Sub_LvLSelSkipBtn",
"Sub_ThreadLuxcavationBtn",
"Sub_LuxcavationBtn",
Expand Down Expand Up @@ -52,13 +54,25 @@
},
"Sub_ThreadLuxcavationBtn": {
"is_sub": true,
"threshold": 0.92,
"recognition": "TemplateMatch",
"template": "limbus_template/daily/Thread.png",
"roi": [
31,258,228,146
],
"action": "Click"
},
"Sub_DiffSelect": {
"is_sub": true,
"recognition": "TemplateMatch",
"template": "limbus_template/daily/DiffSelect.png",
"roi": [
[736, 314, 143, 142],
[774, 415, 104, 109],
[771, 225, 102, 80]
],
"action": "Click"
},
"Sub_SkipBtn": {
"is_sub": true,
"recognition": "TemplateMatch",
Expand All @@ -67,7 +81,8 @@
"roi": [
255,445,228,123
],
"action": "Click"
"action": "Click",
"post_wait_freezes": 2000
},
"Sub_ThreadBattleBtn": {
"is_sub": true,
Expand All @@ -77,7 +92,8 @@
"roi": [
240,405,173,131
],
"action": "Click"
"action": "Click",
"post_wait_freezes": 2000
},
"Sub_SkipConfirmBtn": {
"is_sub": true,
Expand Down Expand Up @@ -171,15 +187,16 @@
"WinRateAuto": {
"pre_wait_freezes": 1500,
"recognition": "TemplateMatch",
"template": "limbus_template/daily/WinRate.png",
"template": "limbus_template/daily/WinRate2.png",
"roi": [
[852,482,171,125],
[892,482,171,125],
[929,480,173,130],
[967,481,171,127],
[1006,480,171,125],
[1046,480,171,125],
[1086,480,171,125]
[1086,480,171,125],
[55, 496, 1183, 128]
],
"action": "Click",
"next": [
Expand All @@ -199,7 +216,8 @@
[935,491,137,131],
[975,491,137,131],
[1015,491,137,131],
[1055,491,137,131]
[1055,491,137,131],
[55, 496, 1183, 128]
],
"action": "Click",
"next": [
Expand Down
34 changes: 27 additions & 7 deletions assets/resource/pipeline/submit_mission.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,59 @@
"SubmitMission":{
"pre_wait_freezes": 1500,
"next": [
"NoMission",
"Sub_MainMenuNotice",
"Sub_MissionClick",
"Sub_MissionNotice",
"Sub_MainMenuNotice",
"Sub_NoMissionNotice",
"Sub_Limbus_Startup"
]
},
"NoMission": {
"recognition": "TemplateMatch",
"threshold": 0.8,
"template": "limbus_template/daily/seasonpass3Complete.png",
"roi": [
1130, 118, 150, 152
],
"action": "DoNothing"
},
"Sub_MainMenuNotice": {
"is_sub": true,
"recognition": "TemplateMatch",
"threshold": 0.8,
"template": "limbus_template/daily/MainNotice.png",
"template": "limbus_template/daily/seasonpass3.png",
"roi": [
871, 112, 409, 239
1107, 119, 170, 150
],
"target": [1139,133,122,105],
"target_offset": [-50, 50, 0, 0],
"action": "Click"
},
"Sub_MissionNotice": {
"is_sub": true,
"recognition": "TemplateMatch",
"threshold": 0.85,
"template": "limbus_template/daily/MissionNoticeFull.png",
"template": "limbus_template/daily/MissionNotice.png",
"roi": [
272, 0, 228, 154
],
"target": [274,0,220,123],
"action": "Click"
},
"Sub_NoMissionNotice": {
"recognition": "TemplateMatch",
"threshold": 0.85,
"template": "limbus_template/daily/MissionNotice.png",
"roi": [
383, 0, 130, 125
],
"action": "DoNothing"
},
"Sub_MissionClick": {
"recognition": "TemplateMatch",
"template": "limbus_template/daily/MissionClickFull.png",
"template": "limbus_template/daily/MissionNotice2.png",
"roi": [
274, 129, 487, 557
258, 132, 505, 549
],
"target_offset": [-150, 20, 0, 0],
"action": "Click",
Expand Down

0 comments on commit 7267316

Please sign in to comment.