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

2025-06-03 15:32:27 +08:00
parent d42f0aa433 04a2cc7b4d
commit 776b408c9c
3 changed files with 4 additions and 13 deletions
@@ -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]