Merge pull request #298 from smjes3/v2.2.14

V2.2.14
linruowuyin · May 24, 2024 · 7c6e1d6 · 7c6e1d6
2 parents c43a8aa + 3fe0c43
commit 7c6e1d6
Show file tree

Hide file tree

Showing 7 changed files with 211 additions and 23 deletions.
diff --git a/fhoe.py b/fhoe.py
@@ -162,9 +162,12 @@ def main():
                 log.info(f"检测到换日，即将从头开锄")
                 map_instance.auto_map(start_map, start_in_mid, dev=dev)
             else:
+                map_instance.calculated.back_to_main(delay=2.0)
                 now = datetime.datetime.now()
-                next_4am = now.replace(hour=4, minute=0, second=0, microsecond=0)
-                if now.hour >= 4:
+                refresh_hour = cfg.CONFIG.get("refresh_hour", 4)
+                refresh_minute = cfg.CONFIG.get("refresh_minute", 0)
+                next_4am = now.replace(hour=refresh_hour, minute=refresh_minute, second=0, microsecond=0)
+                if now.hour >= refresh_hour and now.minute >= refresh_minute:
                     next_4am += datetime.timedelta(days=1)
                 wait_time = (next_4am - now).total_seconds()
                 wait_time += 60

diff --git a/map/HuangQuan/map_3-5_2.json b/map/HuangQuan/map_3-5_2.json
@@ -1,17 +1,17 @@
 {
   "name": "绥  园-2",
   "author": "喵不可言,龙女姬",
-  "start": [       
-        {
-            "map": 1
-        },
-        {
-            "picture\\map_3-5_point_1.png": 1.5
-        },
-        {
-            "picture\\transfer.png": 1.5
-        }
-    ],
+  "start": [
+    {
+      "map": 1
+    },
+    {
+      "picture\\map_3-5_point_1.png": 1.5
+    },
+    {
+      "picture\\transfer.png": 1.5
+    }
+  ],
   "map": [
     {
       "s": 4.48
@@ -81,7 +81,7 @@
     },
     {
       "s": 7.4
-	},
+    },
     {
       "e": 2
     },
@@ -102,7 +102,7 @@
     },
     {
       "a": 1.21
-	},
+    },
     {
       "e": 2
     },
@@ -114,10 +114,10 @@
     },
     {
       "d": 1.83
-	},
+    },
     {
       "e": 2
-	},
+    },
     {
       "d": 5.83
     },
@@ -139,6 +139,9 @@
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },
@@ -181,11 +184,68 @@
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },
     {
-      "d": 0.1
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "a": 0.1
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "w": 0.1
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "a": 0.1
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
+    },
+    {
+      "w": 0.1
+    },
+    {
+      "e": 2
+    },
+    {
+      "a": 0.1
+    },
+    {
+      "e": 2
+    },
+    {
+      "e": 2
     },
     {
       "e": 2

diff --git a/map/HuangQuan/map_3-6_1.json b/map/HuangQuan/map_3-6_1.json
@@ -133,15 +133,72 @@
         {
             "e": 2
         },
+        {
+            "d": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "d": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "d": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "a": 0.1
+        },
         {
             "e": 2
         },
+        {
+            "a": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "a": 0.1
+        },
         {
             "e": 2
         },
         {
             "e": 2
         },
+        {
+            "s": 3
+        },
         {
             "w": 0.88
         },

diff --git a/map/HuangQuan/map_3-7_9.json b/map/HuangQuan/map_3-7_9.json
@@ -68,26 +68,77 @@
             "e": 2
         },
         {
-            "a": 0.56
+            "a": 0.8
         },
         {
             "w": 0.8
         },
         {
             "e": 2
         },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "w": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "a": 0.1
+        },
+        {
+            "e": 2
+        },
+        {
+            "a": 0.1
+        },
         {
             "e": 2
         },
+        {
+            "a": 0.1
+        },
         {
             "e": 2
         },
+        {
+            "a": 0.1
+        },
         {
             "e": 2
         },
+        {
+            "a": 0.1
+        },
         {
             "e": 2
         },
+        {
+            "s": 0.1
+        },
         {
             "e": 2
         },

diff --git a/map/HuangQuan/map_4-7_4.json b/map/HuangQuan/map_4-7_4.json
@@ -26,18 +26,33 @@
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },
+    {
+      "d": 0.1
+    },
     {
       "e": 2
     },

diff --git a/map/HuangQuan/map_4-7_8.json b/map/HuangQuan/map_4-7_8.json
@@ -102,7 +102,7 @@
       "d": 2
     },
     {
-      "w": 1.2
+      "w": 0.9
     },
     {
       "e": 2

diff --git a/utils/map.py b/utils/map.py
@@ -152,13 +152,15 @@ def wait_and_run(self, minute=1, second=0):
         log.info(f"需要等待 {wait_time:.0f} 秒")  
         time.sleep(wait_time)
 
-    def has_crossed_4am(self, start, end):
+    def has_crossed_4am(self, start:datetime.datetime, end:datetime.datetime) -> bool:
         """
         检查是否从开始时间到结束时间跨越了凌晨4点
         """
+        refresh_hour = self.cfg.CONFIG.get("refresh_hour", 4)
+        refresh_minute = self.cfg.CONFIG.get("refresh_minute", 0)
         # 获取开始时间的凌晨4点
-        start_4am = start.replace(hour=4, minute=0, second=0, microsecond=0)
-        if start.hour >= 4:
+        start_4am = start.replace(hour=refresh_hour, minute=refresh_minute, second=0, microsecond=0)
+        if start.hour >= refresh_hour and start.minute >= refresh_minute:
             # 如果开始时间在4点之后，则4点时间应该是下一天的4点
             start_4am += datetime.timedelta(days=1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ @@
           "d": 2
         },
         {
-          "w": 1.2
+          "w": 0.9
         },
         {
           "e": 2
@@ Expand Down @@