Update skill.js

补丁

Author: yx-lingmeng

character/offline/skill.js

@@ -448,7 +448,7 @@ const skills = {
 					function createCustom(suit, count) {
 						return function (itemContainer) {
 							function formatStr(str) {
-								return str.replace(/[♥︎♦︎]/g, '<span style="color: red; ">$&</span>');
+								return str.replace(/(?:♥︎|♦︎)/g, '<span style="color: red; ">$&</span>');
 							}
 							let div = ui.create.div(itemContainer);
 							if (count) {
@@ -548,7 +548,9 @@ const skills = {
 					resolve(result);
 				});
 				next = promise;
-			} else next = Promise.resolve(ai());
+			} else {
+				next = Promise.resolve(ai());
+			}
 			let result1 = await next;
 			if (!result1.bool) {
 				return;
@@ -661,30 +663,41 @@ const skills = {
 			if (humans.length) {
 				await Promise.all(
 					humans.map((current, index) => {
-						return new Promise(async (resolve, reject) => {
-							if (current.isOnline()) {
-								current.send(send, current, player);
-								current.wait((result, player) => {
-									solve(result, player);
-									resolve();
-								});
-							} else if (current == game.me) {
-								const next = lib.skill.yjzhuni.chooseTarget(current, player);
-								const solver = (result, player) => {
-									solve(result, player);
-									resolve();
-								};
-								if (_status.connectMode) {
-									game.me.wait(solver);
-								}
-								const result = await next.forResult();
-								if (_status.connectMode) {
-									game.me.unwait(result, current);
-								} else {
-									solver(result, current);
+						return (async () => {
+							try {
+								if (current.isOnline()) {
+									current.send(send, current, player);
+									await new Promise((resolve) => {
+										current.wait((result, player) => {
+											solve(result, player);
+											resolve();
+										});
+									});
+								} else if (current === game.me) {
+									const next = lib.skill.yjzhuni.chooseTarget(current, player);
+									const solver = (result, player) => {
+										solve(result, player);
+									};
+
+									if (_status.connectMode) {
+										await new Promise((resolve) => {
+											game.me.wait((...args) => {
+												solver(...args);
+												resolve();
+											});
+										});
+									}
+
+									const result = await next.forResult();
+									if (!_status.connectMode) {
+										solver(result, current);
+									}
 								}
+							} catch (err) {
+								console.error("Error processing human:", err);
+								throw err;
 							}
-						});
+						})();
 					})
 				);
 			}
@@ -697,7 +710,9 @@ const skills = {
 			}
 			//清除读条
 			delete event._global_waiting;
-			for (var i of targets) i.hideTimer();
+			for (var i of targets) {
+				i.hideTimer();
+			}
 			//统计票数
 			const ticketsMap = new Map();
 			results.forEach(data => {