瀏覽代碼

feat: 添加秘闻副本层数限制及用户设置的层数限制逻辑

yEs1do 8 月之前
父節點
當前提交
fcdf409198
共有 2 個文件被更改,包括 29 次插入 和 5 次删除
  1. 17 0
      tasks/WantedQuests/config.py
  2. 12 5
      tasks/WantedQuests/script_task.py

+ 17 - 0
tasks/WantedQuests/config.py

@@ -83,6 +83,21 @@ class CooperationSelectMaskDescription(str, Enum):
     Any = 'Any'
     Any = 'Any'
 
 
 
 
+# 定义秘闻副本层数限制
+class LayerLimit(str, Enum):
+    LAYER_1 = '壹'
+    LAYER_2 = '贰'
+    LAYER_3 = '叁'
+    LAYER_4 = '肆'
+    LAYER_5 = '伍'
+    LAYER_6 = '陆'
+    LAYER_7 = '柒'
+    LAYER_8 = '捌'
+    LAYER_9 = '玖'
+    LAYER_10 = '拾'
+    EXTRA = '番外'
+    ALL = '无限制'       # 全都打
+
 class WantedQuestsConfig(BaseModel):
 class WantedQuestsConfig(BaseModel):
     before_end: Time = Field(default=Time(0, 0, 0), description='before_end_help')
     before_end: Time = Field(default=Time(0, 0, 0), description='before_end_help')
     invite_friend_name: str = Field(default=str(""), description="invite_friend_name_help")
     invite_friend_name: str = Field(default=str(""), description="invite_friend_name_help")
@@ -94,6 +109,8 @@ class WantedQuestsConfig(BaseModel):
     cooperation_only: bool = Field(default=False, description="cooperation_only_help")
     cooperation_only: bool = Field(default=False, description="cooperation_only_help")
     # 忽略任务的任务目标名称(“酒吞童子”等),多个用逗号“,,"分隔
     # 忽略任务的任务目标名称(“酒吞童子”等),多个用逗号“,,"分隔
     unwanted_boss_names: str = Field(default='酒吞童子,阎魔', description='unwanted_boss_name_help')
     unwanted_boss_names: str = Field(default='酒吞童子,阎魔', description='unwanted_boss_name_help')
+    # 秘闻层数限制,默认值为7
+    layer_limit: LayerLimit = Field(default=LayerLimit.LAYER_7, description='X层及以上不打')
 
 
 
 
 class WantedQuests(ConfigBase):
 class WantedQuests(ConfigBase):

+ 12 - 5
tasks/WantedQuests/script_task.py

@@ -325,11 +325,18 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
             (类型, 地点层级,可以打败的数量,前往按钮, func)
             (类型, 地点层级,可以打败的数量,前往按钮, func)
             类型: 挑战0, 秘闻1, 探索2
             类型: 挑战0, 秘闻1, 探索2
             """
             """
-            layer_limit = {
-                # 低层不限制
-                # "壹", "贰", "叁", "肆", "伍", "陆",
-                "柒", "捌", "玖", "拾", "番外"
-            }
+            # 获取用户设置的值
+            user_limit = self.config.model.wanted_quests.wanted_quests_config.layer_limit.value            
+            # 定义完整的层数后缀顺序
+            all_layers = ["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾", "番外"]
+            # 根据用户选择进行截取,生成 layer_limit 集合
+            if user_limit == "无限制":
+                layer_limit = set()
+            else:
+                start_idx = all_layers.index(user_limit) if user_limit in all_layers else 6
+                # 截取该层及之后的所有层
+                layer_limit = set(all_layers[start_idx:])
+
             # ,荒川之怒·壹,4,前往按钮,function
             # ,荒川之怒·壹,4,前往按钮,function
             result = [-1, '', -1, GOTO_BUTTON[index], self.challenge, '']
             result = [-1, '', -1, GOTO_BUTTON[index], self.challenge, '']
             type_wq = OCR_WQ_TYPE[index].ocr(self.device.image)
             type_wq = OCR_WQ_TYPE[index].ocr(self.device.image)