diff --git a/audio/die/re_caoxiu.mp3 b/audio/die/re_caoxiu.mp3 index 67bfe9400..b879a0ad4 100644 Binary files a/audio/die/re_caoxiu.mp3 and b/audio/die/re_caoxiu.mp3 differ diff --git a/audio/die/re_caozhang.mp3 b/audio/die/re_caozhang.mp3 index ca916b4a5..cd793fc67 100644 Binary files a/audio/die/re_caozhang.mp3 and b/audio/die/re_caozhang.mp3 differ diff --git a/audio/die/re_chengpu.mp3 b/audio/die/re_chengpu.mp3 index 90b9991d0..6ce1e9558 100644 Binary files a/audio/die/re_chengpu.mp3 and b/audio/die/re_chengpu.mp3 differ diff --git a/audio/die/re_hanhaoshihuan.mp3 b/audio/die/re_hanhaoshihuan.mp3 index b11d67925..0fd524df6 100644 Binary files a/audio/die/re_hanhaoshihuan.mp3 and b/audio/die/re_hanhaoshihuan.mp3 differ diff --git a/audio/die/re_jianyong.mp3 b/audio/die/re_jianyong.mp3 index 6dac0aa9c..5d79b1e88 100644 Binary files a/audio/die/re_jianyong.mp3 and b/audio/die/re_jianyong.mp3 differ diff --git a/audio/die/re_jsp_huangyueying.mp3 b/audio/die/re_jsp_huangyueying.mp3 index 3dbd0bc46..58d731ab2 100644 Binary files a/audio/die/re_jsp_huangyueying.mp3 and b/audio/die/re_jsp_huangyueying.mp3 differ diff --git a/audio/die/re_sunxiu.mp3 b/audio/die/re_sunxiu.mp3 index 8e8d6722d..d87aaeac7 100644 Binary files a/audio/die/re_sunxiu.mp3 and b/audio/die/re_sunxiu.mp3 differ diff --git a/audio/die/re_wangyi.mp3 b/audio/die/re_wangyi.mp3 new file mode 100644 index 000000000..da624213f Binary files /dev/null and b/audio/die/re_wangyi.mp3 differ diff --git a/audio/die/xin_liubiao.mp3 b/audio/die/xin_liubiao.mp3 index 90654b0b6..4446db23f 100644 Binary files a/audio/die/xin_liubiao.mp3 and b/audio/die/xin_liubiao.mp3 differ diff --git a/audio/skill/decadezishou1.mp3 b/audio/skill/decadezishou1.mp3 index 8905ca791..644471ce0 100644 Binary files a/audio/skill/decadezishou1.mp3 and b/audio/skill/decadezishou1.mp3 differ diff --git a/audio/skill/decadezishou2.mp3 b/audio/skill/decadezishou2.mp3 index 4989a7501..2462e87e5 100644 Binary files a/audio/skill/decadezishou2.mp3 and b/audio/skill/decadezishou2.mp3 differ diff --git a/audio/skill/decadezongshi1.mp3 b/audio/skill/decadezongshi1.mp3 index c07dc27a1..05a3fa1c1 100644 Binary files a/audio/skill/decadezongshi1.mp3 and b/audio/skill/decadezongshi1.mp3 differ diff --git a/audio/skill/decadezongshi2.mp3 b/audio/skill/decadezongshi2.mp3 index 91f591a70..a6b636524 100644 Binary files a/audio/skill/decadezongshi2.mp3 and b/audio/skill/decadezongshi2.mp3 differ diff --git a/audio/skill/jyzongshi_re_jianyong1.mp3 b/audio/skill/jyzongshi_re_jianyong1.mp3 index f7f2ddf0b..96f7d26e9 100644 Binary files a/audio/skill/jyzongshi_re_jianyong1.mp3 and b/audio/skill/jyzongshi_re_jianyong1.mp3 differ diff --git a/audio/skill/jyzongshi_re_jianyong2.mp3 b/audio/skill/jyzongshi_re_jianyong2.mp3 index 11c3310d2..4a22f3f60 100644 Binary files a/audio/skill/jyzongshi_re_jianyong2.mp3 and b/audio/skill/jyzongshi_re_jianyong2.mp3 differ diff --git a/audio/skill/lihuo_re_chengpu1.mp3 b/audio/skill/lihuo_re_chengpu1.mp3 index a3cb83ef3..5b839b79f 100644 Binary files a/audio/skill/lihuo_re_chengpu1.mp3 and b/audio/skill/lihuo_re_chengpu1.mp3 differ diff --git a/audio/skill/lihuo_re_chengpu2.mp3 b/audio/skill/lihuo_re_chengpu2.mp3 index 26e2cb585..0ae13ab1d 100644 Binary files a/audio/skill/lihuo_re_chengpu2.mp3 and b/audio/skill/lihuo_re_chengpu2.mp3 differ diff --git a/audio/skill/miji_re_wangyi1.mp3 b/audio/skill/miji_re_wangyi1.mp3 new file mode 100644 index 000000000..12e4a54fc Binary files /dev/null and b/audio/skill/miji_re_wangyi1.mp3 differ diff --git a/audio/skill/miji_re_wangyi2.mp3 b/audio/skill/miji_re_wangyi2.mp3 new file mode 100644 index 000000000..8dadc02d7 Binary files /dev/null and b/audio/skill/miji_re_wangyi2.mp3 differ diff --git a/audio/skill/rechunlao1.mp3 b/audio/skill/rechunlao1.mp3 index 9891715fc..d3ba2b8dd 100644 Binary files a/audio/skill/rechunlao1.mp3 and b/audio/skill/rechunlao1.mp3 differ diff --git a/audio/skill/rechunlao2.mp3 b/audio/skill/rechunlao2.mp3 index 244e041fb..376715241 100644 Binary files a/audio/skill/rechunlao2.mp3 and b/audio/skill/rechunlao2.mp3 differ diff --git a/audio/skill/rejiqiao1.mp3 b/audio/skill/rejiqiao1.mp3 index 1b09d9d74..0bbb8d212 100644 Binary files a/audio/skill/rejiqiao1.mp3 and b/audio/skill/rejiqiao1.mp3 differ diff --git a/audio/skill/rejiqiao2.mp3 b/audio/skill/rejiqiao2.mp3 index cd3fc396d..3a12fc601 100644 Binary files a/audio/skill/rejiqiao2.mp3 and b/audio/skill/rejiqiao2.mp3 differ diff --git a/audio/skill/relinglong1.mp3 b/audio/skill/relinglong1.mp3 index c03677525..074bb5201 100644 Binary files a/audio/skill/relinglong1.mp3 and b/audio/skill/relinglong1.mp3 differ diff --git a/audio/skill/relinglong2.mp3 b/audio/skill/relinglong2.mp3 index 08d47aade..81c658f34 100644 Binary files a/audio/skill/relinglong2.mp3 and b/audio/skill/relinglong2.mp3 differ diff --git a/audio/skill/reqiaoshui1.mp3 b/audio/skill/reqiaoshui1.mp3 index 5fbe25630..9e18c31bd 100644 Binary files a/audio/skill/reqiaoshui1.mp3 and b/audio/skill/reqiaoshui1.mp3 differ diff --git a/audio/skill/reqiaoshui2.mp3 b/audio/skill/reqiaoshui2.mp3 index 7a95b1e8b..936d55530 100644 Binary files a/audio/skill/reqiaoshui2.mp3 and b/audio/skill/reqiaoshui2.mp3 differ diff --git a/audio/skill/reqingxi1.mp3 b/audio/skill/reqingxi1.mp3 index fcaf8cbaf..cb353cbea 100644 Binary files a/audio/skill/reqingxi1.mp3 and b/audio/skill/reqingxi1.mp3 differ diff --git a/audio/skill/reqingxi2.mp3 b/audio/skill/reqingxi2.mp3 index 07b695ae0..62531ec91 100644 Binary files a/audio/skill/reqingxi2.mp3 and b/audio/skill/reqingxi2.mp3 differ diff --git a/audio/skill/reshenduan1.mp3 b/audio/skill/reshenduan1.mp3 index c34aefa4c..13ddba401 100644 Binary files a/audio/skill/reshenduan1.mp3 and b/audio/skill/reshenduan1.mp3 differ diff --git a/audio/skill/reshenduan2.mp3 b/audio/skill/reshenduan2.mp3 index 2f96cd4e7..8c33513ac 100644 Binary files a/audio/skill/reshenduan2.mp3 and b/audio/skill/reshenduan2.mp3 differ diff --git a/audio/skill/rexingxue1.mp3 b/audio/skill/rexingxue1.mp3 index a6e688014..7bade19a9 100644 Binary files a/audio/skill/rexingxue1.mp3 and b/audio/skill/rexingxue1.mp3 differ diff --git a/audio/skill/rexingxue2.mp3 b/audio/skill/rexingxue2.mp3 index 96bd69fdb..c9616b926 100644 Binary files a/audio/skill/rexingxue2.mp3 and b/audio/skill/rexingxue2.mp3 differ diff --git a/audio/skill/reyanzhu1.mp3 b/audio/skill/reyanzhu1.mp3 index b768c2df0..4e82f5014 100644 Binary files a/audio/skill/reyanzhu1.mp3 and b/audio/skill/reyanzhu1.mp3 differ diff --git a/audio/skill/reyanzhu2.mp3 b/audio/skill/reyanzhu2.mp3 index 5397533b9..3eff5eb79 100644 Binary files a/audio/skill/reyanzhu2.mp3 and b/audio/skill/reyanzhu2.mp3 differ diff --git a/audio/skill/reyonglve1.mp3 b/audio/skill/reyonglve1.mp3 index d025a26f9..a3f28184c 100644 Binary files a/audio/skill/reyonglve1.mp3 and b/audio/skill/reyonglve1.mp3 differ diff --git a/audio/skill/reyonglve2.mp3 b/audio/skill/reyonglve2.mp3 index df7d98f2e..e8f3cc5b8 100644 Binary files a/audio/skill/reyonglve2.mp3 and b/audio/skill/reyonglve2.mp3 differ diff --git a/audio/skill/xinjiangchi1.mp3 b/audio/skill/xinjiangchi1.mp3 new file mode 100644 index 000000000..dcef12ef5 Binary files /dev/null and b/audio/skill/xinjiangchi1.mp3 differ diff --git a/audio/skill/xinjiangchi2.mp3 b/audio/skill/xinjiangchi2.mp3 new file mode 100644 index 000000000..23222b9db Binary files /dev/null and b/audio/skill/xinjiangchi2.mp3 differ diff --git a/audio/skill/zhenlie_re_wangyi1.mp3 b/audio/skill/zhenlie_re_wangyi1.mp3 new file mode 100644 index 000000000..bfa7e392f Binary files /dev/null and b/audio/skill/zhenlie_re_wangyi1.mp3 differ diff --git a/audio/skill/zhenlie_re_wangyi2.mp3 b/audio/skill/zhenlie_re_wangyi2.mp3 new file mode 100644 index 000000000..073ce8fa1 Binary files /dev/null and b/audio/skill/zhenlie_re_wangyi2.mp3 differ diff --git a/character/refresh.js b/character/refresh.js index e0b99077a..116314a5d 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -935,6 +935,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var skills=player.additionalSkills['relinglong']; return (skills&&skills.length>0)!=player.hasEmptySlot(5); }, + direct:true, content:function(){ player.removeAdditionalSkill('relinglong'); if(player.hasEmptySlot(5)){ @@ -6206,7 +6207,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, //界曹彰 xinjiangchi:{ - audio:'new_jiangchi', + audio:2, trigger:{player:'phaseUseBegin'}, direct:true, content:function(){ diff --git a/character/yijiang.js b/character/yijiang.js index e376d5c5e..a82ede761 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -10305,6 +10305,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, qiaoshui:{ audio:2, + audioname2:{ + re_jianyong:'reqiaoshui', + xin_jianyong:'xinqiaoshui', + }, trigger:{player:'phaseUseBegin'}, direct:true, filter:function(event,player){ @@ -10345,12 +10349,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, qiaoshui3:{ + charlotte:true, + audio:'qiaoshui', + audioname2:{ + re_jianyong:'reqiaoshui', + xin_jianyong:'xinqiaoshui', + }, trigger:{player:'useCard2'}, - direct:true, filter:function(event,player){ var type=get.type(event.card); return type=='basic'||type=='trick'; }, + direct:true, content:function(){ 'step 0' player.removeSkill('qiaoshui3'); @@ -10390,7 +10400,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } 'step 2' if(event.target){ - player.logSkill('qiaoshui',event.target); + player.logSkill('qiaoshui3',event.target); trigger.targets.add(event.target); } event.finish(); @@ -10405,7 +10415,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(result.bool){ event.targets=result.targets; if(event.isMine()){ - player.logSkill('qiaoshui',event.targets); + player.logSkill('qiaoshui3',event.targets); event.finish(); } for(var i=0;i0&&_status.event&&_status.event.type==='phase'&&get.tag(card,'recover')){ @@ -11944,6 +11955,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, zhenlie:{ audio:2, + audioname:['re_wangyi'], filter:function(event,player){ return event.player!=player&&event.card&&(event.card.name=='sha'||get.type(event.card)=='trick'); }, @@ -14424,6 +14436,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ jyzongshi:'纵适', jyzongshi_info:'当你拼点赢时，你可以获得对方此次拼点的牌；当你拼点没赢时，你可以收回你此次拼点的牌。', qiaoshui:'巧说', + qiaoshui3:'巧说', qiaoshui_info:'出牌阶段开始时，你可与一名其他角色拼点。若你赢，你使用的下一张基本牌或普通锦囊牌可以额外指定任意一名其他角色为目标或减少指定一个目标；若你没赢，你不能使用锦囊牌直到回合结束。', reqiaoshui:'巧说', reqiaoshui_info:'出牌阶段，你可与一名其他角色拼点。若你赢，你使用的下一张基本牌或普通锦囊牌可以额外指定任意一名其他角色为目标或减少指定一个目标；若你没赢，你结束出牌阶段且本回合内锦囊牌不计入手牌上限。',