From d42f0aa433c985c1e579f48ac0ee96b43a25752a Mon Sep 17 00:00:00 2001
From: Art_Sakura <1754798088@qq.com>
Date: Tue, 3 Jun 2025 15:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=97=A7=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=E5=9B=A0=E6=9E=AF=E8=90=8E=E4=BD=9C=E7=89=A9=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/sign_in.json  |  49 +++++++++++++++++++++++++++----------------
 database/userSoil.py |   5 +++++
 resource/db/plant.db | Bin 36864 -> 36864 bytes
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/config/sign_in.json b/config/sign_in.json
index 331e318..749fe68 100644
--- a/config/sign_in.json
+++ b/config/sign_in.json
@@ -1,5 +1,5 @@
 {
-    "date": "202505",
+    "date": "202506",
     "exp_max": 50,
     "exp_min": 5,
     "point_max": 2000,
@@ -17,7 +17,7 @@
             "exp": 25,
             "plant":
             {
-                "胡萝卜": 3
+                "蜜思桃": 1
             }
         },
         "5":
@@ -26,52 +26,65 @@
             "exp": 50,
             "plant":
             {
-                "胡萝卜": 3
+                "香粽龙舟": 1
             }
         },
         "7":
         {
-            "point": 7000,
-            "exp": 50,
+            "point": 12000,
+            "exp": 75,
             "plant":
             {
-                "胡萝卜": 3
+                "园艺世": 1,
+                "蜜思桃": 1
             }
         },
         "10":
         {
-            "point": 7000,
-            "exp": 50,
+            "point": 12000,
+            "vipPoint": 100,
+            "exp": 100,
             "plant":
             {
-                "胡萝卜": 3
+                "园艺世": 1,
+                "蜜思桃": 1,
+                "香粽龙舟": 1
             }
         },
         "15":
         {
-            "point": 7000,
-            "exp": 50,
+            "point": 12000,
+            "vipPoint": 200,
+            "exp": 125,
             "plant":
             {
-                "胡萝卜": 3
+                "园艺世": 3,
+                "蜜思桃": 3,
+                "香粽龙舟": 3
             }
         },
         "20":
         {
-            "point": 7000,
-            "exp": 50,
+            "point": 15000,
+            "vipPoint": 500,
+            "exp": 150,
             "plant":
             {
-                "胡萝卜": 3
+                "园艺世": 5,
+                "蜜思桃": 5,
+                "香粽龙舟": 5
             }
         },
         "25":
         {
-            "point": 7000,
-            "exp": 50,
+            "point": 20000,
+            "vipPoint": 1000,
+            "exp": 200,
             "plant":
             {
-                "胡萝卜": 3
+                "园艺世": 10,
+                "蜜思桃": 10,
+                "香粽龙舟": 10
             }
         }
     }
diff --git a/database/userSoil.py b/database/userSoil.py
index 291d4d1..1dfa9e5 100644
--- a/database/userSoil.py
+++ b/database/userSoil.py
@@ -117,9 +117,14 @@ class CUserSoilDB(CSqlManager):
                     data = farmInfo.get(key)
                     if not data:
                         continue
+
+                    if data == ",,,4,":
+                        continue
+
                     parts = data.split(",")
                     if len(parts) < 3:
                         continue
+
                     name = parts[0]
                     pt = int(parts[1])
                     mt = int(parts[2])
