Skip to content

Commit 04d67c5

Browse files
huiyadanlihuiyadanli
authored
Merge pull request #188 from Yang-z/main
fine-tune
2 parents 2e53bf8 + 3483cec commit 04d67c5

16 files changed

+184
-232
lines changed

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个／21个-f.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
"y": -3733.8955078125,
3131
"type": "path",
3232
"move_mode": "fly",
33-
"action": "stop_flying"
33+
"action": "combat_script",
34+
"action_params": "keypress(VK_SPACE),wait(0.5),click",
35+
"//": "stop_flying"
3436
},
3537
{
3638
"x": -3152.74609375,
@@ -204,7 +206,9 @@
204206
"y": -3625.0078125,
205207
"type": "path",
206208
"move_mode": "fly",
207-
"action": "stop_flying"
209+
"action": "combat_script",
210+
"action_params": "keypress(VK_SPACE),wait(0.5),click",
211+
"//": "stop_flying"
208212
},
209213

210214
{

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
"y": -3742.8154296875,
4343
"type": "path",
4444
"move_mode": "fly",
45-
"action": "stop_flying"
45+
"action": "combat_script",
46+
"action_params": "keypress(VK_SPACE),wait(0.5),click",
47+
"//": "stop_flying"
4648
},
4749

4850
{

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json‎

Lines changed: 63 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@
1212
"move_mode": "walk"
1313
},
1414
{
15-
"x": -3850.6787109375,
16-
"y": -4510.998046875,
15+
"x": -3888.8369140625,
16+
"y": -4398.5390625,
17+
"type": "path",
18+
"move_mode": "run"
19+
},
20+
{
21+
"x": -3850.6845703125,
22+
"y": -4511.197265625,
1723
"type": "path",
1824
"move_mode": "fly",
19-
"action": "stop_flying"
25+
"action": "combat_script",
26+
"action_params": "keypress(VK_SPACE),wait(0.5)",
27+
"//": "stop_flying"
2028
},
2129
{
2230
"x": -3850.6787109375,
@@ -27,8 +35,8 @@
2735
"#": "SE1"
2836
},
2937
{
30-
"x": -3849.4716796875,
31-
"y": -4510.6220703125,
38+
"x": -3848.8515625,
39+
"y": -4510.4755859375,
3240
"type": "target",
3341
"move_mode": "walk",
3442
"action": "",
@@ -164,7 +172,8 @@
164172
"y": -4422.544921875,
165173
"type": "target",
166174
"move_mode": "walk",
167-
"action": "",
175+
"action": "combat_script",
176+
"action_params": "wait(0.2),keypress(x)",
168177
"#": "2"
169178
},
170179
{
@@ -174,9 +183,9 @@
174183
"move_mode": "walk"
175184
},
176185
{
177-
"x": -3789.9228515625,
178-
"y": -4422.2587890625,
179-
"type": "path",
186+
"x": -3790.009765625,
187+
"y": -4421.7783203125,
188+
"type": "target",
180189
"move_mode": "walk"
181190
},
182191
{
@@ -206,8 +215,8 @@
206215
"#": "3"
207216
},
208217
{
209-
"x": -3774.798828125,
210-
"y": -4441.1708984375,
218+
"x": -3773.9287109375,
219+
"y": -4441.794921875,
211220
"type": "target",
212221
"move_mode": "walk",
213222
"action": "",
@@ -232,34 +241,25 @@
232241
"type": "path",
233242
"move_mode": "walk"
234243
},
244+
235245
{
236-
"x": -3740.89453125,
237-
"y": -4441.400390625,
238-
"type": "target",
239-
"move_mode": "walk",
240-
"action": "",
241-
"#": "5"
242-
},
243-
{
244-
"x": -3739.6875,
245-
"y": -4440.29296875,
246+
"x": -3739.9423828125,
247+
"y": -4441.0087890625,
246248
"type": "target",
247249
"move_mode": "walk",
248-
"action": "",
249-
"#": "6"
250+
"#": "5 6"
250251
},
251252
{
252-
"x": -3738.7763671875,
253-
"y": -4440.2119140625,
253+
"x": -3739.9423828125,
254+
"y": -4441.0087890625,
254255
"type": "target",
255256
"move_mode": "walk",
256-
"action": "",
257-
"#": "6"
257+
"#": "5 6"
258258
},
259259
{
260-
"x": -3740.857421875,
261-
"y": -4439.6904296875,
262-
"type": "target",
260+
"x": -3740.419921875,
261+
"y": -4439.140625,
262+
"type": "path",
263263
"move_mode": "walk"
264264
},
265265
{
@@ -310,29 +310,37 @@
310310
"action": "",
311311
"#": "8"
312312
},
313+
314+
{
315+
"x": -3742.2470703125,
316+
"y": -4438.44140625,
317+
"type": "path",
318+
"move_mode": "walk"
319+
},
320+
{
321+
"x": -3741.7060546875,
322+
"y": -4438.869140625,
323+
"type": "path",
324+
"move_mode": "walk"
325+
},
326+
313327
{
314-
"x": -3738.73046875,
315-
"y": -4441.6044921875,
328+
"x": -3738.31640625,
329+
"y": -4442.064453125,
316330
"type": "target",
317331
"move_mode": "walk",
318332
"action": "",
319333
"#": "9"
320334
},
321335
{
322-
"x": -3738.58203125,
323-
"y": -4442.154296875,
336+
"x": -3738.31640625,
337+
"y": -4442.064453125,
324338
"type": "target",
325339
"move_mode": "walk",
326340
"action": "",
327341
"#": "9"
328342
},
329343

