diff --git a/__init__.py b/__init__.py index 1c40f66..4909206 100644 --- a/__init__.py +++ b/__init__.py @@ -39,7 +39,7 @@ __plugin_meta__ = PluginMetadata( """.strip(), extra=PluginExtraData( author="Art_Sakura", - version="1.4", + version="1.4.1", commands=[Command(command="我的农场")], menu_type="群内小游戏", configs=[ diff --git a/database/userSoil.py b/database/userSoil.py index 1dfa9e5..b8c5410 100644 --- a/database/userSoil.py +++ b/database/userSoil.py @@ -56,13 +56,8 @@ class CUserSoilDB(CSqlManager): if currentTime >= soilInfo['matureTime']: return - currentStage = 0 elapsedTime = currentTime - soilInfo['plantTime'] - - for idx, thr in enumerate(phaseList, start=1): - if elapsedTime < thr: - currentStage = idx - break + currentStage = currentStage = sum(1 for thr in phaseList if elapsedTime >= thr) t = int(soilInfo['plantTime']) - phaseList[currentStage] s = int(soilInfo['matureTime']) - phaseList[currentStage] diff --git a/farm/farm.py b/farm/farm.py index 5d6978d..a1bf1dd 100644 --- a/farm/farm.py +++ b/farm/farm.py @@ -308,13 +308,9 @@ class CFarmManager: # return True, plant, False, offsetX, offsetY #如果没有成熟 则根据当前阶段进行绘制 - currentStage = 0 - elapsedTime = currentTime - soilInfo['plantTime'] - for idx, thr in enumerate(phaseList, start=1): - if elapsedTime < thr: - currentStage = idx - break + elapsedTime = currentTime - soilInfo['plantTime'] + currentStage = sum(1 for thr in phaseList if elapsedTime >= thr) if currentStage <= 0: if plantInfo['general'] == False: