Skip to content

Commit

Permalink
v2.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@Saratoga-Official
Saratoga-Official committed Jan 10, 2025
1 parent 1671fc8 commit b64d24f
Show file tree
Hide file tree
Showing 8 changed files with 219 additions and 142 deletions.
155 changes: 67 additions & 88 deletions assets/interface.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,50 +181,6 @@
]
}
}
},
{
"name": "活动地峡之岚",
"entry": "进入活动",
"check": false,
"repeatable": true,
"doc": "[color:red]活动不支持自动导航，活动模式选择活动出征须在出击准备界面点开始，其余设置沿用自动出征，活动答题须在答题界面点开始，选择答题后下面设置将无效[/color]",
"repeat_count": 1,
"option": [
"活动模式",
"战斗编队",
"战斗阵型",
"活动无限次数",
"战斗大破/中破舰船处理",
"门口SL目标1",
"门口SL目标2",
"夜战追击",
"战斗点位",
"战斗使用军阶buff"
],
"pipeline_override": {
"回到关卡了": {
"expected": "出击准备",
"roi": [
980,
581,
254,
75
],
"next": [
"无限战斗",
"无动作结束"
]
},
"进入关卡": {
"expected": "出击准备",
"roi": [
980,
581,
254,
75
]
}
}
}
],
"option": {
Expand Down Expand Up @@ -830,23 +786,56 @@
"name": "第二编队",
"pipeline_override": {
"战斗编队": {
"template": "2队.png"
"roi": [
227,
94,
153,
44
],
"target": [
227,
94,
153,
44
]
}
}
},
{
"name": "第三编队",
"pipeline_override": {
"战斗编队": {
"template": "3队.png"
"roi": [
384,
94,
152,
44
],
"target": [
384,
94,
152,
44
]
}
}
},
{
"name": "第四编队",
"pipeline_override": {
"战斗编队": {
"template": "4队.png"
"roi": [
544,
94,
150,
44
],
"target": [
544,
94,
150,
44
]
}
}
}
Expand Down Expand Up @@ -1057,6 +1046,15 @@
"expected": "潜艇"
}
}
},
{
"name": "无补给",
"pipeline_override": {
"战斗识别SL目标1": {
"expected": "补给",
"inverse": true
}
}
}
]
},
Expand Down Expand Up @@ -1117,6 +1115,15 @@
"expected": "潜艇"
}
}
},
{
"name": "无补给",
"pipeline_override": {
"战斗识别SL目标2": {
"expected": "补给",
"inverse": true
}
}
}
]
},
Expand Down Expand Up @@ -1250,6 +1257,7 @@
"pipeline_override": {
"战斗船舱满退出": {
"next": [
"拆船前领奖",
"战斗船舱满尝试拆船"
],
"interrupt": [
Expand All @@ -1265,12 +1273,16 @@
"cases": [
{
"name": "不使用",
"pipeline_override": {}
"pipeline_override": {
"启用军阶buff": {
"enabled": false
}
}
},
{
"name": "战利品加成",
"pipeline_override": {
"进入关卡": {
"确认进入关卡": {
"next": [
"启用军阶buff",
"战斗编队",
Expand All @@ -1285,7 +1297,7 @@
{
"name": "经验加成",
"pipeline_override": {
"进入关卡": {
"确认进入关卡": {
"next": [
"启用军阶buff",
"战斗编队",
Expand Down Expand Up @@ -1314,7 +1326,7 @@
{
"name": "打捞加成",
"pipeline_override": {
"进入关卡": {
"确认进入关卡": {
"next": [
"启用军阶buff",
"战斗编队",
Expand Down Expand Up @@ -1343,7 +1355,7 @@
{
"name": "好感度加成",
"pipeline_override": {
"进入关卡": {
"确认进入关卡": {
"next": [
"启用军阶buff",
"战斗编队",
Expand Down Expand Up @@ -1372,7 +1384,7 @@
{
"name": "伤害加成",
"pipeline_override": {
"进入关卡": {
"确认进入关卡": {
"next": [
"启用军阶buff",
"战斗编队",
Expand Down Expand Up @@ -1401,7 +1413,7 @@
{
"name": "学院加成",
"pipeline_override": {
"进入关卡": {
"确认进入关卡": {
"next": [
"启用军阶buff",
"战斗编队",
Expand Down Expand Up @@ -1482,6 +1494,7 @@
"pipeline_override": {
"退出狗粮": {
"next": [
"拆船前领奖",
"战斗船舱满尝试拆船"
],
"interrupt": [
Expand Down Expand Up @@ -2300,40 +2313,6 @@
}
}
]
},
"活动无限次数": {
"cases": [
{
"name": "关闭",
"pipeline_override": {
"无限战斗": {
"enabled": false
}
}
},
{
"name": "无限次数",
"pipeline_override": {}
}
]
},
"活动模式": {
"cases": [
{
"name": "活动出征",
"pipeline_override": {}
},
{
"name": "活动答题（测试功能）",
"pipeline_override": {
"进入活动": {
"next": [
"检查题目"
]
}
}
}
]
}
}
}
9 changes: 9 additions & 0 deletions assets/resource/base/pipeline/关卡导航.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"开始出征": {
"next": [
"进入关卡",
"出征领取奖励",
"点击出征",
"导航前"
],
Expand All @@ -10,6 +11,14 @@
"退出"
]
},
"出征领取奖励": {
"recognition": "TemplateMatch",
"template": "领取奖励.png",
"action": "Click",
"next": [
"点击出征"
]
},
"点击出征": {
"recognition": "TemplateMatch",
"template": "出征2.png",
Expand Down
9 changes: 9 additions & 0 deletions assets/resource/base/pipeline/决战.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
{
"开始自动决战": {
"next": [
"决战领取奖励",
"自动决战",
"点击决战",
"决战沉默战士",
"识别决战点",
"退出决战"
]
},
"决战领取奖励": {
"recognition": "TemplateMatch",
"template": "领取奖励.png",
"action": "Click",
"next": [
"开始自动决战"
]
},
"自动决战": {
"recognition": "TemplateMatch",
"template": "出征2.png",
Expand Down
19 changes: 19 additions & 0 deletions assets/resource/base/pipeline/结束前任务.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"收尾工作": {
"next": [
"结束领取奖励",
"点击任务",
"点击船坞"
],
Expand All @@ -9,6 +10,23 @@
"退出"
]
},
"结束领取奖励": {
"recognition": "TemplateMatch",
"template": "领取奖励.png",
"action": "Click",
"next": [
"收尾工作"
]
},
"结束领取奖励2": {
"recognition": "TemplateMatch",
"template": "领取奖励.png",
"action": "Click",
"next": [
"点击船坞",
"任务结束"
]
},
"点击任务": {
"recognition": "TemplateMatch",
"template": "任务.png",
Expand All @@ -32,6 +50,7 @@
"action": "Click",
"green_mask": true,
"next": [
"结束领取奖励2",
"点击船坞",
"任务结束"
]
Expand Down
9 changes: 9 additions & 0 deletions assets/resource/base/pipeline/自动战役.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"开始自动战役": {
"next": [
"战役领取奖励",
"自动战役",
"点击战役",
"战役次数",
Expand All @@ -9,6 +10,14 @@
"退出战役"
]
},
"战役领取奖励": {
"recognition": "TemplateMatch",
"template": "领取奖励.png",
"action": "Click",
"next": [
"开始自动战役"
]
},
"自动战役": {
"recognition": "TemplateMatch",
"template": "出征2.png",
Expand Down
Loading

0 comments on commit b64d24f

Please sign in to comment.