借助战适配新版ui
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful

This commit is contained in:
Elaina 2024-10-09 19:02:44 +08:00
parent 462b26a788
commit 8c2b267454
7 changed files with 11 additions and 11 deletions

View file

@ -369,8 +369,8 @@
"comment": "借助战"
},
"616": {
"label": "OPERATOR_STRANGER_SUPPORT",
"comment": "使用非好友助战"
"label": "OPERATOR_SUPPORT_AGENT",
"comment": "使用助战干员界面"
},
"617": {
"label": "OPERATOR_AGENT_SELECT",

BIN
mower/resources/fight/use.png (Stored with Git LFS)

Binary file not shown.

View file

@ -82,7 +82,7 @@ class CreditFight(SceneGraphSolver):
elif scene == Scene.OPERATOR_SUPPORT:
self.tap(self.choose_support())
self.support = True
elif scene == Scene.OPERATOR_STRANGER_SUPPORT:
elif scene == Scene.OPERATOR_SUPPORT_AGENT:
self.tap_element("fight/use")
elif scene == Scene.OPERATOR_FINISH:
return True

View file

@ -16,7 +16,7 @@ from .utils import edge
@edge(Scene.ACTIVITY_CHOOSE_LEVEL, Scene.ACTIVITY_MAIN)
@edge(Scene.OPERATOR_SUPPORT, Scene.OPERATOR_SELECT)
@edge(Scene.OPERATOR_AGENT_SELECT, Scene.OPERATOR_SELECT)
@edge(Scene.OPERATOR_STRANGER_SUPPORT, Scene.OPERATOR_SUPPORT)
@edge(Scene.OPERATOR_SUPPORT_AGENT, Scene.OPERATOR_SUPPORT)
@edge(Scene.OPERATOR_ELIMINATE_AGENCY, Scene.OPERATOR_ELIMINATE)
def operation_back(solver: BaseSolver):
solver.back()

View file

@ -345,7 +345,7 @@ class Recognizer:
elif self.find("ope_finish"):
self.scene = Scene.OPERATOR_FINISH
elif self.find("fight/use"):
self.scene = Scene.OPERATOR_STRANGER_SUPPORT
self.scene = Scene.OPERATOR_SUPPORT_AGENT
elif self.find("business_card"):
self.scene = Scene.BUSINESS_CARD
elif self.find("friend_list"):

View file

@ -115,7 +115,7 @@ template_matching = {
"episode": (535, 937),
"factory_accelerate": (1800, 775),
"fight/gear": (82, 45),
"fight/use": (858, 864),
"fight/use": (1037, 845),
"friend_list": (61, 306),
"credit_visiting": (78, 220),
"infra_no_operator": None,

View file

@ -183,8 +183,8 @@ class Scene:
"剿灭代理卡使用确认"
OPERATOR_SUPPORT = 615
"借助战"
OPERATOR_STRANGER_SUPPORT = 616
"使用非好友助战"
OPERATOR_SUPPORT_AGENT = 616
"使用助战干员界面"
OPERATOR_AGENT_SELECT = 617
"作战干员选择界面"
OPERATOR_FIGHT = 618
@ -406,7 +406,7 @@ SceneComment = {
613: "代理作战失败",
614: "剿灭代理卡使用确认",
615: "借助战",
616: "使用非好友助战",
616: "使用助战干员界面",
617: "作战干员选择界面",
618: "作战中",
701: "商店其它界面",