diff --git a/genshin.py b/genshin.py index 559d90c..86adc34 100644 --- a/genshin.py +++ b/genshin.py @@ -67,11 +67,11 @@ class genshin: tools.log.info(f"正在为旅行者{i[0]}进行签到...") time.sleep(random.randint(2, 8)) is_data = self.Is_sign(region = i[2], uid = i[1]) - if is_data["first_bind"] == True: + if is_data["first_bind"]: tools.log.warn(f"旅行者{i[0]}是第一次绑定米游社,请先手动签到一次") else: sign_Days = is_data["total_sign_day"] - 1 - if is_data["is_sign"] == True: + if is_data["is_sign"]: tools.log.info(f"旅行者{i[0]}今天已经签到过了~\r\n今天获得的奖励是{tools.Get_item(self.sign_Give[sign_Days])}") else: time.sleep(random.randint(2, 8)) diff --git a/honkai3rd.py b/honkai3rd.py index 5409b67..f75dfdc 100644 --- a/honkai3rd.py +++ b/honkai3rd.py @@ -70,7 +70,7 @@ class honkai3rd: tools.log.info(f"正在为舰长{i[0]}进行签到...") time.sleep(random.randint(2, 8)) is_data = self.Is_sign(region = i[2], uid = i[1], nickname = i[0]) - if is_data == True: + if is_data: time.sleep(random.randint(2, 8)) req = http.post(url=setting.honkai3rd_SignUrl, headers=self.headers, json={'act_id': setting.honkai3rd_Act_id, 'region': i[2], 'uid': i[1]}) diff --git a/login.py b/login.py index 4acc685..9c2f70f 100644 --- a/login.py +++ b/login.py @@ -9,12 +9,14 @@ def login(): config.Clear_cookies() exit(1) temp_Cookies = {} + #判断Cookie里面是否有login_ticket 没有的话直接退了 if "login_ticket" in config.mihoyobbs_Cookies: temp_Cookies = config.mihoyobbs_Cookies.split(";") for i in temp_Cookies: if i.split("=")[0] == " login_ticket": config.mihoyobbs_Login_ticket = i.split("=")[1] break + #这里获取Stuid,但是实际是可以直接拿cookie里面的Uid data = request.get(url=setting.bbs_Cookieurl.format(config.mihoyobbs_Login_ticket)) if "成功" in data["data"]["msg"]: config.mihoyobbs_Stuid = str(data["data"]["cookie_info"]["account_id"]) diff --git a/main.py b/main.py index b8035f6..ebe6179 100644 --- a/main.py +++ b/main.py @@ -11,14 +11,14 @@ import honkai3rd def main(): #初始化,加载配置 config.Load_config() - if config.enable_Config == True: + if config.enable_Config: #检测参数是否齐全,如果缺少就进行登入操作 if config.mihoyobbs_Login_ticket == "" or config.mihoyobbs_Stuid == "" or config.mihoyobbs_Stoken == "": #登入 login.login() time.sleep(random.randint(2, 8)) #获取要使用的BBS列表,#判断是否开启bbs_Signin_multi - if config.mihoyobbs["bbs_Signin_multi"] == True: + if config.mihoyobbs["bbs_Signin_multi"]: #速度快,但是无法设置主社区,主社区默认为第一个 ''' for i in setting.mihoyobbs_List: @@ -36,18 +36,18 @@ def main(): if int(i["id"]) == 5: setting.mihoyobbs_List_Use.append(i) #米游社签到 - if config.mihoyobbs["bbs_Global"] == True: + if config.mihoyobbs["bbs_Global"]: bbs = mihoyobbs.mihoyobbs() if bbs.Task_do["bbs_Sign"] and bbs.Task_do["bbs_Read_posts"] and bbs.Task_do["bbs_Like_posts"] and bbs.Task_do["bbs_Share"]: tools.log.info(f"今天已经全部完成了!一共获得{mihoyobbs.Today_have_getcoins}个米游币,目前有{mihoyobbs.Have_coins}个米游币") else: - if config.mihoyobbs["bbs_Signin"] == True: + if config.mihoyobbs["bbs_Signin"]: bbs.Signin() - if config.mihoyobbs["bbs_Read_posts"] == True: + if config.mihoyobbs["bbs_Read_posts"]: bbs.Readposts() - if config.mihoyobbs["bbs_Like_posts"] == True: + if config.mihoyobbs["bbs_Like_posts"]: bbs.Likeposts() - if config.mihoyobbs["bbs_Share"] == True: + if config.mihoyobbs["bbs_Share"]: bbs.Share() bbs.Get_taskslist() tools.log.info(f"今天已经获得{mihoyobbs.Today_have_getcoins}个米游币,还能获得{mihoyobbs.Today_getcoins}个米游币,目前有{mihoyobbs.Have_coins}个米游币") @@ -55,7 +55,7 @@ def main(): else: tools.log.info("米游社功能未启用!") #原神签到 - if(config.genshin_Auto_sign == True): + if config.genshin_Auto_sign: tools.log.info("正在进行原神签到") genshin_Help = genshin.genshin() genshin_Help.Sign_acc() @@ -63,7 +63,7 @@ def main(): else: tools.log.info("原神签到功能未启用!") #崩坏3签到 - if config.honkai3rd_Auto_sign == True: + if config.honkai3rd_Auto_sign: tools.log.info("正在进行崩坏3签到") honkai3rd_Help = honkai3rd.honkai3rd() honkai3rd_Help.Sign_acc() diff --git a/mihoyobbs.py b/mihoyobbs.py index cc2c158..7dfd4f4 100644 --- a/mihoyobbs.py +++ b/mihoyobbs.py @@ -147,7 +147,7 @@ class mihoyobbs: if data["message"] == "OK": tools.log.info("点赞:{} 成功".format(self.postsList[i][1])) #判断取消点赞是否打开 - if config.mihoyobbs["bbs_Unlike"] == True: + if config.mihoyobbs["bbs_Unlike"]: time.sleep(random.randint(2, 8)) req = http.post(url=setting.bbs_Likeurl, headers=self.headers, json={"post_id": self.postsList[i][0], "is_cancel": True}) diff --git a/tools.py b/tools.py index 4e29de5..b7185b7 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 == True: - if web_old == True: + if web: + if web_old: n = setting.mihoyobbs_Salt_web_old else: n = setting.mihoyobbs_Salt_web