Merge pull request #104 from zzliux/hm_dev

fix: 适配新巅峰赛斗技界面，修复逢魔 极逻辑

Author: horsemi

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

@@ -401,7 +401,8 @@ export class Func506 implements IFuncOrigin {
 			return true;
 		}
 
-		if (thisConf && thisConf.huntBoss_switch === true) {
+		// 兼容没设置该按钮的逻辑 undefined 当true处理
+		if (thisConf && thisConf.huntBoss_switch !== false) {
 			if (thisScript.oper({
 				name: '检测_首领退治是否已开启',
 				operator: [{

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

@@ -278,6 +278,7 @@ export class Func508 implements IFuncOrigin {
 						],
 					}],
 				});
+				sleep(2000);
 
 				thisScript.oper({
 					name: '无法点击首领BOSS集结挑战，换一个首领_是否有寻找 逢魔·普通/极 按钮',
@@ -346,16 +347,26 @@ export class Func508 implements IFuncOrigin {
 					next_scheme_name: thisConf.next_scheme
 				});
 			} else {
+				let operatorIndex = thisConf && thisConf['switch_ji_enabled'] ? 9 : 0
+
+				// 多次寻找无果后放弃挑战逢魔·极，寻找普通逢魔
+				if (thisConf && thisConf['switch_ji_enabled'] && thisScript.global.fm_boss_btn_click_cnt >= (parseInt(thisConf.times_for_search_boss as string) || 20))  {
+					operatorIndex = 0;
+				}
+
+				// 尝试了多次寻找逢魔·极首领，放弃挑战逢魔·极，挑战普通逢魔，重试次数是原有的两倍
+				const reTryNum = thisConf && thisConf['switch_ji_enabled'] && operatorIndex === 0 ? 2 : 1
+
 				if (
 					thisScript.oper({
 						name: '检测_是否有寻找 逢魔·普通/极 按钮',
-						operator: [thisOperator[thisConf && thisConf['switch_ji_enabled'] ? 9 : 0]], //	检测 是否有开启 逢魔·极
+						operator: [thisOperator[operatorIndex]], //	检测 是否有开启 逢魔·极
 					})
 				) {
 					if (!thisScript.global.fm_boss_btn_click_cnt) {
 						thisScript.global.fm_boss_btn_click_cnt = 0;
 					}
-					if (++thisScript.global.fm_boss_btn_click_cnt >= (parseInt(thisConf.times_for_search_boss as string) || 20)) {
+					if (thisScript.global.fm_boss_btn_click_cnt++ >= (parseInt(thisConf.times_for_search_boss as string) * reTryNum || 20 * reTryNum)) {
 						thisScript.global.fm_kiss_boss_flag = true;
 						thisScript.myToast(
 							`第${thisScript.global.fm_boss_btn_click_cnt}次点击查找逢魔·普通/极首领按钮未成功进入首领挑战，标记挑战成功e`

src/common/multiDetectColors.ts

@@ -669,37 +669,39 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
 			[
 				[right, 1232, 617, 0xd2bb90],
 				[right, 1189, 627, 0x3b1e0d],
-				[right, 1190, 109, 0xd7ae7d],
-				[left, 38, 25, 0xf5e5a6],
-				[left, 223, 31, 0x593716],
-				[right, 714, 19, 0x8a4526],
+				[right, 714, 19, 0x6b3121],
 				[right, 743, 38, 0xecd79a],
+				[left, 36, 37, 0xf5e2a3],
+				[right, 1204, 66, 0xe3c298],
 			]
 		],
 	},
 	'巅峰斗技主界面_段位保护': {
 		desc: [1280, 720,
 			[
-				[right, 1232, 617, 0xbebba3],
-				[right, 1189, 627, 0x55565a],
-				[right, 1190, 109, 0xd7ae7d],
-				[left, 38, 25, 0xf5e5a6],
-				[left, 223, 31, 0x593716],
-				[right, 714, 19, 0x8a4526],
+				[right, 714, 19, 0x6b3121],
 				[right, 743, 38, 0xecd79a],
+				[left, 36, 37, 0xf5e2a3],
+				[right, 1204, 66, 0xe3c298],
+				[right, 1179, 594, 0x585a5d],
+				[right, 1203, 601, 0x565358],
+				[right, 1179, 624, 0xc6cbb9],
+				[left, 34, 36, 0xf7e9ab],
 			]
 		]
 	},
 	'巅峰斗技主界面_段位保护裂': {
 		desc: [1280, 720,
 			[
-				[right, 1232, 617, 0xaebcb3],
-				[right, 1190, 109, 0xd7ae7d],
-				[left, 38, 25, 0xf5e5a6],
-				[left, 223, 31, 0x593716],
-				[right, 1189, 624, 0x677d8f],
-				[right, 714, 19, 0x8a4526],
+				[right, 714, 19, 0x6b3121],
 				[right, 743, 38, 0xecd79a],
+				[left, 36, 37, 0xf5e2a3],
+				[right, 1204, 66, 0xe3c298],
+				[right, 1182, 574, 0xaeccda],
+				[right, 1162, 600, 0xaec8cd],
+				[right, 1179, 601, 0x657e90],
+				[right, 1180, 625, 0xb4cbcf],
+				[left, 34, 36, 0xf7e9ab],
 			]
 		],
 	},

src/common/version.ts

@@ -1446,6 +1446,9 @@ export const versionList = [{
 }, {
 	version: '20251225_01',
 	desc: 'fix: 506添加首领退治开关，适配会长副会长场景'
+}, {
+	version: '20251229_01',
+	desc: 'fix: 适配新巅峰赛斗技界面，修复逢魔 极逻辑'
 }];
 
 export default versionList[versionList.length - 1].version;