Merge pull request #823 from universe-st/PR-Branch

新增game.doAsyncInOrder方法，并修改孙休“兴学”为范例

character/yijiang.js

@@ -8067,60 +8067,41 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				trigger:{player:'phaseJieshuBegin'},
 				direct:true,
-				content:function(){
-					'step 0'
+				async content(event,trigger,player){
 					var num=player.hp;
 					if(!player.hasSkill('yanzhu')){
 						num=player.maxHp;
 					}
-					player.chooseTarget([1,num],get.prompt2('xingxue')).set('ai',function(target){
+					const {result:{targets,bool}}=
+					await player.chooseTarget([1,num],get.prompt2('xingxue')).set('ai',function(target){
 						var att=get.attitude(_status.event.player,target);
 						if(target.countCards('he')) return att;
 						return att/10;
 					});
-					'step 1'
-					if(result.bool){
-						player.logSkill('xingxue',result.targets);
-						event.targets=result.targets;
-						event.targets.sort(lib.sort.seat);
+					if(bool){
+						player.logSkill('xingxue',targets);
+						const chooseToPutCard = async function(target){
+							await target.draw();
+							if(target.countCards('he')){
+								const {result:{cards,bool}} = 
+								await target.chooseCard('选择一张牌置于牌堆顶','he',true);
+								if(bool){
+									await target.lose(cards,ui.cardPile,'insert');
+								}
+								game.broadcastAll(function(player){
+									var cardx=ui.create.card();
+									cardx.classList.add('infohidden');
+									cardx.classList.add('infoflip');
+									player.$throw(cardx,1000,'nobroadcast');
+								},target);
+								if(player == game.me){
+									game.delay(0.5);
+								}
+							}
+						};
+						await game.doAsyncInOrder(targets,chooseToPutCard);
 					}
-					else{
-						event.finish();
-					}
-					'step 2'
-					if(event.targets.length){
-						var target=event.targets.shift();
-						target.draw();
-						event.current=target;
-					}
-					else{
-						event.finish();
-					}
-					'step 3'
-					if(event.current&&event.current.countCards('he')){
-						event.current.chooseCard('选择一张牌置于牌堆顶','he',true);
-					}
-					else{
-						event.goto(2);
-					}
-					'step 4'
-					if(result&&result.cards){
-						event.card=result.cards[0];
-						event.current.lose(result.cards,ui.cardPile,'insert');
-						game.broadcastAll(function(player){
-							var cardx=ui.create.card();
-							cardx.classList.add('infohidden');
-							cardx.classList.add('infoflip');
-							player.$throw(cardx,1000,'nobroadcast');
-						},event.current);
-					}
-					else{
-						event.card=null;
-					}
-					'step 5'
-					if(event.current==game.me) game.delay(0.5);
-					event.goto(2);
-				}
+				},
 			},
 			yanzhu:{
 				audio:2,

noname/game/index.js

@@ -8434,6 +8434,21 @@ export class Game extends Uninstantable {
 			return true;
 		});
 	}
+	/**
+	 * 此方法用于对所有targets按顺序执行一个async函数。
+	 * 
+	 * @param { Player[] } targets 需要执行async方法的目标
+	 * @param { AsyncFunction } asyncFunc 需要执行的async方法
+	 * @param { sort } function 排序器，默认为lib.sort.seat
+	 */
+	static async doAsyncInOrder(targets,asyncFunc,sort){
+		if(!sort)sort = lib.sort.seat;
+		let sortedTargets = targets.sort(sort);
+		for(let i=0;i<sortedTargets.length;i++){
+			let target = sortedTargets[i];
+			await Promise.resolve(asyncFunc(target,i));
+		}
+	}
 }
 
 export const game = Game;