Skip to content

Commit 9d3ddf0

Browse files
huiyadanlihuiyadanli
authored
Merge pull request #179 from Yang-z/main
fine-tune
2 parents d16b42a + ef157da commit 9d3ddf0

18 files changed

+224
-220
lines changed

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-万火之瓯-竞技场东-4个.json‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,18 @@
7373
"type": "path",
7474
"move_mode": "walk"
7575
},
76+
7677
{
77-
"x": 8672.3203125,
78-
"y": -1769.1220703125,
79-
"type": "target",
80-
"move_mode": "walk",
81-
"action": "",
82-
"No.": "3"
83-
},
84-
{
85-
"x": 8672.775390625,
86-
"y": -1770.39208984375,
78+
"x": 8672.69921875,
79+
"y": -1769.48388671875,
8780
"type": "target",
8881
"move_mode": "walk",
8982
"action": "",
9083
"No.": "3"
9184
},
9285
{
93-
"x": 8672.783203125,
94-
"y": -1770.392578125,
86+
"x": 8672.6572265625,
87+
"y": -1769.791015625,
9588
"type": "target",
9689
"move_mode": "walk",
9790
"action": "",
@@ -116,12 +109,7 @@
116109
"type": "path",
117110
"move_mode": "walk"
118111
},
119-
{
120-
"x": 8593.53125,
121-
"y": -1763.08837890625,
122-
"type": "path",
123-
"move_mode": "walk"
124-
},
112+
125113
{
126114
"x": 8591.849609375,
127115
"y": -1763.35888671875,

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-七天神像-12个.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,13 @@
105105
},
106106

107107
{
108-
"x": 9726.82421875,
109-
"y": -670.78466796875,
108+
"x": 9734.0712890625,
109+
"y": -670.005859375,
110110
"type": "path",
111111
"move_mode": "fly",
112-
"action": "stop_flying"
112+
"action": "combat_script",
113+
"action_params": "keypress(VK_SPACE),wait(2.5),click",
114+
"//": "stop_flying"
113115
},
114116
{
115117
"x": 9727.59375,

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-奥奇卡纳塔-托佐兹之岛-6个-f.json‎

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,89 +13,60 @@
1313
"action": "force_tp"
1414
},
1515
{
16-
"x": 9663.6328125,
17-
"y": 183.66162109375,
18-
"type": "target",
19-
"move_mode": "walk",
20-
"#": "1"
21-
},
22-
{
23-
"x": 9663.6328125,
24-
"y": 183.66162109375,
16+
"x": 9663.5947265625,
17+
"y": 183.833984375,
2518
"type": "target",
2619
"move_mode": "walk",
2720
"#": "1"
2821
},
22+
2923
{
3024
"x": 9672.03515625,
3125
"y": 189.12353515625,
3226
"type": "path",
3327
"move_mode": "run"
3428
},
3529
{
36-
"x": 9677.35546875,
37-
"y": 225.80224609375,
30+
"x": 9675.875,
31+
"y": 220.560546875,
3832
"type": "path",
3933
"move_mode": "run"
4034
},
35+
4136
{
42-
"x": 9683.83984375,
43-
"y": 230.5029296875,
44-
"type": "target",
45-
"move_mode": "walk",
46-
"#": "2"
47-
},
48-
{
49-
"x": 9683.7568359375,
50-
"y": 230.51806640625,
37+
"x": 9684.16796875,
38+
"y": 230.54736328125,
5139
"type": "target",
5240
"move_mode": "walk",
5341
"#": "2"
5442
},
43+
5544
{
5645
"x": 9687.234375,
5746
"y": 230.724609375,
5847
"type": "target",
5948
"move_mode": "walk",
6049
"#": "3"
6150
},
62-
{
63-
"x": 9687.234375,
64-
"y": 230.724609375,
65-
"type": "target",
66-
"move_mode": "walk",
67-
"#": "3"
68-
},
69-
{
70-
"x": 9694.974609375,
71-
"y": 220.93896484375,
72-
"type": "target",
73-
"move_mode": "walk",
74-
"#": "4"
75-
},
51+
7652
{
7753
"x": 9694.974609375,
7854
"y": 220.93896484375,
7955
"type": "target",
8056
"move_mode": "walk",
8157
"#": "4"
8258
},
59+
8360
{
84-
"x": 9673.7939453125,
85-
"y": 227.576171875,
61+
"x": 9672.3916015625,
62+
"y": 228.1494140625,
8663
"type": "path",
8764
"move_mode": "run"
8865
},
66+
8967
{
90-
"x": 9665.4150390625,
91-
"y": 230.7529296875,
92-
"type": "target",
93-
"move_mode": "walk",
94-
"#": "5"
95-
},
96-
{
97-
"x": 9664.90234375,
98-
"y": 230.03662109375,
68+
"x": 9665.0224609375,
69+
"y": 230.787109375,
9970
"type": "target",
10071
"move_mode": "walk",
10172
"#": "5"

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-失落的苗圃-南-8个-f.json‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,12 @@
4545
"type": "path",
4646
"move_mode": "walk"
4747
},
48-
4948
{
5049
"x": 4021.8759765625,
5150
"y": -1053.74755859375,
5251
"type": "path",
5352
"move_mode": "walk"
5453
},
55-
{
56-
"x": 4025.90185546875,
57-
"y": -1049.61962890625,
58-
"type": "path",
59-
"move_mode": "walk"
60-
},
61-
6254
{
6355
"x": 4031.04833984375,
6456
"y": -1044.80419921875,
@@ -117,6 +109,12 @@
117109
"#": "3"
118110
},
119111

