Diuse/zhenxun_plugin_farm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚑 修复了用户不能正常偷菜、收菜的问题

Browse Source
This commit is contained in:
Art_Sakura 2025-03-22 00:26:29 +08:00
parent 43b2184597
commit 16c801bcb6
2 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.py
View File

@ -295,7 +295,7 @@ async def _(session: Uninfo, target: Match[At]):
point = await g_pSqlManager.getUserPointByUid(tar.target) point = await g_pSqlManager.getUserPointByUid(tar.target)
if point < 0: if point < 0:
await MessageUtils.build_message("尚未开通农场，快at我发送 开通农场 开通吧").send() await MessageUtils.build_message("目标尚未开通农场，快at我发送 开通农场 开通吧").send()
return None return None
result = await g_pFarmManager.stealing(uid, tar.target) result = await g_pFarmManager.stealing(uid, tar.target)

18
farm/farm.py
View File

@ -301,7 +301,7 @@ class CFarmManager:
plant = {} plant = {}
soilNames = [f"soil{i}" for i in range(soilUnlock)] soilNames = [f"soil{i + 1}" for i in range(soilUnlock)]
soilStatuses = await asyncio.gather(*[ soilStatuses = await asyncio.gather(*[
g_pSqlManager.getUserSoilStatusBySoilID(uid, name) g_pSqlManager.getUserSoilStatusBySoilID(uid, name)
for name in soilNames for name in soilNames
@ -312,8 +312,13 @@ class CFarmManager:
experience = 0 experience = 0
for (soil_name, (status, info)) in zip(soilNames, soilStatuses): for (soil_name, (status, info)) in zip(soilNames, soilStatuses):
if not status: if len(info) <= 0:
continue
soilInfo = info.split(',') soilInfo = info.split(',')
if soilInfo[3] == 4:
continue
plantId = soilInfo[0] plantId = soilInfo[0]
plantInfo = g_pJsonManager.m_pPlant['plant'][plantId] # type: ignore plantInfo = g_pJsonManager.m_pPlant['plant'][plantId] # type: ignore
@ -495,7 +500,7 @@ class CFarmManager:
plant = {} plant = {}
#根据解锁土地，获取每块土地状态信息 #根据解锁土地，获取每块土地状态信息
soilNames = [f"soil{i}" for i in range(soilUnlock)] soilNames = [f"soil{i + 1}" for i in range(soilUnlock)]
soilStatuses = await asyncio.gather(*[ soilStatuses = await asyncio.gather(*[
g_pSqlManager.getUserSoilStatusBySoilID(target, name) g_pSqlManager.getUserSoilStatusBySoilID(target, name)
for name in soilNames for name in soilNames
@ -508,7 +513,9 @@ class CFarmManager:
for (soilName, (status, info)) in zip(soilNames, soilStatuses): for (soilName, (status, info)) in zip(soilNames, soilStatuses):
isStealing = False isStealing = False
if not info: if len(info) < 0:
continue
soilInfo = info.split(',') soilInfo = info.split(',')
if soilInfo[3] == 4: if soilInfo[3] == 4:
continue continue
@ -545,8 +552,7 @@ class CFarmManager:
plant[plantId] = plant.get(plantId, 0) + randomNumber plant[plantId] = plant.get(plantId, 0) + randomNumber
harvestRecords.append(f"成功偷到作物：{plantId}，数量为：{randomNumber}") harvestRecords.append(f"成功偷到作物：{plantId}，数量为：{randomNumber}")
newElement = f"|{uid}-{randomNumber}" stealingStatus.append(f"|{uid}-{randomNumber}")
stealingStatus.append(newElement)
#如果将作物偷完，就直接更新状态 并记录用户偷取过 #如果将作物偷完，就直接更新状态 并记录用户偷取过
if plantInfo['harvest'] - randomNumber + stealingNumber == 0: if plantInfo['harvest'] - randomNumber + stealingNumber == 0: