Skip to content

Commit fcb7ad0

Browse files
horsemihorsemi
committed
fix: 修复998 寄养结界适配，优化508 逢魔首领逻辑
1 parent a3ddd5a commit fcb7ad0

File tree

5 files changed

+57
-87
lines changed

5 files changed

+57
-87
lines changed

‎src/common/funcList/508_逢魔首领.ts‎

Lines changed: 25 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -257,56 +257,6 @@ export class Func508 implements IFuncOrigin {
257257
});
258258

259259
sleep(150);
260-
261-
if (thisConf && thisConf['switch_ji_enabled']) {
262-
if (
263-
thisScript.oper({
264-
id: 508,
265-
name: '检测_是否有寻找 逢魔·极 按钮',
266-
operator: [thisOperator[9]],
267-
})
268-
) {
269-
if (!thisScript.global.fm_boss_btn_click_cnt) {
270-
thisScript.global.fm_boss_btn_click_cnt = 0;
271-
}
272-
if (++thisScript.global.fm_boss_btn_click_cnt >= (parseInt(thisConf.times_for_search_boss as string) || 20)) {
273-
thisScript.global.fm_kiss_boss_flag = true;
274-
thisScript.myToast(
275-
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔·极首领按钮未成功进入首领挑战，标记挑战成功a`
276-
);
277-
} else {
278-
thisScript.myToast(
279-
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔·极首领按钮a`
280-
);
281-
}
282-
return true;
283-
}
284-
}
285-
286-
if (
287-
thisScript.oper({
288-
id: 508,
289-
name: '检测_点击寻找首领按钮',
290-
operator: [{
291-
oper: thisOperator[0].oper,
292-
}],
293-
})
294-
) {
295-
if (!thisScript.global.fm_boss_btn_click_cnt) {
296-
thisScript.global.fm_boss_btn_click_cnt = 0;
297-
}
298-
if (++thisScript.global.fm_boss_btn_click_cnt >= (parseInt(thisConf.times_for_search_boss as string) || 20)) {
299-
thisScript.global.fm_kiss_boss_flag = true;
300-
thisScript.myToast(
301-
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔首领按钮未成功进入首领挑战，标记挑战成功a`
302-
);
303-
} else {
304-
thisScript.myToast(
305-
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔首领按钮a`
306-
);
307-
}
308-
return true;
309-
}
310260
} else {
311261
sleep(150);
312262
if (!thisScript.global.checked_yard_count) {
@@ -402,32 +352,33 @@ export class Func508 implements IFuncOrigin {
402352
}
403353
return true;
404354
}
405-
}
406-
407-
if (
408-
thisScript.oper({
409-
id: 508,
410-
name: '检测_点击寻找首领按钮',
411-
operator: [{
412-
oper: thisOperator[0].oper,
413-
}],
414-
})
415-
) {
416-
if (!thisScript.global.fm_boss_btn_click_cnt) {
417-
thisScript.global.fm_boss_btn_click_cnt = 0;
418-
}
419-
if (++thisScript.global.fm_boss_btn_click_cnt >= (parseInt(thisConf.times_for_search_boss as string) || 20)) {
420-
thisScript.global.fm_kiss_boss_flag = true;
421-
thisScript.myToast(
422-
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔首领按钮未成功进入首领挑战，标记挑战成功e`
423-
);
424-
} else {
425-
thisScript.myToast(
426-
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔首领按钮e`
427-
);
355+
} else {
356+
if (
357+
thisScript.oper({
358+
id: 508,
359+
name: '检测_点击寻找首领按钮',
360+
operator: [{
361+
oper: thisOperator[0].oper,
362+
}],
363+
})
364+
) {
365+
if (!thisScript.global.fm_boss_btn_click_cnt) {
366+
thisScript.global.fm_boss_btn_click_cnt = 0;
367+
}
368+
if (++thisScript.global.fm_boss_btn_click_cnt >= (parseInt(thisConf.times_for_search_boss as string) || 20)) {
369+
thisScript.global.fm_kiss_boss_flag = true;
370+
thisScript.myToast(
371+
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔首领按钮未成功进入首领挑战，标记挑战成功e`
372+
);
373+
} else {
374+
thisScript.myToast(
375+
`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔首领按钮e`
376+
);
377+
}
378+
return true;
428379
}
429-
return true;
430380
}
381+
431382
}
432383
}
433384

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,22 @@ export class Func998 implements IFuncOrigin {
212212
{
213213
// 10 判断_是否为己方结界
214214
desc: [
215-
1280,
216-
720,
215+
1280, 720,
217216
[
218-
[center, 611, 300, 0x0c0804],
219-
[center, 913, 305, 0x0c0804],
220-
[left, 318, 305, 0x0c0804],
221-
[center, 613, 294, 0xe1cf6b],
222-
[left, 202, 462, 0x10100c],
223-
],
217+
[center, 326, 306, 0xe2cfc4],
218+
[left, 307, 336, 0xd9c1b3],
219+
[center, 602, 303, 0xe4cfc3],
220+
[center, 623, 303, 0xe4cec3],
221+
[center, 899, 303, 0xe4cfc3],
222+
[center, 920, 303, 0xe4cfc3],
223+
[center, 910, 296, 0xe0c065],
224+
[left, 614, 294, 0xe3c366],
225+
[left, 629, 293, 0xcaa454],
226+
[right, 595, 344, 0xb9833b],
227+
[center, 626, 437, 0x6f4d24],
228+
[left, 206, 461, 0x12100c],
229+
[left, 207, 514, 0x12100c],
230+
]
224231
],
225232
oper: [
226233
[center, 1280, 720, 582, 270, 638, 400, 600], // 点击 式神养成
@@ -554,6 +561,7 @@ export class Func998 implements IFuncOrigin {
554561
return true;
555562
} else {
556563
console.log('没有空位了');
564+
console.log('状态为：获取奖励');
557565
thisScript.global.jy_change_shikigami = 'get_reward';
558566
}
559567
}
@@ -641,8 +649,10 @@ export class Func998 implements IFuncOrigin {
641649
// 获取寄养奖励是获取奖励的最后一步，获取成功后则开始更换结界卡逻辑
642650
if (thisconf && thisconf.change_enchantment_switch) {
643651
thisScript.global.jy_change_shikigami = 'change_enchantment';
652+
console.log('状态为：更换结界卡');
644653
} else {
645654
thisScript.global.jy_change_shikigami = 'jy_flag';
655+
console.log('状态为：开始寄养');
646656
}
647657

648658
return true;

‎src/common/funcList/999_式神育成.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export class Func999 implements IFuncOrigin {
9494
operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
9595
if (
9696
thisScript.oper({
97+
id: 999,
9798
name: '进入式神寄养结界',
9899
operator: [
99100
thisOperator[0],
@@ -108,27 +109,30 @@ export class Func999 implements IFuncOrigin {
108109
return true;
109110
}
110111
// 点击10都点不中就直接跳过不点了
111-
if (thisScript.global.checked_yard_count > 10) {
112-
thisScript.global.checked_yard_count = 0;
112+
if (thisScript.global.checked_yard_count_999 > 10) {
113+
thisScript.global.checked_yard_count_999 = 0;
113114
return thisScript.oper({
115+
id: 999,
114116
name: '点击阴阳寮',
115117
operator: [
116118
{
119+
desc: thisOperator[3].desc,
117120
oper: thisOperator[3].oper,
118121
},
119122
],
120123
});
121124
} else {
122125
sleep(1500);
123-
if (!thisScript.global.checked_yard_count) {
124-
thisScript.global.checked_yard_count = 1;
126+
if (!thisScript.global.checked_yard_count_999) {
127+
thisScript.global.checked_yard_count_999 = 1;
125128
} else {
126-
thisScript.global.checked_yard_count += 1;
129+
thisScript.global.checked_yard_count_999 += 1;
127130
}
128131
}
129132

130133
if (
131134
thisScript.oper({
135+
id: 999,
132136
name: '检测_阴阳寮主页',
133137
operator: [
134138
{

‎src/common/version.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,9 @@ export const versionList = [{
13681368
}, {
13691369
version: '20250819_01',
13701370
desc: 'fix: 增加999 点击寮体力，金币容错机制'
1371+
}, {
1372+
version: '20250820_01',
1373+
desc: 'fix: 修复998 寄养结界适配，优化508 逢魔首领逻辑'
13711374
}];
13721375

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

‎src/system/GlobalStore/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export type globalRootType = {
22
currentNotifyDate: null | Date,
33
app_is_open_flag: boolean,
44
checked_yard_count: number,
5+
checked_yard_count_999: number,
56
currentRunTimes: Record<string, number>,
67
running: boolean,
78
define_run_time: number,
@@ -122,6 +123,7 @@ export const globalRoot: globalRootType = {
122123
currentNotifyDate: null,
123124
app_is_open_flag: true,
124125
checked_yard_count: 0,
126+
checked_yard_count_999: 0,
125127
currentRunTimes: {},
126128
running: undefined,
127129
define_run_time: 0,

0 commit comments

Comments
 (0)