Merge branch 'main' into main

This commit is contained in:
辉鸭蛋
2024-12-01 12:41:09 +08:00
committed by GitHub
172 changed files with 24475 additions and 1120 deletions

View File

@@ -89,16 +89,16 @@
"#": "3"
},
{
"x": -3209.9853515625,
"y": -3604.7265625,
"x": -3211.962890625,
"y": -3603.951171875,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "3"
},
{
"x": -3207.0830078125,
"y": -3606.623046875,
"x": -3212.4130859375,
"y": -3605.99609375,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -166,24 +166,30 @@
"move_mode": "walk"
},
{
"x": -3154.5869140625,
"y": -3833.73828125,
"x": -3170.4130859375,
"y": -3850.8359375,
"type": "path",
"move_mode": "run"
},
{
"x": -3145.6025390625,
"y": -3775.583984375,
"type": "path",
"move_mode": "fly"
},
{
"x": -3149.576171875,
"y": -3829.484375,
"x": -3168.654296875,
"y": -3839.994140625,
"type": "path",
"move_mode": "fly",
"action": "stop_flying"
},
{
"x": -3151.0654296875,
"y": -3842.669921875,
"type": "path",
"move_mode": "run"
},
{
"x": -3149.3564453125,
"y": -3837.0224609375,
"type": "path",
"move_mode": "run"
},
{
"x": -3152.970703125,

View File

@@ -408,6 +408,12 @@
"type": "path",
"move_mode": "walk"
},
{
"x": -3027.904296875,
"y": -3641.369140625,
"type": "path",
"move_mode": "walk"
},
{
"x": -3031.6767578125,
"y": -3640.1640625,

View File

@@ -30,6 +30,12 @@
"type": "target",
"move_mode": "walk",
"action":""
},
{
"x": 425.9228515625,
"y": 232.67333984375,
"type": "path",
"move_mode": "walk"
}
]
}

View File

@@ -100,8 +100,6 @@
"move_mode": "walk"
},
{
"x": 7727.3740234375,
"y": -1545.806640625,
@@ -109,33 +107,43 @@
"move_mode": "run"
},
{
"x": 7738.97216796875,
"y": -1539.4287109375,
"x": 7732.88671875,
"y": -1542.5927734375,
"type": "path",
"move_mode": "run"
},
{
"x": 7737.70751953125,
"y": -1541.71484375,
"type": "path",
"move_mode": "walk"
},
{
"x": 7739.0556640625,
"y": -1538.3515625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "3"
},
{
"x": 7738.73681640625,
"y": -1539.34033203125,
"x": 7738.9873046875,
"y": -1539.18212890625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "3"
},
{
"x": 7738.73681640625,
"y": -1539.34033203125,
"x": 7739.42822265625,
"y": -1539.6357421875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "3"
},
{
"x": 7735.0078125,
"y": -1541.712890625,

View File

@@ -176,6 +176,18 @@
"type": "target",
"move_mode": "walk",
"#": "12"
},
{
"x": 9834.365234375,
"y": -563.93701171875,
"type": "path",
"move_mode": "walk"
},
{
"x": 9831.587890625,
"y": -563.4140625,
"type": "path",
"move_mode": "walk"
}
]
}

View File

