diff --git a/audio/skill/tiandu3.mp3 b/audio/skill/tiandu3.mp3
deleted file mode 100755
index d4b88e398..000000000
Binary files a/audio/skill/tiandu3.mp3 and /dev/null differ
diff --git a/audio/skill/tiandu4.mp3 b/audio/skill/tiandu4.mp3
deleted file mode 100755
index 95c32d486..000000000
Binary files a/audio/skill/tiandu4.mp3 and /dev/null differ
diff --git a/character/standard.js b/character/standard.js
index 4df267f3a..b8580e99b 100644
--- a/character/standard.js
+++ b/character/standard.js
@@ -331,7 +331,7 @@ character.standard={
}
},
tiandu:{
- audio:4,
+ audio:2,
trigger:{player:'judgeEnd'},
frequent:'check',
check:function(event){
diff --git a/extension/boss/extension.js b/extension/boss/extension.js
index 211c671ad..09319c668 100644
--- a/extension/boss/extension.js
+++ b/extension/boss/extension.js
@@ -82,6 +82,14 @@ play.boss={
lib.config.forbidai.push(i);
}
}
+ lib.characterIntro.boss_liedixuande=lib.characterIntro.liubei;
+ lib.characterIntro.boss_gongshenyueying=lib.characterIntro.huangyueying;
+ lib.characterIntro.boss_tianhoukongming=lib.characterIntro.shen_zhugeliang;
+ lib.characterIntro.boss_yuhuoshiyuan=lib.characterIntro.pangtong;
+ lib.characterIntro.boss_qiaokuijunyi=lib.characterIntro.zhanghe;
+ lib.characterIntro.boss_jiarenzidan=lib.characterIntro.caozhen;
+ lib.characterIntro.boss_duanyuzhongda=lib.characterIntro.simayi;
+ lib.characterIntro.boss_juechenmiaocai=lib.characterIntro.xiahouyuan;
}
else if(_status.mode!='jiange'){
for(var i in list2){
diff --git a/game/asset.js b/game/asset.js
index 6fda7c30f..3f59e728f 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -2170,8 +2170,6 @@ window.noname_asset_list=[
'audio/skill/tiandao.mp3',
'audio/skill/tiandu1.mp3',
'audio/skill/tiandu2.mp3',
- 'audio/skill/tiandu3.mp3',
- 'audio/skill/tiandu4.mp3',
'audio/skill/tianming1.mp3',
'audio/skill/tianming2.mp3',
'audio/skill/tianxiang1.mp3',
diff --git a/game/game.js b/game/game.js
index 48eba6fbe..a126347e8 100644
--- a/game/game.js
+++ b/game/game.js
@@ -17869,7 +17869,7 @@
}
}
},
- playSkillAudio:function(name){
+ playSkillAudio:function(name,index){
if(_status.video&&arguments[1]!='video') return;
if(_status.skillaudio.contains(name)) return;
game.addVideo('playSkillAudio',null,name);
@@ -17888,6 +17888,9 @@
audio.addEventListener('ended',function(){
this.remove();
});
+ if(typeof index!='number'){
+ index=Math.ceil(Math.random()*2);
+ }
audio._changed=1;
audio.onerror=function(){
switch(this._changed){
@@ -17897,12 +17900,12 @@
break;
}
case 2:{
- audio.src=lib.assetURL+str+name+Math.ceil(Math.random()*2)+'.mp3';
+ audio.src=lib.assetURL+str+name+index+'.mp3';
this._changed=3;
break;
}
case 3:{
- audio.src=lib.assetURL+str+name+Math.ceil(Math.random()*2)+'.ogg';
+ audio.src=lib.assetURL+str+name+index+'.ogg';
this._changed=4;
break;
}
@@ -25218,6 +25221,9 @@
}
if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0&&
mode!='mode_favourite'&&mode!='mode_banned'){
+ if(!connectMenu&&lib.config.show_charactercard){
+ ui.click.charactercard(this.link,this,true);
+ }
return;
}
ui.click.touchpop();
@@ -33711,7 +33717,7 @@
delete _status.currentlogv.logvtimeout;
}
},
- charactercard:function(name,sourcenode){
+ charactercard:function(name,sourcenode,noedit){
if(_status.dragged) return;
ui.window.classList.add('shortcutpaused');
ui.window.classList.add('systempaused');
@@ -33810,6 +33816,7 @@
changeskin();
}
var ban=ui.create.div('.menubutton.large.ban.character',uiintro,'禁用',function(e){
+ if(this.classList.contains('unselectable')) return;
ui.click.touchpop();
ui.click.intro.call(this,e);
_status.clicked=true;
@@ -33817,6 +33824,7 @@
ban.link=name;
ban._banning='offline';
ban.updateBanned=function(){
+ if(noedit) return;
if(lib.config[get.mode()+'_banned']&&lib.config[get.mode()+'_banned'].contains(name)){
ban.classList.add('active');
}
@@ -33826,6 +33834,7 @@
};
ban.updateBanned();
var fav=ui.create.div('.menubutton.large.fav',uiintro,'收藏',function(){
+ if(this.classList.contains('unselectable')) return;
this.classList.toggle('active');
if(this.classList.contains('active')){
lib.config.favouriteCharacter.add(name);
@@ -33835,7 +33844,11 @@
}
game.saveConfig('favouriteCharacter',lib.config.favouriteCharacter);
});
- if(lib.config.favouriteCharacter.contains(name)){
+ if(noedit){
+ fav.classList.add('unselectable');
+ ban.classList.add('unselectable');
+ }
+ else if(lib.config.favouriteCharacter.contains(name)){
fav.classList.add('active');
}
var intro=ui.create.div('.characterintro',get.characterIntro(name),uiintro);
@@ -33846,7 +33859,7 @@
if(lib.config.mousewheel){
skills.onmousewheel=ui.click.mousewheel;
}
- var clickSkill=function(){
+ var clickSkill=function(e){
var current=this.parentNode.querySelector('.active');
if(current){
current.classList.remove('active');
@@ -33863,13 +33876,63 @@
intro2.innerHTML+='
'+get.translation(derivation[i])+''+lib.translate[derivation[i]+'_info'];
}
}
- //trySkillAudio
+ if(lib.config.background_speak&&e!=='init'){
+ var audioname=this.link;
+ var audioinfo=info.audio;
+ var that=this;
+ var getIndex=function(i){
+ if(typeof that.audioindex!='number'){
+ that.audioindex=i;
+ }
+ that.audioindex++;
+ if(that.audioindex>i){
+ that.audioindex=1;
+ }
+ return that.audioindex;
+ };
+ if(typeof audioinfo=='string'){
+ if(audioinfo.indexOf('ext:')==0){
+ audioinfo=audioinfo.split(':');
+ if(audioinfo.length==3){
+ if(audioinfo[2]=='true'){
+ game.playAudio('..','extension',audioinfo[1],audioname);
+ }
+ else{
+ audioinfo[2]=parseInt(audioinfo[2]);
+ if(audioinfo[2]){
+ game.playAudio('..','extension',audioinfo[1],audioname+getIndex(audioinfo[2]));
+ }
+ }
+ }
+ return;
+ }
+ else{
+ audioname=audioinfo;
+ if(lib.skill[audioinfo]){
+ audioinfo=lib.skill[audioinfo].audio;
+ }
+ }
+ }
+ else if(Array.isArray(audioinfo)){
+ audioname=audioinfo[0];
+ audioinfo=audioinfo[1];
+ }
+ if(typeof audioinfo=='number'){
+ game.playAudio('skill',audioname+getIndex(audioinfo));
+ }
+ else if(audioinfo){
+ game.playAudio('skill',audioname);
+ }
+ else if(true&&info.audio!==false){
+ game.playSkillAudio(audioname,getIndex(2));
+ }
+ }
}
for(var i=0;i.ava>.avatars>div{
cursor: pointer;
}
diff --git a/mode/versus.js b/mode/versus.js
index 72bc09949..1fd95e873 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1,5 +1,36 @@
'use strict';
mode.versus={
+ init:function(){
+ if(get.config('versus_mode')=='jiange'){
+ lib.characterPack.mode_versus={
+ boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+ boss_gongshenyueying:['female','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+ boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+ boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+ boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+ boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+ boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+ boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+
+ boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+ boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojianjg'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+ boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+ boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+ boss_fudibian:['male','wei',4,['boss_jiguan','boss_didongjg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+ boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+ boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyujg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+ boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+ };
+ lib.characterIntro.boss_liedixuande=lib.characterIntro.liubei;
+ lib.characterIntro.boss_gongshenyueying=lib.characterIntro.huangyueying;
+ lib.characterIntro.boss_tianhoukongming=lib.characterIntro.shen_zhugeliang;
+ lib.characterIntro.boss_yuhuoshiyuan=lib.characterIntro.pangtong;
+ lib.characterIntro.boss_qiaokuijunyi=lib.characterIntro.zhenghe;
+ lib.characterIntro.boss_jiarenzidan=lib.characterIntro.caozhen;
+ lib.characterIntro.boss_duanyuzhongda=lib.characterIntro.simayi;
+ lib.characterIntro.boss_juechenmiaocai=lib.characterIntro.xiahouyuan;
+ }
+ },
start:function(){
"step 0"
_status.mode=get.config('versus_mode');
@@ -2636,27 +2667,6 @@ mode.versus={
ctx.stroke();
},
},
- characterPack:{
- mode_versus:{
- boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
- boss_gongshenyueying:['female','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
- boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
- boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
- boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
- boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
- boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
- boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-
- boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'],
- boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojianjg'],['jiangemech','hiddenboss','bossallowed'],'shu'],
- boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'],
- boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'],
- boss_fudibian:['male','wei',4,['boss_jiguan','boss_didongjg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
- boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'],
- boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyujg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
- boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'],
- }
- },
cardsThree:[
["spade",7,"sha"],
["spade",8,"sha"],