From 010fe7d988b0a91b0455dd64b3c73e4a9dd92e61 Mon Sep 17 00:00:00 2001
From: clover420 <748883120@qq.com>
Date: Sun, 28 Aug 2022 18:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=AD=BE=E5=88=B0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud_genshin.py | 14 +++++++++-----
 main.py          |  2 +-
 setting.py       |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cloud_genshin.py b/cloud_genshin.py
index bbfd267..4324724 100644
--- a/cloud_genshin.py
+++ b/cloud_genshin.py
@@ -1,3 +1,4 @@
+import json
 import tools
 import config
 import setting
@@ -32,14 +33,17 @@ class CloudGenshin:
 
     def sign_account(self) -> str:
         ret_msg = "云原神:\r\n"
-        req = http.get(url=setting.cloud_genshin_Inquire, headers=self.headers)
+        req = http.get(url=setting.cloud_genshin_sgin, headers=self.headers)
         data = req.json()
+        data2 = http.get(url=setting.cloud_genshin_inquire, headers=self.headers).json()
         if data['retcode'] == 0:
-            if req["data"]["free_time"]['free_time'] == '0':
-                log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线')
+            if len(data2['data']['list']) >= 1:
+                log.info('签到成功，已获得15分钟免费时长')
+                ret_msg = f'签到成功，已获得15分钟免费时长\n'
             else:
-                log.info(f'签到成功，已获得{data["data"]["free_time"]["free_time"]}分钟免费时长')
-            ret_msg = f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \
+                log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线')
+                ret_msg = '签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线\n'
+            ret_msg += f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \
                       f'畅玩卡状态为 {data["data"]["play_card"]["short_msg"]}，拥有米云币 {data["data"]["coin"]["coin_num"]} 枚'
             log.info(ret_msg)
         elif data['retcode'] == -100:
diff --git a/main.py b/main.py
index eba661b..3d72a91 100644
--- a/main.py
+++ b/main.py
@@ -103,7 +103,7 @@ def main():
             else:
                 cloud_ys = cloud_genshin.CloudGenshin()
                 data = cloud_ys.sign_account()
-                return_data += "\n\n" + data
+                return_data += "\n\n云原神:\n" + data
         return ret_code, return_data
     elif config.config["account"]["cookie"] == "CookieError":
         raise CookieError('Cookie expires')
diff --git a/setting.py b/setting.py
index cdbebcc..18d8d04 100644
--- a/setting.py
+++ b/setting.py
@@ -116,4 +116,5 @@ genshin_Signurl = web_Api + "/event/bbs_sign_reward/sign"
 
 # 云原神相关api
 cloud_genshin_Api = "https://api-cloudgame.mihoyo.com"
-cloud_genshin_Inquire = cloud_genshin_Api + "/hk4e_cg_cn/wallet/wallet/get"
+cloud_genshin_sgin = cloud_genshin_Api + "/hk4e_cg_cn/wallet/wallet/get"
+cloud_genshin_inquire = cloud_genshin_Api + "/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true"