@@ -19,6 +19,13 @@
"move_mode": "walk",
"#": "1"
},
{
"x": 9663.6328125,
"y": 183.66162109375,
"type": "target",
"move_mode": "walk",
"#": "1"
},
{
"x": 9672.03515625,
"y": 189.12353515625,
@@ -32,12 +39,26 @@
"move_mode": "run"
},
{
"x": 9683.0693359375,
"y": 230.0419921875,
"x": 9683.83984375,
"y": 230.5029296875,
"type": "target",
"move_mode": "walk",
"#": "2"
},
{
"x": 9683.7568359375,
"y": 230.51806640625,
"type": "target",
"move_mode": "walk",
"#": "2"
},
{
"x": 9687.234375,
"y": 230.724609375,
"type": "target",
"move_mode": "walk",
"#": "3"
},
{
"x": 9687.234375,
"y": 230.724609375,
@@ -52,12 +73,26 @@
"move_mode": "walk",
"#": "4"
},
{
"x": 9694.974609375,
"y": 220.93896484375,
"type": "target",
"move_mode": "walk",
"#": "4"
},
{
"x": 9673.7939453125,
"y": 227.576171875,
"type": "path",
"move_mode": "run"
},
{
"x": 9665.4150390625,
"y": 230.7529296875,
"type": "target",
"move_mode": "walk",
"#": "5"
},
{
"x": 9664.90234375,
"y": 230.03662109375,

View File

@@ -35,8 +35,6 @@
"#": 1
},
{
"x": 8959.0654296875,
"y": -2679.1455078125,
@@ -44,7 +42,6 @@
"move_mode": "walk"
},
{
"x": 8985.650390625,
"y": -2691.57421875,
@@ -94,8 +91,6 @@
"move_mode": "walk"
},
{
"x": 9054.9326171875,
"y": -2798.36328125,
@@ -120,12 +115,7 @@
"action": "",
"#": 2
},
{
"x": 9059.974609375,
"y": -2792.4677734375,
"type": "path",
"move_mode": "walk"
},
{
"x": 9060.9853515625,
"y": -2791.96484375,
@@ -150,12 +140,7 @@
"action": "",
"#": 3
},
{
"x": 9067.0380859375,
"y": -2798.1220703125,
"type": "path",
"move_mode": "walk"
},
{
"x": 9068.6044921875,
"y": -2798.8125,

View File

@@ -26,12 +26,27 @@
"move_mode": "walk"
},
{
"x": 9767.912109375,
"y": -806.7685546875,
"x": 9766.494140625,
"y": -804.9052734375,
"type": "target",
"move_mode": "fly",
"move_mode": "walk"
},
{
"x": 9768.205078125,
"y": -806.55517578125,
"type": "target",
"move_mode": "walk",
"#": "1"
},
{
"x": 9768.197265625,
"y": -806.56494140625,
"type": "target",
"move_mode": "walk",
"#": "1"
},
{
"x": 9766.7099609375,
"y": -800.212890625,
@@ -74,6 +89,7 @@
},
{
"x": 9719.1982421875,
"y": -852.04931640625,
@@ -88,8 +104,8 @@
"move_mode": "run"
},
{
"x": 9700.9248046875,
"y": -871.435546875,
"x": 9701.865234375,
"y": -872.02490234375,
"type": "target",
"move_mode": "fly",
"action": "stop_flying"

View File

@@ -24,12 +24,24 @@
"type": "path",
"move_mode": "run"
},
{
"x": 9584.697265625,
"y": -1947.31640625,
"type": "path",
"move_mode": "walk"
},
{
"x": 9583.6640625,
"y": -1949.44970703125,
"type": "path",
"move_mode": "walk"
},
{
"x": 9585.4951171875,
"y": -1951.11376953125,
"type": "target",
"move_mode": "walk"
},
{
"x": 9589.12890625,
"y": -1952.841796875,
@@ -38,11 +50,17 @@
"#" : "1"
},
{
"x": 9584.1767578125,
"y": -1955.1591796875,
"x": 9585.60546875,
"y": -1950.939453125,
"type": "path",
"move_mode": "walk"
},
{
"x": 9584.490234375,
"y": -1954.5810546875,
"type": "target",
"move_mode": "walk",
"#" : "2"
"#" : "2 躲技能"
},
{
"x": 9586.87890625,
@@ -52,24 +70,24 @@
"#" : "3"
},
{
"x": 9580.890625,
"y": -1961.4638671875,
"x": 9579.3232421875,
"y": -1961.0849609375,
"type": "path",
"move_mode": "walk"
},
{
"x": 9576.6474609375,
"y": -1960.392578125,
"x": 9576.55078125,
"y": -1960.44677734375,
"type": "target",
"move_mode": "fly",
"action": "",
"#" : "4 5 6"
},
{
"x": 9576.1318359375,
"y": -1959.96533203125,
"x": 9576.55078125,
"y": -1960.44677734375,
"type": "target",
"move_mode": "walk",
"move_mode": "fly",
"action": "",
"#" : "4 5 6"
},

View File

