js：狗粮批发2.1.0 战斗好感1.5.1 锄地一条龙 2.2.9部分战斗策略调整 (#2864)

* js：狗粮批发2.1.0 移除路径内调时，改为自定义配置控制 * js：战斗好感 1.更新了版本号 2.修复摩拉识别使用的错误模板图片路径 3.增加1000Stars选项 * combat：战斗策略 1.新增仅用于盗宝团好感的那维莱特策略 2.为不适合锄地的策略添加-副本后缀 3.删除可完全被万能策略上位替代的策略：月草c，伊芙爱万玛，芙茜万夏 4.删除完全不合理的莱爱万夜和莱爱万夜.只用战技（并不适合锄地却写适合锄地） * 改为归档 * js：锄地一条龙修改触发分配结果不合理的触发条件 * 移除小怪2000部分的json5文件锄地规划纯害人来的
2026-03-15 03:23:22 +08:00 · 2026-02-12 14:38:30 +08:00
parent 167de9a066
commit a0254b66e3
49 changed files with 145 additions and 2578 deletions
--- a/archive/combat/伊芙爱万玛.txt
+++ b/archive/combat/伊芙爱万玛.txt
--- a/archive/combat/月草c-副本.txt
+++ b/archive/combat/月草c-副本.txt
--- a/archive/combat/芙茜万夏.txt
+++ b/archive/combat/芙茜万夏.txt
--- a/archive/combat/莱爱万夜-副本.txt
+++ b/archive/combat/莱爱万夜-副本.txt
--- a/archive/combat/莱爱万夜.只用战技.txt
+++ b/archive/combat/莱爱万夜.只用战技.txt
--- a/repo/combat/奈草女钟万妮芭菈-副本.txt
+++ b/repo/combat/奈草女钟万妮芭菈-副本.txt
--- a/repo/combat/恰斯卡队(恰火莱琴)-副本.txt
+++ b/repo/combat/恰斯卡队(恰火莱琴)-副本.txt
--- a/repo/combat/恰斯卡队(恰钟芭班)-副本.txt
+++ b/repo/combat/恰斯卡队(恰钟芭班)-副本.txt
--- a/repo/combat/那维莱特-盗宝团好感.txt
+++ b/repo/combat/那维莱特-盗宝团好感.txt
@@ -0,0 +1,3 @@
+// 描述：仅供盗宝团好感使用，不适用于锄地，配置组设置-战斗配置-自动检测战斗结束-更快检测战斗结束启用并填1，检查战斗结束的延时改为0.4，js自定义配置中选择禁用异步战斗
+// 作者： mno
+那维莱特 attack(0.05),click(middle),e,keydown(VK_LBUTTON),wait(0.27),keyup(VK_LBUTTON),wait(0.15),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),keydown(VK_LBUTTON),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),click(middle),j,click(middle),wait(0.05),keyup(VK_LBUTTON),wait(0.15)
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/202璃月-渌华池3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/202璃月-渌华池3.json
@@ -68,15 +68,6 @@
      "type": "path",
      "x": 426.7041015625,
      "y": 232.0400390625
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 7,
-      "move_mode": "walk",
-      "type": "orientation",
-      "x": 426.7041015625,
-      "y": 232.0400390625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/302稻妻-九条阵屋2.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/302稻妻-九条阵屋2.json
@@ -79,15 +79,6 @@
      "type": "target",
      "x": -3537.6416015625,
      "y": -3343.54296875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 8,
-      "move_mode": "walk",
-      "type": "path",
-      "x": -3541.4541015625,
-      "y": -3343.9228515625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/601纳塔-圣火竞技场东2.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/601纳塔-圣火竞技场东2.json
@@ -90,15 +90,6 @@
      "type": "target",
      "x": 9079.197265625,
      "y": -1842.89404296875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 9,
-      "move_mode": "run",
-      "type": "orientation",
-      "x": 9079.197265625,
-      "y": -1842.89404296875
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/623纳塔-悠悠集市东海岸6.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/623纳塔-悠悠集市东海岸6.json
@@ -170,15 +170,6 @@
      "type": "target",
      "x": 13628.109375,
      "y": 563.55419921875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 18,
