diff --git a/database/plant.py b/database/plant.py index b8ff5a0..75c0432 100644 --- a/database/plant.py +++ b/database/plant.py @@ -135,7 +135,7 @@ class CPlantManager: async def listPlants(cls) -> list[dict]: """查询所有作物记录""" try: - async with cls.m_pDB.execute("SELECT * FROM plant") as cursor: + async with cls.m_pDB.execute("SELECT * FROM plant ORDER BY level") as cursor: rows = await cursor.fetchall() return [dict(r) for r in rows] except Exception as e: diff --git a/database/user.py b/database/user.py index 4a978c1..9f4eebb 100644 --- a/database/user.py +++ b/database/user.py @@ -11,13 +11,13 @@ class CUserDB(CSqlManager): @classmethod async def initDB(cls): """初始化用户表结构，确保user表存在且字段完整""" - # 用户Uid - # 农场名称 - # 经验值 - # 金币 - # 解锁土地数量 - # 偷菜时间字符串 - # 剩余偷菜次数 + #uid: 用户Uid + #name: 农场名称 + #exp: 经验值 + #point: 金币 + #soil: 解锁土地数量 + #stealTime: 偷菜时间字符串 + #stealCount: 剩余偷菜次数 userInfo = { "uid": "INTEGER PRIMARY KEY AUTOINCREMENT", "name": "TEXT NOT NULL", diff --git a/database/userSoil.py b/database/userSoil.py index bbad63a..efdd587 100644 --- a/database/userSoil.py +++ b/database/userSoil.py @@ -11,17 +11,18 @@ from .database import CSqlManager class CUserSoilDB(CSqlManager): @classmethod async def initDB(cls): - # 用户Uid - # 地块索引从1开始 - # 作物名称 - # 播种时间 - # 成熟时间 - # 土地等级 0=普通地，1=红土地，2=黑土地，3=金土地 - # 枯萎状态 0=未枯萎，1=枯萎 - # 施肥状态 0=未施肥，1=施肥 - # 虫害状态 0=无虫害，1=有虫害 - # 杂草状态 0=无杂草，1=有杂草 - # 缺水状态 0=不缺水，1=缺水 + #uid: 用户Uid + #soilIndex: 地块索引从1开始 + #plantName: 作物名称 + #plantTime: 播种时间 + #matureTime: 成熟时间 + #soilLevel: 土地等级 0=普通地，1=红土地，2=黑土地，3=金土地 + #wiltStatus: 枯萎状态 0=未枯萎，1=枯萎 + #fertilizerStatus: 施肥状态 0=未施肥，1=施肥 + #bugStatus: 虫害状态 0=无虫害，1=有虫害 + #weedStatus: 杂草状态 0=无杂草，1=有杂草 + #waterStatus: 缺水状态 0=不缺水，1=缺水 + #harvestCount: 收获次数 userSoil = { "uid": "TEXT NOT NULL", "soilIndex": "INTEGER NOT NULL", @@ -34,6 +35,7 @@ class CUserSoilDB(CSqlManager): "bugStatus": "INTEGER DEFAULT 0", "weedStatus": "INTEGER DEFAULT 0", "waterStatus": "INTEGER DEFAULT 0", + "harvestCount": "INTEGER DEFAULT 0", "PRIMARY KEY": "(uid, soilIndex)", } @@ -64,7 +66,7 @@ class CUserSoilDB(CSqlManager): Returns: bool: 如果旧表不存在则返回 False，否则迁移并删除后返回 True """ - # 检查旧表是否存在 + #检查旧表是否存在 cursor = await cls.m_pDB.execute( "SELECT name FROM sqlite_master WHERE type='table' AND name='soil'" ) @@ -89,8 +91,12 @@ class CUserSoilDB(CSqlManager): mt = int(parts[2]) await cls.m_pDB.execute( - "INSERT INTO userSoil (uid,soilIndex,plantName,plantTime,matureTime) VALUES (?,?,?,?,?)", - (uid, i, name, pt, mt), + """ + INSERT INTO userSoil + (uid,soilIndex,plantName,plantTime,matureTime,harvestCount,) + VALUES (?,?,?,?,?,?) + """, + (uid, i, name, pt, mt, 0), ) await cls.m_pDB.execute("DROP TABLE soil") @@ -108,7 +114,13 @@ class CUserSoilDB(CSqlManager): """ async with cls._transaction(): await cls.m_pDB.execute( - "INSERT INTO userSoil (uid, soilIndex, plantName, plantTime, matureTime, soilLevel, fertilizerStatus, bugStatus, weedStatus, waterStatus) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + """ + INSERT INTO userSoil + (uid, soilIndex, plantName, plantTime, matureTime, + soilLevel, wiltStatus, fertilizerStatus, bugStatus, + weedStatus, waterStatus, harvestCount) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?) + """, ( soilInfo["uid"], soilInfo["soilIndex"], @@ -116,10 +128,12 @@ class CUserSoilDB(CSqlManager): soilInfo.get("plantTime", 0), soilInfo.get("matureTime", 0), soilInfo.get("soilLevel", 0), + soilInfo.get("wiltStatus", 0), soilInfo.get("fertilizerStatus", 0), soilInfo.get("bugStatus", 0), soilInfo.get("weedStatus", 0), soilInfo.get("waterStatus", 0), + soilInfo.get("harvestCount", 0), ), ) @@ -134,19 +148,27 @@ class CUserSoilDB(CSqlManager): None """ await cls.m_pDB.execute( - "INSERT INTO userSoil (uid, soilIndex, plantName, plantTime, matureTime, soilLevel, fertilizerStatus, bugStatus, weedStatus, waterStatus) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", - ( - soilInfo["uid"], - soilInfo["soilIndex"], - soilInfo.get("plantName", ""), - soilInfo.get("plantTime", 0), - soilInfo.get("matureTime", 0), - soilInfo.get("soilLevel", 0), - soilInfo.get("fertilizerStatus", 0), - soilInfo.get("bugStatus", 0), - soilInfo.get("weedStatus", 0), - soilInfo.get("waterStatus", 0), - ), + """ + INSERT INTO userSoil + (uid, soilIndex, plantName, plantTime, matureTime, + soilLevel, wiltStatus, fertilizerStatus, bugStatus, + weedStatus, waterStatus, harvestCount) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?) + """, + ( + soilInfo["uid"], + soilInfo["soilIndex"], + soilInfo.get("plantName", ""), + soilInfo.get("plantTime", 0), + soilInfo.get("matureTime", 0), + soilInfo.get("soilLevel", 0), + soilInfo.get("wiltStatus", 0), + soilInfo.get("fertilizerStatus", 0), + soilInfo.get("bugStatus", 0), + soilInfo.get("weedStatus", 0), + soilInfo.get("waterStatus", 0), + soilInfo.get("harvestCount", 0), + ), ) @classmethod @@ -289,12 +311,12 @@ class CUserSoilDB(CSqlManager): Returns: bool: 播种成功返回 True，否则返回 False """ - # 校验土地区是否已种植 + #校验土地区是否已种植 soilRecord = await cls.getUserSoil(uid, soilIndex) if soilRecord and soilRecord.get("plantName"): return False - # 获取植物配置 + #获取植物配置 plantCfg = await g_pDBService.plant.getPlantByName(plantName) if not plantCfg: logger.error(f"未知植物: {plantName}") @@ -305,7 +327,6 @@ class CUserSoilDB(CSqlManager): try: async with cls._transaction(): - # 复用原有记录字段，保留土壤状态等信息 prev = soilRecord or {} await cls._deleteUserSoil(uid, soilIndex) await cls._insertUserSoil( @@ -315,13 +336,13 @@ class CUserSoilDB(CSqlManager): "plantName": plantName, "plantTime": nowTs, "matureTime": matureTs, - # 保留之前的土壤等级和状态字段，避免数据丢失 "soilLevel": prev.get("soilLevel", 0), "wiltStatus": prev.get("wiltStatus", 0), "fertilizerStatus": prev.get("fertilizerStatus", 0), "bugStatus": prev.get("bugStatus", 0), "weedStatus": prev.get("weedStatus", 0), "waterStatus": prev.get("waterStatus", 0), + "harvestCount": 0 } ) return True diff --git a/database/userSteal.py b/database/userSteal.py index a46cc94..c0e23ec 100644 --- a/database/userSteal.py +++ b/database/userSteal.py @@ -6,11 +6,11 @@ from .database import CSqlManager class CUserStealDB(CSqlManager): @classmethod async def initDB(cls): - # 被偷用户Uid - # 被偷的地块索引 从1开始 - # 偷菜用户Uid - # 被偷数量 - # 被偷时间 + #uid: 被偷用户Uid + #soilIndex: 被偷的地块索引 从1开始 + #stealerUid: 偷菜用户Uid + #stealCount: 被偷数量 + #stealTime: 被偷时间 userSteal = { "uid": "TEXT NOT NULL", "soilIndex": "INTEGER NOT NULL", @@ -205,13 +205,12 @@ class CUserStealDB(CSqlManager): return False @classmethod - async def deleteStealRecord(cls, uid: str, soilIndex: int, stealerUid: str) -> bool: - """删除指定偷菜记录 + async def deleteStealRecord(cls, uid: str, soilIndex: int) -> bool: + """删除指定偷菜记录（只需被偷用户Uid和地块索引） Args: uid (str): 被偷用户Uid soilIndex (int): 被偷地块索引 - stealerUid (str): 偷菜用户Uid Returns: bool: 删除是否成功 @@ -219,8 +218,8 @@ class CUserStealDB(CSqlManager): try: async with cls._transaction(): await cls.m_pDB.execute( - 'DELETE FROM "userSteal" WHERE uid=? AND soilIndex=? AND stealerUid=?;', - (uid, soilIndex, stealerUid) + 'DELETE FROM "userSteal" WHERE uid=? AND soilIndex=?;', + (uid, soilIndex) ) return True except Exception as e: diff --git a/farm/farm.py b/farm/farm.py index 86997b5..6a00022 100644 --- a/farm/farm.py +++ b/farm/farm.py @@ -210,6 +210,12 @@ class CFarmManager: return True, plant, True else: + #如果是多阶段作物 且没有成熟 + if soilInfo['harvestCount'] >= 1: + plant = BuildImage(background = g_sResourcePath / f"plant/{soilInfo['plantName']}/{plantInfo['phase'] - 2}.png") + + return True, plant, False + #如果没有成熟 则根据当前阶段进行绘制 plantedTime = datetime.fromtimestamp(int(soilInfo['plantTime'])) @@ -412,7 +418,16 @@ class CFarmManager: harvestRecords.append(f"收获作物：{soilInfo['plantName']}，数量为：{number}，经验为：{plantInfo['experience']}") await g_pDBService.userPlant.addUserPlantByUid(uid, soilInfo['plantName'], number) - await g_pDBService.userSoil.updateUserSoil(uid, i, "wiltStatus", 1) + + #如果到达收获次数上限 + if soilInfo['harvestCount'] + 1 >= plantInfo['crop']: + await g_pDBService.userSoil.updateUserSoil(uid, i, "wiltStatus", 1) + else: + matureTs = int(currentTime.timestamp()) + int(plantInfo.get("again", 0)) * 3600 + + await g_pDBService.userSoil.updateUserSoil(uid, i, "harvestCount", soilInfo['harvestCount'] + 1) + await g_pDBService.userSoil.updateUserSoil(uid, i, "lastResetTime", int(currentTime.timestamp())) + await g_pDBService.userSoil.updateUserSoil(uid, i, "matureTime", matureTs) await g_pEventManager.m_afterHarvest.emit(uid=uid, name=soilInfo['plantName'], num=number, soilIndex=i) @@ -463,6 +478,9 @@ class CFarmManager: #批量更新数据库操作 await g_pDBService.userSoil.deleteUserSoil(uid, i) + #铲除作物会将偷菜记录清空 + await g_pDBService.userSteal.deleteStealRecord(uid, i) + await g_pEventManager.m_afterEradicate.emit(uid=uid, soilIndex=i) if experience > 0: @@ -614,7 +632,18 @@ class CFarmManager: #如果将作物偷完，就直接更新状态 并记录用户偷取过 if plantInfo['harvest'] - randomNumber + stealingNumber == 0: - await g_pDBService.userSoil.updateUserSoil(target, i, "wiltStatus", 1) + #如果作物 是最后一阶段作物且偷完 则直接枯萎 + if soilInfo['harvestCount'] + 1 >= plantInfo['crop']: + await g_pDBService.userSoil.updateUserSoil(target, i, "wiltStatus", 1) + else: + matureTs = int(currentTime.timestamp()) + int(plantInfo.get("again", 0)) * 3600 + + await g_pDBService.userSoil.updateUserSoil(uid, i, "harvestCount", soilInfo['harvestCount'] + 1) + await g_pDBService.userSoil.updateUserSoil(uid, i, "lastResetTime", int(currentTime.timestamp())) + await g_pDBService.userSoil.updateUserSoil(uid, i, "matureTime", matureTs) + + await g_pDBService.userSteal.addStealRecord(target, i, uid, randomNumber, int(datetime.now().timestamp())) + else: await g_pDBService.userSteal.addStealRecord(target, i, uid, randomNumber, int(datetime.now().timestamp())) diff --git a/log/log.md b/log/log.md index 5ac289f..acc7f9b 100644 --- a/log/log.md +++ b/log/log.md @@ -1,5 +1,15 @@ # 真寻农场更新日志 +## V1.3 +用户方面 +--- +- 新增部分作物 +- 修复一个严重BUG, 该BUG会导致无法重复偷别人菜的问题 + +代码方面 +--- +- 将作物数据从plant.json迁移至resource/db/plant.db中，并将操作json改为操作数据库 + ## V1.2 用户方面 --- diff --git a/resource/db/plant.db b/resource/db/plant.db index fad7821..32e8163 100644 Binary files a/resource/db/plant.db and b/resource/db/plant.db differ diff --git a/resource/plant/南瓜/2.png b/resource/plant/南瓜/2.png new file mode 100644 index 0000000..ef8d7a0 Binary files /dev/null and b/resource/plant/南瓜/2.png differ diff --git a/resource/plant/南瓜/3.png b/resource/plant/南瓜/3.png new file mode 100644 index 0000000..452b604 Binary files /dev/null and b/resource/plant/南瓜/3.png differ diff --git a/resource/plant/南瓜/4.png b/resource/plant/南瓜/4.png new file mode 100644 index 0000000..0424ecd Binary files /dev/null and b/resource/plant/南瓜/4.png differ diff --git a/resource/plant/南瓜/5.png b/resource/plant/南瓜/5.png new file mode 100644 index 0000000..9393f6d Binary files /dev/null and b/resource/plant/南瓜/5.png differ diff --git a/resource/plant/南瓜/6.png b/resource/plant/南瓜/6.png new file mode 100644 index 0000000..ae3e356 Binary files /dev/null and b/resource/plant/南瓜/6.png differ diff --git a/resource/plant/南瓜/icon.png b/resource/plant/南瓜/icon.png new file mode 100644 index 0000000..25c3a94 Binary files /dev/null and b/resource/plant/南瓜/icon.png differ diff --git a/resource/plant/核桃/1.png b/resource/plant/核桃/1.png new file mode 100644 index 0000000..46e6239 Binary files /dev/null and b/resource/plant/核桃/1.png differ diff --git a/resource/plant/核桃/2.png b/resource/plant/核桃/2.png new file mode 100644 index 0000000..e677dc9 Binary files /dev/null and b/resource/plant/核桃/2.png differ diff --git a/resource/plant/核桃/3.png b/resource/plant/核桃/3.png new file mode 100644 index 0000000..e6c0db4 Binary files /dev/null and b/resource/plant/核桃/3.png differ diff --git a/resource/plant/核桃/4.png b/resource/plant/核桃/4.png new file mode 100644 index 0000000..bff8d97 Binary files /dev/null and b/resource/plant/核桃/4.png differ diff --git a/resource/plant/核桃/5.png b/resource/plant/核桃/5.png new file mode 100644 index 0000000..4235eb7 Binary files /dev/null and b/resource/plant/核桃/5.png differ diff --git a/resource/plant/核桃/icon.png b/resource/plant/核桃/icon.png new file mode 100644 index 0000000..d6fcea1 Binary files /dev/null and b/resource/plant/核桃/icon.png differ diff --git a/resource/plant/桃子/1.png b/resource/plant/桃子/1.png new file mode 100644 index 0000000..2b38d63 Binary files /dev/null and b/resource/plant/桃子/1.png differ diff --git a/resource/plant/桃子/2.png b/resource/plant/桃子/2.png new file mode 100644 index 0000000..972908f Binary files /dev/null and b/resource/plant/桃子/2.png differ diff --git a/resource/plant/桃子/3.png b/resource/plant/桃子/3.png new file mode 100644 index 0000000..abf6eeb Binary files /dev/null and b/resource/plant/桃子/3.png differ diff --git a/resource/plant/桃子/4.png b/resource/plant/桃子/4.png new file mode 100644 index 0000000..c476f01 Binary files /dev/null and b/resource/plant/桃子/4.png differ diff --git a/resource/plant/桃子/5.png b/resource/plant/桃子/5.png new file mode 100644 index 0000000..0ac0938 Binary files /dev/null and b/resource/plant/桃子/5.png differ diff --git a/resource/plant/桃子/icon.png b/resource/plant/桃子/icon.png new file mode 100644 index 0000000..598e779 Binary files /dev/null and b/resource/plant/桃子/icon.png differ diff --git a/resource/plant/橙子/1.png b/resource/plant/橙子/1.png new file mode 100644 index 0000000..a444288 Binary files /dev/null and b/resource/plant/橙子/1.png differ diff --git a/resource/plant/橙子/2.png b/resource/plant/橙子/2.png new file mode 100644 index 0000000..f84d73f Binary files /dev/null and b/resource/plant/橙子/2.png differ diff --git a/resource/plant/橙子/3.png b/resource/plant/橙子/3.png new file mode 100644 index 0000000..3a1f926 Binary files /dev/null and b/resource/plant/橙子/3.png differ diff --git a/resource/plant/橙子/4.png b/resource/plant/橙子/4.png new file mode 100644 index 0000000..661ff6e Binary files /dev/null and b/resource/plant/橙子/4.png differ diff --git a/resource/plant/橙子/5.png b/resource/plant/橙子/5.png new file mode 100644 index 0000000..c37c566 Binary files /dev/null and b/resource/plant/橙子/5.png differ diff --git a/resource/plant/橙子/icon.png b/resource/plant/橙子/icon.png new file mode 100644 index 0000000..48bad24 Binary files /dev/null and b/resource/plant/橙子/icon.png differ diff --git a/resource/plant/甘蔗/1.png b/resource/plant/甘蔗/1.png new file mode 100644 index 0000000..12f9f5f Binary files /dev/null and b/resource/plant/甘蔗/1.png differ diff --git a/resource/plant/甘蔗/2.png b/resource/plant/甘蔗/2.png new file mode 100644 index 0000000..dac7fa0 Binary files /dev/null and b/resource/plant/甘蔗/2.png differ diff --git a/resource/plant/甘蔗/3.png b/resource/plant/甘蔗/3.png new file mode 100644 index 0000000..fcc210f Binary files /dev/null and b/resource/plant/甘蔗/3.png differ diff --git a/resource/plant/甘蔗/4.png b/resource/plant/甘蔗/4.png new file mode 100644 index 0000000..32ee986 Binary files /dev/null and b/resource/plant/甘蔗/4.png differ diff --git a/resource/plant/甘蔗/5.png b/resource/plant/甘蔗/5.png new file mode 100644 index 0000000..e54c275 Binary files /dev/null and b/resource/plant/甘蔗/5.png differ diff --git a/resource/plant/甘蔗/icon.png b/resource/plant/甘蔗/icon.png new file mode 100644 index 0000000..efb1b9f Binary files /dev/null and b/resource/plant/甘蔗/icon.png differ diff --git a/resource/plant/竹笋/1.png b/resource/plant/竹笋/1.png new file mode 100644 index 0000000..2a8dfdc Binary files /dev/null and b/resource/plant/竹笋/1.png differ diff --git a/resource/plant/竹笋/2.png b/resource/plant/竹笋/2.png new file mode 100644 index 0000000..10223a7 Binary files /dev/null and b/resource/plant/竹笋/2.png differ diff --git a/resource/plant/竹笋/3.png b/resource/plant/竹笋/3.png new file mode 100644 index 0000000..a0b1cd3 Binary files /dev/null and b/resource/plant/竹笋/3.png differ diff --git a/resource/plant/竹笋/4.png b/resource/plant/竹笋/4.png new file mode 100644 index 0000000..daf496e Binary files /dev/null and b/resource/plant/竹笋/4.png differ diff --git a/resource/plant/竹笋/5.png b/resource/plant/竹笋/5.png new file mode 100644 index 0000000..3a23e87 Binary files /dev/null and b/resource/plant/竹笋/5.png differ diff --git a/resource/plant/竹笋/icon.png b/resource/plant/竹笋/icon.png new file mode 100644 index 0000000..92150f5 Binary files /dev/null and b/resource/plant/竹笋/icon.png differ diff --git a/resource/plant/芹菜/1.png b/resource/plant/芹菜/1.png new file mode 100644 index 0000000..239784b Binary files /dev/null and b/resource/plant/芹菜/1.png differ diff --git a/resource/plant/芹菜/2.png b/resource/plant/芹菜/2.png new file mode 100644 index 0000000..c2d9ea4 Binary files /dev/null and b/resource/plant/芹菜/2.png differ diff --git a/resource/plant/芹菜/3.png b/resource/plant/芹菜/3.png new file mode 100644 index 0000000..4cc23f1 Binary files /dev/null and b/resource/plant/芹菜/3.png differ diff --git a/resource/plant/芹菜/4.png b/resource/plant/芹菜/4.png new file mode 100644 index 0000000..90e1eb2 Binary files /dev/null and b/resource/plant/芹菜/4.png differ diff --git a/resource/plant/芹菜/5.png b/resource/plant/芹菜/5.png new file mode 100644 index 0000000..0d6f5d7 Binary files /dev/null and b/resource/plant/芹菜/5.png differ diff --git a/resource/plant/芹菜/icon.png b/resource/plant/芹菜/icon.png new file mode 100644 index 0000000..f4d2d3e Binary files /dev/null and b/resource/plant/芹菜/icon.png differ diff --git a/resource/plant/苹果/1.png b/resource/plant/苹果/1.png new file mode 100644 index 0000000..73723c1 Binary files /dev/null and b/resource/plant/苹果/1.png differ diff --git a/resource/plant/苹果/2.png b/resource/plant/苹果/2.png new file mode 100644 index 0000000..b15422d Binary files /dev/null and b/resource/plant/苹果/2.png differ diff --git a/resource/plant/苹果/3.png b/resource/plant/苹果/3.png new file mode 100644 index 0000000..caec43b Binary files /dev/null and b/resource/plant/苹果/3.png differ diff --git a/resource/plant/苹果/4.png b/resource/plant/苹果/4.png new file mode 100644 index 0000000..64bd78f Binary files /dev/null and b/resource/plant/苹果/4.png differ diff --git a/resource/plant/苹果/5.png b/resource/plant/苹果/5.png new file mode 100644 index 0000000..fafcaf9 Binary files /dev/null and b/resource/plant/苹果/5.png differ diff --git a/resource/plant/苹果/icon.png b/resource/plant/苹果/icon.png new file mode 100644 index 0000000..cbfebd8 Binary files /dev/null and b/resource/plant/苹果/icon.png differ diff --git a/resource/plant/草莓/1.png b/resource/plant/草莓/1.png new file mode 100644 index 0000000..8e4679f Binary files /dev/null and b/resource/plant/草莓/1.png differ diff --git a/resource/plant/草莓/2.png b/resource/plant/草莓/2.png new file mode 100644 index 0000000..ae4c4f0 Binary files /dev/null and b/resource/plant/草莓/2.png differ diff --git a/resource/plant/草莓/3.png b/resource/plant/草莓/3.png new file mode 100644 index 0000000..baab9ac Binary files /dev/null and b/resource/plant/草莓/3.png differ diff --git a/resource/plant/草莓/4.png b/resource/plant/草莓/4.png new file mode 100644 index 0000000..5a795b7 Binary files /dev/null and b/resource/plant/草莓/4.png differ diff --git a/resource/plant/草莓/5.png b/resource/plant/草莓/5.png new file mode 100644 index 0000000..7bfd509 Binary files /dev/null and b/resource/plant/草莓/5.png differ diff --git a/resource/plant/草莓/icon.png b/resource/plant/草莓/icon.png new file mode 100644 index 0000000..8c1e2c2 Binary files /dev/null and b/resource/plant/草莓/icon.png differ diff --git a/resource/plant/西瓜/1.png b/resource/plant/西瓜/1.png new file mode 100644 index 0000000..aa3ede9 Binary files /dev/null and b/resource/plant/西瓜/1.png differ diff --git a/resource/plant/西瓜/2.png b/resource/plant/西瓜/2.png new file mode 100644 index 0000000..0f04356 Binary files /dev/null and b/resource/plant/西瓜/2.png differ diff --git a/resource/plant/西瓜/3.png b/resource/plant/西瓜/3.png new file mode 100644 index 0000000..5988384 Binary files /dev/null and b/resource/plant/西瓜/3.png differ diff --git a/resource/plant/西瓜/4.png b/resource/plant/西瓜/4.png new file mode 100644 index 0000000..f69c54c Binary files /dev/null and b/resource/plant/西瓜/4.png differ diff --git a/resource/plant/西瓜/5.png b/resource/plant/西瓜/5.png new file mode 100644 index 0000000..df47f0d Binary files /dev/null and b/resource/plant/西瓜/5.png differ diff --git a/resource/plant/西瓜/icon.png b/resource/plant/西瓜/icon.png new file mode 100644 index 0000000..63425ce Binary files /dev/null and b/resource/plant/西瓜/icon.png differ diff --git a/resource/plant/辣椒/1.png b/resource/plant/辣椒/1.png new file mode 100644 index 0000000..45796af Binary files /dev/null and b/resource/plant/辣椒/1.png differ diff --git a/resource/plant/辣椒/2.png b/resource/plant/辣椒/2.png new file mode 100644 index 0000000..95ab99b Binary files /dev/null and b/resource/plant/辣椒/2.png differ diff --git a/resource/plant/辣椒/3.png b/resource/plant/辣椒/3.png new file mode 100644 index 0000000..1897d68 Binary files /dev/null and b/resource/plant/辣椒/3.png differ diff --git a/resource/plant/辣椒/4.png b/resource/plant/辣椒/4.png new file mode 100644 index 0000000..0b4d2d0 Binary files /dev/null and b/resource/plant/辣椒/4.png differ diff --git a/resource/plant/辣椒/5.png b/resource/plant/辣椒/5.png new file mode 100644 index 0000000..6eceed0 Binary files /dev/null and b/resource/plant/辣椒/5.png differ diff --git a/resource/plant/辣椒/icon.png b/resource/plant/辣椒/icon.png new file mode 100644 index 0000000..d22314a Binary files /dev/null and b/resource/plant/辣椒/icon.png differ diff --git a/resource/plant/香蕉/1.png b/resource/plant/香蕉/1.png new file mode 100644 index 0000000..70fd43c Binary files /dev/null and b/resource/plant/香蕉/1.png differ diff --git a/resource/plant/香蕉/2.png b/resource/plant/香蕉/2.png new file mode 100644 index 0000000..834962c Binary files /dev/null and b/resource/plant/香蕉/2.png differ diff --git a/resource/plant/香蕉/3.png b/resource/plant/香蕉/3.png new file mode 100644 index 0000000..ec4d60d Binary files /dev/null and b/resource/plant/香蕉/3.png differ diff --git a/resource/plant/香蕉/4.png b/resource/plant/香蕉/4.png new file mode 100644 index 0000000..885486f Binary files /dev/null and b/resource/plant/香蕉/4.png differ diff --git a/resource/plant/香蕉/5.png b/resource/plant/香蕉/5.png new file mode 100644 index 0000000..1bfc2d5 Binary files /dev/null and b/resource/plant/香蕉/5.png differ diff --git a/resource/plant/香蕉/icon.png b/resource/plant/香蕉/icon.png new file mode 100644 index 0000000..44640c0 Binary files /dev/null and b/resource/plant/香蕉/icon.png differ diff --git a/resource/plant/魔法神花/1.png b/resource/plant/魔法神花/1.png new file mode 100644 index 0000000..ccfa8bc Binary files /dev/null and b/resource/plant/魔法神花/1.png differ diff --git a/resource/plant/魔法神花/2.png b/resource/plant/魔法神花/2.png new file mode 100644 index 0000000..ae3d7fc Binary files /dev/null and b/resource/plant/魔法神花/2.png differ diff --git a/resource/plant/魔法神花/3.png b/resource/plant/魔法神花/3.png new file mode 100644 index 0000000..e111d31 Binary files /dev/null and b/resource/plant/魔法神花/3.png differ diff --git a/resource/plant/魔法神花/4.png b/resource/plant/魔法神花/4.png new file mode 100644 index 0000000..e61fa45 Binary files /dev/null and b/resource/plant/魔法神花/4.png differ diff --git a/resource/plant/魔法神花/5.png b/resource/plant/魔法神花/5.png new file mode 100644 index 0000000..e6d3956 Binary files /dev/null and b/resource/plant/魔法神花/5.png differ diff --git a/resource/plant/魔法神花/icon.png b/resource/plant/魔法神花/icon.png new file mode 100644 index 0000000..06f49c0 Binary files /dev/null and b/resource/plant/魔法神花/icon.png differ diff --git a/resource/plant/黄瓜/1.png b/resource/plant/黄瓜/1.png new file mode 100644 index 0000000..3b66895 Binary files /dev/null and b/resource/plant/黄瓜/1.png differ diff --git a/resource/plant/黄瓜/2.png b/resource/plant/黄瓜/2.png new file mode 100644 index 0000000..379da3e Binary files /dev/null and b/resource/plant/黄瓜/2.png differ diff --git a/resource/plant/黄瓜/3.png b/resource/plant/黄瓜/3.png new file mode 100644 index 0000000..fa0fd52 Binary files /dev/null and b/resource/plant/黄瓜/3.png differ diff --git a/resource/plant/黄瓜/4.png b/resource/plant/黄瓜/4.png new file mode 100644 index 0000000..c0f07a3 Binary files /dev/null and b/resource/plant/黄瓜/4.png differ diff --git a/resource/plant/黄瓜/5.png b/resource/plant/黄瓜/5.png new file mode 100644 index 0000000..881d1fc Binary files /dev/null and b/resource/plant/黄瓜/5.png differ diff --git a/resource/plant/黄瓜/icon.png b/resource/plant/黄瓜/icon.png new file mode 100644 index 0000000..521f8aa Binary files /dev/null and b/resource/plant/黄瓜/icon.png differ diff --git a/resource/plant/黄豆/2.png b/resource/plant/黄豆/2.png new file mode 100644 index 0000000..5432e0b Binary files /dev/null and b/resource/plant/黄豆/2.png differ diff --git a/resource/plant/黄豆/3.png b/resource/plant/黄豆/3.png new file mode 100644 index 0000000..b5166ea Binary files /dev/null and b/resource/plant/黄豆/3.png differ diff --git a/resource/plant/黄豆/4.png b/resource/plant/黄豆/4.png new file mode 100644 index 0000000..17a1181 Binary files /dev/null and b/resource/plant/黄豆/4.png differ diff --git a/resource/plant/黄豆/5.png b/resource/plant/黄豆/5.png new file mode 100644 index 0000000..194b675 Binary files /dev/null and b/resource/plant/黄豆/5.png differ diff --git a/resource/plant/黄豆/6.png b/resource/plant/黄豆/6.png new file mode 100644 index 0000000..487d95f Binary files /dev/null and b/resource/plant/黄豆/6.png differ diff --git a/resource/plant/黄豆/icon.png b/resource/plant/黄豆/icon.png new file mode 100644 index 0000000..e3fb0a8 Binary files /dev/null and b/resource/plant/黄豆/icon.png differ