fix: 技能识别时只识别中英文字符和数字 (#220)

ZJChe · web-flow · commit c0668f160834 · 2025-08-28T18:03:41.000-04:00
diff --git a/bot/recog/ocr.py b/bot/recog/ocr.py
@@ -1,4 +1,5 @@
 import cv2
+import re
 import paddleocr
 from difflib import SequenceMatcher
 import bot.base.log as logger
@@ -28,6 +29,10 @@ def ocr_line(img, lang="ch"):
             text += text_info[1][0]
     return text
 
+# 剔除所有符号, 只保留中文字符, 英文字符, 数字
+def extract_chinese_english_digits(text: str) -> str:
+    return re.sub(r"[^a-zA-Z0-9\u4e00-\u9fff]", "", text)
+
 # ocr_digits 限制只识别数字，可以提升数字识别的准确度
 def ocr_digits(img):
     res = OCR_EN.ocr(img, cls=False)[0]
@@ -52,10 +57,12 @@ def find_text_pos(ocr_result, target):
     return result
 
 
-def find_similar_text(target_text, ref_text_list, threshold=0):
+def find_similar_text(target_text: str, ref_text_list: list[str], threshold=0):
+    # 去除所有空格, 并把英文字符转为小写
+    target_text = target_text.replace(" ", "").lower()
     result = ""
     for ref_text in ref_text_list:
-        s = SequenceMatcher(None, target_text, ref_text)
+        s = SequenceMatcher(None, target_text, ref_text.replace(" ", "").lower())
         if s.ratio() > threshold:
             result = ref_text
             threshold = s.ratio()
diff --git a/module/umamusume/script/cultivate_task/parse.py b/module/umamusume/script/cultivate_task/parse.py
@@ -7,7 +7,7 @@
 
 from bot.base.task import TaskStatus, EndTaskReason
 from bot.recog.image_matcher import image_match, compare_color_equal
-from bot.recog.ocr import ocr_line, find_similar_text
+from bot.recog.ocr import ocr_line, find_similar_text, extract_chinese_english_digits
 from module.umamusume.asset.race_data import RACE_LIST
 from module.umamusume.context import UmamusumeContext
 from module.umamusume.types import SupportCardInfo
@@ -367,7 +367,7 @@ def get_skill_list(img, skill: list[str], skill_blacklist: list[str]) -> list:
 
                 skill_name_img = skill_info_img[10: 47, 100: 445]
                 skill_cost_img = skill_info_img[69: 99, 525: 588]
-                text = ocr_line(skill_name_img)
+                text = extract_chinese_english_digits(ocr_line(skill_name_img))
                 cost = re.sub("\\D", "", ocr_line(skill_cost_img))
 
                 # 检查是不是金色技能
diff --git a/public/assets/index.3757966e.css b/public/assets/index.3757966e.css
diff --git a/public/assets/index.e7e7ff2c.js b/public/assets/index.e7e7ff2c.js
diff --git a/public/index.html b/public/index.html
@@ -8,8 +8,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <script type="module" crossorigin src="./assets/index.161d56bd.js"></script>
-    <link rel="stylesheet" href="./assets/index.5ae02e0c.css">
+    <script type="module" crossorigin src="./assets/index.e7e7ff2c.js"></script>
+    <link rel="stylesheet" href="./assets/index.3757966e.css">
   </head>
   <body>
     <div id="app"></div>
diff --git a/web/src/components/TaskEditModal.vue b/web/src/components/TaskEditModal.vue
@@ -328,7 +328,7 @@
               <div class="form-group row">
                 <label class="col-sm-3" for="'skill-learn-' + item.id">❗ 学习优先级 {{ item.priority+1 }}</label>
                 <div class="col-sm-6">
-                  <textarea type="text"  v-model="item.skills" class="form-control" id="skill-learn-priority" placeholder="技能1名称,技能2名称,....(使用英文逗号)"></textarea>
+                  <textarea type="text" v-model="item.skills" class="form-control" id="skill-learn-priority" :placeholder="'技能1名称,技能2名称,....(使用英文逗号)\n技能名称可忽略符号, 空格和特殊字符'" ></textarea>
                 </div>
                 <div class="col-sm-3">
                   <span class="red-button auto-btn ml-2" v-on:click="deleteBox(item,index)">删除当前优先级</span>
@@ -1255,4 +1255,58 @@ export default {
   display: inline-block;
   transition: all 0.3s ease;
 }
+
+/* Tooltip 帮助样式 -- 悬浮鼠标后展示提示*/
+.tooltip-help {
+  display: inline-block;
+  margin-left: 8px;
+  position: relative;
+  cursor: default;
+  line-height: 1; /* 保持与文本对齐，避免图标垂直压缩 */
+  vertical-align: middle;
+}
+.tooltip-help-text {
+  visibility: hidden;
+  /* 使用自适应宽度但限制最大值，避免在窄屏上溢出 */
+  width: auto;
+  max-width: 720px;
+  display: block; /* 确保为块级元素以便 min-width 生效 */
+  min-width: 160px;
+  white-space: normal; /* 允许换行 */
+  word-break: normal;
+  overflow-wrap: break-word;
+  background-color: rgba(0,0,0,0.85);
+  color: #fff;
+  text-align: left;
+  border-radius: 4px;
+  padding: 8px;
+  position: absolute;
+  z-index: 2000;
+  bottom: 140%;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 0.9rem;
+  box-shadow: 0 2px 6px rgba(0,0,0,0.3);
+  box-sizing: border-box;
+  line-height: 1.3; /* 改善可读性，避免文字重叠 */
+  /* 强制横向排版，覆盖可能的全局竖排规则 */
+  writing-mode: horizontal-tb !important;
+  text-orientation: mixed !important;
+  direction: ltr !important;
+  min-height: 1.2em;
+}
+.tooltip-help-text::after {
+  content: "";
+  position: absolute;
+  top: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  border-width: 6px;
+  border-style: solid;
+  border-color: rgba(0,0,0,0.85) transparent transparent transparent;
+}
+.tooltip-help:hover .tooltip-help-text,
+.tooltip-help:focus .tooltip-help-text {
+  visibility: visible;
+}
 </style>
