YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #224 from Tipx-L/PR-Branch 

Ensure the compatibility.
This commit is contained in:
Spmario233 2023-08-22 12:53:14 +08:00 committed by GitHub
parent 279ff708f3 bcf5a6443c
commit f3b2cda7da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
game/game.js
View File

@ -9750,6 +9750,7 @@
} }
str=`if(event.step==${k}){event.finish();return;}`+str; str=`if(event.step==${k}){event.finish();return;}`+str;
} }
str=`"use strict";\n${str}`;
return (new Function('event','step','source','player','target','targets', return (new Function('event','step','source','player','target','targets',
'card','cards','skill','forced','num','trigger','result', 'card','cards','skill','forced','num','trigger','result',
'_status','lib','game','ui','get','ai',str)); '_status','lib','game','ui','get','ai',str));
@ -11179,7 +11180,10 @@
game.resume(); game.resume();
_status.imchoosing=false; _status.imchoosing=false;
if(roundmenu) ui.roundmenu.style.display=''; if(roundmenu) ui.roundmenu.style.display='';
if(ui.backgroundMusic) ui.backgroundMusic.play().catch(()=>void 0); if(ui.backgroundMusic){
var promise=ui.backgroundMusic.play();
if(promise) promise.catch(()=>void 0);
}
hitsound_audio.remove(); hitsound_audio.remove();
},1000); },1000);
}; };
@ -11368,7 +11372,10 @@
if(dialog){ if(dialog){
dialog.close(); dialog.close();
} }
if(ui.backgroundMusic) ui.backgroundMusic.play().catch(()=>void 0); if(ui.backgroundMusic){
var promise=ui.backgroundMusic.play();
if(promise) promise.catch(()=>void 0);
}
},event.videoId,event.time); },event.videoId,event.time);
var result=event.result||result; var result=event.result||result;
event.result=result; event.result=result;
@ -18271,7 +18278,7 @@
if(cardRecastable!='unchanged') return cardRecastable; if(cardRecastable!='unchanged') return cardRecastable;
if(get.position(card)!='h') return false; if(get.position(card)!='h') return false;
const info=get.info(card); const info=get.info(card);
return typeof info.chongzhu=='function'?info.chongzhu(event,player):info.chongzhu; return typeof info.chongzhu=='function'?info.chongzhu(_status.event,this):info.chongzhu;
}, },
//装备栏相关 //装备栏相关
//判断一名角色的某个区域是否被废除 //判断一名角色的某个区域是否被废除