Skip to content

Commit 6f2f82c

Browse files
horsemihorsemi
authored
Merge pull request #105 from zzliux/hm_dev
Hm dev
2 parents 3de179b + b5683bd commit 6f2f82c

8 files changed

+23
-44
lines changed

‎src/common/funcList/006_御魂御灵挑战.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ export class Func006 implements IFuncOrigin {
1313
// 0 三类御魂
1414
desc: [1280, 720,
1515
[
16-
[left, 44, 43, 0xc2cbe3],
1716
[right, 1124, 47, 0xd8b188],
1817
[right, 1237, 47, 0xd3af84],
1918
[right, 1161, 608, 0xded2bb],
20-
[right, 1207, 671, 0x372015]
19+
[right, 1207, 671, 0x372015],
20+
[left, 45, 37, 0xf5e5a5],
2121
]
2222
],
2323
oper: [
@@ -27,7 +27,7 @@ export class Func006 implements IFuncOrigin {
2727
// 1 御灵
2828
desc: [1280, 720,
2929
[
30-
[left, 37, 37, 0xc3cce1],
30+
[left, 45, 37, 0xf5e5a5],
3131
[right, 1121, 47, 0xd7b389],
3232
[right, 1230, 46, 0xd3ae83],
3333
[right, 1106, 628, 0xe5d9c3],
@@ -43,7 +43,7 @@ export class Func006 implements IFuncOrigin {
4343
// 2 觉醒
4444
desc: [1280, 720,
4545
[
46-
[left, 45, 45, 0xc2cbe3],
46+
[left, 45, 37, 0xf5e5a5],
4747
[left, 250, 44, 0x583716],
4848
[right, 1230, 41, 0xd3ae84],
4949
[right, 1163, 602, 0xddd2b9],

‎src/common/funcList/016_地鬼_热门收藏挑战.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ export class Func016 implements IFuncOrigin {
2828
}]
2929
}];
3030
operator: IFuncOperatorOrigin[] = [{
31-
// 0
31+
// 0 地鬼首页
3232
desc: [1280, 720,
3333
[
34-
[left, 60, 58, 0xc2cbe3],
3534
[left, 69, 670, 0xaf544c],
3635
[right, 1157, 49, 0xfbf5e5],
3736
[right, 1137, 39, 0xce737b],
3837
[right, 1206, 42, 0xc55149],
39-
[right, 1197, 532, 0xf4f4f4]
38+
[right, 1197, 532, 0xf4f4f4],
39+
[left, 44, 36, 0xf7eaad],
4040
]
4141
],
4242
oper: [

‎src/common/funcList/053_探索地图进入挑战.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export class Func053 implements IFuncOrigin {
3131
desc: [
3232
1280, 720,
3333
[
34-
[left, 20, 45, 0xc3cbe2],
3534
[right, 1232, 43, 0xcaa274],
3635
[left, 182, 141, 0x323045],
3736
[center, 547, 133, 0x5b3232],
3837
[right, 889, 147, 0x555534],
3938
[right, 1240, 181, 0x344158],
39+
[left, 46, 36, 0xf5e2a3],
4040
]
4141
],
4242
oper: [

‎src/common/funcList/308_探索地图进入每周挑战秘闻.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ export class Func308 implements IFuncOrigin {
3939
}, { // 3 每周挑战秘闻选择并进入
4040
desc: [1280, 720,
4141
[
42-
[left, 110, 42, 0xe0daca],
43-
[left, 211, 38, 0xe2dccc],
4442
[left, 50, 598, 0x2c2e3c],
4543
[left, 26, 149, 0x101014],
4644
[center, 465, 641, 0x857d6c],
47-
[right, 1258, 576, 0x3c2830]
45+
[right, 1258, 576, 0x3c2830],
46+
[left, 45, 47, 0xf6e6a7],
4847
]
4948
],
5049
oper: [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export class Func506 implements IFuncOrigin {
249249
[
250250
[right, 1060, 650, 0xfff3f3],
251251
[center, 885, 661, 0xfff4f5],
252-
[left, 259, 35, 0x573515],
252+
[left, 259, 35, 0x2a2937],
253253
[left, 175, 589, 0x684b2c],
254254
[left, 33, 592, 0x8a6137],
255255
]

‎src/common/multiDetectColors.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -528,19 +528,19 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
528528
'探索地图界面': {
529529
desc: [1280, 720,
530530
[
531-
[left, 45, 60, 0xeff5fb],
532531
[right, 1168, 146, 0xd5cec1],
533532
[right, 1124, 32, 0xd7b18b],
534533
[right, 1226, 30, 0xd3af84],
535534
[left, 18, 705, 0x754830],
536535
[left, 210, 711, 0x72452f],
536+
[left, 45, 36, 0xf5e5a6],
537537
]
538538
]
539539
},
540540
'探索地图界面_含时空秘境': {
541541
desc: [1280, 720,
542542
[
543-
[left, 45, 60, 0xeff5fb],
543+
[left, 45, 36, 0xf5e5a6],
544544
[right, 1168, 146, 0xd5cec1],
545545
[right, 1124, 32, 0xd7b18b],
546546
[right, 1226, 30, 0xd3af84],
@@ -670,7 +670,6 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
670670
[right, 1232, 617, 0xd2bb90],
671671
[right, 1189, 627, 0x3b1e0d],
672672
[right, 714, 19, 0x6b3121],
673-
[right, 743, 38, 0xecd79a],
674673
[left, 36, 37, 0xf5e2a3],
675674
[right, 1204, 66, 0xe3c298],
676675
]
@@ -680,7 +679,6 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
680679
desc: [1280, 720,
681680
[
682681
[right, 714, 19, 0x6b3121],
683-
[right, 743, 38, 0xecd79a],
684682
[left, 36, 37, 0xf5e2a3],
685683
[right, 1204, 66, 0xe3c298],
686684
[right, 1179, 594, 0x585a5d],
@@ -694,7 +692,6 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
694692
desc: [1280, 720,
695693
[
696694
[right, 714, 19, 0x6b3121],
697-
[right, 743, 38, 0xecd79a],
698695
[left, 36, 37, 0xf5e2a3],
699696
[right, 1204, 66, 0xe3c298],
700697
[right, 1182, 574, 0xaeccda],

‎src/common/multiFindColors.ts‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,36 +2094,16 @@ const multiFindColors: IMultiFindColorsOrigin = {
20942094
},
20952095
'六道椒图_升级buff': {
20962096
region: [center, 1280, 720, 160, 149, 827, 200],
2097+
// 柔风buff
20972098
desc: [
20982099
[
20992100
1280, 720,
2100-
[ // 第三个柔风
2101-
[center, 754, 164, 0xfff3db],
2102-
[center, 770, 204, 0xeca905],
2103-
[center, 751, 220, 0xbc9121],
2104-
[center, 773, 234, 0x2fe0e1],
2105-
[center, 784, 205, 0x031e88],
2106-
[center, 765, 220, 0xffffff]
2107-
]
2108-
], [
2109-
1280, 720,
2110-
[ // 第一个柔风
2111-
[left, 208, 166, 0xffeabd],
2112-
[left, 224, 203, 0xe1a108],
2113-
[left, 204, 220, 0xe4ae04],
2114-
[left, 226, 236, 0x31e2e1],
2115-
[left, 236, 221, 0x2ed7ea],
2116-
[left, 248, 216, 0x26d0e7]
2117-
]
2118-
], [
2119-
1280, 720,
2120-
[ // 第二个柔风
2121-
[center, 481, 165, 0xfff1d3],
2122-
[center, 497, 203, 0xd2970c],
2123-
[center, 477, 220, 0xe0ac07],
2124-
[center, 485, 241, 0x3fdfef],
2125-
[center, 497, 233, 0x2ae2e8],
2126-
[center, 512, 223, 0x33e5e6]
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],
21272107
]
21282108
]
21292109
],

‎src/common/version.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,6 +1449,9 @@ export const versionList = [{
14491449
}, {
14501450
version: '20251229_01',
14511451
desc: 'fix: 适配新巅峰赛斗技界面，修复逢魔 极逻辑'
1452+
}, {
1453+
version: '20251231_01',
1454+
desc: 'fix: 适配UI调整(或许还有页面没调整,道馆狭间等等,有问题群里反馈)，优化六道椒图，柔风'
14521455
}];
14531456

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

0 commit comments

Comments
 (0)