From db3855fd837a108bb194fae0f191b6bb3b123490 Mon Sep 17 00:00:00 2001
From: liulong <liulong@3mencn.com>
Date: Mon, 30 Sep 2024 10:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8:hammer:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B5=87=E6=B0=B4=E3=80=81=E6=94=B6=E8=8E=B7=E3=80=81=E6=92=AD?=
 =?UTF-8?q?=E7=A7=8D=E3=80=81=E8=B4=AD=E4=B9=B0=E4=B9=8B=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hykb.py | 48 ++++++++++++++----------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/hykb.py b/hykb.py
index f061d9f..2816583 100644
--- a/hykb.py
+++ b/hykb.py
@@ -22,7 +22,7 @@ else:
     print("未查找到Hykb_cookie变量.")
 
 
-class HaoYouKuaiBao():
+class HaoYouKuaiBao:
     """好游快爆签到
     """
 
@@ -210,56 +210,36 @@ class HaoYouKuaiBao():
         data = self.login()
         if data['key'] == 'ok':
             print(f"用户： 【{self.user_name}】登录成功！✅")
+            # 优先判断是否已收获
             if data['config']['csd_jdt'] == "100%":
                 # 收获
                 if self.harvest():
                     info = info + "收获成功\n"
-                    # 播种
-                    b = self.plant()
-                    if b == -1:
-                        info = info + "播种失败，没有种子\n"
-                    elif b == 1:
-                        info = info + "播种成功\n"
-                        # 浇水
-                        data = self.watering()
-                        if data[0] == 1:
-                            info = info + f"浇水成功,获得{data[1]}爆米花\n"
-                        elif data[0] == 0:
-                            info = info + f"今日已浇水\n"
-                        else:
-                            info = info + f"浇水失败\n"
-                    else:
-                        info = info + "播种失败\n"
                 else:
                     info = info + "收获失败\n"
 
-            elif data['config']['grew'] == '-1':
+            # 判断是否已播种
+            if data['config']['grew'] == '-1':
                 # 播种
                 b = self.plant()
                 if b == -1:
                     info = info + "播种失败，没有种子\n"
+                    # 购买种子
+                    if self.buy_seeds():
+                        info = info + "购买种子成功\n"
                 elif b == 1:
                     info = info + "播种成功\n"
-                    # 浇水
-                    data = self.watering()
-                    if data[0] == 1:
-                        info = info + f"浇水成功,获得{data[1]}爆米花\n"
-                    elif data[0] == 0:
-                        info = info + f"今日已浇水\n"
-                    else:
-                        info = info + f"浇水失败\n"
                 else:
                     info = info + "播种失败\n"
 
+            # 浇水
+            data = self.watering()
+            if data[0] == 1:
+                info = info + f"浇水成功,获得{data[1]}爆米花\n"
+            elif data[0] == 0:
+                info = info + f"今日已浇水\n"
             else:
-                # 浇水
-                data = self.watering()
-                if data[0] == 1:
-                    info = info + f"浇水成功,获得{data[1]}爆米花\n"
-                elif data[0] == 0:
-                    info = info + f"今日已浇水\n"
-                else:
-                    info = info + f"浇水失败\n"
+                info = info + f"浇水失败\n"
         else:
             info = info + "登录失败\n"