From 902e6c45a3aa2ee898f10c916139505870eaa7b6 Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Tue, 28 Nov 2023 12:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96lib.skill.rehuashen.createAud?=
 =?UTF-8?q?io=E7=B4=A2=E5=BC=95=E9=85=8D=E9=9F=B3audioname2=E7=9A=84?=
 =?UTF-8?q?=E5=86=99=E6=B3=95=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=8F=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9derivation=E7=9A=84audioname2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/refresh.js | 46 ++++++++++++++++++++++++++------------------
 character/shenhua.js |  5 +----
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/character/refresh.js b/character/refresh.js
index ff17ed721..e18acc095 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -10548,10 +10548,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.popup(link);
 						player.syncStorage('rehuashen');
 						player.updateMarks('rehuashen');
-						var skills=game.expandSkills([link]);
-						skills.forEach(skill=>{
-							lib.skill.rehuashen.createAudio(event.card,skill,'re_zuoci');
-						});
+						lib.skill.rehuashen.createAudio(event.card,link,'re_zuoci');
 					}
 				},
 				init:function(player,skill){
@@ -10667,22 +10664,33 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 					return node;
 				},
-				createAudio:(character,skill,name)=>{
-					var info=lib.skill[skill];
-					if(!info) return;
-					if(!info.audioname2) info.audioname2={};
-					if(info.audioname&&info.audioname.includes(character)){
-						if(info.audio&&typeof info.audio=='string') skill=info.audio;
-						if(!lib.skill[skill+'_'+character]) lib.skill[skill+'_'+character]={audio:2};
-						info.audioname2[name]=(skill+'_'+character);
-					}
-					else if(info.audioname2[character]){
-						info.audioname2[name]=info.audioname2[character];
-					}
-					else{
-						if(info.audio&&typeof info.audio=='string') skill=info.audio;
-						info.audioname2[name]=skill;
+				createAudio:(character,skillx,name)=>{
+					var skills=game.expandSkills([skillx]);
+					skills=skills.filter(skill=>get.info(skill));
+					if(!skills.length) return;
+					var skillss=skills.filter(skill=>get.info(skill).derivation);
+					if(skillss.length){
+						skillss.forEach(skill=>{
+							var derivationSkill=get.info(skill).derivation;
+							skills[Array.isArray(derivationSkill)?'addArray':'add'](derivationSkill);
+						});
 					}
+					skills.forEach(skill=>{
+						var info=lib.skill[skill];
+						if(!info.audioname2) info.audioname2={};
+						if(info.audioname&&info.audioname.includes(character)){
+							if(info.audio&&typeof info.audio=='string') skill=info.audio;
+							if(!lib.skill[skill+'_'+character]) lib.skill[skill+'_'+character]={audio:2};
+							info.audioname2[name]=(skill+'_'+character);
+						}
+						else if(info.audioname2[character]){
+							info.audioname2[name]=info.audioname2[character];
+						}
+						else{
+							if(info.audio&&typeof info.audio=='string') skill=info.audio;
+							info.audioname2[name]=skill;
+						}
+					});
 				},
 				mark:true,
 				intro:{
diff --git a/character/shenhua.js b/character/shenhua.js
index 098f8a4d3..f632b0133 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -4459,10 +4459,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							player.popup(skill);
 							player.syncStorage('huashen');
 							player.updateMarks('huashen');
-							var skills=game.expandSkills([skill]);
-							skills.forEach(skillx=>{
-								lib.skill.rehuashen.createAudio(character,skillx,'zuoci');
-							});
+							lib.skill.rehuashen.createAudio(character,skill,'zuoci');
 						}
 					}
 				}