feat: 青春杯训练逻辑 (shiokaze#169)

* fix(install.ps1,-README.md,-requirements.txt): 更新依赖版本和安装方法

* fix(module/umamusume/asset/point.py,-module/umamusume/script/cultivate_task/info.py,-resource/umamusume/): (@maboroshi0651)同步了一部分国服更新导致的素材变动

* fix(web/src/components,-resource/umamusume/race): 同步其余国服更新素材，更新前端比赛名称

* feat(run.ps1,-check_update.ps1): 添加了自动检测更新的脚本

* feat: 可以在前端设置青春杯剧本，并且可以自动选择进入对应剧本

* Merge dev

* feat(bot/server/handler.py): 强制不让浏览器获取缓存, 保证读到最新版前端页面

* feat: 青春杯训练逻辑

* feat: 前端青春杯额外配置UI

* style: 优化青春杯配置展示界面

* feat: 允许青春杯配置生效

* fix: 修复了前端读取资源可能读取到缓存的问题

Author: ZJChe

bot/base/task.py

@@ -31,6 +31,7 @@ class EndTaskReason(Enum):
     COMPLETE = "任务已完成"
     MANUAL_ABORTED = "任务被手动中止"
     SYSTEM_ERROR = "系统异常"
+    SCENARIO_NOT_FOUND = "找不到育成剧本"
 
 
 class Task(metaclass=ABCMeta):

bot/recog/ocr.py

@@ -1,12 +1,14 @@
+import cv2
 import paddleocr
 from difflib import SequenceMatcher
 import bot.base.log as logger
+import time
 
 log = logger.get_logger(__name__)
 
 OCR_JP = paddleocr.PaddleOCR(lang="japan", show_log=False, use_angle_cls=False)
 OCR_CH = paddleocr.PaddleOCR(lang="ch", show_log=False, use_angle_cls=False)
-
+OCR_EN = paddleocr.PaddleOCR(lang="en", show_log=False, use_angle_cls=False)
 
 # ocr 文字识别图片
 def ocr(img, lang="ch"):
@@ -26,6 +28,16 @@ def ocr_line(img, lang="ch"):
             text += text_info[1][0]
     return text
 
+# ocr_digits 限制只识别数字，可以提升数字识别的准确度
+def ocr_digits(img):
+    res = OCR_EN.ocr(img, cls=False)[0]
+    # 提取所有识别结果，按置信度从高到低排序
+    digits = [(info[1][0], info[1][1]) for info in res]
+    if not digits:
+        return ""
+    # 选置信度最高的那一项
+    best, _ = max(digits, key=lambda x: x[1])
+    return best
 
 # find_text_pos 查找目标文字在图片中的位置
 def find_text_pos(ocr_result, target):

bot/server/handler.py

@@ -51,16 +51,27 @@ def stop_bot():
 
 @server.get("/")
 async def get_index():
-    return FileResponse('public/index.html')
+    return FileResponse('public/index.html', headers={
+        'Cache-Control': 'no-cache, no-store, must-revalidate',
+        'Pragma': 'no-cache',
+        'Expires': '0'
+    })
 
 
 @server.get("/{whatever:path}")
 async def get_static_files_or_404(whatever):
     # try open file for path
     file_path = os.path.join("public", whatever)
+    # 设置防缓存头
+    no_cache_headers = {
+        'Cache-Control': 'no-cache, no-store, must-revalidate',
+        'Pragma': 'no-cache',
+        'Expires': '0'
+    }
+    
     if os.path.isfile(file_path):
         if file_path.endswith((".js", ".mjs")):
-            return FileResponse(file_path, media_type="application/javascript")
+            return FileResponse(file_path, media_type="application/javascript", headers=no_cache_headers)
         else:
-            return FileResponse(file_path)
-    return FileResponse('public/index.html')
+            return FileResponse(file_path, headers=no_cache_headers)
+    return FileResponse('public/index.html', headers=no_cache_headers)

module/umamusume/asset/template.py

@@ -1,9 +1,14 @@
 from bot.base.resource import Template
+from module.umamusume.define import ScenarioType
 
 UMAMUSUME_UI_TEMPLATE_PATH = "/umamusume/ui"
 UMAMUSUME_BTN_TEMPLATE_PATH = "/umamusume/btn"
 UMAMUSUME_REF_TEMPLATE_PATH = "/umamusume/ref"
 UMAMUSUME_UMA_ICON_TEMPLATE_PATH = "/umamusume/uma_icon"
+UMAMUSUME_SCENARIO_TEMPLATE_PATH = "/umamusume/scenario"
+# 青春杯
+UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH = "/umamusume/ui/aoharuhai"
+UMAMUSUME_REF_AOHARUHAI_TEMPLATE_PATH = "/umamusume/ref/aoharuhai"
 # 限时: 富士奇石的表演秀
 UMAMUSUME_UI_FUJIKISEKI_SHOW_TEMPLATE_PATH = "/umamusume/ui/fujikiseki_show"
 
@@ -19,6 +24,15 @@
 UI_CULTIVATE_UMAMUSUME_SELECT = Template("CULTIVATE_UMAMUSUME_SELECT", UMAMUSUME_UI_TEMPLATE_PATH)
 UI_CULTIVATE_FINAL_CHECK = Template("CULTIVATE_FINAL_CHECK", UMAMUSUME_UI_TEMPLATE_PATH)
 
+UI_SCENARIO_URA = Template("SCENARIO_URA", UMAMUSUME_SCENARIO_TEMPLATE_PATH)
+UI_SCENARIO_AOHARUHAI = Template("SCENARIO_AOHARUHAI", UMAMUSUME_SCENARIO_TEMPLATE_PATH)
+
+UI_SCENARIO: dict[ScenarioType, Template] = {
+    ScenarioType.SCENARIO_TYPE_UNKNOWN: None,
+    ScenarioType.SCENARIO_TYPE_URA: UI_SCENARIO_URA,
+    ScenarioType.SCENARIO_TYPE_AOHARUHAI: UI_SCENARIO_AOHARUHAI,
+}
+
 UI_CULTIVATE_EVENT_UMAMUSUME = Template("CULTIVATE_EVENT_UMAMUSUME", UMAMUSUME_UI_TEMPLATE_PATH)
 UI_CULTIVATE_EVENT_SUPPORT_CARD = Template("CULTIVATE_EVENT_SUPPORT_CARD", UMAMUSUME_UI_TEMPLATE_PATH)
 UI_CULTIVATE_EVENT_SCENARIO = Template("CULTIVATE_EVENT_SCENARIO", UMAMUSUME_UI_TEMPLATE_PATH)
@@ -45,6 +59,28 @@
 UI_RACE_REWARD_1 = Template("RACE_REWARD_1", UMAMUSUME_UI_TEMPLATE_PATH)
 UI_RACE_REWARD_2 = Template("RACE_REWARD_2", UMAMUSUME_UI_TEMPLATE_PATH)
 
+# 青春杯比赛
+UI_AOHARUHAI_RACE = Template("AOHARUHAI_RACE", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_1 = Template("AOHARUHAI_RACE_1", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_2 = Template("AOHARUHAI_RACE_2", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_3 = Template("AOHARUHAI_RACE_3", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_4 = Template("AOHARUHAI_RACE_4", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_5 = Template("AOHARUHAI_RACE_5", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_SELECT_OPPONENT = Template("AOHARUHAI_RACE_SELECT_OPPONENT", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_FINAL_START = Template("AOHARUHAI_RACE_FINAL_START", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_CONFIRM = Template("AOHARUHAI_RACE_CONFIRM", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_INRACE = Template("AOHARUHAI_RACE_INRACE", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_END = Template("AOHARUHAI_RACE_END", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+UI_AOHARUHAI_RACE_SCHEDULE = Template("AOHARUHAI_RACE_SCHEDULE", UMAMUSUME_UI_AOHARUHAI_TEMPLATE_PATH)
+
+REF_AOHARUHAI_TEAM_NAME_0 = Template("AOHARUHAI_TEAM_NAME_0", UMAMUSUME_REF_AOHARUHAI_TEMPLATE_PATH)
+REF_AOHARUHAI_TEAM_NAME_1 = Template("AOHARUHAI_TEAM_NAME_1", UMAMUSUME_REF_AOHARUHAI_TEMPLATE_PATH)
+REF_AOHARUHAI_TEAM_NAME_2 = Template("AOHARUHAI_TEAM_NAME_2", UMAMUSUME_REF_AOHARUHAI_TEMPLATE_PATH)
+REF_AOHARUHAI_TEAM_NAME_3 = Template("AOHARUHAI_TEAM_NAME_3", UMAMUSUME_REF_AOHARUHAI_TEMPLATE_PATH)
+
+REF_AOHARUHAI_TEAM_NAME = [REF_AOHARUHAI_TEAM_NAME_0, REF_AOHARUHAI_TEAM_NAME_1,
+                           REF_AOHARUHAI_TEAM_NAME_2, REF_AOHARUHAI_TEAM_NAME_3]
+
 UI_GOAL_ACHIEVED = Template("GOAL_ACHIEVED", UMAMUSUME_UI_TEMPLATE_PATH)
 UI_GOAL_FAILED = Template("GOAL_FAILED", UMAMUSUME_UI_TEMPLATE_PATH)
 UI_NEXT_GOAL = Template("NEXT_GOAL", UMAMUSUME_UI_TEMPLATE_PATH)

module/umamusume/asset/ui.py

@@ -21,6 +21,12 @@
 CULTIVATE_URA_RACE_2 = UI("CULTIVATE_URA_RACE_1", [template.UI_CULTIVATE_GOAL_RACE_1, template.UI_CULTIVATE_URA_RACE_2],[])
 CULTIVATE_URA_RACE_3 = UI("CULTIVATE_URA_RACE_1", [template.UI_CULTIVATE_GOAL_RACE_1, template.UI_CULTIVATE_URA_RACE_3],[])
 
+# 青春杯比赛
+AOHARUHAI_RACE = UI("AOHARUHAI_RACE", [template.UI_AOHARUHAI_RACE], [])
+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], [])
+
 
 CULTIVATE_RACE_LIST = UI("CULTIVATE_RACE_LIST", [template.UI_CULTIVATE_RACE_LIST_1, template.UI_CULTIVATE_RACE_LIST_2], [])
 
@@ -67,6 +73,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,
                 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/context.py

@@ -1,145 +1,15 @@
 from bot.base.context import BotContext
+from module.umamusume.scenario import base_scenario, ura_scenario, aoharuhai_scenario
 from module.umamusume.task import UmamusumeTask, UmamusumeTaskType
 from module.umamusume.define import *
+from module.umamusume.types import TurnInfo
 import bot.base.log as logger
 
 log = logger.get_logger(__name__)
-
-
-class SupportCardInfo:
-    name: str
-    card_type: SupportCardType
-    favor: SupportCardFavorLevel
-    has_event: bool
-
-    def __init__(self,
-                 name: str = "support_card",
-                 card_type: SupportCardType = SupportCardType.SUPPORT_CARD_TYPE_UNKNOWN,
-                 favor: SupportCardFavorLevel = SupportCardFavorLevel.SUPPORT_CARD_FAVOR_LEVEL_UNKNOWN,
-                 has_event: bool = False):
-        self.name = name
-        self.card_type = card_type
-        self.favor = favor
-        self.has_event = has_event
-
-
-class TrainingInfo:
-    support_card_info_list: list[SupportCardInfo]
-    speed_incr: int
-    stamina_incr: int
-    power_incr: int
-    will_incr: int
-    intelligence_incr: int
-    skill_point_incr: int
-
-    def __init__(self):
-        self.speed_incr = 0
-        self.stamina_incr = 0
-        self.power_incr = 0
-        self.will_incr = 0
-        self.intelligence_incr = 0
-        self.skill_point_incr = 0
-        self.support_card_info_list = []
-
-    def log_training_info(self):
-        log.info("训练结果：速度：%s, 耐力：%s, 力量：%s, 毅力：%s, 智力：%s, 技能点：%s", self.speed_incr,
-                 self.stamina_incr, self.power_incr, self.will_incr,
-                 self.intelligence_incr, self.skill_point_incr)
-        text = "此训练附带支援卡列表：["
-        for c in self.support_card_info_list:
-            if c.favor != SupportCardFavorLevel.SUPPORT_CARD_FAVOR_LEVEL_UNKNOWN:
-                text += "[支援卡名称：" + str(c.name) + "支援卡类型：" + str(c.card_type.name) + ", 支援卡羁绊阶段：" + str(c.favor.name) + "] "
-        text += "]"
-        log.info(text)
-
-
-class UmaAttribute:
-    speed: int
-    stamina: int
-    power: int
-    will: int
-    intelligence: int
-    skill_point: int
-
-    def __init__(self):
-        self.speed = 0
-        self.stamina = 0
-        self.power = 0
-        self.will = 0
-        self.intelligence = 0
-        self.skill_point = 0
-
-
-class TurnOperation:
-    turn_operation_type: TurnOperationType
-    turn_operation_type_replace: TurnOperationType
-    training_type: TrainingType
-    race_id: int
-
-    def __init__(self):
-        self.turn_operation_type = TurnOperationType.TURN_OPERATION_TYPE_UNKNOWN
-        self.turn_operation_type_replace = TurnOperationType.TURN_OPERATION_TYPE_UNKNOWN
-        self.training_type = TrainingType.TRAINING_TYPE_UNKNOWN
-        self.race_id = 0
-
-    def log_turn_operation(self):
-        log.info("本回合执行操作：%s", self.turn_operation_type.name)
-        log.info("本回合备选操作：%s", self.turn_operation_type_replace.name)
-        if self.turn_operation_type == TurnOperationType.TURN_OPERATION_TYPE_TRAINING:
-            log.info("训练类型：%s", self.training_type.name)
-
-
-class TurnInfo:
-    date: int
-
-    parse_train_info_finish: bool
-    training_info_list: list[TrainingInfo]
-    parse_main_menu_finish: bool
-    uma_attribute: UmaAttribute
-    remain_stamina: int
-    motivation_level: MotivationLevel
-    medic_room_available: bool
-    race_available: bool
-
-    turn_operation: TurnOperation | None
-    turn_info_logged: bool
-    turn_learn_skill_done: bool
-
-    def __init__(self):
-        self.date = -1
-        self.parse_train_info_finish = False
-        self.training_info_list = [TrainingInfo(), TrainingInfo(), TrainingInfo(), TrainingInfo(), TrainingInfo()]
-        self.parse_main_menu_finish = False
-        self.uma_attribute = UmaAttribute()
-        self.remain_stamina = -1
-        self.motivation_level = MotivationLevel.MOTIVATION_LEVEL_UNKNOWN
-        self.medic_room_available = False
-        self.race_available = False
-        self.turn_operation = None
-        self.turn_info_logged = False
-        self.turn_learn_skill_done = False
-
-    def log_turn_info(self):
-        log.info("当前回合时间 >" + str(self.date))
-        log.info("干劲状态 " + str(self.motivation_level.name))
-        log.info("体力剩余" + str(self.remain_stamina))
-        log.info("当前属性值 速度：%s, 耐力：%s, 力量：%s, 毅力：%s, 智力：%s, 技能点：%s", self.uma_attribute.speed,
-                 self.uma_attribute.stamina, self.uma_attribute.power, self.uma_attribute.will, self.uma_attribute.intelligence, self.uma_attribute.skill_point)
-        log.info("速度训练结果：")
-        self.training_info_list[0].log_training_info()
-        log.info("耐力训练结果：")
-        self.training_info_list[1].log_training_info()
-        log.info("力量训练结果：")
-        self.training_info_list[2].log_training_info()
-        log.info("毅力训练结果：")
-        self.training_info_list[3].log_training_info()
-        log.info("智力训练结果：")
-        self.training_info_list[4].log_training_info()
-
-
 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
@@ -198,6 +68,15 @@ def build_context(task: UmamusumeTask, ctrl) -> UmamusumeContext:
     ctx = UmamusumeContext(task, ctrl)
     if task.task_type == UmamusumeTaskType.UMAMUSUME_TASK_TYPE_CULTIVATE:
         detail = CultivateContextDetail()
+        # 根据剧本类型初始化对应的继承类
+        match task.detail.scenario:
+            case ScenarioType.SCENARIO_TYPE_URA:
+                detail.scenario = ura_scenario.URAScenario()
+            case ScenarioType.SCENARIO_TYPE_AOHARUHAI:
+                detail.scenario = aoharuhai_scenario.AoharuHaiScenario()
+            case _: # 占位, 实际上不可能到达这里
+                log.error("未知的场景")
+                detail.scenario = None
         detail.expect_attribute = task.detail.expect_attribute
         detail.follow_support_card_name = task.detail.follow_support_card_name
         detail.follow_support_card_level = task.detail.follow_support_card_level

module/umamusume/define.py

@@ -4,7 +4,7 @@
 class ScenarioType(Enum):
     SCENARIO_TYPE_UNKNOWN = 0
     SCENARIO_TYPE_URA = 1
-
+    SCENARIO_TYPE_AOHARUHAI = 2
 
 class SupportCardType(Enum):
     SUPPORT_CARD_TYPE_UNKNOWN = 0

module/umamusume/manifest.py

@@ -27,6 +27,10 @@
         CULTIVATE_EVENT_UMAMUSUME: script_cultivate_event,
         CULTIVATE_EVENT_SUPPORT_CARD: script_cultivate_event,
         CULTIVATE_EVENT_SCENARIO: script_cultivate_event,
+        AOHARUHAI_RACE: script_aoharuhai_race,
+        AOHARUHAI_RACE_INRACE: script_aoharuhai_race_inrace,
+        AOHARUHAI_RACE_END: script_aoharuhai_race_end,
+        AOHARUHAI_RACE_SCHEDULE: script_aoharuhai_race_schedule,
         CULTIVATE_GOAL_RACE: script_cultivate_goal_race,
         CULTIVATE_RACE_LIST: script_cultivate_race_list,
         BEFORE_RACE: script_cultivate_before_race,