feat: 权重为-1时跳过该训练

Author: ZJChe

module/umamusume/script/cultivate_task/ai.py

@@ -18,8 +18,11 @@ def get_operation(ctx: UmamusumeContext) -> TurnOperation | None:
 
     attribute_result_max = np.max(attribute_result)
     attribute_result_min = np.min(attribute_result)
-    normalized_attribute_result = (attribute_result - attribute_result_min) / (
-            attribute_result_max - attribute_result_min)
+    if attribute_result_max != attribute_result_min:
+        normalized_attribute_result = (attribute_result - attribute_result_min) / (
+                attribute_result_max - attribute_result_min)
+    else:
+        normalized_attribute_result = [1, 1, 1, 1, 1]
 
     support_card_max = np.max(support_card_result)
     support_card_min = np.min(support_card_result)
@@ -77,6 +80,21 @@ def get_operation(ctx: UmamusumeContext) -> TurnOperation | None:
     for i in range(5):
         training_score.append(normalized_attribute_result[i] * attr_weight + normalized_support_card_result[i] *
                               support_card_weight + normalized_training_level_result[i] * training_level_weight)
+    # 将权重为-1的训练得分置为0    
+    extra_weight = [0, 0, 0, 0, 0]
+    date = ctx.cultivate_detail.turn_info.date
+    if len(ctx.cultivate_detail.extra_weight) == 3:
+        if 0 < date <= 24:
+            extra_weight = ctx.cultivate_detail.extra_weight[0]
+        elif 24 < date <= 48:
+            extra_weight = ctx.cultivate_detail.extra_weight[1]
+        elif 48 < date:
+            extra_weight = ctx.cultivate_detail.extra_weight[2]
+    if -1 in extra_weight:
+        log.debug("将权重为-1的训练得分设置为0")
+        for i in range(5):
+            if extra_weight[i] <= -1:
+                training_score[i] = 0
     log.debug("训练综合得分：" + str(training_score))
 
     # 出道战成功才能参加比赛

module/umamusume/script/cultivate_task/cultivate.py

@@ -102,41 +102,69 @@ def script_cultivate_training_select(ctx: UmamusumeContext):
 
     if not ctx.cultivate_detail.turn_info.parse_train_info_finish:
         def _parse_training_in_thread(ctx, img, train_type):
-                    """Helper function to run parsing in a separate thread."""
-                    parse_training_result(ctx, img, train_type)
-                    parse_training_support_card(ctx, img, train_type)
+            """Helper function to run parsing in a separate thread."""
+            parse_training_result(ctx, img, train_type)
+            parse_training_support_card(ctx, img, train_type)
+        
+        def _clear_training(ctx: UmamusumeContext, train_type: TrainingType):
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].speed_incr = 0
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].stamina_incr = 0
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].power_incr = 0
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].will_incr = 0
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].intelligence_incr = 0
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].skill_point_incr = 0
+            ctx.cultivate_detail.turn_info.training_info_list[train_type.value - 1].support_card_info_list = []
+            
 
         threads :list[threading.Thread] = []
 
+        # 获取当年的额外权重
+        date = ctx.cultivate_detail.turn_info.date
+        if date == 0:
+            extra_weight = [0, 0, 0, 0, 0]
+        elif date <= 24:
+            extra_weight = ctx.cultivate_detail.extra_weight[0]
+        elif date <= 48:
+            extra_weight = ctx.cultivate_detail.extra_weight[1]
+        else:
+            extra_weight = ctx.cultivate_detail.extra_weight[2]
+
         img = ctx.current_screen
         train_type = parse_train_type(ctx, img)
         if train_type == TrainingType.TRAINING_TYPE_UNKNOWN:
             return
         viewed = train_type.value
-        thread = threading.Thread(target=_parse_training_in_thread,
-                                          args=(ctx, img, train_type))
-        threads.append(thread)
-        thread.start()
+        # 仅当权重不为-1时, 开始parse, 否则清零
+        if extra_weight[viewed-1] > -1:
+            thread = threading.Thread(target=_parse_training_in_thread,
+                                            args=(ctx, img, train_type))
+            threads.append(thread)
+            thread.start()
+        else:
+            _clear_training(ctx, train_type)
 
         for i in range(5):
             if i != (viewed - 1):
-                retry = 0
-                max_retry = 3
-                ctx.ctrl.click_by_point(TRAINING_POINT_LIST[i])
-                img = ctx.ctrl.get_screen()
-                while parse_train_type(ctx, img) != TrainingType(i + 1) and retry < max_retry:
-                    if retry > 2:
-                        ctx.ctrl.click_by_point(TRAINING_POINT_LIST[i])
-                    time.sleep(0.2)
+                if extra_weight[i] > -1:
+                    retry = 0
+                    max_retry = 3
+                    ctx.ctrl.click_by_point(TRAINING_POINT_LIST[i])
                     img = ctx.ctrl.get_screen()
-                    retry += 1
-                if retry == max_retry:
-                    return
-                
-                thread = threading.Thread(target=_parse_training_in_thread,
-                                          args=(ctx, img, TrainingType(i + 1)))
-                threads.append(thread)
-                thread.start()
+                    while parse_train_type(ctx, img) != TrainingType(i + 1) and retry < max_retry:
+                        if retry > 2:
+                            ctx.ctrl.click_by_point(TRAINING_POINT_LIST[i])
+                        time.sleep(0.2)
+                        img = ctx.ctrl.get_screen()
+                        retry += 1
+                    if retry == max_retry:
+                        return
+                    
+                    thread = threading.Thread(target=_parse_training_in_thread,
+                                            args=(ctx, img, TrainingType(i + 1)))
+                    threads.append(thread)
+                    thread.start()
+                else:
+                    _clear_training(ctx, TrainingType(i + 1))
 
         for thread in threads:
             thread.join()

public/assets/index.5beca8ca.js renamed to public/assets/index.4c3c5b3d.js

@@ -12,8 +12,8 @@
     <link href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
     <script src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js"></script>
-    <script type="module" crossorigin src="./assets/index.5beca8ca.js"></script>
-    <link rel="stylesheet" href="./assets/index.28584351.css">
+    <script type="module" crossorigin src="./assets/index.4c3c5b3d.js"></script>
+    <link rel="stylesheet" href="./assets/index.e2a87859.css">
   </head>
   <body>
     <div id="app"></div>