From 5007939d1cf624a609dc7aa51a0744b8c68c7e29 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Wed, 3 Sep 2025 16:57:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E5=8F=B7=E5=BC=80=E6=94=BE=E4=BF=A1=E6=81=AF=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 19 ++++++++------- app/utils/constants.py | 54 ++++++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index b52e3bf..a3cbd54 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -1525,12 +1525,6 @@ class AppConfig(GlobalConfig): ): """获取关卡信息""" - if type == "Today": - dt = self.server_date() - index = dt.strftime("%A") - else: - index = type - if json.loads(self.get("Data", "Stage")) != {}: task = asyncio.create_task(self.get_stage()) self.temp_task.append(task) @@ -1538,7 +1532,7 @@ class AppConfig(GlobalConfig): else: await self.get_stage() - if index == "Info": + if type == "Info": today = self.server_date().isoweekday() res_stage_info = [] for stage in RESOURCE_STAGE_INFO: @@ -1551,8 +1545,17 @@ class AppConfig(GlobalConfig): "Activity": json.loads(self.get("Data", "Stage")).get("Info", []), "Resource": res_stage_info, } + elif type == "Today": + data = json.loads(self.get("Data", "Stage")).get( + self.server_date().strftime("%A"), [] + ) + for combox in data: + combox["label"] = RESOURCE_STAGE_DATE_TEXT.get( + combox["value"], combox["label"] + ) + return data else: - return json.loads(self.get("Data", "Stage")).get(index, []) + return json.loads(self.get("Data", "Stage")).get(type, []) async def get_proxy_overview(self) -> Dict[str, Any]: """获取代理情况概览信息""" diff --git a/app/utils/constants.py b/app/utils/constants.py index f53cca6..757cfa5 100644 --- a/app/utils/constants.py +++ b/app/utils/constants.py @@ -22,30 +22,44 @@ RESOURCE_STAGE_INFO = [ {"value": "-", "text": "当前/上次", "days": [1, 2, 3, 4, 5, 6, 7]}, - {"value": "1-7", "text": "1-7 | 常驻开放", "days": [1, 2, 3, 4, 5, 6, 7]}, - {"value": "R8-11", "text": "R8-11 | 常驻开放", "days": [1, 2, 3, 4, 5, 6, 7]}, - { - "value": "12-17-HARD", - "text": "12-17-HARD | 常驻开放", - "days": [1, 2, 3, 4, 5, 6, 7], - }, - {"value": "LS-6", "text": "经验-6/5 | 常驻开放", "days": [1, 2, 3, 4, 5, 6, 7]}, - {"value": "CE-6", "text": "龙门币-6/5 | 二四六日开放", "days": [2, 4, 6, 7]}, - {"value": "AP-5", "text": "红票-5 | 一四六日开放", "days": [1, 4, 6, 7]}, - {"value": "CA-5", "text": "技能-5 | 二三五日开放", "days": [2, 3, 5, 7]}, - {"value": "SK-5", "text": "碳-5 | 一三五六开放", "days": [1, 3, 5, 6]}, - {"value": "PR-A-1", "text": "奶/盾芯片 | 一四五日开放", "days": [1, 4, 5, 7]}, - {"value": "PR-A-2", "text": "奶/盾芯片组 | 一四五日开放", "days": [1, 4, 5, 7]}, - {"value": "PR-B-1", "text": "术/狙芯片 | 一二五六日开放", "days": [1, 2, 5, 6]}, - {"value": "PR-B-2", "text": "术/狙芯片组 | 一二五六日开放", "days": [1, 2, 5, 6]}, - {"value": "PR-C-1", "text": "先/辅芯片 | 三四六日开放", "days": [3, 4, 6, 7]}, - {"value": "PR-C-2", "text": "先/辅芯片组 | 三四六日开放", "days": [3, 4, 6, 7]}, - {"value": "PR-D-1", "text": "近/特芯片 | 二三六日开放", "days": [2, 3, 6, 7]}, - {"value": "PR-D-2", "text": "近/特芯片组 | 二三六日开放", "days": [2, 3, 6, 7]}, + {"value": "1-7", "text": "1-7", "days": [1, 2, 3, 4, 5, 6, 7]}, + {"value": "R8-11", "text": "R8-11", "days": [1, 2, 3, 4, 5, 6, 7]}, + {"value": "12-17-HARD", "text": "12-17-HARD", "days": [1, 2, 3, 4, 5, 6, 7]}, + {"value": "LS-6", "text": "经验-6/5", "days": [1, 2, 3, 4, 5, 6, 7]}, + {"value": "CE-6", "text": "龙门币-6/5", "days": [2, 4, 6, 7]}, + {"value": "AP-5", "text": "红票-5", "days": [1, 4, 6, 7]}, + {"value": "CA-5", "text": "技能-5", "days": [2, 3, 5, 7]}, + {"value": "SK-5", "text": "碳-5", "days": [1, 3, 5, 6]}, + {"value": "PR-A-1", "text": "奶/盾芯片", "days": [1, 4, 5, 7]}, + {"value": "PR-A-2", "text": "奶/盾芯片组", "days": [1, 4, 5, 7]}, + {"value": "PR-B-1", "text": "术/狙芯片", "days": [1, 2, 5, 6]}, + {"value": "PR-B-2", "text": "术/狙芯片组", "days": [1, 2, 5, 6]}, + {"value": "PR-C-1", "text": "先/辅芯片", "days": [3, 4, 6, 7]}, + {"value": "PR-C-2", "text": "先/辅芯片组", "days": [3, 4, 6, 7]}, + {"value": "PR-D-1", "text": "近/特芯片", "days": [2, 3, 6, 7]}, + {"value": "PR-D-2", "text": "近/特芯片组", "days": [2, 3, 6, 7]}, ] """常规资源关信息""" +RESOURCE_STAGE_DATE_TEXT = { + "LS-6": "经验-6/5 | 常驻开放", + "CE-6": "龙门币-6/5 | 二四六日开放", + "AP-5": "红票-5 | 一四六日开放", + "CA-5": "技能-5 | 二三五日开放", + "SK-5": "碳-5 | 一三五六开放", + "PR-A-1": "奶/盾芯片 | 一四五日开放", + "PR-A-2": "奶/盾芯片组 | 一四五日开放", + "PR-B-1": "术/狙芯片 | 一二五六日开放", + "PR-B-2": "术/狙芯片组 | 一二五六日开放", + "PR-C-1": "先/辅芯片 | 三四六日开放", + "PR-C-2": "先/辅芯片组 | 三四六日开放", + "PR-D-1": "近/特芯片 | 二三六日开放", + "PR-D-2": "近/特芯片组 | 二三六日开放", +} +"""常规资源关开放日文本映射""" + + RESOURCE_STAGE_DROP_INFO = { "CE-6": { "Display": "CE-6",