From 47526cb8b9a8fd22ee45a0adb3b4634f2b5fae0a Mon Sep 17 00:00:00 2001
From: kuangshen04 <2832899707@qq.com>
Date: Wed, 25 Oct 2023 16:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8AtrySkillAudio=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=9C=B0=E5=9D=80=E9=83=A8=E5=88=86=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=88=90parseSkillAudio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/game.js | 64 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/game/game.js b/game/game.js
index c0c82c041..b7d698ffb 100644
--- a/game/game.js
+++ b/game/game.js
@@ -36827,24 +36827,25 @@
 			});
 			return audio;
 		},
-		trySkillAudio:function(skill,player,directaudio,nobroadcast/*,index*/){
-			if(!nobroadcast) game.broadcast(game.trySkillAudio,skill,player,directaudio,nobroadcast/*,index*/);
-			var info=get.info(skill);
-			if(!info) return;
-			if(!lib.config.background_speak) return;
-			if(info.direct&&!directaudio) return;
-			if(lib.skill.global.includes(skill)&&!lib.skill[skill].forceaudio) return;
+		/**
+		* 根据skill中的audio,audioname,audioname2和player来获取音频地址列表
+		* @param {String} skill  技能名 
+		* @param {Player|String} player  角色/角色名
+		* @returns {Array} 分析完的语音地址列表
+		*/
+		parseSkillAudio:function(skill,player){
 			if(typeof player=='string') player={name:player};
+			else player={};
 		
 			/**
-			 * 处理 audioInfo 外的参数
-			 * @param {String} skill  技能名 
-			 * @param {Object} player  角色
-			 * @param {Array} audioname  audioname历史
-			 * @param {Array} history  判断deadlock
-			 * @param {Number} fixedNum  [audioname, number] 中的第二个参数，用来限制语音数
-			 * @returns {Array} 音频地址数组（有需要playSkillAudio的为[skillname])
-			 */
+				* 处理 audioInfo 外的参数
+				* @param {String} skill  技能名 
+				* @param {Object} player  角色
+				* @param {Array} audioname  audioname历史
+				* @param {Array} history  判断deadlock
+				* @param {Number} fixedNum  [audioname, number] 中的第二个参数，用来限制语音数
+				* @returns {Array} 音频地址数组（有需要playSkillAudio的为[skillname])
+				*/
 			function getAudioList(skill,player,audioname,history,fixedNum){
 				let info=lib.skill[skill];
 				if(!info) return [];
@@ -36857,7 +36858,7 @@
 				history.push(skill);
 		
 				let audioInfo=info.audio;
-				if(info.audioname2&&player){
+				if(info.audioname2){
 					if(info.audioname2[player.name]) audioInfo=info.audioname2[player.name];
 					else if(info.audioname2[player.name1]) audioInfo=info.audioname2[player.name1];
 					else if(info.audioname2[player.name2]) audioInfo=info.audioname2[player.name2];
@@ -36875,15 +36876,15 @@
 			}
 		
 			/**
-			 * 分析 audioInfo 获取音频地址数组
-			 * @param {String} skill  技能名 
-			 * @param {any} audioInfo  info.audio
-			 * @param {Array} audioname  要判断的audioname
-			 * @param {Object} player  角色
-			 * @param {Array} history  判断deadlock
-			 * @param {Number} fixedNum  [audioname, number] 中的第二个参数，用来限制语音数
-			 * @returns {Array} 音频地址数组（有需要playSkillAudio的为[skillname])
-			 */
+				* 分析 audioInfo 获取音频地址数组
+				* @param {String} skill  技能名 
+				* @param {any} audioInfo  info.audio
+				* @param {Array} audioname  要判断的audioname
+				* @param {Object} player  角色
+				* @param {Array} history  判断deadlock
+				* @param {Number} fixedNum  [audioname, number] 中的第二个参数，用来限制语音数
+				* @returns {Array} 音频地址数组（有需要playSkillAudio的为[skillname])
+				*/
 			function parseAudio(skill,audioInfo,audioname,player,history,fixedNum){
 				if(Array.isArray(audioInfo)){
 					if(typeof audioInfo[0]=='string'&&typeof audioInfo[1]=='number'){// [audioname, number]
@@ -36919,8 +36920,17 @@
 				return audioList;
 			}
 		
-			let list=getAudioList(skill,player);
-			// console.log(skill,lib.skill[skill]&&lib.skill[skill].audio,list);
+			return getAudioList(skill,player);
+		},
+		trySkillAudio:function(skill,player,directaudio,nobroadcast/*,index*/){
+			if(!nobroadcast) game.broadcast(game.trySkillAudio,skill,player,directaudio,nobroadcast/*,index*/);
+			var info=get.info(skill);
+			if(!info) return;
+			if(!lib.config.background_speak) return;
+			if(info.direct&&!directaudio) return;
+			if(lib.skill.global.includes(skill)&&!lib.skill[skill].forceaudio) return;
+		
+			let list=game.parseSkillAudio(skill,player);
 			if(!list.length) return;
 			// if(index) index=index%list.length||list.length;
 			// let audio=list[index?index-1:Math.floor(Math.random()*list.length)];