Merge pull request #88 from zzliux/hm_dev

fix: 优化508 逢魔首领boss检索逻辑,修复518邮箱取色

Author: horsemi

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

@@ -88,7 +88,7 @@ export class Func508 implements IFuncOrigin {
 			],
 			oper: [
 				[right, 1280, 720, 1120, 550, 1160, 587, 800], //	点击挑战
-				[right, 1280, 720, 1141, 68, 1160, 89, 1000], //	点击关闭
+				[right, 1280, 720, 1141, 68, 1160, 89, 2000], //	点击关闭
 			],
 		},
 		{
@@ -270,6 +270,11 @@ export class Func508 implements IFuncOrigin {
 						],
 					}],
 				});
+
+				thisScript.oper({
+					name: '无法点击首领BOSS集结挑战，换一个首领_是否有寻找 逢魔·普通/极 按钮',
+					operator: [thisOperator[thisConf && thisConf['switch_ji_enabled'] ? 9 : 0]], //	检测 是否有开启 逢魔·极
+				})
 			} else {
 				sleep(1000);
 				if (!thisScript.global.checked_yard_count) {

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

@@ -54,29 +54,32 @@ export class Func518 implements IFuncOrigin {
 			//  5 检测_邮件弹窗_无全部领取
 			desc: [1280, 720,
 				[
-					[left, 125, 603, 0x625247],
-					[left, 134, 606, 0x4e3a2c],
-					[center, 577, 83, 0x6e4a36],
+					[center, 577, 83, 0x765139],
 					[center, 603, 25, 0x494264],
-					[right, 1220, 65, 0x353045],
-					[center, 575, 85, 0x704c36],
-					[center, 524, 655, 0xd5c8b7],
+					[center, 575, 85, 0x78533b],
+					[center, 497, 642, 0xd5c8b7],
+					[right, 1138, 66, 0x383347],
+					[left, 111, 602, 0x625247],
 				]
 			],
 			oper: [
-				[left, 1280, 720, 164, 612, 311, 641, 1200], //  点击全部已读
+				[left, 1280, 720, 186, 608, 303, 637, 1200], //  点击全部已读
 				[right, 1280, 720, 1159, 94, 1199, 131, 1200], //  点击关闭
 			],
 		},
 		{
 			//  6 检测_邮件弹窗_领取全部
 			desc: [1280, 720,
 				[
-					[center, 594, 77, 0x6b4834],
-					[left, 110, 65, 0x353045],
-					[left, 124, 626, 0xc59770],
-					[left, 54, 628, 0xebe4d5],
-					[right, 1160, 633, 0xd4c8bd],
+					[center, 577, 83, 0x765139],
+					[center, 603, 25, 0x494264],
+					[center, 575, 85, 0x78533b],
+					[center, 497, 642, 0xd5c8b7],
+					[right, 1138, 66, 0x383347],
+					[left, 47, 622, 0xeee8d4],
+					[left, 138, 617, 0xca9c73],
+					[left, 69, 667, 0xdfd2c2],
+					[left, 102, 673, 0xc59463],
 				]
 			],
 			oper: [

src/common/version.ts

@@ -1404,6 +1404,9 @@ export const versionList = [{
 }, {
 	version: '20251030_01',
 	desc: 'fix: 优化518 商店日常礼包，点击后等待1秒再点击确认；优化18 秘闻对话点击比色'
+}, {
+	version: '20251139_01',
+	desc: 'fix: 优化508 逢魔首领boss检索逻辑,修复518邮箱取色'
 }];
 
 export default versionList[versionList.length - 1].version;