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

Merge branch 'Beta' of https://github.com/Shu-Ying/zhenxun_plugin_farm into Beta

Browse Source
This commit is contained in:
Art_Sakura 2025-06-03 15:32:27 +08:00
commit 776b408c9c
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__init__.py
View File

@ -39,7 +39,7 @@ __plugin_meta__ = PluginMetadata(
""".strip(), """.strip(),
extra=PluginExtraData( extra=PluginExtraData(
author="Art_Sakura", author="Art_Sakura",
version="1.4", version="1.4.1",
commands=[Command(command="我的农场")], commands=[Command(command="我的农场")],
menu_type="群内小游戏", menu_type="群内小游戏",
configs=[ configs=[

7
database/userSoil.py
View File

@ -56,13 +56,8 @@ class CUserSoilDB(CSqlManager):
if currentTime >= soilInfo['matureTime']: if currentTime >= soilInfo['matureTime']:
return return
currentStage = 0
elapsedTime = currentTime - soilInfo['plantTime'] elapsedTime = currentTime - soilInfo['plantTime']
currentStage = currentStage = sum(1 for thr in phaseList if elapsedTime >= thr)
for idx, thr in enumerate(phaseList, start=1):
if elapsedTime < thr:
currentStage = idx
break
t = int(soilInfo['plantTime']) - phaseList[currentStage] t = int(soilInfo['plantTime']) - phaseList[currentStage]
s = int(soilInfo['matureTime']) - phaseList[currentStage] s = int(soilInfo['matureTime']) - phaseList[currentStage]

8
farm/farm.py
View File

@ -308,13 +308,9 @@ class CFarmManager:
# return True, plant, False, offsetX, offsetY # return True, plant, False, offsetX, offsetY
#如果没有成熟 则根据当前阶段进行绘制 #如果没有成熟 则根据当前阶段进行绘制
currentStage = 0
elapsedTime = currentTime - soilInfo['plantTime']
for idx, thr in enumerate(phaseList, start=1): elapsedTime = currentTime - soilInfo['plantTime']
if elapsedTime < thr: currentStage = sum(1 for thr in phaseList if elapsedTime >= thr)
currentStage = idx
break
if currentStage <= 0: if currentStage <= 0:
if plantInfo['general'] == False: if plantInfo['general'] == False: