diff --git a/game/game.js b/game/game.js index bc4a87764..542d2eff8 100644 --- a/game/game.js +++ b/game/game.js @@ -37694,24 +37694,24 @@ new Promise(resolve=>{ else if(player.tempname){ const name=player.tempname.find(i=>info.audioname2[i]); if(name) audioInfo=info.audioname2[name]; - } - else if(player.name&&get.character(player.name)&&get.character(player.name)[4]&&get.character(player.name)[4].some(tag=>tag.startsWith('tempname:'))){ - const list=get.character(player.name)[4].find(tag=>tag.startsWith('tempname:')); - list=list.split(':').slice(1); - const name=list.find(i=>info.audioname2[i]); - if(name) audioInfo=info.audioname2[name]; - } - else if(player.name1&&get.character(player.name1)&&get.character(player.name1)[4]&&get.character(player.name1)[4].some(tag=>tag.startsWith('tempname:'))){ - const list=get.character(player.name1)[4].find(tag=>tag.startsWith('tempname:')); - list=list.split(':').slice(1); - const name=list.find(i=>info.audioname2[i]); - if(name) audioInfo=info.audioname2[name]; - } - else if(player.name2&&get.character(player.name2)&&get.character(player.name2)[4]&&get.character(player.name2)[4].some(tag=>tag.startsWith('tempname:'))){ - const list=get.character(player.name2)[4].find(tag=>tag.startsWith('tempname:')); - list=list.split(':').slice(1); - const name=list.find(i=>info.audioname2[i]); - if(name) audioInfo=info.audioname2[name]; + else if(player.name&&get.character(player.name)&&get.character(player.name)[4]&&get.character(player.name)[4].some(tag=>tag.startsWith('tempname:'))){ + const list=get.character(player.name)[4].find(tag=>tag.startsWith('tempname:')); + list=list.split(':').slice(1); + const name=list.find(i=>info.audioname2[i]); + if(name) audioInfo=info.audioname2[name]; + else if(player.name1&&get.character(player.name1)&&get.character(player.name1)[4]&&get.character(player.name1)[4].some(tag=>tag.startsWith('tempname:'))){ + const list=get.character(player.name1)[4].find(tag=>tag.startsWith('tempname:')); + list=list.split(':').slice(1); + const name=list.find(i=>info.audioname2[i]); + if(name) audioInfo=info.audioname2[name]; + else if(player.name2&&get.character(player.name2)&&get.character(player.name2)[4]&&get.character(player.name2)[4].some(tag=>tag.startsWith('tempname:'))){ + const list=get.character(player.name2)[4].find(tag=>tag.startsWith('tempname:')); + list=list.split(':').slice(1); + const name=list.find(i=>info.audioname2[i]); + if(name) audioInfo=info.audioname2[name]; + } + } + } } } if(typeof audioInfo=='function') audioInfo=audioInfo(player); @@ -37760,24 +37760,24 @@ new Promise(resolve=>{ else if(player.tempname){ const name=player.tempname.find(i=>audioname.includes(i)); if(name) _audioname=`_${name}`; - } - else if(player.name&&get.character(player.name)&&get.character(player.name)[4]&&get.character(player.name)[4].some(tag=>tag.startsWith('tempname:'))){ - const list=get.character(player.name)[4].find(tag=>tag.startsWith('tempname:')); - list=list.split(':').slice(1); - const name=list.find(i=>audioname.includes(i)); - if(name) _audioname=`_${name}`; - } - else if(player.name1&&get.character(player.name1)&&get.character(player.name1)[4]&&get.character(player.name1)[4].some(tag=>tag.startsWith('tempname:'))){ - const list=get.character(player.name1)[4].find(tag=>tag.startsWith('tempname:')); - list=list.split(':').slice(1); - const name=list.find(i=>audioname.includes(i)); - if(name) _audioname=`_${name}`; - } - else if(player.name2&&get.character(player.name2)&&get.character(player.name2)[4]&&get.character(player.name2)[4].some(tag=>tag.startsWith('tempname:'))){ - const list=get.character(player.name2)[4].find(tag=>tag.startsWith('tempname:')); - list=list.split(':').slice(1); - const name=list.find(i=>audioname.includes(i)); - if(name) _audioname=`_${name}`; + else if(player.name&&get.character(player.name)&&get.character(player.name)[4]&&get.character(player.name)[4].some(tag=>tag.startsWith('tempname:'))){ + const list=get.character(player.name)[4].find(tag=>tag.startsWith('tempname:')); + list=list.split(':').slice(1); + const name=list.find(i=>audioname.includes(i)); + if(name) _audioname=`_${name}`; + else if(player.name1&&get.character(player.name1)&&get.character(player.name1)[4]&&get.character(player.name1)[4].some(tag=>tag.startsWith('tempname:'))){ + const list=get.character(player.name1)[4].find(tag=>tag.startsWith('tempname:')); + list=list.split(':').slice(1); + const name=list.find(i=>audioname.includes(i)); + if(name) _audioname=`_${name}`; + else if(player.name2&&get.character(player.name2)&&get.character(player.name2)[4]&&get.character(player.name2)[4].some(tag=>tag.startsWith('tempname:'))){ + const list=get.character(player.name2)[4].find(tag=>tag.startsWith('tempname:')); + list=list.split(':').slice(1); + const name=list.find(i=>audioname.includes(i)); + if(name) _audioname=`_${name}`; + } + } + } } list=list.slice(1);//[路径,number/true,格式]