Skip to content

Commit 0494781

Browse files
horsemihorsemi
authored
Merge branch 'master' into hm_dev
2 parents bbdfecb + 985d362 commit 0494781

10 files changed

+88
-58
lines changed

‎src/common/funcList/014_探索_点击挑战图标.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,22 @@ export class Func014 implements IFuncOrigin {
3737
operator: IFuncOperatorOrigin[] = [{
3838
desc: [1280, 720,
3939
[
40-
[left, 38, 65, 0xf1f5fb],
4140
[left, 36, 570, 0x983254],
4241
[left, 29, 672, 0x615a77],
4342
[right, 1227, 30, 0xd3af84],
4443
[right, 1174, 33, 0xd7b287],
44+
[left, 54, 60, 0xdec38c],
45+
[left, 124, 26, 0xf7eeb5],
4546
]
4647
],
4748
oper: [
48-
[left, 1280, 720, 0, 0, 42, 51, 2000],
49-
[right, 1280, 720, 1121, 117, 1224, 209, 0],
50-
[left, 1280, 720, 46, 215, 162, 525, 0],
51-
[left, 1280, 720, 30, 47, 71, 85, 500],
52-
[center, 1280, 720, 702, 388, 846, 421, 500],
53-
[left, 1280, 720, 0, 0, 16, 16, 0],
54-
[right, 1280, 720, 0, 0, 1275, 715, 0]
49+
[left, 1280, 720, 0, 0, 42, 51, 1000],
50+
[right, 1280, 720, 1121, 117, 1224, 209, 1000],
51+
[left, 1280, 720, 46, 215, 162, 525, 1000],
52+
[left, 1280, 720, 30, 47, 71, 85, 1000],
53+
[center, 1280, 720, 702, 388, 846, 421, 1000],
54+
[left, 1280, 720, 0, 0, 16, 16, 1000],
55+
[right, 1280, 720, 0, 0, 1275, 715, 1000],
5556
]
5657
}, {
5758
// 自动轮换

‎src/common/funcList/025_探索_单人时退出.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export class Func025 implements IFuncOrigin {
1111
operator: IFuncOperatorOrigin[] = [{
1212
desc: [1280, 720, // 组队匹配上了的话就不做任何操作
1313
[
14-
[left, 38, 65, 0xf1f5fb],
14+
[left, 38, 65, 0x40271f],
1515
[left, 36, 570, 0x983254],
1616
[left, 29, 672, 0x615a77],
1717
[right, 1227, 30, 0xd3af84],
1818
[right, 1174, 33, 0xd7b287],
19-
[left, 64, 456, 0xf6f6e9],
19+
[left, 64, 456, 0x181219],
2020
[left, 72, 444, 0x483726]
2121
]
2222
],
@@ -27,7 +27,7 @@ export class Func025 implements IFuncOrigin {
2727
}, {
2828
desc: [1280, 720,
2929
[
30-
[left, 38, 65, 0xf1f5fb],
30+
[left, 38, 65, 0x40271f],
3131
[left, 36, 570, 0x983254],
3232
[left, 29, 672, 0x615a77],
3333
[right, 1227, 30, 0xd3af84],
@@ -40,12 +40,12 @@ export class Func025 implements IFuncOrigin {
4040
]
4141
}, { // 确认退出探索
4242
desc: [1280, 720,
43-
[[center, 340, 261, 0x987238],
44-
[center, 938, 261, 0x906736],
45-
[center, 560, 327, 0x2f2b26],
46-
[center, 722, 326, 0x322e28],
47-
[center, 539, 401, 0xf3b25e],
48-
[center, 729, 404, 0xf3b25e]]
43+
[[center, 340, 261, 0x472b18],
44+
[center, 938, 261, 0xe19398],
45+
[center, 560, 327, 0xffcf57],
46+
[center, 722, 326, 0xc46823],
47+
[center, 539, 401, 0xa56942],
48+
[center, 729, 404, 0x6b413e]]
4949
],
5050
oper: [
5151
[center, 1280, 720, 700, 386, 848, 420, 1000]

‎src/common/funcList/026_现世逢魔.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// TODO
2+
// 自现世逢魔点一下能全开后，该功能关键逻辑已不适用
3+
// 需修改为记录当前是第几次任务（0~4)，然后点击对应的任务图标
4+
15
import { Script } from '@/system/script';
26
import { IFuncOrigin, IFuncOperatorOrigin, IFuncOperator } from '@/interface/IFunc';
37
// const normal = -1; //定义常量
@@ -48,7 +52,7 @@ export class Func026 implements IFuncOrigin {
4852
]
4953
}, { // 花钱的宝箱都不领
5054
desc: [1280, 720,
51-
[[left, 43, 51, 0x4f525c],
55+
[[left, 45, 48, 0x655e44],
5256
[center, 436, 338, 0xcbb59e],
5357
[center, 803, 342, 0xcbb59e],
5458
[center, 578, 444, 0xf4b25f],
@@ -61,9 +65,9 @@ export class Func026 implements IFuncOrigin {
6165
}, {
6266
// 神秘任务_不做
6367
desc: [1280, 720,
64-
[[left, 37, 50, 0x3c3e44],
68+
[[left, 45, 48, 0x655e44],
6569
[center, 650, 140, 0xcaa85d],
66-
[center, 846, 131, 0xeecccc],
70+
[center, 846, 132, 0xe8d4cf],
6771
[center, 564, 339, 0x86201f],
6872
[center, 566, 234, 0x852221]]
6973
],

‎src/common/funcList/503_返回庭院界面.ts‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export class Func503 implements IFuncOrigin {
228228
]
229229
],
230230
oper: [
231-
[left, 1280, 720, 25, 9, 74, 55, 2000]
231+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
232232
]
233233
}, { // 2 斗技界面
234234
desc: [1280, 720,
@@ -273,15 +273,14 @@ export class Func503 implements IFuncOrigin {
273273
desc: [1280, 720,
274274
[
275275
[left, 19, 700, 0x3c3841],
276-
[left, 42, 46, 0xc3cbdf],
277276
[center, 754, 39, 0x583716],
278277
[center, 1181, 650, 0xffffff],
279-
[left, 43, 680, 0xc7957c],
280-
[left, 54, 676, 0x433b42]
278+
[left, 54, 676, 0x433b42],
279+
[left, 45, 48, 0xf5e5a5],
281280
]
282281
],
283282
oper: [
284-
[left, 1280, 720, 27, 25, 72, 73, 1000],
283+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
285284
]
286285
}, { // 6 宠物后院(管他有没有人用)
287286
desc: [1280, 720,
@@ -328,7 +327,7 @@ export class Func503 implements IFuncOrigin {
328327
]
329328
],
330329
oper: [
331-
[left, 1280, 720, 23, 10, 71, 56, 2000], // 返回按钮
330+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
332331
]
333332
}, { // 11 阴阳寮_寄养_己方结界
334333
desc: [1280, 720,
@@ -341,7 +340,7 @@ export class Func503 implements IFuncOrigin {
341340
]
342341
],
343342
oper: [
344-
[left, 1280, 720, 23, 10, 71, 56, 2000], // 返回按钮
343+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
345344
]
346345
}, { // 12 判断_是否为庭院中的'町中'立牌
347346
desc: [
@@ -427,15 +426,15 @@ export class Func503 implements IFuncOrigin {
427426
1280, 720,
428427
[
429428
[right, 1240, 659, 0xdfdbcf],
430-
[left, 33, 52, 0xeff5fb],
429+
[left, 38, 50, 0x8a5f3b],
431430
[left, 87, 617, 0xc2baaa],
432431
[right, 953, 45, 0x25150c],
433432
[right, 1228, 80, 0xddd3c1],
434433
[right, 1251, 79, 0xc4b4a0],
435434
]
436435
],
437436
oper: [
438-
[center, 1280, 720, 17, 25, 74, 79, 1000],
437+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
439438
]
440439
}, { // 21 点开勋章后的突破界面
441440
desc: [
@@ -520,22 +519,22 @@ export class Func503 implements IFuncOrigin {
520519
}, { // 29 巅峰斗技返回
521520
desc: '巅峰斗技主界面',
522521
oper: [
523-
[left, 1280, 720, 22, 4, 67, 49, 500]
522+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
524523
]
525524
}, { // 30 巅峰斗技返回
526525
desc: '巅峰斗技主界面_段位保护',
527526
oper: [
528-
[left, 1280, 720, 22, 4, 67, 49, 500]
527+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
529528
]
530529
}, { // 31 巅峰斗技返回
531530
desc: '巅峰斗技主界面_段位保护裂',
532531
oper: [
533-
[left, 1280, 720, 22, 4, 67, 49, 500]
532+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
534533
]
535534
}, { // 32 巅峰斗技返回
536535
desc: '巅峰斗技主界面_名士',
537536
oper: [
538-
[left, 1280, 720, 22, 4, 67, 49, 500]
537+
[left, 1280, 720, 110, 15, 152, 57, 2000] // 修改为返回庭院按钮
539538
]
540539
}, { // 33 狭间暗域4个区域通用
541540
desc: [

‎src/common/funcList/506_进入寮活动.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@ export class Func506 implements IFuncOrigin {
316316
}
317317

318318
if (thisScript.oper({
319-
name: '检测_道馆是否已开启',
319+
id: 506,
320+
name: '检测_道馆是否已开启_a',
320321
operator: [{
321322
desc: thisOperator[0].desc,
322323
}]
@@ -325,7 +326,8 @@ export class Func506 implements IFuncOrigin {
325326
return true;
326327
} else {
327328
return thisScript.oper({
328-
name: '检测_道馆是否已开启',
329+
id: 506,
330+
name: '操作_道馆是否已开启_b',
329331
operator: [{
330332
oper: thisOperator[0].oper
331333
}]
@@ -334,6 +336,7 @@ export class Func506 implements IFuncOrigin {
334336
}
335337

336338
if (thisScript.oper({
339+
id: 506,
337340
name: '检测_是否为道馆突破选择道馆页面',
338341
operator: [{
339342
desc: thisOperator[8].desc
@@ -344,6 +347,7 @@ export class Func506 implements IFuncOrigin {
344347
}
345348

346349
if (thisScript.oper({
350+
id: 506,
347351
name: '检测_道馆地图场景',
348352
operator: [{
349353
desc: thisOperator[3].desc

‎src/common/funcList/518_邮箱签到.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -489,12 +489,12 @@ export class Func518 implements IFuncOrigin {
489489
desc: [
490490
1280, 720,
491491
[
492-
[left, 29, 26, 0xf5e7a7],
493-
[right, 1249, 28, 0xd7c4a1],
494-
[right, 1195, 652, 0xd03a3a],
495-
[right, 1204, 60, 0x130a08],
496-
[center, 866, 660, 0x3973c6],
497-
[left, 20, 558, 0x645241],
492+
[left, 30, 26, 0xf6e9ab],
493+
[right, 1237, 29, 0xd7c3a2],
494+
[right, 1178, 665, 0xd03a3a],
495+
[right, 1199, 63, 0x140a08],
496+
[right, 882, 672, 0x3d7ccf],
497+
[left, 20, 565, 0x4e271b],
498498
]
499499
],
500500
oper: [
@@ -522,19 +522,19 @@ export class Func518 implements IFuncOrigin {
522522
desc: [
523523
1280, 720,
524524
[
525-
[left, 30, 26, 0xf4e4a4],
526-
[right, 1226, 130, 0xfcdab2],
527-
[right, 1227, 222, 0x967e71],
528-
[right, 1227, 312, 0x967d71],
529-
[right, 1134, 687, 0xf0c967],
525+
[left, 30, 26, 0xf6e9ab],
526+
[right, 1226, 130, 0xffe3b6],
527+
[right, 1224, 212, 0xfff5d2],
528+
[right, 1227, 312, 0xae927d],
529+
[right, 1131, 687, 0xe9c160],
530530
[right, 1148, 665, 0x842121],
531531
[right, 1195, 675, 0xd2ab51],
532532
]
533533
],
534534
oper: [
535-
[right, 1280, 720, 1186, 194, 1237, 247, 1200], // 点击 推荐页签
535+
[right, 1280, 720, 1184, 285, 1231, 350, 1200], // 点击 日常页签
536536
],
537-
}, { // 36 检测_商店_推荐页签_每日领取
537+
}, { // 36 检测_商店_礼包屋_日常页签_每日领取
538538
desc: [1280, 720,
539539
[
540540
[center, 323, 141, 0xe41010],
@@ -920,7 +920,7 @@ export class Func518 implements IFuncOrigin {
920920
if (
921921
thisScript.oper({
922922
id: 518,
923-
name: '检测_商店_推荐页签_每日领取',
923+
name: '检测_商店_礼包屋_日常页签_每日领取',
924924
operator: [thisOperator[36]],
925925
}) ||
926926
thisScript.global.checked_yard_count >= 3

‎src/common/funcList/998_式神寄养.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export class Func998 implements IFuncOrigin {
131131
[
132132
[right, 1186, 74, 0xd4ccbb],
133133
[right, 1185, 93, 0x272420],
134-
[right, 1186, 136, 0xc19b6d],
134+
[right, 1186, 140, 0xc49665],
135135
[right, 1072, 52, 0xa7371e],
136136
],
137137
],

‎src/common/multiFindColors.ts‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,16 +2094,33 @@ const multiFindColors: IMultiFindColorsOrigin = {
20942094
},
20952095
'六道椒图_升级buff': {
20962096
region: [center, 1280, 720, 160, 149, 827, 200],
2097-
// 柔风buff
20982097
desc: [
20992098
[
21002099
1280, 720,
2101-
[
2102-
[left, 222, 232, 0x2adcef],
2103-
[left, 238, 223, 0x34e3e5],
2104-
[left, 187, 223, 0x103a66],
2105-
[left, 205, 208, 0xffffff],
2106-
[left, 201, 268, 0xa14f84],
2100+
[ // 第三个柔风
2101+
[right, 752, 208, 0xffffff],
2102+
[right, 748, 268, 0xa14f84],
2103+
[right, 771, 232, 0x29deec],
2104+
[right, 778, 193, 0x38cae5],
2105+
[right, 754, 167, 0xffe4a8],
2106+
]
2107+
], [
2108+
1280, 720,
2109+
[ // 第一个柔风
2110+
[left, 208, 168, 0xffe4a6],
2111+
[left, 204, 207, 0xffffff],
2112+
[left, 226, 233, 0x2bdce3],
2113+
[left, 200, 268, 0xa14f84],
2114+
[left, 237, 224, 0x31e2e5]
2115+
]
2116+
], [
2117+
1280, 720,
2118+
[ // 第二个柔风
2119+
[center, 482, 167, 0xffe6af],
2120+
[center, 477, 208, 0xffffff],
2121+
[center, 500, 234, 0x30dde2],
2122+
[center, 475, 268, 0xa14f84],
2123+
[center, 513, 223, 0x33e2e4]
21072124
]
21082125
]
21092126
],

‎src/common/toolAuto.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ export function nlpSimilarity(s1: string, s2: string) {
513513
);
514514
}
515515
const result = hanZiSimilarBridge.similarity(s1, s2);
516-
console.log(`result=${result}`);
517516
return result;
518517
}
519518

‎src/common/version.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,6 +1467,12 @@ export const versionList = [{
14671467
}, {
14681468
version: '20260108_01',
14691469
desc: 'fix: 修复道馆',
1470+
}, {
1471+
version: '20260104_02',
1472+
desc: '优化：式神寄养优化取色'
1473+
}, {
1474+
version: '20260104_03',
1475+
desc: 'fix: 逢魔卡勾玉宝箱与神秘任务界面'
14701476
}];
14711477

14721478
export default versionList[versionList.length - 1].version;

0 commit comments

Comments
 (0)