Skip to content

Commit

Permalink
feat: 新增2.1版本77号往事 (#162)
Browse files Browse the repository at this point in the history 
feat: 新增2.1版本77号往事
fix: 增大活动推图关卡识别颜色范围
  • Loading branch information
@Tohkahb
Tohkahb authored Aug 8, 2024
1 parent 3188dad commit 0230afc
Show file tree
Hide file tree
Showing 7 changed files with 153 additions and 69 deletions.
71 changes: 47 additions & 24 deletions assets/interface.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@
"entry": "Close1999"
},
{
"name": "活动：飞驰，明日之城 18 艰难",
"entry": "FloorItToTheGoldenCity",
"name": "活动：77号往事 18 艰难",
"entry": "Route77",
"option": [
"复现次数",
"刷完全部体力",
"吃全部临期糖"
],
"param": {
"EnterTheShow": {
"next": "FloorItToTheGoldenCity"
"next": "Route77"
},
"TargetStageName": {
"text": "18"
Expand All @@ -76,33 +76,19 @@
}
},
{
"name": "活动：复兴乌卢鲁运动会 13 艰难（复刻）",
"entry": "RevivalTheUluruGames_Reproduction",
"option": [
"复现次数",
"刷完全部体力",
"吃全部临期糖"
],
"param": {
"TargetStageName": {
"text": "13"
},
"StageDifficulty": {
"next": "ActivityStageDifficulty"
}
}
},
{
"name": "当期活动推图",
"entry": "FloorItToTheGoldenCity_StagePromotion",
"name": "(测试中)当期活动推图",
"entry": "Route77_StagePromotion",
"option": [
"模式选择",
"体力不够自动吃糖"
]
},
{
"name": "推图模式（请先手动在游戏的页面中打开需要推图的页面，如当期活动、佚事等，然后再运行此任务）",
"entry": "StagePromotion_SwipeRightAndFindStage"
"name": "(测试中)推图模式（请先手动在游戏的页面中打开需要推图的页面，如当期活动、佚事等，然后再运行此任务）",
"entry": "StagePromotion_SwipeRightAndFindStage",
"option": [
"体力不够自动吃糖"
]
},
{
"name": "局外演绎：黄昏的音序",
Expand Down Expand Up @@ -233,6 +219,43 @@
}
}
},
{
"name": "活动：飞驰，明日之城 18 艰难（已结束）",
"entry": "FloorItToTheGoldenCity",
"option": [
"复现次数",
"刷完全部体力",
"吃全部临期糖"
],
"param": {
"EnterTheShow": {
"next": "FloorItToTheGoldenCity"
},
"TargetStageName": {
"text": "18"
},
"StageDifficulty": {
"next": "ActivityStageDifficulty"
}
}
},
{
"name": "活动：复兴乌卢鲁运动会 13 艰难（复刻）",
"entry": "RevivalTheUluruGames_Reproduction",
"option": [
"复现次数",
"刷完全部体力",
"吃全部临期糖"
],
"param": {
"TargetStageName": {
"text": "13"
},
"StageDifficulty": {
"next": "ActivityStageDifficulty"
}
}
},
{
"name": "肉鸽：山麓的回音（已结束）",
"entry": "EchoesinInTheMountain"
Expand Down
Binary file added assets/resource/base/image/Combat/Activity/ActivityNextStage1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Combat/Activity/ActivityNextStage2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Combat/Activity/Route77EnterTheShow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Combat/Activity/Route77MainChapter.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions assets/resource/base/pipeline/activity/Route77.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"Route77": {
"next": [
"Route77EnterTheShow",
"Sub_StartUp"
]
},
"Route77EnterTheShow": {
"recognition": "TemplateMatch",
"template": "Combat/Activity/Route77EnterTheShow.png",
"roi": [
935,
193,
254,
110
],
"action": "Click",
"post_wait_freezes": 1,
"next": [
"Route77MainChapter",
"Route77EnterTheShow"
]
},
"Route77MainChapter": {
"recognition": "TemplateMatch",
"template": "Combat/Activity/Route77MainChapter.png",
"roi": [
988,
571,
281,
144
],
"action": "Click",
"next": "SwipeLeftAndFindStage"
},
"Route77_StagePromotion": {
"next": [
"Route77EnterTheShow_StagePromotion",
"Sub_StartUp"
]
},
"Route77EnterTheShow_StagePromotion": {
"recognition": "TemplateMatch",
"template": "Combat/Activity/Route77EnterTheShow.png",
"roi": [
935,
193,
254,
110
],
"action": "Click",
"post_wait_freezes": 1,
"next": [
"Route77MainChapter_StagePromotion",
"Route77EnterTheShow_StagePromotion"
]
},
"Route77MainChapter_StagePromotion": {
"recognition": "TemplateMatch",
"template": "Combat/Activity/Route77MainChapter.png",
"roi": [
988,
571,
281,
144
],
"action": "Click",
"next": [
"ActivityStageModelSellect"
]
}
}
79 changes: 34 additions & 45 deletions assets/resource/base/pipeline/activity/StagePromotion.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"ActivityStageModelSellect": {
"next_doc": "Set in code."
},
"ActivityStageModel_Story": {
"recognition": "OCR",
"expected": [
"故事模式"
],
"roi": [
14,
10,
90,
244,
143
250,
140
],
"action": "Click",
"next": [
Expand All @@ -23,10 +24,10 @@
"探索模式"
],
"roi": [
14,
10,
200,
244,
143
250,
140
],
"action": "Click",
"next": [
Expand All @@ -50,19 +51,21 @@
],
"method": 4,
"lower": [
122,
122,
122
85,
85,
85
],
"upper": [
133,
135,
139
150,
150,
150
],
"count": 80,
"connected": true,
"count": 70,
"action": "Click",
"next": [
"StagePromotion_ReadyForAction",
"StagePromotion_Skip",
"StagePromotion_NextStage1"
]
},
Expand All @@ -72,23 +75,25 @@
422,
533,
200,
50
60
],
"method": 4,
"lower": [
122,
122,
122
85,
85,
85
],
"upper": [
133,
135,
139
150,
150,
150
],
"connected": true,
"count": 70,
"action": "Click",
"next": [
"StagePromotion_ReadyForAction",
"StagePromotion_Skip",
"StagePromotion_NextStage2"
]
},
Expand Down Expand Up @@ -145,6 +150,7 @@
277,
149
],
"threshold": 0.7,
"next": [
"StagePromotion_SmallCandy",
"StagePromotion_MiniCandy",
Expand Down Expand Up @@ -302,7 +308,10 @@
"next": [
"StagePromotion_Victory",
"StagePromotion_CombatDefeat",
"StagePromotion_Dialog",
"StagePromotion_Skip",
"StagePromotion_ReadyForAction",
"StagePromotion_Dialog_Right",
"StagePromotion_Dialog_Left",
"StagePromotion_Combating"
]
},
Expand Down Expand Up @@ -341,17 +350,8 @@
214
]
},
"StagePromotion_Dialog": {
"next": [
"StagePromotion_Victory",
"StagePromotion_Skip",
"StagePromotion_ReadyForAction",
"StagePromotion_Dialog_Right",
"StagePromotion_Dialog_Left",
"StagePromotion_Combating"
]
},
"StagePromotion_Dialog_Right": {
"is_sub": true,
"recognition": "ColorMatch",
"roi": [
1093,
Expand All @@ -374,15 +374,10 @@
"order_by": "Score",
"index": 0,
"action": "Click",
"target": true,
"next": [
"StagePromotion_Dialog",
"StagePromotion_Combating",
"StagePromotion_Victory",
"StagePromotion_CombatDefeat"
]
"target": true
},
"StagePromotion_Dialog_Left": {
"is_sub": true,
"recognition": "ColorMatch",
"roi": [
72,
Expand All @@ -405,13 +400,7 @@
"order_by": "Score",
"index": 0,
"action": "Click",
"target": true,
"next": [
"StagePromotion_Dialog",
"StagePromotion_Combating",
"StagePromotion_Victory",
"StagePromotion_CombatDefeat"
]
"target": true
},
"StagePromotion_CantAuto": {
"recognition": "TemplateMatch",
Expand Down

0 comments on commit 0230afc

Please sign in to comment.