993启动:删除不重启选项,用战斗界面刷新计时来替代

503:删除id防止污染日志
509:修复悬浮窗遮挡
519:适配600和更新desc
600:优化判断,适配更多寮管理开启选项
601:修复悬浮窗遮挡
script:暂停的方案不会加入历史运行方案中了

Author: shui670

src/common/funcList/503_返回庭院界面.ts

@@ -238,7 +238,7 @@ export class Func503 implements IFuncOrigin {
 			desc: '45 招募界面',
 			type: 'switch',
 			default: true,
-		}, 	{
+		}, {
 			name: 'oper_46',
 			desc: '46 师徒界面',
 			type: 'switch',
@@ -846,7 +846,6 @@ export class Func503 implements IFuncOrigin {
 			}
 
 			if (thisScript.oper({
-				id: 503,
 				name: '庭院界面',
 				operator: [{
 					desc: thisOperator[12].desc
@@ -858,7 +857,9 @@ export class Func503 implements IFuncOrigin {
 					next_scheme = thisScript.superGlobal.next_scheme_name;
 					thisScript.superGlobal.next_scheme_name = null;
 				}
-				log('503_next_scheme:' + next_scheme);
+				if (next_scheme) {
+					log('id_503_next_scheme:' + next_scheme);
+				}
 				if (thisConf.scheme_switch_enabled) {
 					next_scheme = thisConf.next_scheme as string;
 				}

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

@@ -77,7 +77,6 @@ export class Func509 implements IFuncOrigin {
 					[center, 885, 661, 0xfff4f5],
 					[left, 259, 35, 0x2a2937],
 					[left, 175, 589, 0x684b2c],
-					[left, 33, 592, 0x8a6137],
 				]
 			],
 		oper: [

src/common/funcList/518_领取日常奖励.ts

@@ -567,30 +567,30 @@ export class Func518 implements IFuncOrigin {
 		})) {
 			return true;
 		}
-		if (thisScript.oper({
-			id: 518,
-			name: '邮件',
-			operator: [thisOperator[15], thisOperator[9], thisOperator[11]]
-		})) {
-			return true;
-		}
 		if (thisScript.global.function_Swith.email) {
 			if (thisScript.oper({
 				id: 518,
 				name: '邮件',
-				operator: [thisOperator[8]]
+				operator: [thisOperator[8], thisOperator[10]]
 			})) {
 				return true;
 			}
 			if (thisScript.oper({
 				id: 518,
 				name: '邮件',
-				operator: [thisOperator[17], thisOperator[10]]
+				operator: [thisOperator[17]]
 			})) {
 				thisScript.global.function_Swith.email = false;
 				return true;
 			}
 		}
+		if (thisScript.oper({
+			id: 518,
+			name: '邮件',
+			operator: [thisOperator[9], thisOperator[11], thisOperator[15]]
+		})) {
+			return true;
+		}
 		if (thisScript.global.function_Swith.agency) {
 			if (thisScript.oper({
 				id: 518,

src/common/funcList/519_寮管理攻打道馆.ts

@@ -60,7 +60,7 @@ export class Func519 implements IFuncOrigin {
 				[right, 1185, 658, 0x46a774],
 				[left, 88, 618, 0xc1b8aa],
 				[left, 189, 637, 0x777a83],
-				[left, 35, 52, 0xf0f5fb],
+				[left, 47, 37, 0xf5e2a3],
 			]
 		],
 		oper: [
@@ -145,8 +145,7 @@ export class Func519 implements IFuncOrigin {
 		],
 		oper: [
 			[center, 1280, 720, 260, 615, 311, 661, 1000],
-			[center, 1280, 720, 762, 414, 881, 457, 5000], // 建立道馆_确认
-			[center, 1280, 720, 1171, 106, 1224, 143, 1000], // 建立道馆_关闭详细
+			[center, 1280, 720, 762, 414, 881, 457, 1000], // 建立道馆_确认
 		]
 	}, { // 8 道馆中的0次机会
 		desc: [
@@ -171,6 +170,19 @@ export class Func519 implements IFuncOrigin {
 				[right, 689, 651, 0xeb8701],
 			]
 		],
+	}, { // 10 我的道馆界面
+		desc: [1280, 720,
+			[
+				[left, 113, 79, 0x563a2f],
+				[center, 340, 79, 0x51352b],
+				[right, 1195, 126, 0xe9d3ce],
+				[left, 152, 523, 0xf3b25e],
+				[left, 151, 605, 0xf3b25e],
+			]
+		],
+		oper: [
+			[center, 1280, 720, 1179, 110, 1216, 143, 1000],
+		]
 	}
 	];
 	operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
@@ -189,15 +201,14 @@ export class Func519 implements IFuncOrigin {
 			operator: [thisOperator[8], thisOperator[9]]
 		})) {
 			thisScript.myToast('两次机会用光');
-			thisScript.doPush(thisScript, { text: '两次机会用光', before() { thisScript.myToast('脚本即将停止，正在上传数据'); } });
-			thisScript.stop();
+			thisScript.rerun('返回庭院');
 			sleep(2000);
 			return true;
 		}
 		if (thisScript.oper({
 			id: 519,
 			name: '检测_寮活动神社',
-			operator: [thisOperator[0], thisOperator[7]]
+			operator: [thisOperator[0], thisOperator[7], thisOperator[10]]
 		})) {
 			return true;
 		}