Skip to content

Commit 7629d08

Browse files
horsemihorsemi
authored
Merge branch 'master' into hm_dev
2 parents ccf5947 + 6139ba9 commit 7629d08

File tree

6 files changed

+163
-35
lines changed

6 files changed

+163
-35
lines changed

‎src/common/funcList/401_对弈竞猜.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class Func401 implements IFuncOrigin {
4141
[center, 1280, 720, 851, 580, 966, 627, 1000], // 三十万
4242
[center, 1280, 720, 1007, 416, 1109, 494, 1000], // 押注
4343
[center, 1280, 720, 682, 408, 832, 448, 1000], // 押注确认
44-
[left, 1280, 720, 25, 9, 74, 55, 2000], // 完了之后返回上一级（庭院）
44+
[left, 1280, 720, 6, 7, 60, 54, 2000], // 完了之后返回上一级（庭院）
4545
]
4646
}, { // 3 竞猜成功
4747
desc: [
@@ -133,8 +133,10 @@ export class Func401 implements IFuncOrigin {
133133
if (nextH.length === 1) nextH = '0' + nextH;
134134
// @ts-expect-error d.ts文件问题
135135
const str = http.get(rssUrl).body.string();
136-
// 从最近的5个拿，避免拿到昨天的
137-
const str2 = str.match(/<item[\s\S\n]+?<description>([\s\S\n]+?)<\/description>/g).slice(0, 5).join('');
136+
const str2 = str.match(/<item[\s\S\n]+?<description>([\s\S\n]+?)<\/description>/g)
137+
.filter((o: string) => !o.match(/体验服/)) // 过滤体服，避免拿到体服的
138+
.slice(0, 5) // 从最近的5个拿，避免拿到昨天的
139+
.join('');
138140
console.log(str2);
139141

140142
// 该规则目前是面灵气喵的固定规则，其他的up还得再看看怎么搞

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,13 @@ export class Func503 implements IFuncOrigin {
238238
desc: '45 招募界面',
239239
type: 'switch',
240240
default: true,
241-
}]
241+
}, {
242+
name: 'oper_46',
243+
desc: '46 师徒界面',
244+
type: 'switch',
245+
default: true,
246+
}
247+
]
242248
}];
243249
operator: IFuncOperatorOrigin[] = [{ // 0 探索地图
244250
desc: '探索地图界面',
@@ -755,6 +761,20 @@ export class Func503 implements IFuncOrigin {
755761
oper: [
756762
[center, 1280, 720, 29, 9, 65, 49, 1000],
757763
]
764+
}, {
765+
// 46 师徒界面
766+
desc: [1280, 720,
767+
[
768+
[left, 177, 540, 0x3f3333],
769+
[left, 159, 581, 0x161313],
770+
[center, 383, 600, 0x472918],
771+
[center, 419, 135, 0x896955],
772+
[center, 533, 128, 0x312724],
773+
]
774+
],
775+
oper: [
776+
[center, 1280, 720, 21, 16, 67, 56, 1000],
777+
]
758778
}];
759779
operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
760780
const thisConf = thisScript.scheme.config['503'];

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

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class Func506 implements IFuncOrigin {
2828
},
2929
{
3030
name: 'huntBoss_switch',
31-
desc: '是否进入首领退治(用于会长副会长问题)',
31+
desc: '是否下滑进入狭间',
3232
type: 'switch',
3333
default: true,
3434
value: true,
@@ -78,7 +78,7 @@ export class Func506 implements IFuncOrigin {
7878
oper: [
7979
[center, 1280, 720, 896, 172, 1103, 321, 1200] // 打开宴会
8080
]
81-
}, { // 3 已适配66 检查_是否为道馆地图页面
81+
}, { // 3 已适配66 检测_是否为道馆地图页面
8282
desc: [
8383
1280, 720,
8484
[
@@ -247,7 +247,27 @@ export class Func506 implements IFuncOrigin {
247247
[left, 33, 592, 0x8a6137],
248248
]
249249
],
250+
}, { // 16 滑动
251+
desc: [1280, 720,
252+
[
253+
[left, 42, 31, 0xf4e4a4],
254+
[right, 760, 255, 0xe2dfda],
255+
[right, 820, 276, 0xdebce4],
256+
[right, 702, 265, 0xe0bfe5],
257+
[right, 755, 285, 0x4c4943],
258+
[right, 857, 237, 0x2b1d15],
259+
[right, 836, 240, 0x30221b],
260+
[right, 767, 246, 0xb03a32],
261+
]
262+
],
263+
oper: [
264+
[right, 1280, 720, 548, 561, 767, 621, -1], // 滑动开始位置
265+
[right, 1280, 720, 548, 107, 767, 164, -1], // 滑动结束位置
266+
]
250267
}];
268+
269+
270+
251271
operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
252272
const thisConf = thisScript.scheme.config['506'];
253273

@@ -398,8 +418,44 @@ export class Func506 implements IFuncOrigin {
398418
return true;
399419
}
400420

401-
// 兼容没设置该按钮的逻辑 undefined 当true处理
402-
if (thisConf && thisConf.huntBoss_switch !== false) {
421+
// 处理是否下滑进入狭间的逻辑
422+
if (thisConf && thisConf.huntBoss_switch === true) {
423+
// 如果开启了“下滑进入狭间”开关
424+
// 初始化滑动计数器，使用方括号语法避免类型错误
425+
if (!thisScript.global['liao_swipe_count']) {
426+
thisScript.global['liao_swipe_count'] = 0;
427+
}
428+
429+
// 只在首次执行滑动
430+
if (thisScript.global['liao_swipe_count'] < 1) {
431+
// 参考 511 文件，使用 regionBezierSwipe 方法
432+
// thisOperator[16] 定义了滑动操作，oper[0]是起点，oper[1]是终点
433+
thisScript.regionBezierSwipe(thisOperator[16].oper[0], thisOperator[16].oper[1], [1200, 1500], 1000);
434+
435+
// 增加滑动计数
436+
thisScript.global['liao_swipe_count']++;
437+
}
438+
439+
// 滑动后直接检测狭间暗域
440+
if (thisScript.oper({
441+
name: '检测_狭间暗域是否已开启',
442+
operator: [{
443+
desc: thisOperator[11].desc
444+
}]
445+
})) {
446+
if (_liao_activity_state && _liao_activity_state.narrow) {
447+
return true;
448+
} else {
449+
return thisScript.oper({
450+
name: '检测_狭间暗域是否已开启',
451+
operator: [{
452+
oper: thisOperator[11].oper
453+
}]
454+
});
455+
}
456+
}
457+
} else {
458+
// 如果关闭了“下滑进入狭间”开关，则执行首领退治逻辑
403459
if (thisScript.oper({
404460
name: '检测_首领退治是否已开启',
405461
operator: [{
@@ -419,6 +475,8 @@ export class Func506 implements IFuncOrigin {
419475
}
420476
}
421477

478+
479+
422480
if (thisScript.oper({
423481
name: '检测_是否为首领退治页面',
424482
operator: [thisOperator[9]]
@@ -600,3 +658,5 @@ export class Func506 implements IFuncOrigin {
600658
}
601659
}
602660
}
661+
662+
export default new Func506();

‎src/common/funcList/517_宠物庭院.ts‎

Lines changed: 67 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ export class Func517 implements IFuncOrigin {
2424
]
2525
],
2626
oper: [
27-
[right, 1280, 720, 1022, 420, 1080, 464, 1200] // 点击宠物屋
27+
[right, 1280, 720, 1022, 420, 1080, 450, 1200] // 点击宠物屋
2828
]
2929
}, { // 页面是否为庭院且能识别宠物屋(菜单未展开) 只支持默认庭院皮肤与默认装饰
3030
desc:
3131
[1280, 720,
3232
[
3333
[right, 1226, 47, 0xcda47a],
3434
[right, 1157, 45, 0xb39671],
35-
[center, 389, 65, 0xfbc573],
3635
[right, 1207, 637, 0xdfd1cb],
3736
[right, 1034, 448, 0xfff1be],
3837
[right, 1084, 450, 0x241738],
@@ -146,7 +145,6 @@ export class Func517 implements IFuncOrigin {
146145
[right, 1149, 637, 0xc0bab4],
147146
[left, 118, 648, 0x3d2c1c],
148147
[left, 142, 97, 0x4c3120],
149-
[left, 198, 95, 0xd4ccc7],
150148
]
151149
],
152150
oper: [
@@ -164,9 +162,6 @@ export class Func517 implements IFuncOrigin {
164162
[center, 954, 698, 0x6b4232],
165163
[right, 1202, 682, 0x946241],
166164
[left, 34, 666, 0xd4c4a3],
167-
[left, 66, 42, 0xd5c3a1],
168-
[center, 378, 548, 0xe57a52],
169-
[center, 835, 386, 0x9c9c7a],
170165
]
171166
]
172167
}, { // 式神选择弹窗
@@ -198,9 +193,43 @@ export class Func517 implements IFuncOrigin {
198193
[right, 1020, 448, 0x302552],
199194
]
200195
]
201-
}];
196+
}, {
197+
// 师徒界面
198+
desc: [1280, 720,
199+
[
200+
[left, 177, 540, 0x3f3333],
201+
[left, 159, 581, 0x161313],
202+
[center, 383, 600, 0x472918],
203+
[center, 419, 135, 0x896955],
204+
[center, 533, 128, 0x312724],
205+
]
206+
],
207+
oper: [
208+
[center, 1280, 720, 21, 16, 67, 56, 1000],
209+
]
210+
}
211+
];
202212
operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
213+
// 优先检测是否已经在宠物小屋界面，解决直接在小屋启动脚本的问题
214+
if (thisScript.oper({
215+
id: 517,
216+
name: '页面为宠物小屋',
217+
operator: [thisOperator[3], thisOperator[5], thisOperator[6], thisOperator[7], thisOperator[8], thisOperator[10]]
218+
})) {
219+
return true;
220+
}
203221

222+
// 其次检测是否已投食，如果是则返回庭院
223+
if (thisScript.oper({
224+
id: 517,
225+
name: '检测_已投食',
226+
operator: [thisOperator[9]]
227+
})) {
228+
const next_scheme = '返回庭院';
229+
thisScript.rerun(next_scheme);
230+
}
231+
232+
// 然后检测是否在庭院
204233
if (thisScript.oper({
205234
id: 517,
206235
name: '页面是否为庭院且能识别宠物屋',
@@ -214,40 +243,54 @@ export class Func517 implements IFuncOrigin {
214243
desc: thisOperator[11].desc
215244
}]
216245
})) {
217-
return thisScript.oper({
246+
// 1. 执行点击宠物屋
247+
thisScript.oper({
218248
id: 517,
219249
name: '点击宠物屋',
220250
operator: [{
221251
oper: thisOperator[0].oper
222252
}]
223253
});
224-
}
225254

226-
if (thisScript.oper({
227-
id: 517,
228-
name: '页面为宠物小屋',
229-
operator: [thisOperator[3], thisOperator[5], thisOperator[6], thisOperator[7], thisOperator[8], thisOperator[10]]
230-
})) {
231-
return true;
232-
}
255+
// 2. 识别是否是师徒界面 (thisOperator[12] 是师徒界面的定义)
256+
if (thisScript.oper({
257+
id: 517,
258+
name: '检测师徒界面',
259+
operator: [{
260+
desc: thisOperator[12].desc
261+
}]
262+
})) {
263+
// 3. 如果是师徒界面，运行师徒的oper (通常是关闭师徒界面)
264+
thisScript.oper({
265+
id: 517,
266+
name: '师徒界面操作',
267+
operator: [{
268+
oper: thisOperator[12].oper
269+
}]
270+
});
233271

234-
if (thisScript.oper({
235-
id: 517,
236-
name: '检测_已投食',
237-
operator: [thisOperator[9]]
238-
})) {
239-
const next_scheme = '返回庭院';
240-
thisScript.rerun(next_scheme);
272+
// 4. 师徒界面处理完后，再次点击宠物屋，进入后续流程
273+
return thisScript.oper({
274+
id: 517,
275+
name: '再次点击宠物屋',
276+
operator: [{
277+
oper: thisOperator[0].oper
278+
}]
279+
});
280+
}
281+
282+
// 5. 如果不是师徒界面，直接返回true，继续后续流程
283+
return true;
241284
}
242285

286+
// 最后检测宠物后庭
243287
if (thisScript.oper({
244288
id: 517,
245289
name: '检测_宠物后庭',
246290
operator: [{
247291
desc: thisOperator[4].desc
248292
}]
249293
})) {
250-
251294
// 做延时检测 防止登陆后的弹窗
252295
if (thisScript.global.checked_yard_count >= 6) {
253296
thisScript.global.checked_yard_count = 0;
@@ -273,5 +316,4 @@ export class Func517 implements IFuncOrigin {
273316
return false;
274317
}
275318
}
276-
277319
export default new Func517();

‎src/common/multiFindColors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ const multiFindColors: IMultiFindColorsOrigin = {
22642264
]]
22652265
},
22662266
'右边侧栏下一页图标': {
2267-
region: [center, 1280, 720, 1150, 145, 1261, 513],
2267+
region: [center, 1280, 720, 1150, 145, 1261, 573],
22682268
desc: [[
22692269
1280, 720,
22702270
[

‎src/common/version.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1510,6 +1510,10 @@ export const versionList = [{
15101510
304修复逻辑错误)`,
15111511
}, {
15121512
version: '20260217_01',
1513-
desc: '修复：每日一抽功能，添加寮活动自动翻页功能',
1513+
desc: `新年好！
1514+
修复: 401对弈竞猜庭院右侧活动不翻页问题，误识别体服问题`
1515+
}, {
1516+
version: '20260217_02',
1517+
desc: '修复：每日一抽功能，添加寮活动自动翻页功能',
15141518
}];
15151519
export default versionList[versionList.length - 1].version;

0 commit comments

Comments
 (0)