Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #12

Closed
wants to merge 2 commits into from
Closed

Dev #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c23e4f3
feat: 模拟军演检测到战力过高时自动刷新
LBEILC Sep 14, 2024
b56735e
feat: 解耦部分代码，放入utils.json中，夏活任务优化，优化部分任务名称，增加可读性
LBEILC Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions assets/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
},
{
"name": "模拟军演",
"entry": "Rehearsal",
"entry": "模拟军演",
"param": {
"Sortie": {
"next": "Simulation"
"首页_出击": {
"next": "模拟军演_入口"
}
}
},
Expand All @@ -64,7 +64,7 @@
"name": "周本",
"entry": "WeekInstance",
"param": {
"Sortie": {
"首页_出击": {
"next": "ActivityExploration"
}
},
Expand All @@ -89,7 +89,7 @@
{
"name": "技能书",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -106,7 +106,7 @@
{
"name": "星币",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -123,7 +123,7 @@
{
"name": "经验书",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -140,7 +140,7 @@
{
"name": "遗余之谱(异星灰域商店币)",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -157,7 +157,7 @@
{
"name": "芯片_物攻振奋",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -174,7 +174,7 @@
{
"name": "芯片_能量金刚",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -191,7 +191,7 @@
{
"name": "芯片_切割集中",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -208,7 +208,7 @@
{
"name": "模块_气象山脉",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -225,7 +225,7 @@
{
"name": "模块_灭刃乐团",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand All @@ -242,7 +242,7 @@
{
"name": "模块_不朽虫洞",
"param": {
"Sortie": {
"首页_出击": {
"next": "DailyExplore_Entry"
},
"DailyExplore_Entry": {
Expand Down
51 changes: 25 additions & 26 deletions assets/resource/base/pipeline/combat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"DailyExplore": {
"next": [
"Sortie",
"首页_出击",
"Sub_StartUp"
]
},
"DailyExplore_Entry":{
"DailyExplore_Entry": {
"recognition": "OCR",
"text": [
"每日探索"
Expand All @@ -19,7 +19,7 @@
"action": "Click",
"next_doc": "Set in code."
},
"DailyExplore_ReAc":{
"DailyExplore_ReAc": {
"recognition": "OCR",
"text": [
"资源采集"
Expand All @@ -33,7 +33,7 @@
"action": "Click",
"next_doc": "Set in code."
},
"DailyExplore_ReAc_Skill":{
"DailyExplore_ReAc_Skill": {
"recognition": "OCR",
"text": [
"技能磨砺"
Expand All @@ -49,7 +49,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_ReAc_Money":{
"DailyExplore_ReAc_Money": {
"recognition": "OCR",
"text": [
"星币开采"
Expand All @@ -65,7 +65,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_ReAc_Experience":{
"DailyExplore_ReAc_Experience": {
"recognition": "OCR",
"text": [
"技术解析"
Expand All @@ -81,7 +81,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_ReAc_Token":{
"DailyExplore_ReAc_Token": {
"recognition": "OCR",
"text": [
"荒墟拾遗"
Expand All @@ -97,7 +97,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_LevelSelect":{
"DailyExplore_LevelSelect": {
"recognition": "OCR",
"text_doc": "Set in code.",
"roi": [
Expand All @@ -111,7 +111,7 @@
"DailyExplore_MopUp"
]
},
"DailyExplore_MopUp":{
"DailyExplore_MopUp": {
"recognition": "OCR",
"text": [
"扫荡"
Expand All @@ -128,7 +128,7 @@
"DailyExplore_MopUp"
]
},
"DailyExplore_MopUpStart":{
"DailyExplore_MopUpStart": {
"recognition": "OCR",
"text": [
"开始战斗"
Expand All @@ -142,12 +142,12 @@
"action": "Click",
"next": [
"DailyExplore_MopUpDoubleMarkup",
"DailyExplore_MopUpAwards",
"DailyExplore_NoFuel",
"DailyExplore_MopUpAwards",
"DailyExplore_NoFuel",
"DailyExplore_MopUpStart"
]
},
"DailyExplore_NoFuel":{
"DailyExplore_NoFuel": {
"recognition": "OCR",
"text": [
"燃料补给"
Expand All @@ -169,7 +169,7 @@
"StartUp"
]
},
"DailyExplore_MopUpAwards":{
"DailyExplore_MopUpAwards": {
"recognition": "OCR",
"text": [
"扫荡奖励"
Expand All @@ -187,7 +187,7 @@
"DailyExplore_MopUpAwards"
]
},
"DailyExplore_LevelUp":{
"DailyExplore_LevelUp": {
"is_sub": true,
"recognition": "TemplateMatch",
"template": "Combat/DailyExplore_LevelUp.png",
Expand All @@ -199,7 +199,7 @@
],
"action": "Click"
},
"DailyExplore_MopUpDoubleMarkup":{
"DailyExplore_MopUpDoubleMarkup": {
"is_sub": true,
"recognition": "OCR",
"text": [
Expand All @@ -212,10 +212,9 @@
100
],
"action": "Click",
"next": [
]
"next": []
},
"DailyExplore_ChEm":{
"DailyExplore_ChEm": {
"recognition": "OCR",
"text": [
"芯片嵌合"
Expand All @@ -229,7 +228,7 @@
"action": "Click",
"next_doc": "Set in code."
},
"DailyExplore_ChEm_1":{
"DailyExplore_ChEm_1": {
"recognition": "OCR",
"text": [
"鼓军嵌合"
Expand All @@ -245,7 +244,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_ChEm_2":{
"DailyExplore_ChEm_2": {
"recognition": "OCR",
"text": [
"光"
Expand All @@ -261,7 +260,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_ChEm_3":{
"DailyExplore_ChEm_3": {
"recognition": "OCR",
"text": [
"注"
Expand All @@ -277,7 +276,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_UpAc":{
"DailyExplore_UpAc": {
"recognition": "OCR",
"text": [
"跃升行动"
Expand All @@ -291,7 +290,7 @@
"action": "Click",
"next_doc": "Set in code."
},
"DailyExplore_UpAc_1":{
"DailyExplore_UpAc_1": {
"recognition": "OCR",
"text": [
"自然"
Expand All @@ -307,7 +306,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_UpAc_2":{
"DailyExplore_UpAc_2": {
"recognition": "OCR",
"text": [
"人造"
Expand All @@ -323,7 +322,7 @@
"DailyExplore_LevelSelect"
]
},
"DailyExplore_UpAc_3":{
"DailyExplore_UpAc_3": {
"recognition": "OCR",
"text": [
"生命"
Expand Down
Loading
Loading