-      "move_mode": "run",
-      "type": "orientation",
-      "x": 13627.654296875,
-      "y": 562.6103515625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/645纳塔-提提岛北3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点1号线/执行/645纳塔-提提岛北3.json
@@ -98,15 +98,6 @@
      "type": "target",
      "x": 15038.3603515625,
      "y": 1630.52294921875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 10,
-      "move_mode": "climb",
-      "type": "orientation",
-      "x": 15038.3603515625,
-      "y": 1630.52294921875
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/214璃月-轻策庄3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/214璃月-轻策庄3.json
@@ -27,15 +27,6 @@
      "x": 546.6943359375,
      "y": 1766.89453125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 2,
-      "move_mode": "run",
-      "type": "orientation",
-      "x": 525.374976299503,
-      "y": 1746.3123787362929
-    },
    {
      "action": "",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/229璃月-沉玉谷灵濛山书洞3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/229璃月-沉玉谷灵濛山书洞3.json
@@ -172,15 +172,6 @@
      "type": "target",
      "x": 2090.8876953125,
      "y": 2131.40478515625
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 18,
-      "move_mode": "climb",
-      "type": "orientation",
-      "x": 2090.8876953125,
-      "y": 2131.40478515625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/429须弥-花海锋刃林泽3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/429须弥-花海锋刃林泽3.json
@@ -134,15 +134,6 @@
      "type": "target",
      "x": 6333.35791015625,
      "y": 839.99169921875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 14,
-      "move_mode": "climb",
-      "type": "orientation",
-      "x": 6333.35791015625,
-      "y": 839.99169921875
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/603纳塔-悬木人声望2.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通98点2号线/执行/603纳塔-悬木人声望2.json
@@ -61,15 +61,6 @@
      "type": "target",
      "x": 8437.7216796875,
      "y": -2113.0166015625
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 6,
-      "move_mode": "climb",
-      "type": "orientation",
-      "x": 8437.7216796875,
-      "y": -2113.0166015625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/1P枫丹-科学院工坊激活CD.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/激活/1P枫丹-科学院工坊激活CD.json
@@ -27,15 +27,6 @@
      "x": 4429.1826171875,
      "y": 5097.20703125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 2,
-      "move_mode": "walk",
-      "type": "orientation",
-      "x": 4437.81640625,
-      "y": 5082.35791015625
-    },
    {
      "action": "",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/05【额外】纳塔-鸡屁股9.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/仅12h额外/执行/05【额外】纳塔-鸡屁股9.json
@@ -26,15 +26,6 @@
      "x": 8738.1943359375,
      "y": -1857.46533203125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 2,
-      "move_mode": "fly",
-      "type": "orientation",
-      "x": 8756.15625,
-      "y": -1848.7205981121242
-    },
    {
      "action": "stop_flying",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/01【额外】稻妻-踏鞴砂大炮点5.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/01【额外】稻妻-踏鞴砂大炮点5.json
@@ -37,15 +37,6 @@
      "x": -3247.587890625,
      "y": -3539.9248046875
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 3,
-      "move_mode": "dash",
-      "type": "orientation",
-      "x": -3247.587890625,
-      "y": -3539.9248046875
-    },
    {
      "action": "",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/02【额外】须弥-水天丛林7.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/02【额外】须弥-水天丛林7.json
@@ -35,15 +35,6 @@
      "x": 3162.83740234375,
      "y": -1776.4501953125
    },
