mower-ng/mower-ng
4
0
Fork 0
Code Issues 51 Pull requests Wiki Activity

卫戍协议操作与识别改进、适配原型协议

Browse source
This commit is contained in:
zhbaor 2024-11-19 12:54:57 +08:00
parent 6df5160a9f
commit c77a72ebd3
14 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mower/utils/graph/stronghold_protocol.py
View file

@ -16,6 +16,7 @@ def sp_back(solver: BaseSolver):
@edge(Scene.SP_GIVEUP_CONFIRM, Scene.SP_MAIN)
@edge(Scene.SP_BACK_CONFIRM, Scene.SP_MAIN)
@edge(Scene.SP_WASTE_CONFIRM, Scene.SP_AUTO)
def dialog_confirm(solver: BaseSolver):
solver.tap("double_confirm/main", x_rate=1)

2
mower/utils/recognize/__init__.py
View file

@ -260,6 +260,8 @@ class Recognizer:
self.scene = Scene.SP_BACK_CONFIRM
elif self.find("double_confirm/stronghold_protocol_giveup"):
self.scene = Scene.SP_GIVEUP_CONFIRM
elif self.find("double_confirm/stronghold_protocol_waste"):
self.scene = Scene.SP_WASTE_CONFIRM
else:
self.scene = Scene.DOUBLE_CONFIRM
elif self.find("mission_trainee_on"):

4
mower/utils/recognize/data.py
View file

@ -39,6 +39,7 @@ color = {
"double_confirm/sss_abandon_drop": (901, 463),
"double_confirm/stronghold_protocol_back": (1056, 437),
"double_confirm/stronghold_protocol_giveup": (921, 434),
"double_confirm/stronghold_protocol_waste": (706, 398),
"double_confirm/voice": (745, 435),
"drone": (274, 437),
"factory_collect": (1542, 886),
@ -172,6 +173,9 @@ color = {
"stronghold_protocol/defence": (29, 14),
"stronghold_protocol/empty": (1533, 934),
"stronghold_protocol/main": (1456, 472),
"stronghold_protocol/money0": (326, 255),
"stronghold_protocol/money2": (327, 255),
"stronghold_protocol/round1": (1701, 856),
"stronghold_protocol/start": (1709, 879),
"stronghold_protocol/stop": (1272, 801),
"terminal_main": (1658, 734),

3
mower/utils/scene.py
View file

@ -369,6 +369,8 @@ class Scene:
"卫戍协议回到主页确认"
SP_ANIMATION = 1808
"卫戍协议动画"
SP_WASTE_CONFIRM = 1809
"卫戍协议浪费金币确认"
LOADING = 9998
"场景跳转时的等待界面"
CONFIRM = 9999
@ -561,6 +563,7 @@ SceneComment = {
1806: "卫戍协议结算",
1807: "卫戍协议回到主页确认",
1808: "卫戍协议动画",
1809: "卫戍协议浪费金币确认",
9998: "场景跳转时的等待界面",
9999: "确认对话框",
}

4
mower/utils/typealias/res.py
View file

@ -89,6 +89,7 @@ Res = Literal[
"double_confirm/sss_abandon_drop",
"double_confirm/stronghold_protocol_back",
"double_confirm/stronghold_protocol_giveup",
"double_confirm/stronghold_protocol_waste",
"double_confirm/voice",
"drone",
"episode",
@ -520,6 +521,9 @@ Res = Literal[
"stronghold_protocol/entry.jpg",
"stronghold_protocol/main",
"stronghold_protocol/medic",
"stronghold_protocol/money0",
"stronghold_protocol/money2",
"stronghold_protocol/round1",
"stronghold_protocol/start",
"stronghold_protocol/stop",
"switch_order/check",