diff --git a/resource/db/plant.db b/resource/db/plant.db
index 87d69863066395067ddc8c35a72500e5db4763aa..70775662d8bd4986a7852cf1c448dc4a53b5606e 100644
GIT binary patch
delta 1442
zcmZvc+ix316o+@#@m{@aZzj8riED2OO=IucUN^mj8t<hhX-a`gC?ur_+O#xMDNTSx
zk$9>@As|#iqw|80S_KfVlxTS(y`)l6#ecvXZ*5<Ycte#?VSHa=uQaoo-*@KBIcF}_
z4Z6BPUmH?N6h-l*g`3S;H^<Zxm0uf`#4r^Sd`j>|Ltc?rd_^B*{j2OpAxr+28i~i_
z2u>`|oqg~8xepiLU#fR><+TZq$uq<mMXgO0*qYVVMZX}8(4zk0#H9E7%hUR35w`e(
z(ivMBQ@^lu1h%Ci5QNzOEEB>vbjE@$(TJhbHMbv6=h=9vgg$ZLD>3Wqkr3Kz3c9{H
zKfiQ-c~(F6>U3u~RT~N!iOd@fKLIv&f(}1fUp4$Iv6ZmrlrWV>h(qM#kMbPPk?--{
zFCTvW!{aYDqwl2pQ-eio+_KDl#e<|Dd%o5mI8^J$5AL@t|FHIJf-4C%_wq2XR)r?N
zm#jnn6>CG1rBE8R-Ie^J{k!tYcC;F;L}~fH{HZ)Cv(f|UGigF%A`c>;M~+4~@i%cz
ztcXasCsYMjp!jXR$~)Xs?iRPq?PLF9Z?c!zEc1xD&b+}4Y_8r3E0w(%r4dcCpb>wJ
z<NzPc>{pJAv{aHD$&G`bXU6)c_F%N9X^W2YHTmzEaqK;ZQKBvr<Ky*0fIDkpZ@61u
zowZc=*?>-#tQQV$pUJ7t?f_|(6pC{ucJ%;h%mMFY0lVpLeU<2wsaB{Yrl$S9lLu6H
zSC>7>;^|qkb}~TPYcHHLHD{;?$-_dz(ClYAsC@=<@M9vY*@+&=gg+BmY!7xJ@J{8h
z9q-mJ6W!4QdNY~Zr}C<;2K08w>+^=@4g^SJOE_)-E|pEq!=0^dhm66&Iqdagv<rnA
zXJMkTky~$CT3HErYv>%Oz~*>HE5~}E7?{b7=0pRiwarm@H)*J4Ie=OY;nsz0vMlu=
z(xYF#dwAn}_$fJz%aJYvD7<BAt{6zG<x+&*1Ey*VfhnCbT{Kji??wK-X!Mu40I9o!
zbSkHn*_|@E^DNAzNF|sahyg{-;1|LK@wGcfUW!I+@W<N*cKS%nJM^K`d9@TG_FVI2
hY2^Yp7e+OkCNp*t8ZIBs_Sp#Ya6j$(eP{kD{0F$Z;R^r&

delta 1303
zcmZXTPi)gj6vjOcv1jbq$<)(^(9)PLp>dNmDHScmPD&O+Rkcu5RV?iGu<34BDuuS<
zpWs9bhzmVXJ&6N<B!u9Csx6hda7E(6VY|oO<%ER90dar>5+`=zw8Bj+*^<BCH}8FZ
zGhTQoE<6-(x6*z=5D3468+Y$=y0^Js=)RfM)SwWMmjuO?m(&;P3zwSPWp_!w5*StA
z3D2X^D1y-omB}+xznz<#Kkq%nLu2LAc-b5;{WwxKJ;_WeraAq)Idp8iJXjtxkB<!<
zEsdQrhoywXdkTWJ8!qcsla>(Xs;}1uJLITsqZ<i$t+&Ctu8USDccdcQ+C1KusPRCR
zyX!hdA;l5|@l7?+t+0DX{#(SB#=V_V9^}aA@?yrl9=Q~Rulq`FzU5U6=ankedqB<|
zf{|RmyO?{V!NH~=#0}#16#t<|Uxsglhr){fm%glz>rw4r?Vk3F)*gBrdK{VxCDjk=
zQ*~Okln=^^GOOgsXY!m}Bz^b`eun39PW~jX$@6kndM`bZCf6225-W956h|UPNJM0a
zV1DIcv?UupxMvd}ga!$mKG7RFlAtKDVMfD*!0L(pY+yG<F;C>iVS;&$euzgiY~Y6m
z&<B-hh88<~fcGS@@Ke?(?DDCDULEMEq>ZBK)2nWb;ckUjiPz~+KAB~Q+czWfG&Oe*
zv^jfeac8}K{bZIF+I(uYDbQ2htk7DgV%!b0u@rN5d<UeKF#~_bx|kDd0BQIb>oT0}
z4FH@eUMbq3cfrh#E>>vqf!YUH@XbjXPO}ee%xC$J6e}{HUYkFIvxPJpFuw2LMpy#|
z48Ac<6zxQT+Mbuai8jGXYlhj>SE>dmtnIg`9jOD*I+3P@uut{&@#l$dYV)(dc^*i$
z2;AddTdP<9n@BS|RHtGbf(HjIR#bi2Ye`ht#nOhO_*QIAVTMnKH0s}GQq;yi-AiM(
z^S*MOim?opc8l3k1CW3=TPz>sfK>kzguJi9I0%c)Nu#ihC*2CbnN1r90(=2R{spi)
dn`Dm2{abYruIBkkL6pStmJV=#F7@cw-2V~C!x#Vn