Merge pull request #503 from universe-st/PR-Branch
[BUGFIX]修复上个属性配音相关PR报错问题。
This commit is contained in:
commit
81b47ffe11
13
game/game.js
13
game/game.js
|
@ -35458,13 +35458,14 @@
|
|||
if(!lib.config.background_audio||get.type(card)=='equip'&&!lib.config.equip_audio) return;
|
||||
var nature=get.natureList(card)[0];
|
||||
if(lib.natureAudio[card.name]){
|
||||
let shaAudio = lib.natureAudio.sha[nature];
|
||||
if(shaAudio === 'default'){
|
||||
let useAudio = lib.natureAudio[card.name][nature];
|
||||
if(useAudio === 'default'){
|
||||
game.playAudio('card',sex,`${card.name}_${nature}`);
|
||||
}else if(shaAudio[sex]){
|
||||
game.playAudio(shaAudio[sex]);
|
||||
return;
|
||||
}else if(useAudio && useAudio[sex]){
|
||||
game.playAudio(useAudio[sex]);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
const audio=lib.card[card.name].audio;
|
||||
if(typeof audio=='string'){
|
||||
|
@ -59278,7 +59279,7 @@
|
|||
if(node._nointro) return;
|
||||
if(typeof node._customintro=='function'){
|
||||
if(node._customintro(uiintro,evt)===false) return;
|
||||
lib.placePoppedDialog(uiintro,evt);
|
||||
if(evt)lib.placePoppedDialog(uiintro,evt);
|
||||
}
|
||||
else if(Array.isArray(node._customintro)){
|
||||
var caption=node._customintro[0];
|
||||
|
|
Loading…
Reference in New Issue