@@ -11,6 +11,12 @@
"type": "teleport",
"move_mode": "walk"
},
{
"x": 4176.16455078125,
"y": -2726.15234375,
"type": "path",
"move_mode": "run"
},
{
"x": 4166.1396484375,
"y": -2730.453125,

View File

@@ -99,13 +99,13 @@
{
"x": 4056.98583984375,
"y": -2032.7099609375,
"type": "path",
"type": "target",
"move_mode": "walk"
},
{
"x": 4058.92333984375,
"y": -2033.771484375,
"type": "path",
"type": "target",
"move_mode": "walk"
},
@@ -131,7 +131,6 @@
"action": "stop_flying"
},
{
"x": 4200.22802734375,
"y": -2047.04541015625,
@@ -149,8 +148,6 @@
"#": "3"
},
{
"x": 4212.25146484375,
"y": -2026.8671875,
@@ -158,15 +155,21 @@
"move_mode": "walk"
},
{
"x": 4215.18701171875,
"y": -2025.05859375,
"x": 4215.06982421875,
"y": -2024.91357421875,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "4"
},
{
"x": 4215.0322265625,
"y": -2024.9189453125,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "4"
}
]
}

View File

@@ -33,7 +33,6 @@
"#": "1"
},
{
"x": 4010.53076171875,
"y": -1062.2978515625,
@@ -74,15 +73,14 @@
"move_mode": "walk"
},
{
"x": 4024.052734375,
"y": -1040.53564453125,
"x": 4024.9404296875,
"y": -1040.6513671875,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "2"
},
{
"x": 4030.0244140625,
"y": -1048.982421875,
@@ -97,8 +95,6 @@
},
{
"x": 4027.53076171875,
"y": -1056.11669921875,
@@ -130,7 +126,6 @@
"#": "3"
},
{
"x": 4025.77099609375,
"y": -1056.43212890625,
@@ -138,8 +133,16 @@
"move_mode": "walk"
},
{
"x": 4021.49072265625,
"y": -1059.29443359375,
"x": 4022.77783203125,
"y": -1058.47802734375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "4"
},
{
"x": 4021.642578125,
"y": -1058.65966796875,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -154,9 +157,6 @@
"#": "4"
},
{
"x": 4025.650390625,
"y": -1077.04345703125,
@@ -170,7 +170,6 @@
"move_mode": "run"
},
{
"x": 4007.63037109375,
"y": -1073.99560546875,
@@ -217,7 +216,6 @@
"#": "6"
},
{
"x": 3990.36474609375,
"y": -1086.3388671875,
@@ -225,10 +223,10 @@
"move_mode": "walk"
},
{
"x": 3996.50048828125,
"y": -1052.4130859375,
"x": 3996.8916015625,
"y": -1052.46142578125,
"type": "target",
"move_mode": "walk",
"move_mode": "run",
"action": "",
"#": "7"
},

View File

@@ -126,20 +126,22 @@
"move_mode": "fly"
},
{
"x": 5638.16845703125,
"y": 893.82373046875,
"x": 5639.48388671875,
"y": 893.79638671875,
"type": "target",
"move_mode": "walk",
"action": ""
"action": "",
"#": 3
},
{
"x": 5641.98193359375,
"y": 892.064453125,
"x": 5639.455078125,
"y": 893.81201171875,
"type": "target",
"move_mode": "walk"
"move_mode": "walk",
"action": "",
"#": 3
},
{
"x": 5603.14794921875,
"y": 890.646484375,
@@ -148,7 +150,6 @@
"action": "stop_flying"
},
{
"x": 5546.05126953125,
"y": 938.8857421875,
@@ -172,7 +173,8 @@
"y": 913.49169921875,
"type": "target",
"move_mode": "walk",
"action": ""
"action": "",
"#": 4
}
]
}

View File

