From d3b66b3bf3bb7777cec97eba71b02b6fd8eff0ac Mon Sep 17 00:00:00 2001 From: Womsxd <45663319+Womsxd@users.noreply.github.com> Date: Sun, 6 Jun 2021 21:58:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- genshin.py | 16 +++++----------- honkai3rd.py | 12 +++--------- tools.py | 6 ++++++ 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/genshin.py b/genshin.py index b3672da..4f0c959 100644 --- a/genshin.py +++ b/genshin.py @@ -27,7 +27,7 @@ class genshin: #获取绑定的账号列表 def Getacc_list(self) -> list: - tools.log.info("正在获取米哈游账号绑定的游戏账号列表...") + tools.log.info("正在获取米哈游账号绑定原神账号列表...") temp_List = [] req = httpx.get(setting.genshin_Account_info_url, headers=self.headers) data = req.json() @@ -39,12 +39,6 @@ class genshin: tools.log.info(f"已获取到{len(temp_List)}个原神账号信息") return temp_List - #获取签到的奖励名称 - def Get_item(self, raw_data:dict) ->str: - temp_Name = raw_data["name"] - temp_Cnt = raw_data["cnt"] - return f"{temp_Name}x{temp_Cnt}" - #获取已经签到奖励列表 def Get_singgive(self) -> list: tools.log.info("正在获取签到奖励列表...") @@ -78,7 +72,7 @@ class genshin: else: sing_Days = is_data["total_sign_day"] - 1 if is_data["is_sign"] == True: - tools.log.info(f"旅行者{i[0]}今天已经签到过了~\r\n今天获得的奖励是{self.Get_item(self.sing_Give[sing_Days])}") + tools.log.info(f"旅行者{i[0]}今天已经签到过了~\r\n今天获得的奖励是{tools.Get_item(self.sing_Give[sing_Days])}") else: time.sleep(random.randint(2, 6)) req = httpx.post(url=setting.genshin_Singurl, headers=self.headers, @@ -86,11 +80,11 @@ class genshin: data = req.json() if data["retcode"] == 0: if sing_Days == 0: - tools.log.info(f"旅行者{i[0]}签到成功~\r\n今天获得的奖励是{self.Get_item(self.sing_Give[sing_Days])}") + tools.log.info(f"旅行者{i[0]}签到成功~\r\n今天获得的奖励是{tools.Get_item(self.sing_Give[sing_Days])}") else: - tools.log.info(f"旅行者{i[0]}签到成功~\r\n今天获得的奖励是{self.Get_item(self.sing_Give[sing_Days + 1])}") + tools.log.info(f"旅行者{i[0]}签到成功~\r\n今天获得的奖励是{tools.Get_item(self.sing_Give[sing_Days + 1])}") elif data["retcode"] == -5003: - tools.log.info(f"旅行者{i[0]}今天已经签到过了~\r\n今天获得的奖励是{self.Get_item(self.sing_Give[sing_Days])}") + tools.log.info(f"旅行者{i[0]}今天已经签到过了~\r\n今天获得的奖励是{tools.Get_item(self.sing_Give[sing_Days])}") else: tools.log.warn("账号签到失败！") print (req.text) diff --git a/honkai3rd.py b/honkai3rd.py index a59ec57..bac7a33 100644 --- a/honkai3rd.py +++ b/honkai3rd.py @@ -25,7 +25,7 @@ class honkai3rd: #获取绑定的账号列表 def Getacc_list(self) -> list: - tools.log.info("正在获取米哈游账号绑定的游戏账号列表...") + tools.log.info("正在获取米哈游账号绑定的崩坏3账号列表...") temp_List = [] req = httpx.get(setting.honkai3rd_Account_info_url, headers=self.headers) data = req.json() @@ -37,12 +37,6 @@ class honkai3rd: tools.log.info(f"已获取到{len(temp_List)}个崩坏3账号信息") return temp_List - #获取签到的奖励名称 - def Get_item(self, raw_data:dict) ->str: - temp_Name = raw_data["name"] - temp_Cnt = raw_data["cnt"] - return f"{temp_Name}x{temp_Cnt}" - #获取今天已经签到了的dict def Get_today_item(self,raw_data:list) -> dict: #用range进行循环，当staus等于0的时候上一个就是今天签到的dict @@ -66,7 +60,7 @@ class honkai3rd: if today_Item["status"] == 1: return True else: - tools.log.info(f"舰长{nickname}今天已经签到过了~\r\n今天获得的奖励是{self.Get_item(today_Item)}") + tools.log.info(f"舰长{nickname}今天已经签到过了~\r\n今天获得的奖励是{tools.Get_item(today_Item)}") return False #签到 @@ -83,7 +77,7 @@ class honkai3rd: data = req.json() if data["retcode"] == 0: today_Item = self.Get_today_item(data["data"]["list"]) - tools.log.info(f"舰长{i[0]}签到成功~\r\n今天获得的奖励是{self.Get_item(today_Item)}") + tools.log.info(f"舰长{i[0]}签到成功~\r\n今天获得的奖励是{tools.Get_item(today_Item)}") elif (data["retcode"] == -5003): tools.log.info(f"舰长{i[0]}今天已经签到过了~") else: diff --git a/tools.py b/tools.py index 2f8c89c..7cd838a 100644 --- a/tools.py +++ b/tools.py @@ -52,6 +52,12 @@ def Get_deviceid() -> str: return str(uuid.uuid3(uuid.NAMESPACE_URL, config.mihoyobbs_Cookies)).replace( '-', '').upper() +#获取签到的奖励名称 +def Get_item(self, raw_data:dict) ->str: + temp_Name = raw_data["name"] + temp_Cnt = raw_data["cnt"] + return f"{temp_Name}x{temp_Cnt}" + #获取明天早晨0点的时间戳 def Nextday() -> int: now_time = int(time.time())