Merge pull request #17 from babalae/main

pull upstream
This commit is contained in:
Yang-z
2025-01-02 12:47:55 +08:00
committed by GitHub
4 changed files with 76 additions and 40 deletions

View File

@@ -1,5 +1,5 @@
{
"time": "20241231193656",
"time": "20250101212239",
"url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip",
"file": "repo.json",
"indexes": [
@@ -7846,8 +7846,8 @@
{
"name": "狗粮-枫丹-研究院区-中部塔内-9个.json",
"type": "file",
"hash": "e26d49a3439bb6a0180a1e44ac510fb785cbb5ae",
"version": "e26d49a",
"hash": "671aff74b56244cc1de500ae15f4be35838443f1",
"version": "671aff7",
"author": "Yang-z",
"description": "",
"tags": [
@@ -7901,8 +7901,8 @@
{
"name": "狗粮-枫丹-研究院区-西南偏西-4个-f.json",
"type": "file",
"hash": "9a60af206e51630647de0b447ecc02c2f6ef8020",
"version": "9a60af2",
"hash": "0285928c56e0b44cc21cc79fc747d12999770ceb",
"version": "0285928",
"author": "Yang-z",
"description": "",
"tags": [
@@ -8022,8 +8022,8 @@
{
"name": "狗粮-稻妻-神无冢-堇色之庭-4个.json",
"type": "file",
"hash": "e8e554658d0ce0671168f487bbe0e480c3effbbd",
"version": "e8e5546",
"hash": "73b792a5da58011658ba837964e52c1aa66b1647",
"version": "73b792a",
"author": "Yang-z",
"description": "",
"tags": [
@@ -8116,8 +8116,8 @@
{
"name": "【额外】狗粮-纳塔-灵谜纹+13个.json",
"type": "file",
"hash": "51e843e59ce4f26c8958f40afbe426b0bee0c049",
"version": "51e843e",
"hash": "307b665d13104a69a0f071674fc6bd7bd3ada9eb",
"version": "307b665",
"author": "Yang-z",
"description": "",
"tags": [
@@ -10879,8 +10879,8 @@
{
"name": "大伟丘-漓月-石门.json",
"type": "file",
"hash": "ea2fff0c3d97b6f9c28993c641f9b6a88a2ba2e6",
"version": "ea2fff0",
"hash": "fcd2abaf4ed4a4a40567dbdfc9538e92e8aa2ac5",
"version": "fcd2aba",
"author": "起个名字好难",
"description": "",
"tags": [
@@ -12168,8 +12168,8 @@
{
"name": "AutoArtifacts_A_B_Extra",
"type": "directory",
"hash": "b19301b522b5cd581e5477caa60c1e11375df9ef",
"version": "2.0.0",
"hash": "2dd1c1507b55b42393a83ba50f3f4dcc3f6a8375",
"version": "2.0.1",
"author": "Yang-z",
"description": "狗粮ABE路线自动拾取分解~|~圣遗物狗粮AB及额外路线自动轮换自动分解。大幅优化",
"tags": []
@@ -12195,8 +12195,8 @@
{
"name": "AutoDomain",
"type": "directory",
"hash": "9ddefdc469c2bd29798c013ec567e6aed784b28e",
"version": "1.4",
"hash": "2cab2b69c872cf1b6518299d501d80646ab4d22d",
"version": "1.5",
"author": "huiyadanli&iris",
"description": "传送并自动秘境~|~BetterGI自带脚本用于传送后并执行自动秘境。秘境中角色死亡复活后继续回去战斗。",
"tags": []

View File

@@ -270,14 +270,41 @@
try{
await genshin.tp(domainInfo.position[2], domainInfo.position[0]);
await sleep(1000);
// 向前走,除非秘境是芬德尼尔之顶
if (domainName !== "芬德尼尔之顶") {
// 向前走
keyDown("w");
await sleep(2500);
keyUp("w");
await sleep(500);
switch (domainName) {
case "芬德尼尔之顶":
case "太山府":
// 这两个不需要向前走
break;
case "无妄引咎密宫":
// 火本需要往左走再往上走
keyDown("a");
await sleep(1500);
keyUp("a");
await sleep(500);
keyDown("w");
await sleep(500);
keyUp("w");
await sleep(500);
break;
case "苍白的遗荣":
// 这个走一秒就够了并且有可能被晶蝶打断所以需要按F
keyDown("w");
await sleep(1000);
keyUp("w");
await sleep(500);
keyDown("f");
await sleep(500);
keyUp("f");
await sleep(500);
break;
default:
// 其余秘境需要向前走
keyDown("w");
await sleep(2500);
keyUp("w");
await sleep(500);
break;
}
// 执行自动秘境

View File

@@ -1,7 +1,7 @@
{
"manifest_version": 1,
"name": "传送并自动秘境",
"version": "1.4",
"version": "1.5",
"description": "BetterGI自带脚本用于传送后并执行自动秘境。秘境中角色死亡复活后继续回去战斗。",
"authors": [
{

View File

@@ -10,52 +10,61 @@
"positions": [
{
"id": 1,
"x": 207.4208984375,
"y": 1572.96630859375,
"action": "",
"move_mode": "walk",
"type": "teleport",
"x": 207.4208984375,
"y": 1572.96630859375
"type": "teleport"
},
{
"id": 2,
"x": 188.2685546875,
"y": 1559.70556640625,
"type": "path",
"action": "",
"move_mode": "walk",
"action": ""
"type": "path"
},
{
"id": 3,
"x": 170.125,
"y": 1545.15771484375,
"type": "path",
"action": "",
"move_mode": "fly",
"action": ""
"type": "path"
},
{
"id": 4,
"x": 157.76953125,
"y": 1558.8671875,
"x": 165.6962890625,
"y": 1554.583984375,
"type": "path",
"move_mode": "climb",
"action": "combat_script",
"action_params": "wait(3)"
"action": "",
"action_params": ""
},
{
"id": 5,
"x": 163.98828125,
"y": 1570.40625,
"x": 159.861328125,
"y": 1566.85205078125,
"type": "path",
"move_mode": "fly",
"action": ""
"action": "",
"action_params": ""
},
{
"id": 6,
"x": 163.98828125,
"y": 1570.40625,
"action": "",
"move_mode": "fly",
"type": "path"
},
{
"id": 7,
"x": 172.564453125,
"y": 1575.044921875,
"type": "path",
"action": "fight",
"move_mode": "walk",
"action": "fight"
"type": "path"
}
]
}