feat: 技能学习更新和优化 (#219)

* ci: 仅在release时编译

* feat: 优化若干技能学习功能

Author: ZJChe

.github/workflows/python-build.yml

@@ -2,13 +2,8 @@ name: Python Build and Release
 
 on:
   push:
-    branches:
-      - '**'
     tags:
       - 'v*'
-  pull_request:
-    branches:
-      - '**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

bot/base/localization.py

@@ -51,9 +51,9 @@ class LocalizationMap:
     RACE_TACTIC_TYPE_ESCAPE = '领跑'
 
     TASK_STATUS_INVALID = '任务无效'
-    TASK_STATUS_PENDING = '任务暂停'
-    TASK_STATUS_RUNNING = '任务运行'
-    TASK_STATUS_INTERRUPT = '任务被打断'
+    TASK_STATUS_PENDING = '任务等待中'
+    TASK_STATUS_RUNNING = '任务运行中'
+    TASK_STATUS_INTERRUPT = '任务被中断'
     TASK_STATUS_SUCCESS = '任务完成'
     TASK_STATUS_FAILED = '任务失败'
     TASK_STATUS_SCHEDULED = '任务定时'

bot/base/task.py

@@ -29,7 +29,9 @@ class TaskStatus(Enum):
 
 class EndTaskReason(Enum):
     COMPLETE = "任务已完成"
+    STOP_AT_SKILL_LEARN = "任务完成并在学习技能页面停止"
     MANUAL_ABORTED = "任务被手动中止"
+    CANCELLED_DUE_TO_STOP_AT_SKILL_LEARN = "因其它任务等待学习技能而取消"
     SYSTEM_ERROR = "系统异常"
     SCENARIO_NOT_FOUND = "找不到育成剧本"
 

module/umamusume/context.py

@@ -26,6 +26,7 @@ class CultivateContextDetail:
     learn_skill_threshold: int
     learn_skill_only_user_provided: bool
     learn_skill_before_race: bool
+    learn_skill_cooldown: int
     allow_recover_tp: bool
     parse_factor_done: bool
     extra_weight: list
@@ -44,6 +45,7 @@ def __init__(self):
         self.debut_race_win = False
         self.clock_use_limit = 0
         self.clock_used = 0
+        self.learn_skill_cooldown = 0
         self.allow_recover_tp = False
         self.parse_factor_done = False
         self.extra_weight = []

module/umamusume/script/cultivate_task/cultivate.py

@@ -5,6 +5,7 @@
 import numpy as np
 
 from bot.base.task import TaskStatus, EndTaskReason
+from bot.engine.scheduler import scheduler
 from module.umamusume.asset.point import *
 from module.umamusume.types import TurnInfo
 from module.umamusume.script.cultivate_task.const import SKILL_LEARN_PRIORITY_LIST
@@ -28,6 +29,8 @@ def script_cultivate_main_menu(ctx: UmamusumeContext):
         ctx.cultivate_detail.turn_info.date = current_date
         log.debug("进入新回合，日期：" + str(current_date))
         ctx.cultivate_detail.reset_skill_learn()
+        # 进入新会合后降低技能学习冷却倒计时
+        ctx.cultivate_detail.learn_skill_cooldown = max(0, ctx.cultivate_detail.learn_skill_cooldown - 1)
 
     # 解析主界面
     if not ctx.cultivate_detail.turn_info.parse_main_menu_finish:
@@ -42,7 +45,11 @@ def script_cultivate_main_menu(ctx: UmamusumeContext):
 
     if (ctx.cultivate_detail.turn_info.uma_attribute.skill_point > ctx.cultivate_detail.learn_skill_threshold
             and not ctx.cultivate_detail.turn_info.turn_learn_skill_done):
-        if len(ctx.cultivate_detail.learn_skill_list) > 0 or not ctx.cultivate_detail.learn_skill_only_user_provided:
+        if (any(len(skill_list) for skill_list in ctx.cultivate_detail.learn_skill_list) \
+            or not ctx.cultivate_detail.learn_skill_only_user_provided) \
+            and ctx.cultivate_detail.learn_skill_cooldown == 0:
+            # 如果只允许学习用户的技能, 且技能列表为空,则不学习技能
+            # 如果冷却倒计时为0, 则可以学习技能 (无需判断是否育成结束)
             ctx.ctrl.click_by_point(CULTIVATE_SKILL_LEARN)
         else:
             ctx.cultivate_detail.learn_skill_done = True
@@ -452,6 +459,16 @@ def script_cultivate_finish(ctx: UmamusumeContext):
 
 
 def script_cultivate_learn_skill(ctx: UmamusumeContext):
+    # 如果指定育成结束后停留在学习技能页面:
+    if ctx.cultivate_detail.cultivate_finish and ctx.task.detail.stop_at_skill_learn:
+        ctx.task.end_task(TaskStatus.TASK_STATUS_SUCCESS, EndTaskReason.STOP_AT_SKILL_LEARN)
+        # 终止所有待处理任务
+        task_list = scheduler.get_task_list()
+        for task in task_list:
+            if task.task_status == TaskStatus.TASK_STATUS_PENDING:
+                task.end_task(TaskStatus.TASK_STATUS_FAILED, EndTaskReason.CANCELLED_DUE_TO_STOP_AT_SKILL_LEARN)
+        return
+
     if ctx.cultivate_detail.learn_skill_done:
         if ctx.cultivate_detail.learn_skill_selected:
             ctx.ctrl.click_by_point(CULTIVATE_LEARN_SKILL_CONFIRM)
@@ -461,13 +478,13 @@ def script_cultivate_learn_skill(ctx: UmamusumeContext):
     learn_skill_list: list[list[str]]
     learn_skill_blacklist: list[str] = ctx.cultivate_detail.learn_skill_blacklist
     if ctx.cultivate_detail.cultivate_finish or not ctx.cultivate_detail.learn_skill_only_user_provided:
-        if len(ctx.cultivate_detail.learn_skill_list) == 0:
+        if not any(len(skill_list) for skill_list in ctx.cultivate_detail.learn_skill_list):
             learn_skill_list = SKILL_LEARN_PRIORITY_LIST
         else:
             #如果用户自定义了技能优先级，那么不再采用预设的优先级
             learn_skill_list = ctx.cultivate_detail.learn_skill_list
     else:
-        if len(ctx.cultivate_detail.learn_skill_list) == 0:
+        if not any(len(skill_list) for skill_list in ctx.cultivate_detail.learn_skill_list):
             ctx.ctrl.click_by_point(RETURN_TO_CULTIVATE_FINISH)
             ctx.cultivate_detail.learn_skill_done = True
             ctx.cultivate_detail.turn_info.turn_learn_skill_done = True
@@ -548,6 +565,10 @@ def script_cultivate_learn_skill(ctx: UmamusumeContext):
     #如果一个优先级全为空，则直接将其删除
     ctx.cultivate_detail.learn_skill_list = [x for x in ctx.cultivate_detail.learn_skill_list if x != []]
 
+    if len(target_skill_list) == 0:
+        # 如果什么技能都没学, 则至少冷却12回合后再检查
+        ctx.cultivate_detail.learn_skill_cooldown = 12
+
     # 点技能
     while True:
         img = ctx.ctrl.get_screen()

module/umamusume/task.py

@@ -16,6 +16,7 @@ class TaskDetail:
     clock_use_limit: int
     learn_skill_threshold: int
     learn_skill_only_user_provided: bool
+    stop_at_skill_learn: bool
     allow_recover_tp: bool
     cultivate_progress_info: dict
     extra_weight: list
@@ -63,6 +64,7 @@ def build_task(task_execute_mode: TaskExecuteMode, task_type: int,
     td.clock_use_limit = attachment_data['clock_use_limit']
     td.learn_skill_threshold = attachment_data['learn_skill_threshold']
     td.learn_skill_only_user_provided = attachment_data['learn_skill_only_user_provided']
+    td.stop_at_skill_learn = attachment_data['stop_at_skill_learn']
     td.allow_recover_tp = attachment_data['allow_recover_tp']
     td.extra_weight = attachment_data['extra_weight']
     td.cultivate_result = {}

module/umamusume/types.py

@@ -151,50 +151,3 @@ def log_turn_info(self, scenario_type : ScenarioType):
         self.training_info_list[3].log_training_info(scenario_type)
         log.info("智力训练结果：")
         self.training_info_list[4].log_training_info(scenario_type)
-
-
-class CultivateContextDetail:
-    turn_info: TurnInfo | None
-    turn_info_history: list[TurnInfo]
-    scenario : "base_scenario.BaseScenario"
-    expect_attribute: list[int] | None
-    follow_support_card_name: str
-    follow_support_card_level: int
-    extra_race_list: list[int]
-    learn_skill_list: list[list[str]]
-    learn_skill_blacklist: list[str]
-    learn_skill_done: bool
-    learn_skill_selected: bool
-    cultivate_finish: bool
-    tactic_list: list[int]
-    debut_race_win: bool
-    clock_use_limit: int
-    clock_used: int
-    learn_skill_threshold: int
-    learn_skill_only_user_provided: bool
-    learn_skill_before_race: bool
-    allow_recover_tp: bool
-    parse_factor_done: bool
-    extra_weight: list
-
-    def __init__(self):
-        self.expect_attribute = None
-        self.turn_info = TurnInfo()
-        self.turn_info_history = []
-        self.extra_race_list = []
-        self.learn_skill_list = []
-        self.learn_skill_blacklist = []
-        self.learn_skill_done = False
-        self.learn_skill_selected = False
-        self.cultivate_finish = False
-        self.tactic_list = []
-        self.debut_race_win = False
-        self.clock_use_limit = 0
-        self.clock_used = 0
-        self.allow_recover_tp = False
-        self.parse_factor_done = False
-        self.extra_weight = []
-
-    def reset_skill_learn(self):
-        self.learn_skill_done = False
-        self.learn_skill_selected = False