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 87d6986..7077566 100644 Binary files a/resource/db/plant.db and b/resource/db/plant.db differ