-    {
-      "action": "set_time",
-      "action_params": "12:00",
-      "id": 3,
-      "move_mode": "walk",
-      "type": "orientation",
-      "x": 3162.83740234375,
-      "y": -1776.4501953125
-    },
    {
      "action": "stop_flying",
      "action_params": "5000",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/05【额外】纳塔-鸡屁股9.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/执行/05【额外】纳塔-鸡屁股9.json
@@ -26,15 +26,6 @@
      "x": 8738.1943359375,
      "y": -1857.46533203125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 2,
-      "move_mode": "fly",
-      "type": "orientation",
-      "x": 8756.15625,
-      "y": -1848.7205981121242
-    },
    {
      "action": "stop_flying",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/激活/4须弥额外激活CD.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/额外/所有额外/激活/4须弥额外激活CD.json
@@ -63,15 +63,6 @@
      "x": 4390.72265625,
      "y": -1875.52783203125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 6,
-      "move_mode": "dash",
-      "type": "orientation",
-      "x": 4390.72265625,
-      "y": -1875.52783203125
-    },
    {
      "action": "",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/202璃月-渌华池3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/202璃月-渌华池3.json
@@ -68,15 +68,6 @@
      "type": "path",
      "x": 426.7041015625,
      "y": 232.0400390625
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 7,
-      "move_mode": "walk",
-      "type": "orientation",
-      "x": 426.7041015625,
-      "y": 232.0400390625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/302稻妻-九条阵屋2.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/302稻妻-九条阵屋2.json
@@ -79,15 +79,6 @@
      "type": "target",
      "x": -3537.6416015625,
      "y": -3343.54296875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 8,
-      "move_mode": "walk",
-      "type": "path",
-      "x": -3541.4541015625,
-      "y": -3343.9228515625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/623纳塔-悠悠集市东海岸6.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/623纳塔-悠悠集市东海岸6.json
@@ -170,15 +170,6 @@
      "type": "target",
      "x": 13628.109375,
      "y": 563.55419921875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 18,
-      "move_mode": "run",
-      "type": "orientation",
-      "x": 13627.654296875,
-      "y": 562.6103515625
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/645纳塔-提提岛北3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/01普通/645纳塔-提提岛北3.json
@@ -98,15 +98,6 @@
      "type": "target",
      "x": 15038.3603515625,
      "y": 1630.52294921875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 10,
-      "move_mode": "climb",
-      "type": "orientation",
-      "x": 15038.3603515625,
-      "y": 1630.52294921875
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/03额外/02【额外】须弥-水天丛林7.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/03额外/02【额外】须弥-水天丛林7.json
@@ -35,15 +35,6 @@
      "x": 3162.83740234375,
      "y": -1776.4501953125
    },
-    {
-      "action": "set_time",
-      "action_params": "12:00",
-      "id": 3,
-      "move_mode": "walk",
-      "type": "orientation",
-      "x": 3162.83740234375,
-      "y": -1776.4501953125
-    },
    {
      "action": "stop_flying",
      "action_params": "5000",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/03额外/05【额外】纳塔-鸡屁股9.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁1号线/03额外/05【额外】纳塔-鸡屁股9.json
@@ -26,15 +26,6 @@
      "x": 8738.1943359375,
      "y": -1857.46533203125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 2,
-      "move_mode": "fly",
-      "type": "orientation",
-      "x": 8756.15625,
-      "y": -1848.7205981121242
-    },
    {
      "action": "stop_flying",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/429须弥-花海锋刃林泽3.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/01普通/429须弥-花海锋刃林泽3.json
@@ -134,15 +134,6 @@
      "type": "target",
      "x": 6333.35791015625,
      "y": 839.99169921875
-    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 14,
-      "move_mode": "climb",
-      "type": "orientation",
-      "x": 6333.35791015625,
-      "y": 839.99169921875
    }
  ]
 }
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/03额外/05【额外】纳塔-鸡屁股9.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/高铁/高铁2号线/03额外/05【额外】纳塔-鸡屁股9.json
@@ -26,15 +26,6 @@
      "x": 8738.1943359375,
      "y": -1857.46533203125
    },
