适配寮活动，修复邮箱签到结界卡，寮宴会优化，寮商店修复

Author: zzliux

src/common/funcList/1101_寮商店.ts

@@ -352,28 +352,19 @@ export class Func1101 implements IFuncOrigin {
 				name: '寮商店_功勋商店',
 				operator: [{ desc: thisOperator[4].desc }, thisOperator[20]]
 			})) {
-				if (thisScript.oper({
-					id: 1101,
-					name: '寮商店_购买',
-					operator: [thisOperator[15], thisOperator[16], thisOperator[17], thisOperator[18]]
-				})) {
-					curCnt -= 0.5;
-					thisScript.keepScreen(false);
-					continue;
-				}
 				const result = thisScript.findText('.+', 0, thisOperator[14].oper[2], '包含');
 				if (result.length === 0) {
 					console.log('未识别到任何字体');
 					return true;
 				} else {
 					for (const r of thisScript.global.MT_liaoShopList) {
-						const findInvName = thisScript.findTextByOcrResult(r, result, '包含');
-						if (findInvName.length) {
+						const findList = thisScript.findTextByOcrResult(r, result, '包含');
+						if (findList.length) {
 							const toClickRegion = [
-								findInvName[0].points[0].x,
-								findInvName[0].points[0].y,
-								findInvName[0].points[0].x + 20,
-								findInvName[0].points[0].y + 20,
+								findList[0].points[0].x,
+								findList[0].points[0].y,
+								findList[0].points[0].x + 20,
+								findList[0].points[0].y + 20,
 								1000,
 							]
 							thisScript.regionClick([toClickRegion]);
@@ -384,10 +375,20 @@ export class Func1101 implements IFuncOrigin {
 								thisScript.global.MT_liaoShop = 'back';
 								break outer;
 							}
+							thisScript.keepScreen(false);
 							break;
 						}
 					}
 				}
+				if (thisScript.oper({
+					id: 1101,
+					name: '寮商店_购买',
+					operator: [thisOperator[15], thisOperator[16], thisOperator[17], thisOperator[18]]
+				})) {
+					curCnt -= 0.5;
+					thisScript.keepScreen(false);
+					continue;
+				}
 				curCnt++;
 				if (thisScript.oper({
 					name: '寮商店_购买',

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

@@ -424,13 +424,17 @@ export class Func500 implements IFuncOrigin {
 		}
 		// 道馆活动
 		if (thisScript.superGlobal.liao_activity_Swith['a_ctivity_dojo'] || thisScript.superGlobal.liao_activity_Swith['a_ctivity_dojo_again']) {
-			if (thisconf.admin) {
-				thisScript.superGlobal.liao_activity_Swith['a_ctivity_dojo'] = false;
-				thisScript.superGlobal.liao_activity_Swith['a_ctivity_dojo_again'] = false;
-				thisScript.superGlobal.liao_activity_Swith['a_ctivity_narrow'] = false;
-				const next_scheme = thisconf.a_ctivity_dojo_select;
-				thisScript.rerun(next_scheme);
-				return true;
+			if ((nowDay >= 1 && nowDay <= 4) ||
+				((nowDay === 5 || nowDay === 6 || nowDay === 0) && !thisconf.a_ctivity_narrow)
+			) {
+				if (thisconf.admin) {
+					thisScript.superGlobal.liao_activity_Swith['a_ctivity_dojo'] = false;
+					thisScript.superGlobal.liao_activity_Swith['a_ctivity_dojo_again'] = false;
+					thisScript.superGlobal.liao_activity_Swith['a_ctivity_narrow'] = false;
+					const next_scheme = thisconf.a_ctivity_dojo_select;
+					thisScript.rerun(next_scheme);
+					return true;
+				}
 			}
 			if (thisScript.oper({
 				name: '检测_寮界面道馆是否已开启',

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

@@ -63,7 +63,8 @@ export class Func518 implements IFuncOrigin {
 				]
 			],
 			oper: [
-				[center, 1280, 720, 173, 614, 307, 637, 1000], //  一键已读
+				[center, 1280, 720, 200, 136, 435, 198, 1000], //  点击第一封邮件
+				[center, 1280, 720, 192, 613, 300, 635, 1000], //  一键已读
 				[right, 1280, 720, 1159, 94, 1199, 131, 1200], //  点击关闭
 			],
 		},
@@ -692,6 +693,20 @@ export class Func518 implements IFuncOrigin {
 					[right, 1160, 681, 0x831f1f],
 				]
 			],
+		}, { // 48 结界卡邮件提醒
+			desc: [1280, 720,
+				[
+					[left, 206, 185, 0xf9dec0],
+					[left, 216, 185, 0xeaccac],
+					[left, 202, 165, 0xf28957],
+					[left, 178, 151, 0xf4eae0],
+					[left, 200, 149, 0xf7ede2],
+				]
+			],
+			oper: [
+				[center, 1280, 720, 176, 138, 454, 200, 1000],
+				[center, 1280, 720, 1008, 596, 1134, 630, 1000],
+			]
 		}
 	];
 	operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
@@ -783,6 +798,7 @@ export class Func518 implements IFuncOrigin {
 				name: '检测_领取奖励弹窗',
 				operator: [
 					thisOperator[43],
+					thisOperator[48],
 					thisOperator[5],
 					thisOperator[7],
 					thisOperator[8],

src/common/funcList/522_寮宴会.ts

@@ -130,7 +130,6 @@ export class Func522 implements IFuncOrigin {
 		oper: [
 			[center, 1280, 720, 707, 416, 813, 438, 1000],
 			[center, 1280, 720, 1083, 422, 1117, 456, 1000],
-			[center, 1280, 720, 1013, 294, 1035, 312, 1000],
 		]
 	}, { // 8 点击阴阳寮
 		desc: '页面是否为庭院_菜单已展开_另一种图标_御祝图标_只支持默认庭院皮肤与默认装饰',
@@ -181,7 +180,7 @@ export class Func522 implements IFuncOrigin {
 			if (thisconfig.admin) {
 				if (thisScript.oper({
 					name: '宴会__寮管理开启',
-					operator: [thisOperator[4]],
+					operator: [thisOperator[4], thisOperator[9]],
 				})) {
 					return true;
 				}
@@ -203,7 +202,7 @@ export class Func522 implements IFuncOrigin {
 			}
 			if (thisScript.oper({
 				name: '进入寮神社',
-				operator: [thisOperator[8], thisOperator[9]]
+				operator: [thisOperator[8]]
 			})) {
 				return true;
 			}