From 16001cdedab4bfd536f5f2123ee56eb8a225194f Mon Sep 17 00:00:00 2001
From: Womsxd <45663319+Womsxd@users.noreply.github.com>
Date: Mon, 7 Jun 2021 15:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=B7=E7=B3=8A=E4=BA=A7=E7=94=9F=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

改动
---
 .github/workflows/{pylint.yml => pylint.yml-off} | 0
 main.py                                          | 7 ++++---
 mihoyobbs.py                                     | 6 +++---
 tools.py                                         | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename .github/workflows/{pylint.yml => pylint.yml-off} (100%)

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml-off
similarity index 100%
rename from .github/workflows/pylint.yml
rename to .github/workflows/pylint.yml-off
diff --git a/main.py b/main.py
index 80f68ae..b567b2c 100644
--- a/main.py
+++ b/main.py
@@ -43,18 +43,19 @@ def main():
                 bbs.Likeposts()
             if config.mihoyobbs["bbs_Share"] == True:
                 bbs.Share()
-            tools.log.info(f"今天还能获得{mihoyobbs.Today_getcoins}个米游币，目前有{mihoyobbs.Have_coins}个米游币")
+            bbs.Get_taskslist()
+            tools.log.info(f"今天已经获得{mihoyobbs.Today_have_getcoins}，还能获得{mihoyobbs.Today_getcoins}个米游币，目前有{mihoyobbs.Have_coins}个米游币")
         else:
             tools.log.info("米游社功能未启用！")
         #原神签到
-        if(config.genshin_AutoSingin == True):
+        if(config.genshin_Auto_sing == True):
             tools.log.info("正在进行原神签到")
             genshin_Help = genshin.genshin()
             genshin_Help.Sing_acc()
         else:
             tools.log.info("原神签到功能未启用！")
         #崩坏3签到
-        if config.honkai3rd_AutoSing == True:
+        if config.honkai3rd_Auto_sing == True:
             tools.log.info("正在进行崩坏3签到")
             honkai3rd_Help = honkai3rd.honkai3rd()
             honkai3rd_Help.Sing_acc()
diff --git a/mihoyobbs.py b/mihoyobbs.py
index 5671ffb..b276204 100644
--- a/mihoyobbs.py
+++ b/mihoyobbs.py
@@ -51,16 +51,16 @@ class mihoyobbs:
             config.Clear_cookies()
             exit()
         else:
+            Today_getcoins = data["data"]["can_get_points"]
+            Today_have_getcoins = data["data"]["already_received_points"]
             Have_coins = data["data"]["total_points"]
             #如果当日可获取米游币数量为0直接判断全部任务都完成了
-            if data["data"]["can_get_points"] == 0:
+            if Today_getcoins == 0:
                 self.Task_do["bbs_Sign"] = True
                 self.Task_do["bbs_Read_posts"] = True
                 self.Task_do["bbs_Like_posts"] = True
                 self.Task_do["bbs_Share"] = True
-                Today_have_getcoins = data["data"]["already_received_points"] #账号今天获得了多少米游币
             else:
-                Today_getcoins = data["data"]["can_get_points"]
                 #如果第0个大于或等于62则直接判定任务没做
                 if data["data"]["states"][0]["mission_id"] >= 62:
                     tools.log.info(f"新的一天，今天可以获得{Today_getcoins}个米游币")
diff --git a/tools.py b/tools.py
index 7cd838a..87270bc 100644
--- a/tools.py
+++ b/tools.py
@@ -35,8 +35,8 @@ def Timestamp() -> int:
 
 #获取请求Header里的DS 当web为true则生成网页端的DS
 def Get_ds(web:bool, web_old:bool) -> str:
-    if web in True:
-        if web_old in True:
+    if web == True:
+        if web_old == True:
             n = setting.mihoyobbs_Salt_web_old
         else:
             n = setting.mihoyobbs_Salt_web
@@ -53,7 +53,7 @@ def Get_deviceid() -> str:
                 '-', '').upper()
 
 #获取签到的奖励名称
-def Get_item(self, raw_data:dict) ->str:
+def Get_item(raw_data:dict) ->str:
     temp_Name = raw_data["name"]
     temp_Cnt = raw_data["cnt"]
     return f"{temp_Name}x{temp_Cnt}"