-    {
-      "action": "set_time",
-      "action_params": "06:00",
-      "id": 2,
-      "move_mode": "fly",
-      "type": "orientation",
-      "x": 8756.15625,
-      "y": -1848.7205981121242
-    },
    {
      "action": "stop_flying",
      "action_params": "",
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/调为夜晚.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/调为夜晚.json
@@ -0,0 +1,31 @@
+{
+  "info": {
+    "authors": [
+      {
+        "links": "",
+        "name": "mno"
+      }
+    ],
+    "bgi_version": "0.45.0",
+    "description": "",
+    "enable_monster_loot_split": false,
+    "last_modified_time": 1765207268104,
+    "map_match_method": "",
+    "map_name": "Teyvat",
+    "name": "调为夜晚",
+    "tags": [],
+    "type": "collect",
+    "version": "1.0"
+  },
+  "positions": [
+    {
+      "action": "set_time",
+      "action_params": "18:00",
+      "id": 1,
+      "move_mode": "walk",
+      "type": "orientation",
+      "x": 0,
+      "y": 0
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/调为白天.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/调为白天.json
@@ -0,0 +1,31 @@
+{
+  "info": {
+    "authors": [
+      {
+        "links": "",
+        "name": "mno"
+      }
+    ],
+    "bgi_version": "0.45.0",
+    "description": "",
+    "enable_monster_loot_split": false,
+    "last_modified_time": 1765207268104,
+    "map_match_method": "",
+    "map_name": "Teyvat",
+    "name": "调为白天",
+    "tags": [],
+    "type": "collect",
+    "version": "1.0"
+  },
+  "positions": [
+    {
+      "action": "set_time",
+      "action_params": "6:00",
+      "id": 1,
+      "move_mode": "walk",
+      "type": "orientation",
+      "x": 0,
+      "y": 0
+    }
+  ]
+}
--- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js
@@ -59,6 +59,7 @@ let timeMoveUp = Math.round(timeMove * 0.45);
 let timeMoveDown = Math.round(timeMove * 0.55);
 let rollingDelay = 25;
 let gameRegion;
+let lastsettimeTime = 0;

 (async function () {
    setGameMetrics(1920, 1080, 1);
@@ -1130,6 +1131,15 @@ async function fakeLog(name, isJs, isStart, duration) {
 }

 async function runPath(fullPath, targetItemPath = null) {
+    let settimeInterval = 10 * 60 * 1000;
+    if (settings.setTimeMode && settings.setTimeMode != "不调节时间" && (((new Date() - lastsettimeTime) > settimeInterval))) {
+        if (settings.setTimeMode === "尽量调为白天") {
+            await pathingScript.runFile("assets/调为白天.json");
+        } else {
+            await pathingScript.runFile("assets/调为夜晚.json");
+        }
+        lastsettimeTime = new Date();
+    }
    state = state || {};   // 若已存在则保持原引用，否则新建空对象
    state.running = true;

--- a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "AAA狗粮批发",
-  "version": "2.0.7",
+  "version": "2.1.0",
  "tags": [
    "狗粮"
  ],
--- a/repo/js/AAA-Artifacts-Bulk-Supply/settings.json
+++ b/repo/js/AAA-Artifacts-Bulk-Supply/settings.json
@@ -10,6 +10,17 @@
    "type": "input-text",
    "label": "请输入【清怪队伍】的名称\n请在配置组设置中为该配队配置对应的战斗策略\n不填时不执行清怪路线"
  },
+  {
+    "name": "setTimeMode",
+    "type": "select",
+    "label": "尝试调节时间来获得移速加成\n队伍中含迪希雅、嘉明或塔利雅时选择白天\n队伍中含罗莎莉亚时选择夜晚",
+    "options": [
+      "不调节时间",
+      "尽量调为白天",
+      "尽量调为夜晚"
+    ],
+    "default": "不调节时间"
+  },
  {
    "name": "minIntervalTime",
    "type": "input-text",
--- a/repo/js/AutoFriendshipFight/main.js
+++ b/repo/js/AutoFriendshipFight/main.js
@@ -51,7 +51,7 @@ expRo.Threshold = 0.85;
 expRo.Use3Channels = true;
 expRo.InitTemplate();

-const moraRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/exp.png"), 74, 341, 207 - 74, 803 - 341);
+const moraRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/mora.png"), 74, 341, 207 - 74, 803 - 341);
 moraRo.Threshold = 0.85;
 moraRo.Use3Channels = true;
 moraRo.InitTemplate();
@@ -320,8 +320,12 @@ async function executeSingleFriendshipRound(roundIndex, ocrTimeout, fightTimeout
        detectedExpOrMora = false;
    }
    if (!initialDetected || roundIndex > 0) {
+        if (settings.use1000Stars) {
+            await genshin.wonderlandCycle();
+        } else {
            await genshin.relogin();
        }
+    }

    // 启动路径导航任务（异步）
    let pathTask = AutoPath(`${enemyType}-战斗点`);
--- a/repo/js/AutoFriendshipFight/manifest.json
+++ b/repo/js/AutoFriendshipFight/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "战斗好感：自动好感度&卡时间",
-  "version": "1.5.0",
+  "version": "1.5.1",
  "bgi_version": "0.45.1",
  "tags": [
    "好感",
--- a/repo/js/AutoFriendshipFight/settings.json
+++ b/repo/js/AutoFriendshipFight/settings.json
@@ -28,6 +28,11 @@
    "type": "checkbox",
    "label": "禁用容易导致问题的异步战斗，改为正常的战斗结束逻辑，勾选后需要在配置组中正常配置战斗结束检测"
  },
+  {
+    "name": "use1000Stars",
+    "type": "checkbox",
+    "label": "使用进出千星替代退出重登"
+  },
  {
    "name": "loopTillNoExpOrMora",
    "type": "checkbox",
@@ -41,7 +46,7 @@
  {
    "name": "runTimes",
    "type": "input-text",
-    "label": "(选填)运行次数\n【默认10次，卡时间模式默认50次】"
+    "label": "(选填)运行次数\n【默认10次】"
  },
  {
    "name": "ocrTimeout",
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -644,7 +644,7 @@ async function findBestRouteGroups(pathings, k1, k2, targetEliteNum, targetMonst
    const m = Math.floor((totalTimeCombined % 3600) / 60);
    const s = totalTimeCombined % 60;
    log.info(`预计总用时: ${h} 时 ${m} 分 ${s.toFixed(0)} 秒`);
-    if (totalSelectedElites < targetEliteNum || totalSelectedMonsters < targetMonsterNum || totalSelectedElites > targetEliteNum * 1.1) {
+    if (totalSelectedElites < targetEliteNum - 5 || totalSelectedMonsters < targetMonsterNum - 25 || totalSelectedElites > targetEliteNum * 1.1) {
        log.warn("警告，可能条件填写不合理，分配结果与目标存在较大差异");
        await sleep(5000);
    }
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "锄地一条龙",
-  "version": "2.2.8",
+  "version": "2.2.9",
  "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
  "authors": [
    {
--- a/repo/pathing/锄地专区/小怪2000@mno/0_6_纳塔/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/0_6_纳塔/control.json5
@@ -1,4 +0,0 @@
-{
-  "ref":".."
-}
- 
--- a/repo/pathing/锄地专区/小怪2000@mno/1_1_蒙德/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/1_1_蒙德/control.json5
@@ -1,4 +0,0 @@
-{
-  "ref":".."
-}
- 
--- a/repo/pathing/锄地专区/小怪2000@mno/1_2_璃月/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/1_2_璃月/control.json5
@@ -1,4 +0,0 @@
-{
-  "ref":".."
-}
- 
--- a/repo/pathing/锄地专区/小怪2000@mno/1_3_稻妻/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/1_3_稻妻/control.json5
@@ -1,4 +0,0 @@
-{
-  "ref":".."
-}
- 
--- a/repo/pathing/锄地专区/小怪2000@mno/1_4_须弥/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/1_4_须弥/control.json5
@@ -1,4 +0,0 @@
-{
-  "ref":".."
-}
- 
--- a/repo/pathing/锄地专区/小怪2000@mno/1_5_枫丹/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/1_5_枫丹/control.json5
@@ -1,4 +0,0 @@
-{
-  "ref":".."
-}
- 
--- a/repo/pathing/锄地专区/小怪2000@mno/control.json5
+++ b/repo/pathing/锄地专区/小怪2000@mno/control.json5