Merge remote-tracking branch 'origin/master' into kk_dev

Author: shui670

src/common/funcList/002_退出结算.ts

@@ -312,6 +312,21 @@ export class Func002 implements IFuncOrigin {
 				[center, 78, 675, 0x36261a],
 			]
 		],
+		oper: [
+			[center, 1280, 720, 1112, 113, 1238, 595, 1000],
+		]
+	}, {
+		// 28 喂猫喂狗奖励
+		desc: [1280, 720,
+			[
+				[center, 327, 191, 0x5c4026],
+				[center, 499, 191, 0xa38051],
+				[right, 965, 188, 0x654323],
+				[right, 933, 212, 0x3e3935],
+				[right, 940, 272, 0xb0a1a0],
+			]
+		],
+
 		oper: [
 			[center, 1280, 720, 1112, 113, 1238, 595, 1000],
 		]
@@ -361,7 +376,7 @@ export class Func002 implements IFuncOrigin {
 				thisOperator[12], thisOperator[13], thisOperator[14], thisOperator[15],
 				thisOperator[16], thisOperator[17], thisOperator[22], thisOperator[18], // 22要放18前面
 				thisOperator[21], thisOperator[23], thisOperator[24], thisOperator[25],
-				thisOperator[26], thisOperator[27],
+				thisOperator[26], thisOperator[27], thisOperator[28],
 			]
 		});
 	}

src/common/funcList/006_御魂御灵挑战.ts

@@ -26,7 +26,7 @@ export class Func006 implements IFuncOrigin {
 		// 1 御灵
 		desc: [1280, 720,
 			[
-				[left, 37, 37, 0xc3cce1],
+				[left, 37, 37, 0xfff2bc],
 				[right, 1121, 47, 0xd7b389],
 				[right, 1230, 46, 0xd3ae83],
 				[right, 1106, 628, 0xe5d9c3],

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

@@ -233,6 +233,11 @@ export class Func503 implements IFuncOrigin {
 			desc: '44 宴会_料理筹备界面',
 			type: 'switch',
 			default: true,
+		}, {
+			name: 'oper_45',
+			desc: '45 招募界面',
+			type: 'switch',
+			default: true,
 		}]
 	}];
 	operator: IFuncOperatorOrigin[] = [{	// 0 探索地图
@@ -734,6 +739,22 @@ export class Func503 implements IFuncOrigin {
 		oper: [
 			[center, 1280, 720, 30, 41, 63, 71, 1000],
 		]
+	}, { // 45 寮招募界面
+		desc: [
+			1280, 720,
+			[
+				[center, 564, 33, 0xf7f2df],
+				[right, 595, 35, 0x23180f],
+				[right, 720, 39, 0x583716],
+				[center, 401, 619, 0xcaa97f],
+				[center, 405, 639, 0xbc9972],
+				[center, 417, 609, 0x4c403b],
+				[center, 424, 649, 0xe8e6e4]
+			]
+		],
+		oper: [
+			[center, 1280, 720, 29, 9, 65, 49, 1000],
+		]
 	}];
 	operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
 		const thisConf = thisScript.scheme.config['503'];