feat: 移除过期活动

fzls · Jul 24, 2024 · b11dedb · b11dedb
1 parent 566000f
commit b11dedb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/config_ui.py b/config_ui.py
@@ -2923,30 +2923,28 @@ class FunctionSwitchesConfigUi(QWidget):
             ("心悦app", "get_xinyue_app"),
             ("dnf论坛签到", "get_dnf_bbs_signin"),
             ("小酱油周礼包和生日礼包", "get_xiaojiangyou"),
-            ("DNF福利中心兑换", "get_dnf_welfare"),
-            ("DNF落地页活动", "get_dnf_luodiye"),
             # 收费活动
             ("dnf助手编年史（需配置助手userId和token和uniqueRoleId）", "get_dnf_helper_chronicle"),
             ("绑定手机活动", "get_dnf_bind_phone"),
             ("DNF漫画预约活动", "get_dnf_comic"),
             ("DNF神界成长之路", "get_dnf_shenjie_grow_up"),
-            ("DNF周年庆登录活动", "get_dnf_anniversary"),
-            ("DNF卡妮娜的心愿摇奖机", "get_dnf_kanina"),
             ("colg每日签到", "get_colg_signin"),
             ("勇士的冒险补给", "get_maoxian"),
             ("colg其他活动", "get_colg_other_act"),
-            ("DNF格斗大赛", "get_dnf_pk"),
             ("WeGame活动", "get_dnf_wegame"),
         ],
         "QQ空间pskey": [
-            ("集卡", "get_ark_lottery"),
-            ("超级会员", "get_dnf_super_vip"),
         ],
     }
 
     # 已过期的活动，方便快速加回去
     expired_act_category_to_act_desc_switch_list = {
         "普通skey": [
+            ("DNF格斗大赛", "get_dnf_pk"),
+            ("DNF卡妮娜的心愿摇奖机", "get_dnf_kanina"),
+            ("DNF周年庆登录活动", "get_dnf_anniversary"),
+            ("DNF落地页活动", "get_dnf_luodiye"),
+            ("DNF福利中心兑换", "get_dnf_welfare"),
             ("DNFxSNK", "get_dnf_snk"),
             ("9163补偿", "get_dnf_9163_apologize"),
             ("超核勇士wpe", "get_dnf_chaohe_wpe"),
@@ -2978,6 +2976,8 @@ class FunctionSwitchesConfigUi(QWidget):
             ("集卡", "get_ark_lottery"),
         ],
         "QQ空间pskey": [
+            ("集卡", "get_ark_lottery"),
+            ("超级会员", "get_dnf_super_vip"),
             ("qq会员杯", "get_dnf_club_vip"),
             ("会员关怀", "get_vip_mentor"),
             ("黄钻", "get_dnf_yellow_diamond"),

diff --git a/djc_helper.py b/djc_helper.py
@@ -661,7 +661,6 @@ def free_activities(self) -> list[tuple[str, Callable]]:
             ("心悦app", self.xinyue_app_operations),
             ("dnf论坛签到", self.dnf_bbs),
             ("小酱油周礼包和生日礼包", self.xiaojiangyou),
-            ("DNF福利中心兑换", self.dnf_welfare),
         ]
 
     def payed_activities(self) -> list[tuple[str, Callable]]:
@@ -674,15 +673,9 @@ def payed_activities(self) -> list[tuple[str, Callable]]:
             ("DNF漫画预约活动", self.dnf_comic),
             ("DNF神界成长之路", self.dnf_shenjie_grow_up),
             ("DNF神界成长之路二期", self.dnf_shenjie_grow_up_v2),
-            ("DNF落地页活动_ide", self.dnf_luodiye_ide),
-            ("DNF周年庆登录活动", self.dnf_anniversary),
-            ("超级会员", self.dnf_super_vip),
-            ("集卡", self.dnf_ark_lottery),
-            ("DNF卡妮娜的心愿摇奖机", self.dnf_kanina),
             ("colg每日签到", self.colg_signin),
             ("勇士的冒险补给", self.maoxian),
             ("colg其他活动", self.colg_other_act),
-            ("DNF格斗大赛", self.dnf_pk),
             ("WeGame活动", self.dnf_wegame),
         ]
 
