Merge pull request #232 from T888T/main

修复领取邮件时无邮件时会异常的问题 并优化兼容度

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/assets/合成台位置/璃月凯瑟琳.json

@@ -1,60 +0,0 @@
-{
-  "info": {
-    "name": "璃月凯瑟琳",
-    "type": "collect",
-    "author": "½",
-    "version": "1.0",
-    "description": "",
-    "bgiVersion": "0.35.1"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": 267.958984375,
-      "y": -665.10888671875,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport"
-    },
-    {
-      "id": 2,
-      "x": 258.3662109375,
-      "y": -663.82177734375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 3,
-      "x": 246.689453125,
-      "y": -662.83740234375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 4,
-      "x": 233.8564453125,
-      "y": -661.95849609375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 5,
-      "x": 219.0625,
-      "y": -657.271484375,
-      "type": "target",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 6,
-      "x": 203.84765625,
-      "y": -659.7158203125,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    }
-  ]
-}

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/assets/合成台位置/稻妻凯瑟琳.json

@@ -1,36 +0,0 @@
-{
-  "info": {
-    "name": "稻妻凯瑟琳",
-    "type": "collect",
-    "author": "½",
-    "version": "1.0",
-    "description": "",
-    "bgiVersion": "0.35.1"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": -4402.556640625,
-      "y": -3053.041015625
-    },
-    {
-      "id": 2,
-      "x": -4408.984375,
-      "y": -3068.2470703125,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 3,
-      "x": -4418.185546875,
-      "y": -3086.4326171875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    }
-  ]
-}

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/assets/合成台位置/纳塔凯瑟琳.json

@@ -1,20 +0,0 @@
-{
-  "info": {
-    "name": "纳塔凯瑟琳",
-    "type": "collect",
-    "author": "½",
-    "version": "1.0",
-    "description": "",
-    "bgiVersion": "0.35.1"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "force_tp",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": 9046.666015625,
-      "y": -1855.35791015625
-    }
-  ]
-}

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/assets/合成台位置/蒙德凯瑟琳.json

@@ -1,44 +0,0 @@
-{
-  "info": {
-    "name": "蒙德凯瑟琳",
-    "type": "collect",
-    "author": "½",
-    "version": "1.0",
-    "description": "",
-    "bgiVersion": "0.35.1"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": -867.6884765625,
-      "y": 2281.365966796875,
-      "type": "teleport",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 2,
-      "x": -882.1455078125,
-      "y": 2262.399658203125,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 3,
-      "x": -893.3056640625,
-      "y": 2249.19482421875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 4,
-      "x": -914.3564453125,
-      "y": 2233.071044921875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    }
-  ]
-}

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/assets/合成台位置/须弥凯瑟琳.json

@@ -1,68 +0,0 @@
-{
-  "info": {
-    "name": "须弥凯瑟琳",
-    "type": "collect",
-    "author": "½",
-    "version": "1.0",
-    "description": "",
-    "bgiVersion": "0.35.1"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": 2786.97265625,
-      "y": -503.10498046875,
-      "type": "teleport",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 2,
-      "x": 2787.900390625,
-      "y": -494.41162109375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 3,
-      "x": 2786.150390625,
-      "y": -486.7470703125,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 4,
-      "x": 2781.1748046875,
-      "y": -483.95751953125,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 5,
-      "x": 2774.4716796875,
-      "y": -480.65478515625,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 6,
-      "x": 2771.126953125,
-      "y": -476.7919921875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    },
-    {
-      "id": 7,
-      "x": 2765.76953125,
-      "y": -476.0498046875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": ""
-    }
-  ]
-}

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/main.js

@@ -1,9 +1,5 @@
 (async function () {
-
+    setGameMetrics(1920, 1080, 1);  // 设置游戏运行的分辨率和缩放
-
-
-    // 设置游戏运行的分辨率和缩放
-    setGameMetrics(1920, 1080, 1);
     //基础延迟
     let delay = settings.delay || 2000;
     //定义合成台and凯瑟琳的选择路径
@@ -42,28 +38,24 @@
     }
 
 
-
-
     // 领取邮件
-    setGameMetrics(3840, 2160, 2);
     keyPress("Escape");
     await sleep(1500);
-    click(94, 1212);
+    click(50, 605);
-    // click(50, 605); //1920x1080
     await sleep(1500);
-    click(500, 2024);
+    click(150, 1015); 
+    await sleep(1000);
+    click(150, 1015); 
     await sleep(1000);
     keyPress("Escape");
     await sleep(1000);
     keyPress("Escape");
-    await sleep(1000);
-    // keyPress("Escape");
     log.info("已完成 领取邮件");
-    setGameMetrics(1920, 1080, 1);
+    await sleep(delay);
+    // exit();
 
     
     // 设置世界权限
-    log.info("请确保执行脚本时处于主界面");
     keyPress("VK_F2")
     await sleep(1000);
     click(160, 1020); // 点击世界权限
@@ -108,7 +100,7 @@
     await sleep(1000);
     keyPress("Escape"); // 确保完全退出合成
     log.info("已完成 合成浓缩树脂");
-    await sleep(2000);
+    await sleep(delay);
 
     // 自动秘境
     while (true) {
@@ -128,8 +120,9 @@
         }
     }
 
-    if (settings.decomposeDogFood == "是" | settings.decomposeDogFood == undefined) {
+
     // 分解狗粮
+    if (settings.decomposeDogFood == "是" | settings.decomposeDogFood == undefined) {
         keyPress("B");
         await sleep(1000);
         click(670, 40);
@@ -219,7 +212,7 @@
     click(960, 50);
     await sleep(1000);
     click(1720, 980);
-    await sleep(1000);
+    await sleep(2000);
     click(860, 50);
     await sleep(1000);
     click(1720, 980);

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/manifest.json

@@ -1,11 +1,13 @@
 {
   "manifest_version": 1,
   "name": "Tzi-每日一条龙+副本晶蝶尘歌壶邮件",
-  "version": "0.01",
+  "version": "0.02",
+  "bgi_version": "0.36.0",
   "description": "每日一条龙 包含每日任务 刷副本，分解狗粮，尘歌壶，抓晶蝶 自动下线。【自动副本】请先去独立任务中将自动秘境配置完成，【自动晶蝶】队伍需要携带早柚或瑶瑶。【尘歌壶】将快捷道具栏需装满4个，确保尘歌壶在第5位。运行前可以右键配置参数。主要适配枫丹凯瑟琳锚点。",
   "authors": [
     {
-      "name": "T子"
+      "name": "T子",
+      "link": "https://github.com/T888T/bettergi-scripts-list"
     }
   ],
   "settings_ui": "settings.json",

repo/js/Tzi-每日一条龙+副本晶蝶尘歌壶/settings.json

@@ -77,9 +77,10 @@
       "是",
       "否"
     ]
-  },  {
+  },
+  {
     "name": "delay",
     "type": "input-text",
-    "label": "无法运行可以适当加大(默认 2000ms)"
+    "label": "默认无需调整 无法运行可以适当加大(默认 2000ms)"
-  },
+  }
 ]