diff --git a/audio/skill/boss_biantianx1.mp3 b/audio/skill/boss_biantianx1.mp3 new file mode 100755 index 000000000..5ef3c9794 Binary files /dev/null and b/audio/skill/boss_biantianx1.mp3 differ diff --git a/audio/skill/boss_biantianx2.mp3 b/audio/skill/boss_biantianx2.mp3 new file mode 100755 index 000000000..710f40643 Binary files /dev/null and b/audio/skill/boss_biantianx2.mp3 differ diff --git a/audio/skill/boss_chiying1.mp3 b/audio/skill/boss_chiying1.mp3 new file mode 100755 index 000000000..aca9f9f98 Binary files /dev/null and b/audio/skill/boss_chiying1.mp3 differ diff --git a/audio/skill/boss_chiying2.mp3 b/audio/skill/boss_chiying2.mp3 new file mode 100755 index 000000000..1b1cc42f4 Binary files /dev/null and b/audio/skill/boss_chiying2.mp3 differ diff --git a/audio/skill/boss_chuanyun.mp3 b/audio/skill/boss_chuanyun.mp3 new file mode 100755 index 000000000..f13dd1e1e Binary files /dev/null and b/audio/skill/boss_chuanyun.mp3 differ diff --git a/audio/skill/boss_fanshi.mp3 b/audio/skill/boss_fanshi.mp3 new file mode 100644 index 000000000..91cf43991 Binary files /dev/null and b/audio/skill/boss_fanshi.mp3 differ diff --git a/audio/skill/boss_fengxing.mp3 b/audio/skill/boss_fengxing.mp3 new file mode 100755 index 000000000..b02851179 Binary files /dev/null and b/audio/skill/boss_fengxing.mp3 differ diff --git a/audio/skill/boss_gongshenjg1.mp3 b/audio/skill/boss_gongshenjg1.mp3 new file mode 100755 index 000000000..8a6ef780f Binary files /dev/null and b/audio/skill/boss_gongshenjg1.mp3 differ diff --git a/audio/skill/boss_gongshenjg2.mp3 b/audio/skill/boss_gongshenjg2.mp3 new file mode 100755 index 000000000..bc65eaa4e Binary files /dev/null and b/audio/skill/boss_gongshenjg2.mp3 differ diff --git a/audio/skill/boss_huodi1.mp3 b/audio/skill/boss_huodi1.mp3 new file mode 100755 index 000000000..8082784de Binary files /dev/null and b/audio/skill/boss_huodi1.mp3 differ diff --git a/audio/skill/boss_huodi2.mp3 b/audio/skill/boss_huodi2.mp3 new file mode 100755 index 000000000..6dbec1652 Binary files /dev/null and b/audio/skill/boss_huodi2.mp3 differ diff --git a/audio/skill/boss_jingmiao1.mp3 b/audio/skill/boss_jingmiao1.mp3 new file mode 100755 index 000000000..8a6ef780f Binary files /dev/null and b/audio/skill/boss_jingmiao1.mp3 differ diff --git a/audio/skill/boss_jingmiao2.mp3 b/audio/skill/boss_jingmiao2.mp3 new file mode 100755 index 000000000..bc65eaa4e Binary files /dev/null and b/audio/skill/boss_jingmiao2.mp3 differ diff --git a/audio/skill/boss_jizhen1.mp3 b/audio/skill/boss_jizhen1.mp3 new file mode 100755 index 000000000..99b5fcbb7 Binary files /dev/null and b/audio/skill/boss_jizhen1.mp3 differ diff --git a/audio/skill/boss_jizhen2.mp3 b/audio/skill/boss_jizhen2.mp3 new file mode 100755 index 000000000..4aec610d3 Binary files /dev/null and b/audio/skill/boss_jizhen2.mp3 differ diff --git a/audio/skill/boss_jueji1.mp3 b/audio/skill/boss_jueji1.mp3 new file mode 100755 index 000000000..c6c512063 Binary files /dev/null and b/audio/skill/boss_jueji1.mp3 differ diff --git a/audio/skill/boss_jueji2.mp3 b/audio/skill/boss_jueji2.mp3 new file mode 100755 index 000000000..d5fac95a8 Binary files /dev/null and b/audio/skill/boss_jueji2.mp3 differ diff --git a/audio/skill/boss_leili1.mp3 b/audio/skill/boss_leili1.mp3 new file mode 100755 index 000000000..408afa77d Binary files /dev/null and b/audio/skill/boss_leili1.mp3 differ diff --git a/audio/skill/boss_leili2.mp3 b/audio/skill/boss_leili2.mp3 new file mode 100755 index 000000000..b757942ec Binary files /dev/null and b/audio/skill/boss_leili2.mp3 differ diff --git a/audio/skill/boss_lingfeng1.mp3 b/audio/skill/boss_lingfeng1.mp3 new file mode 100755 index 000000000..349b1a613 Binary files /dev/null and b/audio/skill/boss_lingfeng1.mp3 differ diff --git a/audio/skill/boss_lingfeng2.mp3 b/audio/skill/boss_lingfeng2.mp3 new file mode 100755 index 000000000..65caa5982 Binary files /dev/null and b/audio/skill/boss_lingfeng2.mp3 differ diff --git a/audio/skill/boss_qiwu.mp3 b/audio/skill/boss_qiwu.mp3 new file mode 100755 index 000000000..1f5aac095 Binary files /dev/null and b/audio/skill/boss_qiwu.mp3 differ diff --git a/audio/skill/boss_skonghun.mp3 b/audio/skill/boss_skonghun.mp3 new file mode 100755 index 000000000..ada348912 Binary files /dev/null and b/audio/skill/boss_skonghun.mp3 differ diff --git a/audio/skill/boss_tianyujg.mp3 b/audio/skill/boss_tianyujg.mp3 new file mode 100755 index 000000000..303577141 Binary files /dev/null and b/audio/skill/boss_tianyujg.mp3 differ diff --git a/audio/skill/boss_xuanlei.mp3 b/audio/skill/boss_xuanlei.mp3 new file mode 100755 index 000000000..6876b45dc Binary files /dev/null and b/audio/skill/boss_xuanlei.mp3 differ diff --git a/audio/skill/boss_yuhuojg.mp3 b/audio/skill/boss_yuhuojg.mp3 new file mode 100755 index 000000000..636993cbe Binary files /dev/null and b/audio/skill/boss_yuhuojg.mp3 differ diff --git a/audio/skill/boss_zhinang1.mp3 b/audio/skill/boss_zhinang1.mp3 new file mode 100755 index 000000000..b9bd7f2f0 Binary files /dev/null and b/audio/skill/boss_zhinang1.mp3 differ diff --git a/audio/skill/boss_zhinang2.mp3 b/audio/skill/boss_zhinang2.mp3 new file mode 100755 index 000000000..4ae10a53c Binary files /dev/null and b/audio/skill/boss_zhinang2.mp3 differ diff --git a/audio/skill/guanxing_jiangwei1.mp3 b/audio/skill/guanxing_jiangwei1.mp3 new file mode 100755 index 000000000..03b707b97 Binary files /dev/null and b/audio/skill/guanxing_jiangwei1.mp3 differ diff --git a/audio/skill/guanxing_jiangwei2.mp3 b/audio/skill/guanxing_jiangwei2.mp3 new file mode 100755 index 000000000..faaa80d5a Binary files /dev/null and b/audio/skill/guanxing_jiangwei2.mp3 differ diff --git a/audio/skill/jijiang3.mp3 b/audio/skill/jijiang1_liushan1.mp3 similarity index 100% rename from audio/skill/jijiang3.mp3 rename to audio/skill/jijiang1_liushan1.mp3 diff --git a/audio/skill/jijiang4.mp3 b/audio/skill/jijiang1_liushan2.mp3 similarity index 100% rename from audio/skill/jijiang4.mp3 rename to audio/skill/jijiang1_liushan2.mp3 diff --git a/audio/skill/jijiang2_liushan1.mp3 b/audio/skill/jijiang2_liushan1.mp3 new file mode 100755 index 000000000..927d10203 Binary files /dev/null and b/audio/skill/jijiang2_liushan1.mp3 differ diff --git a/audio/skill/jijiang2_liushan2.mp3 b/audio/skill/jijiang2_liushan2.mp3 new file mode 100755 index 000000000..59a3a343e Binary files /dev/null and b/audio/skill/jijiang2_liushan2.mp3 differ diff --git a/audio/skill/jizhi_jianyong1.mp3 b/audio/skill/jizhi_jianyong1.mp3 new file mode 100755 index 000000000..f57cf0406 Binary files /dev/null and b/audio/skill/jizhi_jianyong1.mp3 differ diff --git a/audio/skill/jizhi_jianyong2.mp3 b/audio/skill/jizhi_jianyong2.mp3 new file mode 100755 index 000000000..184bdd052 Binary files /dev/null and b/audio/skill/jizhi_jianyong2.mp3 differ diff --git a/audio/skill/yinghun_sunce1.mp3 b/audio/skill/yinghun_sunce1.mp3 new file mode 100755 index 000000000..c6f10e3c3 Binary files /dev/null and b/audio/skill/yinghun_sunce1.mp3 differ diff --git a/audio/skill/yinghun_sunce2.mp3 b/audio/skill/yinghun_sunce2.mp3 new file mode 100755 index 000000000..1469788a4 Binary files /dev/null and b/audio/skill/yinghun_sunce2.mp3 differ diff --git a/character/boss.js b/character/boss.js index 65d55a636..509abcb96 100644 --- a/character/boss.js +++ b/character/boss.js @@ -831,6 +831,7 @@ character.boss={ } }, boss_gongshenjg:{ + audio:2, trigger:{player:'phaseEnd'}, mode:['versus'], filter:function(event,player){ @@ -966,6 +967,7 @@ character.boss={ trigger:{player:'phaseBegin'}, forced:true, unique:true, + audio:false, group:'boss_biantian4', content:function(){ "step 0" @@ -987,6 +989,7 @@ character.boss={ "step 1" var targets=[]; if(result.color=='red'){ + game.playAudio('boss_biantianx2'); for(var i=0;i0) return 0; + if(player.num('e','zhuge')&&player.num('h','sha')>1) return 0; + if(!player.num('h','sha')) return 0; + for(var i=0;i0){ + var e2=target.get('e','2'); + if(e2){ + if(e2.name=='tengjia'){ + if(!player.num('h',{name:'sha',nature:'fire'})&&!player.num('e','zhuque')) return 0; + } + if(e2.name=='renwang'){ + if(!player.num('h',{name:'sha',color:'red'})) return 0; + } + if(e2.name=='baiyin') return 0; + } + if(player.num('e','guanshi')&&player.num('he')>2) return 1; + return target.num('h')>3?0:1; + } + } + } + } if(player==_status.event.dying||player.isTurnedOver()) return 3; } }, effect:{ - target:function(card){ + target:function(card,player,target){ if(card.name=='guiyoujie') return [0,0.5]; + if(target.isTurnedOver()){ + if(get.tag(card,'damage')){ + if(player.skills.contains('jueqing')) return [1,-2]; + if(target.hp==1) return; + return [1,target.num('h')/2]; + } + } } } }, diff --git a/game/game.js b/game/game.js index 685ad5f30..c59291d5e 100755 --- a/game/game.js +++ b/game/game.js @@ -18,7 +18,9 @@ var lib={ version:1.79, changeLog:[ + '修bug', '自动标身份', + '配音支持与人名关联', ], configprefix:'noname_0.9_', updates:[], @@ -32,6 +34,7 @@ characterPack:{}, cardPack:{}, onresize:[], + onwash:[], onDB:function(func){ if(lib.db){ func(); @@ -4434,6 +4437,17 @@ audioname=audioinfo[0]; audioinfo=audioinfo[1]; } + if(Array.isArray(info.audioname)){ + if(info.audioname.contains(player.name)){ + audioname+='_'+player.name; + } + else if(info.audioname.contains(player.name1)){ + audioname+='_'+player.name1; + } + else if(info.audioname.contains(player.name2)){ + audioname+='_'+player.name2; + } + } if(typeof audioinfo=='number'){ game.playAudio('skill',audioname+Math.ceil(audioinfo*Math.random())); } @@ -6977,6 +6991,17 @@ audioname=audioinfo[0]; audioinfo=audioinfo[1]; } + if(Array.isArray(info.audioname)){ + if(info.audioname.contains(this.name)){ + audioname+='_'+this.name; + } + else if(info.audioname.contains(this.name1)){ + audioname+='_'+this.name1; + } + else if(info.audioname.contains(this.name2)){ + audioname+='_'+this.name2; + } + } if(typeof audioinfo==='number'){ game.playAudio('skill',audioname+Math.ceil(audioinfo*Math.random())); } @@ -10931,6 +10956,7 @@ }, reloadCurrent:function(){ game.saveConfig('continue_name',[game.me.name1||game.me.name,game.me.name2]); + game.saveConfig('mode',lib.config.mode); localStorage.setItem(lib.configprefix+'directstart',true); game.reload(); }, @@ -11846,6 +11872,7 @@ map.links.push(pointer.name); } game.saveConfig('continue_name_boss',map); + game.saveConfig('mode',lib.config.mode); localStorage.setItem(lib.configprefix+'directstart',true); game.reload(); }); @@ -11858,6 +11885,7 @@ enemy:_status.enemyBackup, color:_status.color }); + game.saveConfig('mode',lib.config.mode); localStorage.setItem(lib.configprefix+'directstart',true); game.reload(); }); @@ -20128,7 +20156,9 @@ _status.maxShuffle--; } var cards=[],i; - if(game.onWash) game.onWash(); + for(var i=0;i