@@ -691,6 +684,13 @@ def expired_activities(self) -> list[tuple[str, Callable]]:
         # hack: 已经过期非常久且很久未再出的的活动相关信息已挪到 djc_helper_tomb.py ，需要时可前往查看
         # undone: 当这个列表下方过期很久的活动变得很多的时候，就再将部分挪到上面这个墓地中
         return [
+            ("DNF格斗大赛", self.dnf_pk),
+            ("DNF卡妮娜的心愿摇奖机", self.dnf_kanina),
+            ("集卡", self.dnf_ark_lottery),
+            ("超级会员", self.dnf_super_vip),
+            ("DNF周年庆登录活动", self.dnf_anniversary),
+            ("DNF落地页活动_ide", self.dnf_luodiye_ide),
+            ("DNF福利中心兑换", self.dnf_welfare),
             ("DNF落地页活动_ide_dup", self.dnf_luodiye_ide_dup),
             ("DNFxSNK", self.dnf_snk),
             ("超核勇士wpe", self.dnf_chaohe_wpe),

diff --git a/urls.py b/urls.py
@@ -60,21 +60,21 @@ def newNotAmsActInfo(dtBeginTime: str, dtEndTime: str, sActivityName: str) -> Am
     #
     newNotAmsActInfo(month_start_day______, month_end_day________, "DNF助手编年史"),
     newNotAmsActInfo("2023-12-21 00:00:00", not_know_end_time____, "DNF漫画预约活动"),
-    newNotAmsActInfo("2024-02-01 12:00:00", "2024-06-30 23:59:59", "DNF神界成长之路"),
-    newNotAmsActInfo("2024-04-18 00:00:00", "2024-07-31 23:59:59", "DNF神界成长之路二期"),
-    newNotAmsActInfo("2024-06-13 09:55:00", "2024-07-12 23:59:59", "DNF落地页活动_ide"),
-    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-04 23:59:59", "DNF周年庆登录活动"),
-    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-12 23:59:59", "超级会员"),
-    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-12 23:59:59", "集卡"),
-    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-10 23:59:59", "DNF卡妮娜的心愿摇奖机"),
+    newNotAmsActInfo("2024-02-01 12:00:00", "2024-11-29 23:59:59", "DNF神界成长之路"),
+    newNotAmsActInfo("2024-04-18 00:00:00", "2024-12-31 23:59:59", "DNF神界成长之路二期"),
     newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-31 23:59:59", "colg每日签到"),
     newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-25 23:59:59", "勇士的冒险补给"),
     newNotAmsActInfo("2024-06-13 00:00:00", "2025-01-31 23:59:59", "colg其他活动"),
-    newNotAmsActInfo("2024-06-20 00:00:00", "2024-07-10 23:59:59", "DNF格斗大赛"),
     newNotAmsActInfo("2024-07-04 11:00:00", "2024-07-24 23:59:59", "WeGame活动"),
     #
     # 已过期活动
     #
+    newNotAmsActInfo("2024-06-20 00:00:00", "2024-07-10 23:59:59", "DNF格斗大赛"),
+    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-10 23:59:59", "DNF卡妮娜的心愿摇奖机"),
+    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-12 23:59:59", "集卡"),
+    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-12 23:59:59", "超级会员"),
+    newNotAmsActInfo("2024-06-13 00:00:00", "2024-07-04 23:59:59", "DNF周年庆登录活动"),
+    newNotAmsActInfo("2024-06-13 09:55:00", "2024-07-12 23:59:59", "DNF落地页活动_ide"),
     newNotAmsActInfo("2023-11-16 00:00:00", "2023-12-19 23:59:59", "qq视频蚊子腿-爱玩"),
     newNotAmsActInfo("2023-12-21 00:00:00", "2024-01-24 23:59:59", "DNF马杰洛的规划"),
     newNotAmsActInfo("2024-01-11 10:00:00", "2024-02-20 23:59:59", "DNF心悦wpe"),
@@ -93,7 +93,6 @@ def newNotAmsActInfo(dtBeginTime: str, dtEndTime: str, sActivityName: str) -> Am
     "心悦app": "https://xinyue.qq.com/beta/#/download",
     "dnf论坛签到": "https://dnf.gamebbs.qq.com/plugin.php?id=k_misign:sign",
     "小酱油周礼包和生日礼包": "游戏内右下角点击 小酱油 图标",
-    "DNF福利中心兑换": "https://dnf.qq.com/cp/a20190312welfare/index.htm",
     #
     # 短期付费活动
     #
@@ -102,19 +101,20 @@ def newNotAmsActInfo(dtBeginTime: str, dtEndTime: str, sActivityName: str) -> Am
     "DNF漫画预约活动": "https://dnf.qq.com/cp/a20231211comic/index.html",
     "DNF神界成长之路": "https://dnf.qq.com/cp/a2024user/page1.html",
     "DNF神界成长之路二期": "https://dnf.qq.com/cp/a2024user/index.html",
-    "DNF落地页活动_ide": "https://dnf.qq.com/act/a20240613index/index.html",
-    "DNF周年庆登录活动": "https://dnf.qq.com/cp/a20240613celebration/",
-    "超级会员": "https://act.qzone.qq.com/v2/vip/tx/p/50148_928bd0e0",
-    "集卡": "https://act.qzone.qq.com/v2/vip/tx/p/50140_591877ab",
-    "DNF卡妮娜的心愿摇奖机": "https://dnf.qq.com/cp/a20240613wish/indexm.html",
     "colg每日签到": "https://bbs.colg.cn/forum-171-1.html",
     "勇士的冒险补给": "https://act.xinyue.qq.com/bb/act/a4a4b8cefdc8645299a546567fc1c68ad/index.html",
     "colg其他活动": "https://bbs.colg.cn/forum-171-1.html",
-    "DNF格斗大赛": "https://act.xinyue.qq.com/act/a20240613dnfcombat/index.html",
     "WeGame活动": "https://dnf.qq.com/cp/a20240704wegame/index.html",
     #
     # 已过期活动
     #
+    "DNF格斗大赛": "https://act.xinyue.qq.com/act/a20240613dnfcombat/index.html",
+    "DNF卡妮娜的心愿摇奖机": "https://dnf.qq.com/cp/a20240613wish/indexm.html",
+    "集卡": "https://act.qzone.qq.com/v2/vip/tx/p/50140_591877ab",
+    "超级会员": "https://act.qzone.qq.com/v2/vip/tx/p/50148_928bd0e0",
+    "DNF周年庆登录活动": "https://dnf.qq.com/cp/a20240613celebration/",
+    "DNF落地页活动_ide": "https://dnf.qq.com/act/a20240613index/index.html",
+    "DNF福利中心兑换": "https://dnf.qq.com/cp/a20190312welfare/index.htm",
     "DNF落地页活动_ide_dup": "https://dnf.qq.com/act/a20240418index/index.html",
     "DNFxSNK": "https://dnf.qq.com/cp/a20240418snklink/indexm.html",
     "超核勇士wpe": "https://act.supercore.qq.com/supercore/act/a9eba0142961a4a64a52e369e002a66e8/index.html",