@@ -35,16 +35,16 @@
"#": "SE1"
},
{
"x": -3850.1796875,
"y": -4510.3369140625,
"x": -3849.619140625,
"y": -4510.076171875,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "SE2"
},
{
"x": -3850.1796875,
"y": -4510.3369140625,
"x": -3849.4716796875,
"y": -4510.6220703125,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -302,8 +302,6 @@
"#": "7"
},
{
"x": -3739.787109375,
"y": -4426.6416015625,
@@ -311,11 +309,12 @@
"move_mode": "walk"
},
{
"x": -3742.9111328125,
"y": -4424.607421875,
"type": "path",
"x": -3742.4375,
"y": -4424.3310546875,
"type": "target",
"move_mode": "walk"
},
{
"x": -3753.9892578125,
"y": -4424.9609375,
@@ -463,14 +462,18 @@
"#": "12"
},
{
"x": -3742.904296875,
"y": -4436.3154296875,
"type": "path",
"move_mode": "walk"
},
{
"x": -3740.294921875,
"y": -4437.44921875,
"type": "target",
"move_mode": "walk"
},
{
"x": -3738.1171875,
"y": -4437.6005859375,
@@ -483,6 +486,7 @@
"type": "path",
"move_mode": "walk"
},
{
"x": -3726.888671875,
"y": -4433.171875,
@@ -516,20 +520,20 @@
{
"x": -3727.8212890625,
"y": -4438.9990234375,
"x": -3726.6845703125,
"y": -4438.4697265625,
"type": "path",
"move_mode": "walk"
},
{
"x": -3731.369140625,
"y": -4438.029296875,
"x": -3730.7236328125,
"y": -4437.998046875,
"type": "path",
"move_mode": "walk"
},
{
"x": -3733.2099609375,
"y": -4434.453125,
"x": -3732.982421875,
"y": -4434.646484375,
"type": "path",
"move_mode": "walk"
},
@@ -544,13 +548,13 @@
{
"x": -3734.474609375,
"y": -4432.3515625,
"type": "target",
"type": "path",
"move_mode": "walk"
},
{
"x": -3727.3017578125,
"y": -4432.943359375,
"type": "target",
"type": "path",
"move_mode": "walk"
},

View File

@@ -19,8 +19,8 @@
},
{
"x": 3615.7001953125,
"y": 3276.17138671875,
"x": 3615.6,
"y": 3277.05,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -50,16 +50,22 @@
},
{
"x": 3586.56982421875,
"y": 3288.8876953125,
"x": 3585.166015625,
"y": 3289.40185546875,
"type": "target",
"move_mode": "walk",
"action": "",
"#": 2
},
{
"x": 3583.556640625,
"y": 3287.450439453125,
"x": 3583.4326171875,
"y": 3287.7548828125,
"type": "path",
"move_mode": "walk"
},
{
"x": 3583.5732421875,
"y": 3290.464599609375,
"type": "path",
"move_mode": "walk"
}

View File

@@ -1,70 +0,0 @@
{
"info": {
"name": "",
"type": "collect",
"author":"Yang-z"
},
"positions": [
{
"x": 3636.08251953125,
"y": 4795.94384765625,
"type": "teleport",
"move_mode": "walk"
},
{
"x": 3586.474609375,
"y": 4721.8291015625,
"type": "path",
"move_mode": "run"
},
{
"x": 3580.4384765625,
"y": 4716.591796875,
"type": "target",
"move_mode": "walk",
"action": "",
"#" : "1"
},
{
"x": 3580.36376953125,
"y": 4713.65234375,
"type": "target",
"move_mode": "walk",
"action": "",
"#" : "2"
},
{
"x": 3580.36376953125,
"y": 4713.65234375,
"type": "target",
"move_mode": "walk",
"action": "",
"#" : "2"
},
{
"x": 3585.587890625,
"y": 4717.0830078125,
"type": "path",
"move_mode": "run"
},
{
"x": 3556.82568359375,
"y": 4736.08056640625,
"type": "path",
"move_mode": "run"
},
{
"x": 3552.07763671875,
"y": 4737.794921875,
"type": "target",
"move_mode": "walk",
"action": "",
"#" : "3"
}
]
}

View File

