diff --git a/audio/background/music_chuqi.mp3 b/audio/background/music_chuqi.mp3 deleted file mode 100644 index 4b288a458..000000000 Binary files a/audio/background/music_chuqi.mp3 and /dev/null differ diff --git a/audio/card/default.mp3 b/audio/card/default.mp3 new file mode 100644 index 000000000..3cf8a69d7 Binary files /dev/null and b/audio/card/default.mp3 differ diff --git a/audio/die/caocao.mp3 b/audio/die/caocao.mp3 deleted file mode 100644 index 19f31a584..000000000 Binary files a/audio/die/caocao.mp3 and /dev/null differ diff --git a/audio/die/daqiao.mp3 b/audio/die/daqiao.mp3 deleted file mode 100644 index df57e7235..000000000 Binary files a/audio/die/daqiao.mp3 and /dev/null differ diff --git a/audio/die/diaochan.mp3 b/audio/die/diaochan.mp3 deleted file mode 100644 index cef995e1c..000000000 Binary files a/audio/die/diaochan.mp3 and /dev/null differ diff --git a/audio/die/ganning.mp3 b/audio/die/ganning.mp3 deleted file mode 100644 index 2c11d67bc..000000000 Binary files a/audio/die/ganning.mp3 and /dev/null differ diff --git a/audio/die/guanyu.mp3 b/audio/die/guanyu.mp3 deleted file mode 100644 index fbd7edfed..000000000 Binary files a/audio/die/guanyu.mp3 and /dev/null differ diff --git a/audio/die/guojia.mp3 b/audio/die/guojia.mp3 deleted file mode 100644 index 56ab69db4..000000000 Binary files a/audio/die/guojia.mp3 and /dev/null differ diff --git a/audio/die/huanggai.mp3 b/audio/die/huanggai.mp3 deleted file mode 100644 index d4c356c43..000000000 Binary files a/audio/die/huanggai.mp3 and /dev/null differ diff --git a/audio/die/huangyueying.mp3 b/audio/die/huangyueying.mp3 deleted file mode 100644 index 78f4c87f0..000000000 Binary files a/audio/die/huangyueying.mp3 and /dev/null differ diff --git a/audio/die/huatuo.mp3 b/audio/die/huatuo.mp3 deleted file mode 100644 index 4cd62eb4d..000000000 Binary files a/audio/die/huatuo.mp3 and /dev/null differ diff --git a/audio/die/liubei.mp3 b/audio/die/liubei.mp3 deleted file mode 100644 index 864cb2660..000000000 Binary files a/audio/die/liubei.mp3 and /dev/null differ diff --git a/audio/die/luxun.mp3 b/audio/die/luxun.mp3 deleted file mode 100644 index 35f59e51c..000000000 Binary files a/audio/die/luxun.mp3 and /dev/null differ diff --git a/audio/die/lvbu.mp3 b/audio/die/lvbu.mp3 deleted file mode 100644 index a54702dc2..000000000 Binary files a/audio/die/lvbu.mp3 and /dev/null differ diff --git a/audio/die/lvmeng.mp3 b/audio/die/lvmeng.mp3 deleted file mode 100644 index 83b697458..000000000 Binary files a/audio/die/lvmeng.mp3 and /dev/null differ diff --git a/audio/die/machao.mp3 b/audio/die/machao.mp3 deleted file mode 100644 index 4bb3df3f4..000000000 Binary files a/audio/die/machao.mp3 and /dev/null differ diff --git a/audio/die/re_caocao.mp3 b/audio/die/re_caocao.mp3 deleted file mode 100644 index 19f31a584..000000000 Binary files a/audio/die/re_caocao.mp3 and /dev/null differ diff --git a/audio/die/re_daqiao.mp3 b/audio/die/re_daqiao.mp3 deleted file mode 100644 index df57e7235..000000000 Binary files a/audio/die/re_daqiao.mp3 and /dev/null differ diff --git a/audio/die/re_gannning.mp3 b/audio/die/re_gannning.mp3 deleted file mode 100644 index 2c11d67bc..000000000 Binary files a/audio/die/re_gannning.mp3 and /dev/null differ diff --git a/audio/die/re_guanyu.mp3 b/audio/die/re_guanyu.mp3 deleted file mode 100644 index fbd7edfed..000000000 Binary files a/audio/die/re_guanyu.mp3 and /dev/null differ diff --git a/audio/die/re_guojia.mp3 b/audio/die/re_guojia.mp3 deleted file mode 100644 index 56ab69db4..000000000 Binary files a/audio/die/re_guojia.mp3 and /dev/null differ diff --git a/audio/die/re_huanggai.mp3 b/audio/die/re_huanggai.mp3 deleted file mode 100644 index d4c356c43..000000000 Binary files a/audio/die/re_huanggai.mp3 and /dev/null differ diff --git a/audio/die/re_huangyueying.mp3 b/audio/die/re_huangyueying.mp3 deleted file mode 100644 index 78f4c87f0..000000000 Binary files a/audio/die/re_huangyueying.mp3 and /dev/null differ diff --git a/audio/die/re_huatuo.mp3 b/audio/die/re_huatuo.mp3 deleted file mode 100644 index 4cd62eb4d..000000000 Binary files a/audio/die/re_huatuo.mp3 and /dev/null differ diff --git a/audio/die/re_luxun.mp3 b/audio/die/re_luxun.mp3 deleted file mode 100644 index 35f59e51c..000000000 Binary files a/audio/die/re_luxun.mp3 and /dev/null differ diff --git a/audio/die/re_lvbu.mp3 b/audio/die/re_lvbu.mp3 deleted file mode 100644 index a54702dc2..000000000 Binary files a/audio/die/re_lvbu.mp3 and /dev/null differ diff --git a/audio/die/re_lvmeng.mp3 b/audio/die/re_lvmeng.mp3 deleted file mode 100644 index 83b697458..000000000 Binary files a/audio/die/re_lvmeng.mp3 and /dev/null differ diff --git a/audio/die/re_machao.mp3 b/audio/die/re_machao.mp3 deleted file mode 100644 index 4bb3df3f4..000000000 Binary files a/audio/die/re_machao.mp3 and /dev/null differ diff --git a/audio/die/re_simayi.mp3 b/audio/die/re_simayi.mp3 deleted file mode 100644 index 889a34431..000000000 Binary files a/audio/die/re_simayi.mp3 and /dev/null differ diff --git a/audio/die/re_xiahoudun.mp3 b/audio/die/re_xiahoudun.mp3 deleted file mode 100644 index b73122b49..000000000 Binary files a/audio/die/re_xiahoudun.mp3 and /dev/null differ diff --git a/audio/die/re_xuzhu.mp3 b/audio/die/re_xuzhu.mp3 deleted file mode 100644 index 09c9f9fbf..000000000 Binary files a/audio/die/re_xuzhu.mp3 and /dev/null differ diff --git a/audio/die/re_zhangfei.mp3 b/audio/die/re_zhangfei.mp3 deleted file mode 100644 index 41a890b84..000000000 Binary files a/audio/die/re_zhangfei.mp3 and /dev/null differ diff --git a/audio/die/re_zhangliao.mp3 b/audio/die/re_zhangliao.mp3 deleted file mode 100644 index 8f314993f..000000000 Binary files a/audio/die/re_zhangliao.mp3 and /dev/null differ diff --git a/audio/die/re_zhaoyun.mp3 b/audio/die/re_zhaoyun.mp3 deleted file mode 100644 index 8fa04cb1f..000000000 Binary files a/audio/die/re_zhaoyun.mp3 and /dev/null differ diff --git a/audio/die/re_zhouyu.mp3 b/audio/die/re_zhouyu.mp3 deleted file mode 100644 index 59160b6fb..000000000 Binary files a/audio/die/re_zhouyu.mp3 and /dev/null differ diff --git a/audio/die/simayi.mp3 b/audio/die/simayi.mp3 deleted file mode 100644 index 889a34431..000000000 Binary files a/audio/die/simayi.mp3 and /dev/null differ diff --git a/audio/die/sunquan.mp3 b/audio/die/sunquan.mp3 deleted file mode 100644 index 4e7ff2f76..000000000 Binary files a/audio/die/sunquan.mp3 and /dev/null differ diff --git a/audio/die/sunshangxiang.mp3 b/audio/die/sunshangxiang.mp3 deleted file mode 100644 index ea03b8b0f..000000000 Binary files a/audio/die/sunshangxiang.mp3 and /dev/null differ diff --git a/audio/die/xiahoudun.mp3 b/audio/die/xiahoudun.mp3 deleted file mode 100644 index b73122b49..000000000 Binary files a/audio/die/xiahoudun.mp3 and /dev/null differ diff --git a/audio/die/xuzhu.mp3 b/audio/die/xuzhu.mp3 deleted file mode 100644 index 09c9f9fbf..000000000 Binary files a/audio/die/xuzhu.mp3 and /dev/null differ diff --git a/audio/die/zhangfei.mp3 b/audio/die/zhangfei.mp3 deleted file mode 100644 index 41a890b84..000000000 Binary files a/audio/die/zhangfei.mp3 and /dev/null differ diff --git a/audio/die/zhangliao.mp3 b/audio/die/zhangliao.mp3 deleted file mode 100644 index 8f314993f..000000000 Binary files a/audio/die/zhangliao.mp3 and /dev/null differ diff --git a/audio/die/zhaoyun.mp3 b/audio/die/zhaoyun.mp3 deleted file mode 100644 index 8fa04cb1f..000000000 Binary files a/audio/die/zhaoyun.mp3 and /dev/null differ diff --git a/audio/die/zhenji.mp3 b/audio/die/zhenji.mp3 deleted file mode 100644 index 393087261..000000000 Binary files a/audio/die/zhenji.mp3 and /dev/null differ diff --git a/audio/die/zhouyu.mp3 b/audio/die/zhouyu.mp3 deleted file mode 100644 index 59160b6fb..000000000 Binary files a/audio/die/zhouyu.mp3 and /dev/null differ diff --git a/audio/die/zhugeliang.mp3 b/audio/die/zhugeliang.mp3 deleted file mode 100644 index bf5c954dc..000000000 Binary files a/audio/die/zhugeliang.mp3 and /dev/null differ diff --git a/audio/effect/discard.mp3 b/audio/effect/discard.mp3 new file mode 100644 index 000000000..62933c85a Binary files /dev/null and b/audio/effect/discard.mp3 differ diff --git a/audio/effect/draw.mp3 b/audio/effect/draw.mp3 new file mode 100644 index 000000000..62933c85a Binary files /dev/null and b/audio/effect/draw.mp3 differ diff --git a/audio/effect/recover.mp3 b/audio/effect/recover.mp3 new file mode 100644 index 000000000..ef55a1d24 Binary files /dev/null and b/audio/effect/recover.mp3 differ diff --git a/audio/skill/default/1.mp3 b/audio/skill/default/1.mp3 new file mode 100644 index 000000000..3cf8a69d7 Binary files /dev/null and b/audio/skill/default/1.mp3 differ diff --git a/audio/skill/default/2.mp3 b/audio/skill/default/2.mp3 new file mode 100644 index 000000000..3cf8a69d7 Binary files /dev/null and b/audio/skill/default/2.mp3 differ diff --git a/audio/skill/default/3.mp3 b/audio/skill/default/3.mp3 new file mode 100644 index 000000000..3cf8a69d7 Binary files /dev/null and b/audio/skill/default/3.mp3 differ diff --git a/audio/skill/default/4.mp3 b/audio/skill/default/4.mp3 new file mode 100644 index 000000000..3cf8a69d7 Binary files /dev/null and b/audio/skill/default/4.mp3 differ diff --git a/audio/skill/default/5.mp3 b/audio/skill/default/5.mp3 new file mode 100644 index 000000000..3cf8a69d7 Binary files /dev/null and b/audio/skill/default/5.mp3 differ diff --git a/audio/skill/default/female/1.mp3 b/audio/skill/default/female/1.mp3 new file mode 100644 index 000000000..4f9c80c2f Binary files /dev/null and b/audio/skill/default/female/1.mp3 differ diff --git a/audio/skill/default/female/2.mp3 b/audio/skill/default/female/2.mp3 new file mode 100644 index 000000000..b34919e55 Binary files /dev/null and b/audio/skill/default/female/2.mp3 differ diff --git a/audio/skill/default/female/3.mp3 b/audio/skill/default/female/3.mp3 new file mode 100644 index 000000000..f14bd4629 Binary files /dev/null and b/audio/skill/default/female/3.mp3 differ diff --git a/audio/skill/default/female/4.mp3 b/audio/skill/default/female/4.mp3 new file mode 100644 index 000000000..dc73d9a35 Binary files /dev/null and b/audio/skill/default/female/4.mp3 differ diff --git a/audio/skill/default/female/5.mp3 b/audio/skill/default/female/5.mp3 new file mode 100644 index 000000000..b34919e55 Binary files /dev/null and b/audio/skill/default/female/5.mp3 differ diff --git a/audio/skill/default/male/1.mp3 b/audio/skill/default/male/1.mp3 new file mode 100644 index 000000000..f5831031d Binary files /dev/null and b/audio/skill/default/male/1.mp3 differ diff --git a/audio/skill/default/male/2.mp3 b/audio/skill/default/male/2.mp3 new file mode 100644 index 000000000..f5831031d Binary files /dev/null and b/audio/skill/default/male/2.mp3 differ diff --git a/audio/skill/default/male/3.mp3 b/audio/skill/default/male/3.mp3 new file mode 100644 index 000000000..22a566982 Binary files /dev/null and b/audio/skill/default/male/3.mp3 differ diff --git a/audio/skill/default/male/4.mp3 b/audio/skill/default/male/4.mp3 new file mode 100644 index 000000000..38f50e2d2 Binary files /dev/null and b/audio/skill/default/male/4.mp3 differ diff --git a/audio/skill/default/male/5.mp3 b/audio/skill/default/male/5.mp3 new file mode 100644 index 000000000..22a566982 Binary files /dev/null and b/audio/skill/default/male/5.mp3 differ diff --git a/audio/skill/fankui/1.mp3 b/audio/skill/fankui/1.mp3 deleted file mode 100644 index a1d68a887..000000000 Binary files a/audio/skill/fankui/1.mp3 and /dev/null differ diff --git a/audio/skill/fankui/2.mp3 b/audio/skill/fankui/2.mp3 deleted file mode 100644 index 284988d57..000000000 Binary files a/audio/skill/fankui/2.mp3 and /dev/null differ diff --git a/audio/skill/ganglie/1.mp3 b/audio/skill/ganglie/1.mp3 deleted file mode 100644 index 1e47886f3..000000000 Binary files a/audio/skill/ganglie/1.mp3 and /dev/null differ diff --git a/audio/skill/ganglie/2.mp3 b/audio/skill/ganglie/2.mp3 deleted file mode 100644 index d0303a5de..000000000 Binary files a/audio/skill/ganglie/2.mp3 and /dev/null differ diff --git a/audio/skill/guicai/1.mp3 b/audio/skill/guicai/1.mp3 deleted file mode 100644 index fd171681a..000000000 Binary files a/audio/skill/guicai/1.mp3 and /dev/null differ diff --git a/audio/skill/guicai/2.mp3 b/audio/skill/guicai/2.mp3 deleted file mode 100644 index cff128b29..000000000 Binary files a/audio/skill/guicai/2.mp3 and /dev/null differ diff --git a/audio/skill/hujia/1.mp3 b/audio/skill/hujia/1.mp3 deleted file mode 100644 index 280ac3a6d..000000000 Binary files a/audio/skill/hujia/1.mp3 and /dev/null differ diff --git a/audio/skill/hujia/2.mp3 b/audio/skill/hujia/2.mp3 deleted file mode 100644 index 0b1e62706..000000000 Binary files a/audio/skill/hujia/2.mp3 and /dev/null differ diff --git a/audio/skill/jianxiong/1.mp3 b/audio/skill/jianxiong/1.mp3 deleted file mode 100644 index ec135cf97..000000000 Binary files a/audio/skill/jianxiong/1.mp3 and /dev/null differ diff --git a/audio/skill/jianxiong/2.mp3 b/audio/skill/jianxiong/2.mp3 deleted file mode 100644 index 9d9f227b8..000000000 Binary files a/audio/skill/jianxiong/2.mp3 and /dev/null differ diff --git a/audio/skill/luoyi/1.mp3 b/audio/skill/luoyi/1.mp3 deleted file mode 100644 index 2bacc31b7..000000000 Binary files a/audio/skill/luoyi/1.mp3 and /dev/null differ diff --git a/audio/skill/luoyi/2.mp3 b/audio/skill/luoyi/2.mp3 deleted file mode 100644 index a1df9da99..000000000 Binary files a/audio/skill/luoyi/2.mp3 and /dev/null differ diff --git a/audio/skill/refankui/1.mp3 b/audio/skill/refankui/1.mp3 deleted file mode 100644 index a1d68a887..000000000 Binary files a/audio/skill/refankui/1.mp3 and /dev/null differ diff --git a/audio/skill/refankui/2.mp3 b/audio/skill/refankui/2.mp3 deleted file mode 100644 index 284988d57..000000000 Binary files a/audio/skill/refankui/2.mp3 and /dev/null differ diff --git a/audio/skill/reguicai/1.mp3 b/audio/skill/reguicai/1.mp3 deleted file mode 100644 index fd171681a..000000000 Binary files a/audio/skill/reguicai/1.mp3 and /dev/null differ diff --git a/audio/skill/reguicai/2.mp3 b/audio/skill/reguicai/2.mp3 deleted file mode 100644 index cff128b29..000000000 Binary files a/audio/skill/reguicai/2.mp3 and /dev/null differ diff --git a/audio/skill/rejianxiong/1.mp3 b/audio/skill/rejianxiong/1.mp3 deleted file mode 100644 index ec135cf97..000000000 Binary files a/audio/skill/rejianxiong/1.mp3 and /dev/null differ diff --git a/audio/skill/rejianxiong/2.mp3 b/audio/skill/rejianxiong/2.mp3 deleted file mode 100644 index 9d9f227b8..000000000 Binary files a/audio/skill/rejianxiong/2.mp3 and /dev/null differ diff --git a/audio/skill/reluoyi/1.mp3 b/audio/skill/reluoyi/1.mp3 deleted file mode 100644 index 2bacc31b7..000000000 Binary files a/audio/skill/reluoyi/1.mp3 and /dev/null differ diff --git a/audio/skill/reluoyi/2.mp3 b/audio/skill/reluoyi/2.mp3 deleted file mode 100644 index a1df9da99..000000000 Binary files a/audio/skill/reluoyi/2.mp3 and /dev/null differ diff --git a/audio/skill/retuxi/1.mp3 b/audio/skill/retuxi/1.mp3 deleted file mode 100644 index 643b7af64..000000000 Binary files a/audio/skill/retuxi/1.mp3 and /dev/null differ diff --git a/audio/skill/retuxi/2.mp3 b/audio/skill/retuxi/2.mp3 deleted file mode 100644 index c356a1171..000000000 Binary files a/audio/skill/retuxi/2.mp3 and /dev/null differ diff --git a/audio/skill/tuxi/1.mp3 b/audio/skill/tuxi/1.mp3 deleted file mode 100644 index 643b7af64..000000000 Binary files a/audio/skill/tuxi/1.mp3 and /dev/null differ diff --git a/audio/skill/tuxi/2.mp3 b/audio/skill/tuxi/2.mp3 deleted file mode 100644 index c356a1171..000000000 Binary files a/audio/skill/tuxi/2.mp3 and /dev/null differ diff --git a/character/refresh.js b/character/refresh.js index 73e48931b..f6461b2a7 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -1,26 +1,26 @@ character.refresh={ character:{ - re_caocao:['male','wei',4,['hujia','rejianxiong'],['zhu','fullskin','die_audio']], - re_simayi:['male','wei',3,['refankui','reguicai'],['fullskin','die_audio']], - re_guojia:['male','wei',3,['tiandu','reyiji'],['fullskin','die_audio']], + re_caocao:['male','wei',4,['hujia','rejianxiong'],['zhu','fullskin']], + re_simayi:['male','wei',3,['refankui','reguicai'],['fullskin']], + re_guojia:['male','wei',3,['tiandu','reyiji'],['fullskin']], re_lidian:['male','wei',3,['xunxun','wangxi'],['fullskin']], - re_zhangliao:['male','wei',4,['retuxi'],['fullskin','die_audio']], - re_xuzhu:['male','wei',4,['reluoyi'],['fullskin','die_audio']], - re_xiahoudun:['male','wei',4,['reganglie','qingjian'],['fullskin','die_audio']], - re_zhangfei:['male','shu',4,['paoxiao','retishen'],['fullskin','die_audio']], - re_zhaoyun:['male','shu',4,['longdan','reyajiao'],['fullskin'],['fullskin','die_audio']], - re_guanyu:['male','shu',4,['wusheng','yijue'],['fullskin','die_audio']], - re_machao:['male','shu',4,['mashu','retieji'],['fullskin','die_audio']], - re_xushu:['male','shu',4,['zhuhai','qianxin'],['fullskin','die_audio']], - re_zhouyu:['male','wu',3,['reyingzi','refanjian'],['fullskin','die_audio']], - re_lvmeng:['male','wu',4,['keji','qinxue'],['fullskin','die_audio']], - re_ganning:['male','wu',4,['qixi','fenwei'],['fullskin','die_audio']], - re_luxun:['male','wu',3,['reqianxun','relianying'],['fullskin','die_audio']], - re_daqiao:['female','wu',3,['reguose','liuli'],['fullskin','die_audio']], - re_huanggai:['male','wu',4,['rekurou','zhaxiang'],['fullskin','die_audio']], - re_lvbu:['male','qun',5,['wushuang'],['fullskin','die_audio']], + re_zhangliao:['male','wei',4,['retuxi'],['fullskin']], + re_xuzhu:['male','wei',4,['reluoyi'],['fullskin']], + re_xiahoudun:['male','wei',4,['reganglie','qingjian'],['fullskin']], + re_zhangfei:['male','shu',4,['paoxiao','retishen'],['fullskin']], + re_zhaoyun:['male','shu',4,['longdan','reyajiao'],['fullskin'],['fullskin']], + re_guanyu:['male','shu',4,['wusheng','yijue'],['fullskin']], + re_machao:['male','shu',4,['mashu','retieji'],['fullskin']], + re_xushu:['male','shu',4,['zhuhai','qianxin'],['fullskin']], + re_zhouyu:['male','wu',3,['reyingzi','refanjian'],['fullskin']], + re_lvmeng:['male','wu',4,['keji','qinxue'],['fullskin']], + re_ganning:['male','wu',4,['qixi','fenwei'],['fullskin']], + re_luxun:['male','wu',3,['reqianxun','relianying'],['fullskin']], + re_daqiao:['female','wu',3,['reguose','liuli'],['fullskin']], + re_huanggai:['male','wu',4,['rekurou','zhaxiang'],['fullskin']], + re_lvbu:['male','qun',5,['wushuang'],['fullskin']], re_gongsunzan:['male','qun',4,['qiaomeng','reyicong'],['fullskin']], - re_huatuo:['male','qun',3,['chulao','jijiu'],['fullskin','die_audio']], + re_huatuo:['male','qun',3,['chulao','jijiu'],['fullskin']], }, skill:{ reqicai:{ @@ -59,7 +59,6 @@ character.refresh={ } }, retuxi:{ - audio:2, trigger:{player:'phaseDrawBefore'}, direct:true, content:function(){ @@ -85,7 +84,6 @@ character.refresh={ } }, reguicai:{ - audio:2, trigger:{global:'judge'}, direct:true, filter:function(event,player){ @@ -129,7 +127,6 @@ character.refresh={ } }, refankui:{ - audio:2, trigger:{player:'damageEnd'}, direct:true, filter:function(event,player){ @@ -165,7 +162,6 @@ character.refresh={ } }, reluoyi:{ - audio:2, trigger:{player:'phaseDrawBegin'}, check:function(event,player){ if(player.num('h','sha')) return true; @@ -550,7 +546,6 @@ character.refresh={ } }, rejianxiong:{ - audio:2, trigger:{player:'damageEnd'}, direct:true, content:function(){ diff --git a/character/standard.js b/character/standard.js index a95721fae..cd7788c5d 100644 --- a/character/standard.js +++ b/character/standard.js @@ -1,30 +1,30 @@ character.standard={ character:{ - caocao:['male','wei',4,['hujia','jianxiong'],['zhu','fullskin','die_audio']], + caocao:['male','wei',4,['hujia','jianxiong'],['zhu','fullskin']], simayi:['male','wei',3,['fankui','guicai'],['fullskin']], - xiahoudun:['male','wei',4,['ganglie'],['fullskin','die_audio']], - zhangliao:['male','wei',4,['tuxi'],['fullskin','die_audio']], - xuzhu:['male','wei',4,['luoyi'],['fullskin','die_audio']], - guojia:['male','wei',3,['tiandu','yiji'],['fullskin','die_audio']], - zhenji:['female','wei',3,['luoshen','qingguo'],['fullskin','die_audio']], - liubei:['male','shu',4,['rende','jijiang'],['zhu','fullskin','die_audio']], - guanyu:['male','shu',4,['wusheng'],['fullskin','die_audio']], - zhangfei:['male','shu',4,['paoxiao'],['fullskin','die_audio']], - zhugeliang:['male','shu',3,['guanxing','kongcheng'],['fullskin','die_audio']], - zhaoyun:['male','shu',4,['longdan'],['fullskin','die_audio']], - machao:['male','shu',4,['mashu','tieji'],['fullskin','die_audio']], - huangyueying:['female','shu',3,['jizhi','qicai'],['fullskin','die_audio']], - sunquan:['male','wu',4,['zhiheng','jiuyuan'],['zhu','fullskin','die_audio']], - ganning:['male','wu',4,['qixi'],['fullskin','die_audio']], - lvmeng:['male','wu',4,['keji'],['fullskin','die_audio']], - huanggai:['male','wu',4,['kurou'],['fullskin','die_audio']], - zhouyu:['male','wu',3,['yingzi','fanjian'],['fullskin','die_audio']], - daqiao:['female','wu',3,['guose','liuli'],['fullskin','die_audio']], - luxun:['male','wu',3,['qianxun','lianying'],['fullskin','die_audio']], - sunshangxiang:['female','wu',3,['xiaoji','jieyin'],['fullskin','die_audio']], - huatuo:['male','qun',3,['qingnang','jijiu'],['fullskin','die_audio']], - lvbu:['male','qun',4,['wushuang'],['fullskin','die_audio']], - diaochan:['female','qun',3,['lijian','biyue'],['fullskin','die_audio']], + xiahoudun:['male','wei',4,['ganglie'],['fullskin']], + zhangliao:['male','wei',4,['tuxi'],['fullskin']], + xuzhu:['male','wei',4,['luoyi'],['fullskin']], + guojia:['male','wei',3,['tiandu','yiji'],['fullskin']], + zhenji:['female','wei',3,['luoshen','qingguo'],['fullskin']], + liubei:['male','shu',4,['rende','jijiang'],['zhu','fullskin']], + guanyu:['male','shu',4,['wusheng'],['fullskin']], + zhangfei:['male','shu',4,['paoxiao'],['fullskin']], + zhugeliang:['male','shu',3,['guanxing','kongcheng'],['fullskin']], + zhaoyun:['male','shu',4,['longdan'],['fullskin']], + machao:['male','shu',4,['mashu','tieji'],['fullskin']], + huangyueying:['female','shu',3,['jizhi','qicai'],['fullskin']], + sunquan:['male','wu',4,['zhiheng','jiuyuan'],['zhu','fullskin']], + ganning:['male','wu',4,['qixi'],['fullskin']], + lvmeng:['male','wu',4,['keji'],['fullskin']], + huanggai:['male','wu',4,['kurou'],['fullskin']], + zhouyu:['male','wu',3,['yingzi','fanjian'],['fullskin']], + daqiao:['female','wu',3,['guose','liuli'],['fullskin']], + luxun:['male','wu',3,['qianxun','lianying'],['fullskin']], + sunshangxiang:['female','wu',3,['xiaoji','jieyin'],['fullskin']], + huatuo:['male','qun',3,['qingnang','jijiu'],['fullskin']], + lvbu:['male','qun',4,['wushuang'],['fullskin']], + diaochan:['female','qun',3,['lijian','biyue'],['fullskin']], }, perfectPair:{ xiahoudun:['xiahouyuan'], @@ -41,7 +41,6 @@ character.standard={ }, skill:{ hujia:{ - audio:2, unique:true, trigger:{player:'chooseToRespondBegin'}, filter:function(event,player){ @@ -88,7 +87,7 @@ character.standard={ }, }, jianxiong:{ - audio:2, + trigger:{player:'damageEnd'}, filter:function(event,player){ return get.itemtype(event.cards)=='cards'&&get.position(event.cards[0])=='d'; @@ -108,7 +107,7 @@ character.standard={ } }, fankui:{ - audio:2, + trigger:{player:'damageEnd'}, direct:true, filter:function(event,player){ @@ -136,7 +135,6 @@ character.standard={ } }, guicai:{ - audio:2, trigger:{global:'judge'}, direct:true, filter:function(event,player){ @@ -182,7 +180,6 @@ character.standard={ } }, ganglie:{ - audio:2, trigger:{player:'damageEnd'}, filter:function(event,player){ return (event.source!=undefined); @@ -218,7 +215,6 @@ character.standard={ } }, tuxi:{ - audio:2, trigger:{player:'phaseDrawBefore'}, direct:true, content:function(){ @@ -258,7 +254,6 @@ character.standard={ } }, luoyi:{ - audio:2, trigger:{player:'phaseDrawBegin'}, check:function(event,player){ var i,cancel=true; @@ -729,9 +724,6 @@ character.standard={ } }, ai:{ - tag:{ -// rejudge:0.3 - }, threaten:1.2 } }, diff --git a/game/config.js b/game/config.js index a05acfd5b..23825d736 100644 --- a/game/config.js +++ b/game/config.js @@ -74,6 +74,7 @@ window.config={ background_music_config:'背景音乐', background_audio_config:'游戏音效', background_speak_config:'人物配音', + background_ogg_config:'补全配音', music_default:'默认', music_diaochan:'貂蝉', music_danji:'单骑', diff --git a/game/game.js b/game/game.js index cdce20e6c..0e6478570 100644 --- a/game/game.js +++ b/game/game.js @@ -1130,13 +1130,23 @@ window.play={}; player.checkShow(event.skill); } } - if(lib.config.background_audio&&lib.card[card.name].audio){ + if(lib.config.background_audio){ var sex=player.sex=='female'?'female':'male'; - if(card.name=='sha'&&(card.nature=='fire'||card.nature=='thunder')){ - game.playAudio('card',sex,card.name+'_'+card.nature); + if(lib.card[card.name].audio){ + if(card.name=='sha'&&(card.nature=='fire'||card.nature=='thunder')){ + game.playAudio('card',sex,card.name+'_'+card.nature); + } + else{ + game.playAudio('card',sex,card.name); + } } else{ - game.playAudio('card',sex,card.name); + if(lib.config.background_ogg){ + game.playAudioOgg('card',sex,card.name); + } + else{ + game.playAudio('card/default'); + } } } if(event.animate!=false){ @@ -1274,8 +1284,17 @@ window.play={}; useSkill:function(){ "step 0" var info=get.info(event.skill); - if(lib.config.background_speak&&info.audio){ - game.playAudio('skill',event.skill,Math.ceil(info.audio*Math.random())); + if(lib.config.background_speak&&!lib.skill.global.contains(event.skill)){ + if(info.audio){ + game.playAudio('skill',event.skill,Math.ceil(info.audio*Math.random())); + } + else if(lib.config.background_ogg){ + game.playAudioOgg('skill',event.skill); + } + else{ + game.playAudio('skill','default', + player.sex=='female'?'female':'male',Math.ceil(Math.random()*5)); + } } if(player.checkShow){ player.checkShow(event.skill); @@ -1392,6 +1411,9 @@ window.play={}; ui.clear(); }, draw:function(){ + if(lib.config.background_audio){ + game.playAudio('effect','draw'); + } if(event.log!=false){ game.log(get.translation(player)+'摸了'+get.cnNumber(num)+'张牌'); } @@ -1406,6 +1428,9 @@ window.play={}; }, discard:function(){ "step 0" + if(lib.config.background_audio){ + game.playAudio('effect','discard'); + } var str=get.translation(player)+'弃置了'; str+=get.translation(cards[0]); for(var i=1;iplayer.maxHp-player.hp) num=player.maxHp-player.hp; if(num>0){ player.changeHp(num); @@ -1796,7 +1832,10 @@ window.play={}; if(lib.config.background_speak){ if(lib.character[player.name]&&lib.character[player.name][4]&& lib.character[player.name][4].contains('die_audio')){ - game.playAudio('die',player.name) + game.playAudio('die',player.name); + } + else if(lib.config.background_ogg){ + game.playAudioOgg('die',player.name); } } if(lib.config.background_audio){ @@ -3390,8 +3429,16 @@ window.play={}; this.checkShow(name); } var info=lib.skill[name]; - if(info&&lib.config.background_speak&&info.audio){ - game.playAudio('skill',name,Math.ceil(info.audio*Math.random())); + if(info&&lib.config.background_speak){ + if(info.audio){ + game.playAudio('skill',name,Math.ceil(info.audio*Math.random())); + } + else{ + if(lib.config.background_ogg){ + game.playAudioOgg('skill',name); + } + game.playAudio('skill','default',Math.ceil(Math.random()*5)); + } } }, unprompt:function(){ @@ -4897,6 +4944,25 @@ window.play={}; }; ui.window.appendChild(audio); }, + playAudioOgg:function(){ + var str=''; + for(var i=0;i