refactor: 重构青春杯对手选择的代码, 防止模拟器卡顿或者网络卡顿造成的选择对手失败

Author: ZJChe

module/umamusume/asset/ui.py

@@ -26,6 +26,8 @@
 AOHARUHAI_RACE_INRACE = UI("AOHARUHAI_RACE_INRACE", [template.UI_AOHARUHAI_RACE_INRACE], [])
 AOHARUHAI_RACE_END = UI("AOHARUHAI_RACE_END", [template.UI_AOHARUHAI_RACE_END], [])
 AOHARUHAI_RACE_SCHEDULE = UI("AOHARUHAI_RACE_SCHEDULE", [template.UI_AOHARUHAI_RACE_SCHEDULE], [])
+AOHARUHAI_RACE_FINAL_START = UI("AOHARUHAI_RACE_FINAL_START", [template.UI_AOHARUHAI_RACE_FINAL_START], [])
+AOHARUHAI_RACE_SELECT_OPPONENT = UI("AOHARUHAI_RACE_SELECT_OPPONENT", [template.UI_AOHARUHAI_RACE_SELECT_OPPONENT], [])
 
 
 CULTIVATE_RACE_LIST = UI("CULTIVATE_RACE_LIST", [template.UI_CULTIVATE_RACE_LIST_1, template.UI_CULTIVATE_RACE_LIST_2], [])
@@ -73,7 +75,7 @@
                 CULTIVATE_SUPPORT_CARD_SELECT, CULTIVATE_FOLLOW_SUPPORT_CARD_SELECT, CULTIVATE_FINAL_CHECK, INFO,
                 CULTIVATE_MAIN_MENU, CULTIVATE_TRAINING_SELECT, CULTIVATE_EXTEND, CULTIVATE_CATCH_DOLL_GAME,
                 CULTIVATE_CATCH_DOLL_GAME_RESULT, CULTIVATE_LEVEL_RESULT,
-                AOHARUHAI_RACE, AOHARUHAI_RACE_INRACE, AOHARUHAI_RACE_END, AOHARUHAI_RACE_SCHEDULE,
+                AOHARUHAI_RACE_FINAL_START, AOHARUHAI_RACE_SELECT_OPPONENT, AOHARUHAI_RACE, AOHARUHAI_RACE_INRACE, AOHARUHAI_RACE_END, AOHARUHAI_RACE_SCHEDULE,
                 CULTIVATE_GOAL_RACE, CULTIVATE_RACE_LIST, CULTIVATE_RESULT, CULTIVATE_RESULT_1, CULTIVATE_RESULT_2,
                 CULTIVATE_LEARN_SKILL, RECEIVE_CUP,
                 CULTIVATE_URA_RACE_1, CULTIVATE_URA_RACE_2,CULTIVATE_URA_RACE_3,

module/umamusume/manifest.py

@@ -27,6 +27,8 @@
         CULTIVATE_EVENT_UMAMUSUME: script_cultivate_event,
         CULTIVATE_EVENT_SUPPORT_CARD: script_cultivate_event,
         CULTIVATE_EVENT_SCENARIO: script_cultivate_event,
+        AOHARUHAI_RACE_FINAL_START: script_aoharuhai_race_final_start,
+        AOHARUHAI_RACE_SELECT_OPPONENT: script_aoharuhai_race_select_oponent,
         AOHARUHAI_RACE: script_aoharuhai_race,
         AOHARUHAI_RACE_INRACE: script_aoharuhai_race_inrace,
         AOHARUHAI_RACE_END: script_aoharuhai_race_end,

module/umamusume/script/cultivate_task/cultivate.py

@@ -234,17 +234,6 @@ def script_cultivate_event(ctx: UmamusumeContext):
         log.debug("未出现选项")
 
 def script_aoharuhai_race(ctx: UmamusumeContext):
-    def select_opponent (race_index: int):
-        match race_index:
-            case 1:
-                ctx.ctrl.click(360, 290, "选择第一个对手")
-            case 2:
-                ctx.ctrl.click(360, 560, "选择第二个对手")
-            case 3:
-                ctx.ctrl.click(360, 830, "选择第三个对手")
-        time.sleep(2)
-        ctx.ctrl.click(360, 1080, "开始对战")
-
     img = ctx.ctrl.get_screen(to_gray=True)
     if image_match(img, UI_AOHARUHAI_RACE_1).find_match:
         race_index = 0
@@ -260,22 +249,24 @@ def select_opponent (race_index: int):
         ctx.ctrl.click(360, 1180, "确认比赛结果")
         return
 
+    ctx.cultivate_detail.turn_info.aoharu_race_index = race_index
     ctx.ctrl.click(360, 1080, "开始青春杯对战")
 
-    if race_index == 4:
-        while True:
-            time.sleep(1)
-            img = ctx.ctrl.get_screen(to_gray=True)
-            if image_match(img, UI_AOHARUHAI_RACE_FINAL_START).find_match:
-                break
-        ctx.ctrl.click(360, 980, "确认决赛对手")
-    else:
-        while True:
-            time.sleep(1)
-            img = ctx.ctrl.get_screen(to_gray=True)
-            if image_match(img, UI_AOHARUHAI_RACE_SELECT_OPPONENT).find_match:
-                break
-        select_opponent(ctx.task.detail.scenario_config.aoharu_config.get_opponent(race_index))
+def script_aoharuhai_race_final_start(ctx: UmamusumeContext):
+    ctx.ctrl.click(360, 980, "确认决赛对手")
+
+def script_aoharuhai_race_select_oponent(ctx: UmamusumeContext):
+    def select_opponent (race_index: int):
+        match race_index:
+            case 1:
+                ctx.ctrl.click(360, 290, "选择第一个对手")
+            case 2:
+                ctx.ctrl.click(360, 560, "选择第二个对手")
+            case 3:
+                ctx.ctrl.click(360, 830, "选择第三个对手")
+        time.sleep(2)
+        ctx.ctrl.click(360, 1080, "开始对战")
+    select_opponent(ctx.task.detail.scenario_config.aoharu_config.get_opponent(ctx.cultivate_detail.turn_info.aoharu_race_index))
 
 def script_aoharuhai_race_confirm(ctx: UmamusumeContext):
     ctx.ctrl.click(520, 920, "确认对战")

module/umamusume/types.py

@@ -117,6 +117,9 @@ class TurnInfo:
     turn_info_logged: bool
     turn_learn_skill_done: bool
 
+    # 青春杯
+    aoharu_race_index: int
+
     def __init__(self):
         self.date = -1
         self.parse_train_info_finish = False
@@ -130,6 +133,7 @@ def __init__(self):
         self.turn_operation = None
         self.turn_info_logged = False
         self.turn_learn_skill_done = False
+        self.aoharu_race_index = 0
 
     def log_turn_info(self, scenario_type : ScenarioType):
         log.info("当前回合时间 >" + str(self.date))