add expore hard task 6 and 11 to 16

pur1fying · Jan 3, 2024 · 84bb075 · 84bb075
1 parent a819f82
commit 84bb075
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/gui/components/expand/hardTaskConfig.py b/gui/components/expand/hardTaskConfig.py
@@ -27,9 +27,9 @@ def __init__(self, parent=None):
                 'label': """
     推图关卡中填写的数据不应该超出这些字符或单词 "-" , "sss", "present", "task", "," , 和数字
     按逗号拆分后变为若干关卡
-    1.如果只有一个数字
-    例子:15
-    根据上面三个按钮的开关 将(15-1,15-2,15-3)打到sss/拿礼物/完成挑战任务
+    1.如果只有一个数字 或 指定关卡
+    例子:15,12-2
+    根据上面三个按钮的开关 将(15-1,15-2,15-3,12-2)打到sss/拿礼物/完成挑战任务
 
     2.如果是一个数字并跟字符串，则用‘-’分隔
     例子: 15-sss-present
@@ -53,7 +53,7 @@ def __init__(self, parent=None):
         self.push_card = QHBoxLayout(self)
         self.push_card_label = QHBoxLayout(self)
         self.label_tip_push = QLabel(
-            '<b>困难图队伍属性和普通图相同(见普通图推图设置)，请按照以上说明选择推困难图关卡并按对应图设置队伍</b>', self)
+            '<b>困难图队伍属性和普通图相同(见普通图推图设置)，请按照以上说明选择推困难图关卡并按对应图设置队伍(额外需要: H15-3贯穿2队 H16-3:贯穿1队)</b>', self)
         self.input_push = LineEdit(self)
         self.accept_push = PushButton('开始推图', self)
 

diff --git a/module/explore_hard_task.py b/module/explore_hard_task.py
@@ -28,7 +28,7 @@ def implement(self):
         region = int(data[0])
         mission = int(data[1])
         unfinished_tasks = data[2:]
-        if not 7 <= region <= 10:
+        if not 6 <= region <= 16:
             self.logger.warning("Region not support")
             return True
         self.stage_data = get_stage_data(region)
@@ -470,12 +470,20 @@ def get_explore_hard_task_data(st, need_sss=True, need_task=True, need_present=T
                 continue
             if temp[0].isdigit() and temp[1].isdigit():  # 指定关卡
                 tt = ''
-                if 'sss' in temp:
-                    tt = tt + '-sss'
-                if 'present' in temp:
-                    tt = tt + '-present'
-                if 'task' in temp:
-                    tt = tt + '-task'
+                if len (temp) == 2:
+                    if need_sss:
+                        tt = tt + '-sss'
+                    if need_present:
+                        tt = tt + '-present'
+                    if need_task:
+                        tt = tt + '-task'
+                else:
+                    if 'sss' in temp:
+                        tt = tt + '-sss'
+                    if 'present' in temp:
+                        tt = tt + '-present'
+                    if 'task' in temp:
+                        tt = tt + '-task'
                 tasks.append(temp[0] + '-' + temp[1] + tt)
             elif temp[0].isdigit() and not temp[1].isdigit():
                 tt = ''