330-
{
331-
"x": -3738.0673828125,
332-
"y": -4439.9228515625,
333-
"type": "target",
334-
"move_mode": "walk"
335-
},
336344
{
337345
"x": -3740.6142578125,
338346
"y": -4435.5537109375,
@@ -367,14 +375,7 @@
367375
"action": "",
368376
"#": "10"
369377
},
370-
{
371-
"x": -3772.146484375,
372-
"y": -4439.849609375,
373-
"type": "target",
374-
"move_mode": "walk",
375-
"action": "",
376-
"#": "10"
377-
},
378+
378379
{
379380
"x": -3775.4658203125,
380381
"y": -4439.1611328125,
@@ -466,25 +467,17 @@
466467
"#": "13"
467468
},
468469
{
469-
"x": -3727.03515625,
470-
"y": -4431.9111328125,
471-
"type": "target",
472-
"move_mode": "walk",
473-
"action": "",
474-
"#": "14"
475-
},
476-
{
477-
"x": -3727.1845703125,
478-
"y": -4431.47265625,
470+
"x": -3727.5048828125,
471+
"y": -4431.0224609375,
479472
"type": "target",
480473
"move_mode": "walk",
481474
"action": "",
482475
"#": "14"
483476
},
484477

485478
{
486-
"x": -3729.2822265625,
487-
"y": -4429.0654296875,
479+
"x": -3730.1171875,
480+
"y": -4429.974609375,
488481
"type": "path",
489482
"move_mode": "walk"
490483
},
@@ -518,80 +511,44 @@
518511
},
519512

520513
{
521-
"x": -3720.18359375,
522-
"y": -4430.9423828125,
514+
"x": -3719.4345703125,
515+
"y": -4431.1865234375,
523516
"type": "target",
524517
"move_mode": "walk",
525518
"action": "",
526519
"#": "16"
527520
},
528521
{
529-
"x": -3719.9521484375,
530-
"y": -4430.4619140625,
531-
"type": "target",
532-
"move_mode": "walk",
533-
"action": "",
534-
"#": "16"
535-
},
536-
{
537-
"x": -3719.9375,
538-
"y": -4430.4326171875,
522+
"x": -3720.29296875,
523+
"y": -4430.4189453125,
539524
"type": "target",
540525
"move_mode": "walk",
541526
"action": "",
542527
"#": "16"
543528
},
544529

545530
{
546-
"x": -3718.8193359375,
547-
"y": -4432.46484375,
548-
"type": "target",
549-
"move_mode": "walk"
550-
},
551-
{
552-
"x": -3719.064453125,
553-
"y": -4431.0537109375,
531+
"x": -3721.7392578125,
532+
"y": -4431.853515625,
554533
"type": "path",
555534
"move_mode": "walk"
556535
},
557-
{
558-
"x": -3722.5244140625,
559-
"y": -4430.033203125,
560-
"type": "path",
561-
"move_mode": "walk"
562-
},
563-
564536

565537
{
566-
"x": -3725.986328125,
567-
"y": -4429.5283203125,
568-
"type": "target",
569-
"move_mode": "walk",
570-
"action": "",
571-
"#": "17"
572-
},
573-
{
574-
"x": -3726.0458984375,
575-
"y": -4429.078125,
538+
"x": -3725.7646484375,
539+
"y": -4429.1943359375,
576540
"type": "target",
577541
"move_mode": "walk",
578542
"action": "",
579543
"#": "17"
580544
},
581545
{
582-
"x": -3726.8388671875,
583-
"y": -4428.9970703125,
546+
"x": -3725.7646484375,
547+
"y": -4429.1943359375,
584548
"type": "target",
585549
"move_mode": "walk",
586550
"action": "",
587551
"#": "17"
588-
},
589-
590-
{
591-
"x": -3726.9306640625,
592-
"y": -4428.8232421875,
593-
"type": "path",
594-
"move_mode": "walk"
595552
}
596553

597554

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,20 @@
123123
"action": "",
124124
"#": 3
125125
},
126+
126127
{
127128
"x": 3954.81787109375,
128129
"y": 4875.39111328125,
129130
"type": "path",
130131
"move_mode": "fly"
131132
},
133+
{
134+
"x": 3956.9384765625,
135+
"y": 4874.291015625,
136+
"type": "path",
137+
"move_mode": "walk"
138+
},
139+
132140
{
133141
"x": 3959.8349609375,
134142
"y": 4875.939453125,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
"move_mode": "fly"
6161
},
6262

63-
6463
{
6564
"x": 4400.6455078125,
6665
"y": 4929.09765625,
@@ -111,7 +110,7 @@
111110
"move_mode": "walk",
112111
"action": "combat_script",
113112
"action_params": "wait(1.5)",
114-
"//": "drump down"
113+
"//": "jump down, and do wait, otherwise.."
115114
},
116115

117116
{

‎repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-望泷村西南-4个-f.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"type": "teleport",
1212
"move_mode": "walk"
1313
},
14+
{
15+
"x": -754.037109375,
16+
"y": -4002.3544921875,
17+
"type": "path",
18+
"move_mode": "run"
19+
},
1420
{
1521
"x": -725.943359375,
1622
"y": -4029.255859375,

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

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

0 commit comments

Comments
 (0)