112+
{
113+
"x": 4028.2431640625,
114+
"y": -1055.45263671875,
115+
"type": "path",
116+
"move_mode": "walk"
117+
},
120118
{
121119
"x": 4025.5146484375,
122120
"y": -1056.8466796875,
@@ -132,8 +130,8 @@
132130
"#": "4"
133131
},
134132
{
135-
"x": 4020.8701171875,
136-
"y": -1058.67724609375,
133+
"x": 4021.318359375,
134+
"y": -1058.283203125,
137135
"type": "target",
138136
"move_mode": "walk",
139137
"#": "4"

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
"y": 4831.5673828125,
1717
"type": "path",
1818
"move_mode": "fly",
19-
"action": "stop_flying"
19+
"action": "combat_script",
20+
"action_params": "keypress(VK_SPACE),wait(1),click",
21+
"//": "stop_flying"
2022
},
2123
{
2224
"x": 3950.2333984375,

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json‎

Lines changed: 58 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,20 @@
7575
"action": "",
7676
"#" : "1"
7777
},
78+
7879
{
79-
"x": 4399.92822265625,
80-
"y": 4927.32666015625,
80+
"x": 4399.10888671875,
81+
"y": 4928.0341796875,
8182
"type": "path",
8283
"move_mode": "walk"
8384
},
84-
8585
{
86-
"x": 4399.69970703125,
87-
"y": 4922.84375,
88-
"type": "target",
89-
"move_mode": "walk",
90-
"action": "",
91-
"#" : "2"
86+
"x": 4399.25732421875,
87+
"y": 4926.962890625,
88+
"type": "path",
89+
"move_mode": "walk"
9290
},
91+
9392
{
9493
"x": 4399.69970703125,
9594
"y": 4922.84375,
@@ -110,19 +109,27 @@
110109
"y": 4925.7412109375,
111110
"type": "path",
112111
"move_mode": "walk",
112+
"action": "combat_script",
113+
"action_params": "wait(1.5)",
113114
"//": "drump down"
114115
},
115116

116117
{
117-
"x": 4397.05615234375,
118-
"y": 4927.0498046875,
118+
"x": 4396.4033203125,
119+
"y": 4926.8662109375,
120+
"type": "path",
121+
"move_mode": "walk"
122+
},
123+
{
124+
"x": 4397.484375,
125+
"y": 4928.078125,
119126
"type": "path",
120127
"move_mode": "walk"
121128
},
122129

123130
{
124-
"x": 4397.67236328125,
125-
"y": 4931.48486328125,
131+
"x": 4397.40869140625,
132+
"y": 4931.0205078125,
126133
"type": "target",
127134
"move_mode": "walk",
128135
"action": "",
@@ -165,6 +172,12 @@
165172
"#" : "5"
166173
},
167174

175+
{
176+
"x": 4403.11767578125,
177+
"y": 4925.39306640625,
178+
"type": "path",
179+
"move_mode": "walk"
180+
},
168181
{
169182
"x": 4402.4287109375,
170183
"y": 4931.62451171875,
@@ -190,27 +203,52 @@
190203
"type": "path",
191204
"move_mode": "walk"
192205
},
206+
193207
{
194-
"x": 4399.09765625,
195-
"y": 4922.85595703125,
208+
"x": 4404.35009765625,
209+
"y": 4924.2646484375,
210+
"type": "target",
211+
"move_mode": "walk",
212+
"//": "为了背对交互干扰"
213+
},
214+
{
215+
"x": 4404.51220703125,
216+
"y": 4923.27099609375,
217+
"type": "path",
218+
"move_mode": "walk"
219+
},
220+
221+
{
222+
"x": 4401.71728515625,
223+
"y": 4921.8876953125,
196224
"type": "target",
197225
"move_mode": "walk",
198226
"action": "",
199227
"#" : "6"
200228
},
201229
{
202-
"x": 4400.71435546875,
203-
"y": 4921.76318359375,
230+
"x": 4401.71728515625,
231+
"y": 4921.8876953125,
232+
"type": "target",
233+
"move_mode": "walk",
234+
"action": "",
235+
"#" : "6"
236+
},
237+
{
238+
"x": 4398.994140625,
239+
"y": 4921.734375,
204240
"type": "target",
205241
"move_mode": "walk",
206242
"action": "",
207243
"#" : "7"
208244
},
209245
{
210-
"x": 4401.265625,
211-
"y": 4919.58203125,
246+
"x": 4398.994140625,
247+
"y": 4921.734375,
212248
"type": "target",
213-
"move_mode": "walk"
249+
"move_mode": "walk",
250+
"action": "",
251+
"#" : "7"
214252
},
215253

216254
{

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
"#": "2"
5555
},
5656
{
57-
"x": 9725.4921875,
58-
"y": -1548.083984375,
57+
"x": 9725.1689453125,
58+
"y": -1547.59716796875,
5959
"type": "path",
6060
"move_mode": "walk",
6161
"action": "combat_script",
62-
"action_params": "keypress(VK_SPACE),wait(3),mousedown,wait(0.5),moveby(-2000,2000),wait(1.0),mouseup",
62+
"action_params": "keypress(VK_SPACE),wait(1.5),mousedown,wait(0.5),moveby(5000,0),wait(1.0),mouseup",
6363
"//": "降落，扫码",
6464
"#": "3"
6565
},

‎repo/js/AutoArtifacts_A_B_Extra/main.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
"【额外】狗粮-纳塔-灵谜纹+13个.json" // 24小时刷新
7878
]; // 13个
7979

80-
// 每日拾取点位数
81-
// A: 97 + 21 + 7 + 10 = 135
82-
// B: 97 + 20 + 7 + 13 = 137
80+
// 每日拾取点位数及耗时
81+
// A: 97 + 21 + 7 + 10 = 135 (~50 minutes)
82+
// B: 97 + 20 + 7 + 13 = 137 (~45 minutes)
8383

8484

8585
// 读取用户设置

‎repo/js/AutoArtifacts_A_B_Extra/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"manifest_version": 1,
33
"name": "狗粮ABE路线，自动拾取分解",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"bgi_version": "0.38.1",
6-
"description": "圣遗物狗粮AB及额外路线自动轮换，自动分解。（大幅优化）",
6+
"description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。",
77
"authors": [
88
{
99
"name": "Yang-z",

0 commit comments

Comments
 (0)