Merge branch 'babalae:main' into main

babalae · Jan 4, 2025 · 049ba04 · 049ba04
2 parents 81e4535 + 242f688
commit 049ba04
Show file tree

Hide file tree

Showing 31 changed files with 2,203 additions and 249 deletions.
diff --git a/repo.json b/repo.json
@@ -1,5 +1,5 @@
 {
-  "time": "20250103220338",
+  "time": "20250104150334",
   "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip",
   "file": "repo.json",
   "indexes": [
@@ -6814,8 +6814,8 @@
                 {
                   "name": "【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json",
                   "type": "file",
-                  "hash": "edbbc203e296c244d7cdf953194ed857a53232ee",
-                  "version": "edbbc20",
+                  "hash": "06da57ae6f88feb5e32b8e9b6c68b60db6c27065",
+                  "version": "06da57a",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -6825,8 +6825,8 @@
                 {
                   "name": "【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json",
                   "type": "file",
-                  "hash": "a23d82da6dd351031390775552bc85a09610b450",
-                  "version": "a23d82d",
+                  "hash": "3c5e68447daa7a267e18232e667e4c39b71e89cd",
+                  "version": "3c5e684",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -7629,8 +7629,8 @@
                 {
                   "name": "【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json",
                   "type": "file",
-                  "hash": "d5e756c3dd4a1feb3951d1e4b41bb0c868274bee",
-                  "version": "d5e756c",
+                  "hash": "17c572758f4116fb57d768bf629e3f8af3739dab",
+                  "version": "17c5727",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -7835,8 +7835,8 @@
                 {
                   "name": "狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json",
                   "type": "file",
-                  "hash": "83c748c006be2673a25f5a945fa0a06f0365e76a",
-                  "version": "83c748c",
+                  "hash": "2393ec32083f14e84aa03a5cce4988570ab21147",
+                  "version": "2393ec3",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -7846,8 +7846,8 @@
                 {
                   "name": "狗粮-枫丹-研究院区-中部塔内-9个.json",
                   "type": "file",
-                  "hash": "d16ef3f5158994e4e930cdc7e7de371f0463da75",
-                  "version": "d16ef3f",
+                  "hash": "4aaf00f775650f47578ad41f7d5842dc0e5d3467",
+                  "version": "4aaf00f",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -7945,8 +7945,8 @@
                 {
                   "name": "狗粮-稻妻-海祇岛-望泷村西南-4个-f.json",
                   "type": "file",
-                  "hash": "cf7ed4679edffd3f4f50747eba4e7787d2274faa",
-                  "version": "cf7ed46",
+                  "hash": "168eb729c9bdc18902747fc59b0dffe54f662e5d",
+                  "version": "168eb72",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -8116,8 +8116,8 @@
                 {
                   "name": "【额外】狗粮-纳塔-灵谜纹+13个.json",
                   "type": "file",
-                  "hash": "47c62d4f6f156d240205ec160d955b8a388162b0",
-                  "version": "47c62d4",
+                  "hash": "d14fdb127a6ac27ed873913e02b3a10b8ea2a952",
+                  "version": "d14fdb1",
                   "author": "Yang-z",
                   "description": "",
                   "tags": [
@@ -11358,6 +11358,166 @@
             }
           ]
         },
+        {
+          "name": "纳塔龙众",
+          "type": "directory",
+          "children": [
+            {
+              "name": "纳塔龙众-万火之瓯1.json",
+              "type": "file",
+              "hash": "a8590af47ed34921a340d2acbf6bcbb8e470c021",
+              "version": "a8590af",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-万火之瓯2.json",
+              "type": "file",
+              "hash": "3b457ce58689298106a7ccf350c0f6903a874b8b",
+              "version": "3b457ce",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-万火之瓯3.json",
+              "type": "file",
+              "hash": "aa44e3dfa3870a8efbfd487200e820a19224009d",
+              "version": "aa44e3d",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-万火之瓯4.json",
+              "type": "file",
+              "hash": "a04c9ec338098de8ba890a9aafa49d09eba36486",
+              "version": "a04c9ec",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-万火之瓯5.json",
+              "type": "file",
+              "hash": "9671d14da4a871bb040b3518ee4f032d859348e9",
+              "version": "9671d14",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-万火之瓯6.json",
+              "type": "file",
+              "hash": "8ce23191c02b7d591a6ef8e0a2d7ecee07606da6",
+              "version": "8ce2319",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-万火之瓯7.json",
+              "type": "file",
+              "hash": "3bc79b756f5c4bb785f6429b3525e89bcd4bf398",
+              "version": "3bc79b7",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷1.json",
+              "type": "file",
+              "hash": "9587997fe4ceee67fa448ddc8ded995ca0ce40a2",
+              "version": "9587997",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷2.json",
+              "type": "file",
+              "hash": "a8921e86aebd19c797aee605917bd1b650cee701",
+              "version": "a8921e8",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷3.json",
+              "type": "file",
+              "hash": "41250059f77d4908f048096100527eb42381fe72",
+              "version": "4125005",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷4.json",
+              "type": "file",
+              "hash": "093cd2347c347ccbdae07055595e4567f84561db",
+              "version": "093cd23",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷5.json",
+              "type": "file",
+              "hash": "7e929dc427378e3c990724cc07a4cc769863c976",
+              "version": "7e929dc",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷6.json",
+              "type": "file",
+              "hash": "135ec6eb88dcf1b4dc227061dbb98cd3099388f9",
+              "version": "135ec6e",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            },
+            {
+              "name": "纳塔龙众-坚岩隘谷7.json",
+              "type": "file",
+              "hash": "0dacffd46881f28dbde34abe4a34666916cb9be2",
+              "version": "0dacffd",
+              "author": "老马RYO",
+              "description": "",
+              "tags": [
+                "纳塔龙众"
+              ]
+            }
+          ]
+        },
         {
           "name": "骗骗花",
           "type": "directory",
@@ -12339,8 +12499,8 @@
         {
           "name": "AutoArtifacts_A_B_Extra",
           "type": "directory",
-          "hash": "d1b98cb7f56f4a8bd4c112c2de6fc18242135796",
-          "version": "2.0.2",
+          "hash": "67f86b14578b2537c0cc2870686e1d131df2585e",
+          "version": "2.0.3",
           "author": "Yang-z",
           "description": "狗粮ABE路线，自动拾取分解~|~圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。",
           "tags": []

diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json
@@ -30,7 +30,9 @@
             "y": -3733.8955078125,
             "type": "path",
             "move_mode": "fly",
-            "action": "stop_flying"
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.5),click",
+            "//": "stop_flying"
         },
         {
             "x": -3152.74609375,
@@ -204,7 +206,9 @@
             "y": -3625.0078125,
             "type": "path",
             "move_mode": "fly",
-            "action": "stop_flying"
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.5),click",
+            "//": "stop_flying"
         },
 
         {

diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json
@@ -42,7 +42,9 @@
             "y": -3742.8154296875,
             "type": "path",
             "move_mode": "fly",
-            "action": "stop_flying"
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.5),click",
+            "//": "stop_flying"
         },
 
         {