Skip to content

Commit 3ba9002

Browse files
committed
修复狩猎战
1 parent e9d8773 commit 3ba9002

File tree

2 files changed

+34
-42
lines changed

2 files changed

+34
-42
lines changed

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

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ export class Func500 implements IFuncOrigin {
165165
[left, 112, 594, 0x664b30],
166166
[left, 139, 590, 0x5b452c],
167167
[left, 175, 603, 0x966f47],
168-
[right, 1172, 457, 0xf2d7b7],
169-
[right, 1199, 476, 0xffeed7],
168+
[right, 884, 661, 0xfff3f6],
169+
[right, 1061, 650, 0xfff2f2],
170170
]
171171
],
172172
}, { // 5 检测_是否为狩猎战挑战奉献榜场景_待开始(弃用)
@@ -344,37 +344,31 @@ export class Func500 implements IFuncOrigin {
344344
return true;
345345
}
346346
// 狩猎战判断(其他开关为关时)
347-
if (thisScript.oper({
348-
id: 500,
349-
name: '寮神社界面',
350-
operator: [{ desc: thisOperator[11].desc }]
351-
})) {
352-
if (thisScript.superGlobal.liao_activity_Swith['a_ctivity_hunt'] && Object.entries(thisScript.superGlobal.liao_activity_Swith).every(
353-
([key, value]) => ['a_ctivity_gateOfHades', 'a_ctivity_hunt'].includes(key) || value === false
354-
)) {
355-
if ([1, 2, 3, 4].includes(nowDay) && nowHour >= 5 && nowHour < 23) { // 判断星期一二三四,是否在5-23点(5时为误差,有人5:55开启定时)
356-
if (thisScript.oper({
357-
name: '检测_狩猎战',
358-
operator: [thisOperator[3]],
359-
})) {
360-
return true;
361-
}
362-
if (thisScript.oper({
363-
name: '检测_是否在狩猎战界面',
364-
operator: [thisOperator[4]],
365-
})) {
366-
const next_scheme = thisconf.a_ctivity_hunt_select;
367-
// 关闭开关 传参 切换到狩猎战
368-
thisScript.superGlobal.liao_activity_Swith['a_ctivity_hunt'] = false;
369-
thisScript.rerun(next_scheme);
370-
return true;
371-
}
372-
} else {
373-
console.log('狩猎战 不在时间段内');
347+
if (thisScript.superGlobal.liao_activity_Swith['a_ctivity_hunt'] && Object.entries(thisScript.superGlobal.liao_activity_Swith).every(
348+
([key, value]) => ['a_ctivity_gateOfHades', 'a_ctivity_hunt'].includes(key) || value === false
349+
)) {
350+
if ([1, 2, 3, 4].includes(nowDay) && nowHour >= 5 && nowHour < 23) { // 判断星期一二三四,是否在5-23点(5时为误差,有人5:55开启定时)
351+
if (thisScript.oper({
352+
name: '检测_狩猎战',
353+
operator: [thisOperator[3]],
354+
})) {
355+
return true;
356+
}
357+
if (thisScript.oper({
358+
name: '检测_是否在狩猎战界面',
359+
operator: [thisOperator[4]],
360+
})) {
361+
const next_scheme = thisconf.a_ctivity_hunt_select;
362+
// 关闭开关 传参 切换到狩猎战
374363
thisScript.superGlobal.liao_activity_Swith['a_ctivity_hunt'] = false;
364+
thisScript.rerun(next_scheme);
365+
return true;
375366
}
376-
367+
} else {
368+
console.log('狩猎战 不在时间段内');
369+
thisScript.superGlobal.liao_activity_Swith['a_ctivity_hunt'] = false;
377370
}
371+
378372
}
379373
// 阴门判断(其他开关为关时)
380374
if (thisScript.oper({

src/common/funcList/509_进入式神录.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,18 @@ export class Func509 implements IFuncOrigin {
7171
]
7272
},
7373
{
74-
desc: // 狩猎
74+
desc: [1280, 720,
7575
[
76-
1280, 720,
77-
[
78-
[left, 47, 31, 0xd7c5a2],
79-
[left, 108, 24, 0xd7c5a2],
80-
[left, 181, 23, 0xd6c5a4],
81-
[center, 930, 659, 0xe3d8d8],
82-
[center, 940, 679, 0x493a38],
83-
[right, 984, 621, 0xebb552],
84-
]
85-
],
76+
[right, 1034, 658, 0x534742],
77+
[right, 1046, 649, 0xfcecec],
78+
[right, 1061, 649, 0xfff0ef],
79+
[right, 1047, 667, 0xfff5f5],
80+
[right, 1062, 667, 0xfff4f4],
81+
[right, 1050, 676, 0x765e45],
82+
]
83+
],
8684
oper: [
87-
[center, 1280, 720, 922, 628, 993, 681, 1200] // 点击_式神
85+
[center, 1280, 720, 1034, 638, 1066, 669, 1000],
8886
]
8987
},
9088
{

0 commit comments

Comments
 (0)