@@ -13,8 +13,8 @@
},
{
"x": 4611.33056640625,
"y": 4929.84326171875,
"x": 4609.60595703125,
"y": 4937.71826171875,
"type": "path",
"move_mode": "run"
},
@@ -27,13 +27,19 @@
"#": "1"
},
{
"x": 4605.20068359375,
"y": 4934.0498046875,
"x": 4604.48583984375,
"y": 4934.646484375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "1"
},
{
"x": 4609.60595703125,
"y": 4937.71826171875,
"type": "path",
"move_mode": "walk"
},
{
"x": 4695.14013671875,
@@ -47,22 +53,35 @@
"type": "path",
"move_mode": "run"
},
{
"x": 4677.40771484375,
"y": 4998.9794921875,
"x": 4681.24267578125,
"y": 5003.5537109375,
"type": "path",
"move_mode": "walk"
},
{
"x": 4678.181640625,
"y": 4999.17431640625,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "2"
},
{
"x": 4678.38671875,
"y": 5000.13232421875,
"x": 4678.181640625,
"y": 4999.17431640625,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "2"
},
{
"x": 4688.0302734375,
"y": 4989.86865234375,
"type": "path",
"move_mode": "walk"
},
{
"x": 4712.2392578125,
@@ -90,6 +109,12 @@
"action": "",
"#": "3"
},
{
"x": 4723.48974609375,
"y": 4933.87158203125,
"type": "path",
"move_mode": "walk"
},
{
"x": 4706.38916015625,
"y": 4924.84423828125,
@@ -110,6 +135,12 @@
"type": "path",
"move_mode": "walk"
},
{
"x": 4737.34423828125,
"y": 4906.07568359375,
"type": "target",
"move_mode": "walk"
},
{
"x": 4735.310546875,
"y": 4902.712890625,
@@ -119,8 +150,8 @@
"#": "4"
},
{
"x": 4735.5859375,
"y": 4904.025390625,
"x": 4735.37744140625,
"y": 4902.59423828125,
"type": "target",
"move_mode": "walk",
"action": "",

View File

@@ -1,55 +0,0 @@
{
"info": {
"name": "",
"type": "collect",
"author":"Yang-z"
},
"positions": [
{
"x": 3563.25537109375,
"y": 3018.392578125,
"type": "teleport",
"move_mode": "walk"
},
{
"x": 3579.912109375,
"y": 3031.2421875,
"type": "path",
"move_mode": "run"
},
{
"x": 3591.27197265625,
"y": 3063.642578125,
"type": "path",
"move_mode": "run"
},
{
"x": 3588.08544921875,
"y": 3069.444580078125,
"type": "path",
"move_mode": "walk"
},
{
"x": 3586.4267578125,
"y": 3070.46240234375,
"type": "target",
"move_mode": "walk",
"action": "",
"#" : "1"
},
{
"x": 3583.62255859375,
"y": 3071.27734375,
"type": "path",
"move_mode": "walk"
},
{
"x": 3585.4072265625,
"y": 3068.656494140625,
"type": "path",
"move_mode": "walk"
}
]
}

View File

@@ -62,7 +62,7 @@
{
"x": -989.744140625,
"y": -3705.7880859375,
"type": "path",
"type": "target",
"move_mode": "walk"
},
{

View File

@@ -43,7 +43,8 @@
"y": -3197.0888671875,
"type": "target",
"move_mode": "walk",
"action": "",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 1
},
{
@@ -151,7 +152,8 @@
"y": -3228.68359375,
"type": "target",
"move_mode": "walk",
"action": "",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 4
},
{

View File

@@ -12,22 +12,15 @@
"move_mode": "walk"
},
{
"x": -3241.349609375,
"y": -6193.00390625,
"type": "path",
"move_mode": "run"
},
{
"x": -3231.896484375,
"y": -6214.564453125,
"x": -3219.5185546875,
"y": -6216.2353515625,
"type": "path",
"move_mode": "run"
},
{
"x": -3228.822265625,
"y": -6218.640625,
"x": -3228.1904296875,
"y": -6219.2265625,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -35,8 +28,8 @@
},
{
"x": -3229.384765625,
"y": -6221.478515625,
"x": -3228.859375,
"y": -6222.716796875,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -44,42 +37,39 @@
},
{
"x": -3230.751953125,
"y": -6224.287109375,
"x": -3260.615234375,
"y": -6212.7294921875,
"type": "path",
"move_mode": "run"
},
{
"x": -3267.4814453125,
"y": -6217.068359375,
"type": "path",
"move_mode": "walk"
},
{
"x": -3256.541015625,
"y": -6223.8203125,
"type": "path",
"move_mode": "run"
},
{
"x": -3270.1845703125,
"y": -6216.2060546875,
"type": "path",
"move_mode": "run"
},
{
"x": -3270.6044921875,
"y": -6215.556640625,
"x": -3270.759765625,
"y": -6215.4892578125,
"type": "target",
"move_mode": "run",
"action": "",
"#": "3"
},
{
"x": -3271.138671875,
"y": -6215.7783203125,
"x": -3270.759765625,
"y": -6215.4892578125,
"type": "target",
"move_mode": "run",
"action": "",
"#": "3"
},
{
"x": -3269.556640625,
"y": -6212.7734375,
"type": "path",
"move_mode": "walk"
}
]
}

View File

@@ -0,0 +1,43 @@
{
"info": {
"name": "",
"type": "collect",
"author":"Yang-z"
},
"positions": [
{
"x": -3103.740234375,
"y": -6268.5400390625,
"type": "teleport",
"move_mode": "walk"
},
{
"x": -3037.77734375,
"y": -6187.048828125,
"type": "path",
"move_mode": "run"
},
{
"x": -3034.861328125,
"y": -6182.2666015625,
"type": "target",
"move_mode": "walk",
"action": ""
},
{
"x": -3032.9755859375,
"y": -6182.5380859375,
"type": "target",
"move_mode": "walk",
"action": ""
},
{
"x": -3035.11328125,
"y": -6182.3037109375,
"type": "path",
"move_mode": "walk"
}
]
}

