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

__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=[

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]

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: