diff --git a/audio/die/caorui.mp3 b/audio/die/caorui.mp3 new file mode 100755 index 000000000..4374f7e0a Binary files /dev/null and b/audio/die/caorui.mp3 differ diff --git a/audio/die/caoxiu.mp3 b/audio/die/caoxiu.mp3 new file mode 100755 index 000000000..4e70df1ef Binary files /dev/null and b/audio/die/caoxiu.mp3 differ diff --git a/audio/die/gongsunyuan.mp3 b/audio/die/gongsunyuan.mp3 new file mode 100755 index 000000000..8c99dbb56 Binary files /dev/null and b/audio/die/gongsunyuan.mp3 differ diff --git a/audio/die/guotufengji.mp3 b/audio/die/guotufengji.mp3 new file mode 100755 index 000000000..c20f1ae94 Binary files /dev/null and b/audio/die/guotufengji.mp3 differ diff --git a/audio/die/liuchen.mp3 b/audio/die/liuchen.mp3 new file mode 100755 index 000000000..839c730c1 Binary files /dev/null and b/audio/die/liuchen.mp3 differ diff --git a/audio/die/mayunlu.mp3 b/audio/die/mayunlu.mp3 new file mode 100755 index 000000000..6049965f4 Binary files /dev/null and b/audio/die/mayunlu.mp3 differ diff --git a/audio/die/quancong.mp3 b/audio/die/quancong.mp3 new file mode 100755 index 000000000..affcb2443 Binary files /dev/null and b/audio/die/quancong.mp3 differ diff --git a/audio/die/sunxiu.mp3 b/audio/die/sunxiu.mp3 new file mode 100755 index 000000000..a1bbdeea7 Binary files /dev/null and b/audio/die/sunxiu.mp3 differ diff --git a/audio/die/wutugu.mp3 b/audio/die/wutugu.mp3 new file mode 100755 index 000000000..0606972e8 Binary files /dev/null and b/audio/die/wutugu.mp3 differ diff --git a/audio/die/xiahoushi.mp3 b/audio/die/xiahoushi.mp3 new file mode 100755 index 000000000..389d5800d Binary files /dev/null and b/audio/die/xiahoushi.mp3 differ diff --git a/audio/die/zhangyi.mp3 b/audio/die/zhangyi.mp3 new file mode 100755 index 000000000..5b3bd2028 Binary files /dev/null and b/audio/die/zhangyi.mp3 differ diff --git a/audio/die/zhongyao.mp3 b/audio/die/zhongyao.mp3 new file mode 100755 index 000000000..39a408836 Binary files /dev/null and b/audio/die/zhongyao.mp3 differ diff --git a/audio/die/wolong.mp3 b/audio/die/zhugeliangwolong.mp3 similarity index 100% rename from audio/die/wolong.mp3 rename to audio/die/zhugeliangwolong.mp3 diff --git a/audio/die/zhuzhi.mp3 b/audio/die/zhuzhi.mp3 new file mode 100755 index 000000000..76d56e225 Binary files /dev/null and b/audio/die/zhuzhi.mp3 differ diff --git a/audio/skill/anguo1.mp3 b/audio/skill/anguo1.mp3 new file mode 100755 index 000000000..62d80879d Binary files /dev/null and b/audio/skill/anguo1.mp3 differ diff --git a/audio/skill/anguo2.mp3 b/audio/skill/anguo2.mp3 new file mode 100755 index 000000000..c2dda32d9 Binary files /dev/null and b/audio/skill/anguo2.mp3 differ diff --git a/audio/skill/fengpo1.mp3 b/audio/skill/fengpo1.mp3 new file mode 100755 index 000000000..6e3d990ee Binary files /dev/null and b/audio/skill/fengpo1.mp3 differ diff --git a/audio/skill/fengpo2.mp3 b/audio/skill/fengpo2.mp3 new file mode 100755 index 000000000..2801f2e37 Binary files /dev/null and b/audio/skill/fengpo2.mp3 differ diff --git a/audio/skill/hanyong1.mp3 b/audio/skill/hanyong1.mp3 new file mode 100755 index 000000000..4abf15219 Binary files /dev/null and b/audio/skill/hanyong1.mp3 differ diff --git a/audio/skill/hanyong2.mp3 b/audio/skill/hanyong2.mp3 new file mode 100755 index 000000000..76338b480 Binary files /dev/null and b/audio/skill/hanyong2.mp3 differ diff --git a/audio/skill/huaiyi1.mp3 b/audio/skill/huaiyi1.mp3 new file mode 100755 index 000000000..dfe49792c Binary files /dev/null and b/audio/skill/huaiyi1.mp3 differ diff --git a/audio/skill/huaiyi2.mp3 b/audio/skill/huaiyi2.mp3 new file mode 100755 index 000000000..2fa8c353f Binary files /dev/null and b/audio/skill/huaiyi2.mp3 differ diff --git a/audio/skill/huituo1.mp3 b/audio/skill/huituo1.mp3 new file mode 100755 index 000000000..4e6ecc00a Binary files /dev/null and b/audio/skill/huituo1.mp3 differ diff --git a/audio/skill/huituo2.mp3 b/audio/skill/huituo2.mp3 new file mode 100755 index 000000000..299a290bb Binary files /dev/null and b/audio/skill/huituo2.mp3 differ diff --git a/audio/skill/huomo1.mp3 b/audio/skill/huomo1.mp3 new file mode 100755 index 000000000..81be12e90 Binary files /dev/null and b/audio/skill/huomo1.mp3 differ diff --git a/audio/skill/huomo2.mp3 b/audio/skill/huomo2.mp3 new file mode 100755 index 000000000..67c61c77e Binary files /dev/null and b/audio/skill/huomo2.mp3 differ diff --git a/audio/skill/huomo_jiu1.mp3 b/audio/skill/huomo_jiu1.mp3 new file mode 100755 index 000000000..81be12e90 Binary files /dev/null and b/audio/skill/huomo_jiu1.mp3 differ diff --git a/audio/skill/huomo_jiu2.mp3 b/audio/skill/huomo_jiu2.mp3 new file mode 100755 index 000000000..67c61c77e Binary files /dev/null and b/audio/skill/huomo_jiu2.mp3 differ diff --git a/audio/skill/huomo_sha1.mp3 b/audio/skill/huomo_sha1.mp3 new file mode 100755 index 000000000..81be12e90 Binary files /dev/null and b/audio/skill/huomo_sha1.mp3 differ diff --git a/audio/skill/huomo_sha2.mp3 b/audio/skill/huomo_sha2.mp3 new file mode 100755 index 000000000..67c61c77e Binary files /dev/null and b/audio/skill/huomo_sha2.mp3 differ diff --git a/audio/skill/huomo_tao1.mp3 b/audio/skill/huomo_tao1.mp3 new file mode 100755 index 000000000..81be12e90 Binary files /dev/null and b/audio/skill/huomo_tao1.mp3 differ diff --git a/audio/skill/huomo_tao2.mp3 b/audio/skill/huomo_tao2.mp3 new file mode 100755 index 000000000..67c61c77e Binary files /dev/null and b/audio/skill/huomo_tao2.mp3 differ diff --git a/audio/skill/jigong1.mp3 b/audio/skill/jigong1.mp3 new file mode 100755 index 000000000..7c2004874 Binary files /dev/null and b/audio/skill/jigong1.mp3 differ diff --git a/audio/skill/jigong2.mp3 b/audio/skill/jigong2.mp3 new file mode 100755 index 000000000..7d2aac827 Binary files /dev/null and b/audio/skill/jigong2.mp3 differ diff --git a/audio/skill/mingjian1.mp3 b/audio/skill/mingjian1.mp3 new file mode 100755 index 000000000..e5913018f Binary files /dev/null and b/audio/skill/mingjian1.mp3 differ diff --git a/audio/skill/mingjian2.mp3 b/audio/skill/mingjian2.mp3 new file mode 100755 index 000000000..8af29f5ba Binary files /dev/null and b/audio/skill/mingjian2.mp3 differ diff --git a/audio/skill/qiaoshi1.mp3 b/audio/skill/qiaoshi1.mp3 new file mode 100755 index 000000000..da9857bb4 Binary files /dev/null and b/audio/skill/qiaoshi1.mp3 differ diff --git a/audio/skill/qiaoshi2.mp3 b/audio/skill/qiaoshi2.mp3 new file mode 100755 index 000000000..06a175820 Binary files /dev/null and b/audio/skill/qiaoshi2.mp3 differ diff --git a/audio/skill/qinwang11.mp3 b/audio/skill/qinwang11.mp3 new file mode 100755 index 000000000..242052eb6 Binary files /dev/null and b/audio/skill/qinwang11.mp3 differ diff --git a/audio/skill/qinwang12.mp3 b/audio/skill/qinwang12.mp3 new file mode 100755 index 000000000..d421ab5d5 Binary files /dev/null and b/audio/skill/qinwang12.mp3 differ diff --git a/audio/skill/qinwang21.mp3 b/audio/skill/qinwang21.mp3 new file mode 100755 index 000000000..242052eb6 Binary files /dev/null and b/audio/skill/qinwang21.mp3 differ diff --git a/audio/skill/qinwang22.mp3 b/audio/skill/qinwang22.mp3 new file mode 100755 index 000000000..d421ab5d5 Binary files /dev/null and b/audio/skill/qinwang22.mp3 differ diff --git a/audio/skill/ranshang1 .mp3 b/audio/skill/ranshang1 .mp3 new file mode 100755 index 000000000..479d02a17 Binary files /dev/null and b/audio/skill/ranshang1 .mp3 differ diff --git a/audio/skill/ranshang2.mp3 b/audio/skill/ranshang2.mp3 new file mode 100755 index 000000000..e14182675 Binary files /dev/null and b/audio/skill/ranshang2.mp3 differ diff --git a/audio/skill/ranshang21 .mp3 b/audio/skill/ranshang21 .mp3 new file mode 100755 index 000000000..479d02a17 Binary files /dev/null and b/audio/skill/ranshang21 .mp3 differ diff --git a/audio/skill/ranshang22.mp3 b/audio/skill/ranshang22.mp3 new file mode 100755 index 000000000..e14182675 Binary files /dev/null and b/audio/skill/ranshang22.mp3 differ diff --git a/audio/skill/shifei1.mp3 b/audio/skill/shifei1.mp3 new file mode 100755 index 000000000..d3d784645 Binary files /dev/null and b/audio/skill/shifei1.mp3 differ diff --git a/audio/skill/shifei2.mp3 b/audio/skill/shifei2.mp3 new file mode 100755 index 000000000..fbe57d83f Binary files /dev/null and b/audio/skill/shifei2.mp3 differ diff --git a/audio/skill/taoxi1.mp3 b/audio/skill/taoxi1.mp3 new file mode 100755 index 000000000..11b67b173 Binary files /dev/null and b/audio/skill/taoxi1.mp3 differ diff --git a/audio/skill/taoxi2.mp3 b/audio/skill/taoxi2.mp3 new file mode 100755 index 000000000..c08859155 Binary files /dev/null and b/audio/skill/taoxi2.mp3 differ diff --git a/audio/skill/wurong1.mp3 b/audio/skill/wurong1.mp3 new file mode 100755 index 000000000..53647c0f7 Binary files /dev/null and b/audio/skill/wurong1.mp3 differ diff --git a/audio/skill/wurong2.mp3 b/audio/skill/wurong2.mp3 new file mode 100755 index 000000000..9f1c6d513 Binary files /dev/null and b/audio/skill/wurong2.mp3 differ diff --git a/audio/skill/xingshuai1.mp3 b/audio/skill/xingshuai1.mp3 new file mode 100755 index 000000000..e2b69097d Binary files /dev/null and b/audio/skill/xingshuai1.mp3 differ diff --git a/audio/skill/xingshuai2.mp3 b/audio/skill/xingshuai2.mp3 new file mode 100755 index 000000000..63d0c3f71 Binary files /dev/null and b/audio/skill/xingshuai2.mp3 differ diff --git a/audio/skill/xingxue1.mp3 b/audio/skill/xingxue1.mp3 new file mode 100755 index 000000000..146b2a2c4 Binary files /dev/null and b/audio/skill/xingxue1.mp3 differ diff --git a/audio/skill/xingxue2.mp3 b/audio/skill/xingxue2.mp3 new file mode 100755 index 000000000..7d23c0c36 Binary files /dev/null and b/audio/skill/xingxue2.mp3 differ diff --git a/audio/skill/yanyu1.mp3 b/audio/skill/yanyu1.mp3 new file mode 100755 index 000000000..4fc0aa964 Binary files /dev/null and b/audio/skill/yanyu1.mp3 differ diff --git a/audio/skill/yanyu2.mp3 b/audio/skill/yanyu2.mp3 new file mode 100755 index 000000000..f7c18db9a Binary files /dev/null and b/audio/skill/yanyu2.mp3 differ diff --git a/audio/skill/yanzhu1.mp3 b/audio/skill/yanzhu1.mp3 new file mode 100755 index 000000000..6247f756c Binary files /dev/null and b/audio/skill/yanzhu1.mp3 differ diff --git a/audio/skill/yanzhu2.mp3 b/audio/skill/yanzhu2.mp3 new file mode 100755 index 000000000..7c1774ef2 Binary files /dev/null and b/audio/skill/yanzhu2.mp3 differ diff --git a/audio/skill/yaoming1.mp3 b/audio/skill/yaoming1.mp3 new file mode 100755 index 000000000..e9b9fa6d0 Binary files /dev/null and b/audio/skill/yaoming1.mp3 differ diff --git a/audio/skill/yaoming2.mp3 b/audio/skill/yaoming2.mp3 new file mode 100755 index 000000000..d48557b6c Binary files /dev/null and b/audio/skill/yaoming2.mp3 differ diff --git a/audio/skill/zhanjue1.mp3 b/audio/skill/zhanjue1.mp3 new file mode 100755 index 000000000..acdae92fe Binary files /dev/null and b/audio/skill/zhanjue1.mp3 differ diff --git a/audio/skill/zhanjue2.mp3 b/audio/skill/zhanjue2.mp3 new file mode 100755 index 000000000..ff429164a Binary files /dev/null and b/audio/skill/zhanjue2.mp3 differ diff --git a/audio/skill/zuoding1.mp3 b/audio/skill/zuoding1.mp3 new file mode 100755 index 000000000..c8a52ecb9 Binary files /dev/null and b/audio/skill/zuoding1.mp3 differ diff --git a/audio/skill/zuoding2.mp3 b/audio/skill/zuoding2.mp3 new file mode 100755 index 000000000..bbce32b5d Binary files /dev/null and b/audio/skill/zuoding2.mp3 differ diff --git a/character/sp.js b/character/sp.js index 5283c9630..e78487669 100755 --- a/character/sp.js +++ b/character/sp.js @@ -250,6 +250,7 @@ character.sp={ }, chenqing2:{}, ranshang:{ + audio:2, trigger:{player:'damageEnd'}, filter:function(event,player){ return event.nature=='fire'; @@ -287,6 +288,7 @@ character.sp={ group:'ranshang2' }, ranshang2:{ + audio:2, trigger:{player:'phaseEnd'}, forced:true, filter:function(event,player){ @@ -311,6 +313,7 @@ character.sp={ group:'hanyong2' }, hanyong2:{ + audio:false, trigger:{player:'phaseBegin'}, forced:true, popup:false, @@ -320,6 +323,7 @@ character.sp={ } }, hanyong3:{ + audio:false, trigger:{source:'damageBegin'}, forced:true, filter:function(event,player){ @@ -426,6 +430,7 @@ character.sp={ } }, fengpo:{ + audio:2, trigger:{player:['shaBegin','juedouBegin']}, filter:function(event,player){ if(player.skills.contains('fengpo3')) return false; @@ -458,6 +463,7 @@ character.sp={ event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2'; }, forced:true, + audio:false, content:function(){ if(typeof player.storage.fengpo=='number'){ trigger.num+=player.storage.fengpo; diff --git a/character/yijiang.js b/character/yijiang.js index c8055031a..c1d31e285 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -708,6 +708,7 @@ character.yijiang={ } }, jigong:{ + audio:2, trigger:{player:'phaseUseBegin'}, check:function(event,player){ var nh=player.num('h')-player.num('h',{type:'equip'}); @@ -732,6 +733,7 @@ character.yijiang={ } }, shifei:{ + audio:2, trigger:{player:'chooseToRespondBegin'}, filter:function(event,player){ if(event.responded) return false; @@ -804,6 +806,7 @@ character.yijiang={ } }, huaiyi:{ + audio:2, enable:'phaseUse', usable:1, delay:0, @@ -866,6 +869,7 @@ character.yijiang={ } }, yaoming:{ + audio:2, trigger:{player:'damageEnd',source:'damageEnd'}, direct:true, filter:function(event,player){ @@ -905,6 +909,7 @@ character.yijiang={ }, yaoming2:{}, anguo:{ + audio:2, enable:'phaseUse', usable:1, filterTarget:function(card,player,target){ @@ -970,6 +975,7 @@ character.yijiang={ } }, xingxue:{ + audio:2, trigger:{player:'phaseEnd'}, direct:true, content:function(){ @@ -1028,6 +1034,7 @@ character.yijiang={ } }, yanzhu:{ + audio:2, enable:'phaseUse', usable:1, filterTarget:function(card,player,target){ @@ -1173,6 +1180,7 @@ character.yijiang={ } }, zhanjue:{ + audio:2, enable:'phaseUse', filterCard:true, selectCard:-1, @@ -1207,6 +1215,7 @@ character.yijiang={ } }, zhanjue2:{ + audio:false, trigger:{player:'phaseBegin'}, forced:true, popup:false, @@ -1216,6 +1225,7 @@ character.yijiang={ } }, zhanjue3:{ + audio:false, trigger:{player:'damageAfter',source:'damageAfter'}, forced:true, popup:false, @@ -1243,6 +1253,7 @@ character.yijiang={ group:['qinwang1','qinwang2'], }, qinwang1:{ + audio:2, trigger:{player:'chooseToRespondBegin'}, filter:function(event,player){ if(event.responded) return false; @@ -1309,6 +1320,7 @@ character.yijiang={ } }, qinwang2:{ + audio:2, enable:'chooseToUse', filter:function(event,player){ if(event.filterCard&&!event.filterCard({name:'sha'},player)) return false; @@ -1432,6 +1444,7 @@ character.yijiang={ } }, huomo:{ + audio:2, trigger:{player:'chooseToRespondBegin'}, filter:function(event,player){ if(event.responded) return false; @@ -1621,6 +1634,7 @@ character.yijiang={ } }, taoxi:{ + audio:2, trigger:{player:'useCardToBegin'}, filter:function(event,player){ return _status.currentPhase==player&&event.targets.length==1&& @@ -1647,6 +1661,7 @@ character.yijiang={ group:['taoxi2','taoxi3'] }, taoxi2:{ + audio:false, enable:'phaseUse', filter:function(event,player){ if(player.storage.taoxi&&player.storage.taoxi2&& @@ -1710,6 +1725,7 @@ character.yijiang={ }, taoxi4:{}, xingshuai:{ + audio:2, trigger:{player:'dying'}, priority:6, filter:function(event,player){ @@ -1776,6 +1792,7 @@ character.yijiang={ } }, mingjian:{ + audio:2, trigger:{player:'phaseUseBefore'}, direct:true, filter:function(event,player){ @@ -1796,7 +1813,7 @@ character.yijiang={ } 'step 1' if(result.bool){ - player.logSkill('huituo',result.targets); + player.logSkill('mingjian',result.targets); trigger.untrigger(); trigger.finish(); var target=result.targets[0]; @@ -1808,6 +1825,7 @@ character.yijiang={ } }, mingjian2:{ + audio:false, trigger:{global:'phaseAfter'}, forced:true, popup:false, @@ -1828,6 +1846,7 @@ character.yijiang={ } }, huituo:{ + audio:2, trigger:{player:'damageEnd'}, direct:true, content:function(){ @@ -1955,6 +1974,7 @@ character.yijiang={ } }, qiaoshi:{ + audio:2, trigger:{global:'phaseEnd'}, filter:function(event,player){ return event.player!=player&&event.player.num('h')==player.num('h'); @@ -1971,6 +1991,7 @@ character.yijiang={ } }, yanyu:{ + audio:2, enable:'phaseUse', filter:function(event,player){ return player.num('h','sha')>0; diff --git a/game/game.js b/game/game.js index a5234019e..62930a9f5 100755 --- a/game/game.js +++ b/game/game.js @@ -21,7 +21,7 @@ '折叠手牌显示花色', 'AI改进', '武将图修改', - 'boss配音', + 'boss、将5配音(@tanyuanjkl提取)', '隐藏模式、武将、卡牌包', '开始界面', '中间显示历史记录', @@ -2206,8 +2206,8 @@ help:{ '游戏选项':'