View File

@@ -0,0 +1,43 @@
{
"info": {
"name": "",
"type": "collect",
"author":"Yang-z"
},
"positions": [
{
"x": -2612.30078125,
"y": -6508.21875,
"type": "teleport",
"move_mode": "walk"
},
{
"x": -2581.470703125,
"y": -6529.7802734375,
"type": "path",
"move_mode": "fly",
"action": "stop_flying"
},
{
"x": -2581.470703125,
"y": -6529.7802734375,
"type": "target",
"move_mode": "walk",
"action": ""
},
{
"x": -2579.80859375,
"y": -6533.02734375,
"type": "target",
"move_mode": "walk",
"action": ""
},
{
"x": -2582.0341796875,
"y": -6525.9619140625,
"type": "path",
"move_mode": "walk"
}
]
}

View File

@@ -29,37 +29,45 @@
"type": "path",
"move_mode": "run"
},
{
"x": 4274.20458984375,
"y": 4584.49267578125,
"type": "path",
"move_mode": "walk"
},
{
"x": 4278.322265625,
"y": 4581.658203125,
"type": "target",
"move_mode": "walk"
},
{
"x": 4280.720703125,
"y": 4579.73193359375,
"type": "target",
"move_mode": "walk",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 1
},
{
"x": 4281.57421875,
"y": 4579.0537109375,
"type": "target",
"move_mode": "walk",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 1
},
{
"x": 4281.57421875,
"y": 4579.0537109375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": 1
},
{
"x": 4281.57421875,
"y": 4579.0537109375,
"type": "target",
"move_mode": "fly",
"action": "stop_flying",
"#": 1
},
{
"x": 4281.57421875,
"y": 4579.0537109375,
"type": "target",
"move_mode": "fly",
"action": "stop_flying",
"#": 1
},
{
@@ -93,28 +101,36 @@
"move_mode": "run"
},
{
"x": 4385.12109375,
"y": 4825.5810546875,
"type": "target",
"move_mode": "walk"
},
{
"x": 4383.2890625,
"y": 4827.6865234375,
"type": "target",
"move_mode": "walk",
"action": "",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 2
},
{
"x": 4382.4169921875,
"y": 4828.38720703125,
"type": "target",
"move_mode": "fly",
"action": "stop_flying",
"move_mode": "walk",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 2
},
{
"x": 4381.66357421875,
"y": 4828.92529296875,
"type": "target",
"move_mode": "fly",
"action": "stop_flying",
"move_mode": "walk",
"action": "",
"#": 2
},
@@ -126,35 +142,44 @@
"move_mode": "run"
},
{
"x": 4454.5625,
"y": 4862.7509765625,
"x": 4452.7392578125,
"y": 4861.34375,
"type": "path",
"move_mode": "run"
},
{
"x": 4457.26513671875,
"y": 4866.49365234375,
"type": "target",
"move_mode": "walk"
},
{
"x": 4458.3935546875,
"y": 4867.66015625,
"type": "target",
"move_mode": "walk",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 3
},
{
"x": 4459.04248046875,
"y": 4868.44873046875,
"type": "target",
"move_mode": "walk",
"action": "combat_script",
"action_params": "attack(0.2),attack(0.2),attack(0.2)",
"#": 3
},
{
"x": 4459.04248046875,
"y": 4868.44873046875,
"type": "target",
"move_mode": "walk",
"action": "",
"#": 3
},
{
"x": 4459.04248046875,
"y": 4868.44873046875,
"type": "target",
"move_mode": "fly",
"action": "stop_flying",
"#": 3
},
{
"x": 4459.04248046875,
"y": 4868.44873046875,
"type": "target",
"move_mode": "fly",
"action": "stop_flying",
"#": 3
},
{
"x": 4461.5029296875,
"y": 4870.7666015625,

View File

@@ -1,5 +1,5 @@
(async function () {
setGameMetrics(1920, 1080, 1);
const folderA = 'assets/狗粮A线@Yang-z/';
const folderB = 'assets/狗粮B线@Yang-z/';
const folderE = 'assets/狗粮额外@Yang-z/';
@@ -29,16 +29,13 @@
"(恢复)狗粮-稻妻-神无冢.json",
"【收尾】狗粮-稻妻-神无冢-踏鞴砂①-6个21个.json",
"【收尾】狗粮-稻妻-神无冢-踏鞴砂②-7个21个.json",
"【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个21个.json",
"(恢复)狗粮-稻妻-神无冢.json"
"【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个21个.json"
]; // 97+21个
const pathingB = [
"狗粮-枫丹-白露区-秋分山东侧-2个.json",
"狗粮-枫丹-白露区-秋分山西侧-北-2个.json",
"狗粮-枫丹-莫尔泰区-七天神像-1个.json",
"狗粮-枫丹-伊黎耶林区-欧庇克莱歌剧院东南-2个.json",
"狗粮-枫丹-研究院区-东-3个.json",
"(恢复)狗粮-枫丹-研究院区.json",
"狗粮-枫丹-研究院区-学术会堂-1个2个.json",
"狗粮-枫丹-研究院区-中央实验室遗址-北侧屋内-4个.json",
@@ -61,9 +58,10 @@
"狗粮-稻妻-清籁岛-越石村-8个.json",
"狗粮-稻妻-清籁岛-平海砦西-8个.json",
"狗粮-稻妻-鹤观-东-3个.json",
"狗粮-稻妻-鹤观-东偏中-2个.json",
"狗粮-稻妻-鹤观-南-2个.json",
"(恢复)狗粮-稻妻-清籁岛.json",
"【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json",
"(恢复)狗粮-稻妻-清籁岛.json",
"【收尾】狗粮-稻妻-清籁岛-清籁丸-20个.json"
]; // 97+20个
const pathingE = [
@@ -73,16 +71,6 @@
]; // 17个其中纳塔第2个似乎是一次性的
let tryTimes = 2; // 尝试次数
function updateTryTimes() {
try {
tryTimes = ~~settings.tryTimes ? ~~settings.tryTimes : 2;
} catch (error) {
log.error(error.toString());
}
log.debug(`全局尝试次数:${tryTimes}`);
}
let path = ''; // 路线
function determinePath() {
try {
@@ -101,17 +89,20 @@
}
// 准备
async function init() {
async function init(resizeMap = true) {
// restore and alignment
await genshin.tp("253.146484375", "1285.14306640625"); await sleep(3000);
// zoom map to 75%
keyPress("M"); await sleep(1000);
for (let i = 0; i < 5; i++) {
click(42, 420); await sleep(500); // zoom in
if (resizeMap) {
// zoom map to 75%
keyPress("M"); await sleep(1000);
for (let i = 0; i < 5; i++) {
click(42, 420); await sleep(500); // zoom in
}
click(42, 645); await sleep(1000); // zoom out
keyPress("M"); await sleep(1000);
}
click(42, 645); await sleep(1000); // zoom out
keyPress("M"); await sleep(1000);
}
// 分解圣遗物
@@ -136,13 +127,13 @@
}
// 单一脚本执行
async function runFile(filePath, times = tryTimes) {
async function runFile(filePath, times = 2) {
log.info(filePath);
try {
times--;
await pathingScript.runFile(filePath);
}
catch (error) {
catch (error) { // bgi已捕获可预期异常此处仅做兜底
log.error(error.toString());
await sleep(3000);
if (times > 0) await runFile(filePath, times);
@@ -162,16 +153,16 @@
}
// main
updateTryTimes();
determinePath();
await init();
// A or B
await init();
log.info(`开始执行${path}线路。`);
if (path == 'A') await batch(folderA, pathingA);
else await batch(folderB, pathingB);
// Extra
await init(false);
log.info(`开始执行额外线路。`);
await batch(folderE, pathingE, true); // 强制交互

View File

@@ -1,8 +1,8 @@
{
"manifest_version": 1,
"name": "狗粮ABE路线自动拾取分解",
"version": "1.4.1",
"bgi_version": "0.36.5",
"version": "1.5.2",
"bgi_version": "0.37.1",
"description": "圣遗物狗粮AB路线自动轮换及额外点位拾取途中自动分解。更新纳塔5.2优质点位。",
"authors": [
{

View File

@@ -1,9 +1,4 @@
[
{
"name": "tryTimes",
"type": "input-text",
"label": "尝试次数"
},
{
"name": "path",