diff --git a/audio/die/bailingyun.mp3 b/audio/die/bailingyun.mp3 new file mode 100644 index 000000000..9d57c7909 Binary files /dev/null and b/audio/die/bailingyun.mp3 differ diff --git a/audio/die/bulianshi.mp3 b/audio/die/bulianshi.mp3 index 931ec8498..c372ea741 100644 Binary files a/audio/die/bulianshi.mp3 and b/audio/die/bulianshi.mp3 differ diff --git a/audio/die/dc_liuli.mp3 b/audio/die/dc_liuli.mp3 new file mode 100644 index 000000000..0b05df737 Binary files /dev/null and b/audio/die/dc_liuli.mp3 differ diff --git a/audio/die/fuhuanghou.mp3 b/audio/die/fuhuanghou.mp3 index 57cf2ce21..0602b102d 100644 Binary files a/audio/die/fuhuanghou.mp3 and b/audio/die/fuhuanghou.mp3 differ diff --git a/audio/die/guanzhang.mp3 b/audio/die/guanzhang.mp3 index 672d7143c..e30586666 100644 Binary files a/audio/die/guanzhang.mp3 and b/audio/die/guanzhang.mp3 differ diff --git a/audio/die/hetaihou.mp3 b/audio/die/hetaihou.mp3 index 7748154a5..9755983cf 100644 Binary files a/audio/die/hetaihou.mp3 and b/audio/die/hetaihou.mp3 differ diff --git a/audio/die/jsrg_gaoxiang.mp3 b/audio/die/jsrg_gaoxiang.mp3 deleted file mode 100644 index ef9808d49..000000000 Binary files a/audio/die/jsrg_gaoxiang.mp3 and /dev/null differ diff --git a/audio/die/jsrg_guozhao.mp3 b/audio/die/jsrg_guozhao.mp3 deleted file mode 100644 index 40f5d84d8..000000000 Binary files a/audio/die/jsrg_guozhao.mp3 and /dev/null differ diff --git a/audio/die/jsrg_jiangwei.mp3 b/audio/die/jsrg_jiangwei.mp3 deleted file mode 100644 index b35f93a41..000000000 Binary files a/audio/die/jsrg_jiangwei.mp3 and /dev/null differ diff --git a/audio/die/jsrg_liuyong.mp3 b/audio/die/jsrg_liuyong.mp3 deleted file mode 100644 index aa10552f9..000000000 Binary files a/audio/die/jsrg_liuyong.mp3 and /dev/null differ diff --git a/audio/die/jsrg_luxun.mp3 b/audio/die/jsrg_luxun.mp3 deleted file mode 100644 index 736605485..000000000 Binary files a/audio/die/jsrg_luxun.mp3 and /dev/null differ diff --git a/audio/die/jsrg_simayi.mp3 b/audio/die/jsrg_simayi.mp3 deleted file mode 100644 index c79c0b084..000000000 Binary files a/audio/die/jsrg_simayi.mp3 and /dev/null differ diff --git a/audio/die/jsrg_sunlubansunluyu.mp3 b/audio/die/jsrg_sunlubansunluyu.mp3 deleted file mode 100644 index f9ede96e3..000000000 Binary files a/audio/die/jsrg_sunlubansunluyu.mp3 and /dev/null differ diff --git a/audio/die/jsrg_weiwenzhugezhi.mp3 b/audio/die/jsrg_weiwenzhugezhi.mp3 deleted file mode 100644 index 0afea51fc..000000000 Binary files a/audio/die/jsrg_weiwenzhugezhi.mp3 and /dev/null differ diff --git a/audio/die/jsrg_zhangxuan.mp3 b/audio/die/jsrg_zhangxuan.mp3 deleted file mode 100644 index cbf320fa2..000000000 Binary files a/audio/die/jsrg_zhangxuan.mp3 and /dev/null differ diff --git a/audio/die/jsrg_zhaoyun.mp3 b/audio/die/jsrg_zhaoyun.mp3 deleted file mode 100644 index 1d45c280e..000000000 Binary files a/audio/die/jsrg_zhaoyun.mp3 and /dev/null differ diff --git a/audio/die/jsrg_zhugeliang.mp3 b/audio/die/jsrg_zhugeliang.mp3 deleted file mode 100644 index d37d32005..000000000 Binary files a/audio/die/jsrg_zhugeliang.mp3 and /dev/null differ diff --git a/audio/die/luyi.mp3 b/audio/die/luyi.mp3 index 3c1ee5b14..ee12f8ffb 100644 Binary files a/audio/die/luyi.mp3 and b/audio/die/luyi.mp3 differ diff --git a/audio/die/wangyi.mp3 b/audio/die/wangyi.mp3 index 9a948750e..9ad9e6a70 100644 Binary files a/audio/die/wangyi.mp3 and b/audio/die/wangyi.mp3 differ diff --git a/audio/die/xunyu.mp3 b/audio/die/xunyu.mp3 index 3892885fa..03cbe4de0 100644 Binary files a/audio/die/xunyu.mp3 and b/audio/die/xunyu.mp3 differ diff --git a/audio/skill/anxu1.mp3 b/audio/skill/anxu1.mp3 index f6adb1cf8..949984ff6 100644 Binary files a/audio/skill/anxu1.mp3 and b/audio/skill/anxu1.mp3 differ diff --git a/audio/skill/anxu2.mp3 b/audio/skill/anxu2.mp3 index cc962383d..74c29ef61 100644 Binary files a/audio/skill/anxu2.mp3 and b/audio/skill/anxu2.mp3 differ diff --git a/audio/skill/dcdehua1.mp3 b/audio/skill/dcdehua1.mp3 new file mode 100644 index 000000000..20f737e42 Binary files /dev/null and b/audio/skill/dcdehua1.mp3 differ diff --git a/audio/skill/dcdehua2.mp3 b/audio/skill/dcdehua2.mp3 new file mode 100644 index 000000000..3d8cc9225 Binary files /dev/null and b/audio/skill/dcdehua2.mp3 differ diff --git a/audio/skill/dcfuli1.mp3 b/audio/skill/dcfuli1.mp3 new file mode 100644 index 000000000..546dd734e Binary files /dev/null and b/audio/skill/dcfuli1.mp3 differ diff --git a/audio/skill/dcfuli2.mp3 b/audio/skill/dcfuli2.mp3 new file mode 100644 index 000000000..cde4a717f Binary files /dev/null and b/audio/skill/dcfuli2.mp3 differ diff --git a/audio/skill/dcfuxue1.mp3 b/audio/skill/dcfuxue1.mp3 index 92dd04024..6bb24be71 100644 Binary files a/audio/skill/dcfuxue1.mp3 and b/audio/skill/dcfuxue1.mp3 differ diff --git a/audio/skill/dcfuxue2.mp3 b/audio/skill/dcfuxue2.mp3 index e0eafb85d..143d914f0 100644 Binary files a/audio/skill/dcfuxue2.mp3 and b/audio/skill/dcfuxue2.mp3 differ diff --git a/audio/skill/dclinghui1.mp3 b/audio/skill/dclinghui1.mp3 new file mode 100644 index 000000000..106805d92 Binary files /dev/null and b/audio/skill/dclinghui1.mp3 differ diff --git a/audio/skill/dclinghui2.mp3 b/audio/skill/dclinghui2.mp3 new file mode 100644 index 000000000..184eceb92 Binary files /dev/null and b/audio/skill/dclinghui2.mp3 differ diff --git a/audio/skill/dcshoutan1.mp3 b/audio/skill/dcshoutan1.mp3 index f7481e53c..f30b39eb7 100644 Binary files a/audio/skill/dcshoutan1.mp3 and b/audio/skill/dcshoutan1.mp3 differ diff --git a/audio/skill/dcshoutan2.mp3 b/audio/skill/dcshoutan2.mp3 index d4aee325a..4b41190d8 100644 Binary files a/audio/skill/dcshoutan2.mp3 and b/audio/skill/dcshoutan2.mp3 differ diff --git a/audio/skill/dcxiace1.mp3 b/audio/skill/dcxiace1.mp3 new file mode 100644 index 000000000..e47f563b7 Binary files /dev/null and b/audio/skill/dcxiace1.mp3 differ diff --git a/audio/skill/dcxiace2.mp3 b/audio/skill/dcxiace2.mp3 new file mode 100644 index 000000000..d84876b6b Binary files /dev/null and b/audio/skill/dcxiace2.mp3 differ diff --git a/audio/skill/dcyaoyi1.mp3 b/audio/skill/dcyaoyi1.mp3 index 2ce4f9be3..00819e5bf 100644 Binary files a/audio/skill/dcyaoyi1.mp3 and b/audio/skill/dcyaoyi1.mp3 differ diff --git a/audio/skill/dcyaoyi2.mp3 b/audio/skill/dcyaoyi2.mp3 index f7213067b..2176b80b9 100644 Binary files a/audio/skill/dcyaoyi2.mp3 and b/audio/skill/dcyaoyi2.mp3 differ diff --git a/audio/skill/dcyuxin1.mp3 b/audio/skill/dcyuxin1.mp3 new file mode 100644 index 000000000..686095a8c Binary files /dev/null and b/audio/skill/dcyuxin1.mp3 differ diff --git a/audio/skill/dcyuxin2.mp3 b/audio/skill/dcyuxin2.mp3 new file mode 100644 index 000000000..5104f9460 Binary files /dev/null and b/audio/skill/dcyuxin2.mp3 differ diff --git a/audio/skill/fuhun1.mp3 b/audio/skill/fuhun1.mp3 index b8d89d67a..d0db6137b 100644 Binary files a/audio/skill/fuhun1.mp3 and b/audio/skill/fuhun1.mp3 differ diff --git a/audio/skill/fuhun2.mp3 b/audio/skill/fuhun2.mp3 index feb676e56..5fa5223ec 100644 Binary files a/audio/skill/fuhun2.mp3 and b/audio/skill/fuhun2.mp3 differ diff --git a/audio/skill/huamu3.mp3 b/audio/skill/huamu3.mp3 new file mode 100644 index 000000000..e5c772da0 Binary files /dev/null and b/audio/skill/huamu3.mp3 differ diff --git a/audio/skill/huamu4.mp3 b/audio/skill/huamu4.mp3 new file mode 100644 index 000000000..ac52aac18 Binary files /dev/null and b/audio/skill/huamu4.mp3 differ diff --git a/audio/skill/huamu5.mp3 b/audio/skill/huamu5.mp3 new file mode 100644 index 000000000..38349b422 Binary files /dev/null and b/audio/skill/huamu5.mp3 differ diff --git a/audio/skill/huamu6.mp3 b/audio/skill/huamu6.mp3 new file mode 100644 index 000000000..3a5604f43 Binary files /dev/null and b/audio/skill/huamu6.mp3 differ diff --git a/audio/skill/jsrgchiying1.mp3 b/audio/skill/jsrgchiying1.mp3 deleted file mode 100644 index a3481ab39..000000000 Binary files a/audio/skill/jsrgchiying1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgchiying2.mp3 b/audio/skill/jsrgchiying2.mp3 deleted file mode 100644 index 57682e688..000000000 Binary files a/audio/skill/jsrgchiying2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgchushi1.mp3 b/audio/skill/jsrgchushi1.mp3 deleted file mode 100644 index 7262cce98..000000000 Binary files a/audio/skill/jsrgchushi1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgchushi2.mp3 b/audio/skill/jsrgchushi2.mp3 deleted file mode 100644 index da7af0a21..000000000 Binary files a/audio/skill/jsrgchushi2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgdailao1.mp3 b/audio/skill/jsrgdailao1.mp3 deleted file mode 100644 index 245b2906f..000000000 Binary files a/audio/skill/jsrgdailao1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgdailao2.mp3 b/audio/skill/jsrgdailao2.mp3 deleted file mode 100644 index 7267723fc..000000000 Binary files a/audio/skill/jsrgdailao2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgdaimou1.mp3 b/audio/skill/jsrgdaimou1.mp3 deleted file mode 100644 index 427b5eaf6..000000000 Binary files a/audio/skill/jsrgdaimou1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgdaimou2.mp3 b/audio/skill/jsrgdaimou2.mp3 deleted file mode 100644 index a449e83f5..000000000 Binary files a/audio/skill/jsrgdaimou2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgdanxin1.mp3 b/audio/skill/jsrgdanxin1.mp3 deleted file mode 100644 index f5f2cee2c..000000000 Binary files a/audio/skill/jsrgdanxin1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgdanxin2.mp3 b/audio/skill/jsrgdanxin2.mp3 deleted file mode 100644 index c5f8cb612..000000000 Binary files a/audio/skill/jsrgdanxin2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfangjie1.mp3 b/audio/skill/jsrgfangjie1.mp3 deleted file mode 100644 index 75fb46549..000000000 Binary files a/audio/skill/jsrgfangjie1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfangjie2.mp3 b/audio/skill/jsrgfangjie2.mp3 deleted file mode 100644 index 9daadd915..000000000 Binary files a/audio/skill/jsrgfangjie2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfengxiang1.mp3 b/audio/skill/jsrgfengxiang1.mp3 deleted file mode 100644 index 6f374efb6..000000000 Binary files a/audio/skill/jsrgfengxiang1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfengxiang2.mp3 b/audio/skill/jsrgfengxiang2.mp3 deleted file mode 100644 index caf015a1b..000000000 Binary files a/audio/skill/jsrgfengxiang2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfuhai1.mp3 b/audio/skill/jsrgfuhai1.mp3 deleted file mode 100644 index 307269eba..000000000 Binary files a/audio/skill/jsrgfuhai1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfuhai2.mp3 b/audio/skill/jsrgfuhai2.mp3 deleted file mode 100644 index e8a91fbfe..000000000 Binary files a/audio/skill/jsrgfuhai2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfumou1.mp3 b/audio/skill/jsrgfumou1.mp3 deleted file mode 100644 index dfad8ca52..000000000 Binary files a/audio/skill/jsrgfumou1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgfumou2.mp3 b/audio/skill/jsrgfumou2.mp3 deleted file mode 100644 index a63c1e1af..000000000 Binary files a/audio/skill/jsrgfumou2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgjinfa1.mp3 b/audio/skill/jsrgjinfa1.mp3 deleted file mode 100644 index e7b6c7891..000000000 Binary files a/audio/skill/jsrgjinfa1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgjinfa2.mp3 b/audio/skill/jsrgjinfa2.mp3 deleted file mode 100644 index 2ebf83bdf..000000000 Binary files a/audio/skill/jsrgjinfa2.mp3 and /dev/null differ diff --git a/audio/skill/jsrglonglin1.mp3 b/audio/skill/jsrglonglin1.mp3 deleted file mode 100644 index d2495f271..000000000 Binary files a/audio/skill/jsrglonglin1.mp3 and /dev/null differ diff --git a/audio/skill/jsrglonglin2.mp3 b/audio/skill/jsrglonglin2.mp3 deleted file mode 100644 index 08288cf42..000000000 Binary files a/audio/skill/jsrglonglin2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgpianchong1.mp3 b/audio/skill/jsrgpianchong1.mp3 deleted file mode 100644 index 43bcf8443..000000000 Binary files a/audio/skill/jsrgpianchong1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgpianchong2.mp3 b/audio/skill/jsrgpianchong2.mp3 deleted file mode 100644 index 20615d10e..000000000 Binary files a/audio/skill/jsrgpianchong2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgshezeng1.mp3 b/audio/skill/jsrgshezeng1.mp3 deleted file mode 100644 index fd6774832..000000000 Binary files a/audio/skill/jsrgshezeng1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgshezeng2.mp3 b/audio/skill/jsrgshezeng2.mp3 deleted file mode 100644 index 9ea3b38bf..000000000 Binary files a/audio/skill/jsrgshezeng2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgtongli1.mp3 b/audio/skill/jsrgtongli1.mp3 deleted file mode 100644 index c026fbaaf..000000000 Binary files a/audio/skill/jsrgtongli1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgtongli2.mp3 b/audio/skill/jsrgtongli2.mp3 deleted file mode 100644 index 955f1a40c..000000000 Binary files a/audio/skill/jsrgtongli2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgtuigu1.mp3 b/audio/skill/jsrgtuigu1.mp3 deleted file mode 100644 index 91644b64b..000000000 Binary files a/audio/skill/jsrgtuigu1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgtuigu2.mp3 b/audio/skill/jsrgtuigu2.mp3 deleted file mode 100644 index b2c2e51e1..000000000 Binary files a/audio/skill/jsrgtuigu2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgwentian1.mp3 b/audio/skill/jsrgwentian1.mp3 deleted file mode 100644 index e664e1633..000000000 Binary files a/audio/skill/jsrgwentian1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgwentian2.mp3 b/audio/skill/jsrgwentian2.mp3 deleted file mode 100644 index d6491e59a..000000000 Binary files a/audio/skill/jsrgwentian2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgxuanfeng1.mp3 b/audio/skill/jsrgxuanfeng1.mp3 deleted file mode 100644 index 7c56a2329..000000000 Binary files a/audio/skill/jsrgxuanfeng1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgxuanfeng2.mp3 b/audio/skill/jsrgxuanfeng2.mp3 deleted file mode 100644 index f92fda041..000000000 Binary files a/audio/skill/jsrgxuanfeng2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgyingshi1.mp3 b/audio/skill/jsrgyingshi1.mp3 deleted file mode 100644 index 62e8ff873..000000000 Binary files a/audio/skill/jsrgyingshi1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgyingshi2.mp3 b/audio/skill/jsrgyingshi2.mp3 deleted file mode 100644 index ce9ebcbe9..000000000 Binary files a/audio/skill/jsrgyingshi2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgyinlve1.mp3 b/audio/skill/jsrgyinlve1.mp3 deleted file mode 100644 index 599bb4cc1..000000000 Binary files a/audio/skill/jsrgyinlve1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgyinlve2.mp3 b/audio/skill/jsrgyinlve2.mp3 deleted file mode 100644 index c0483e541..000000000 Binary files a/audio/skill/jsrgyinlve2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgyoujin1.mp3 b/audio/skill/jsrgyoujin1.mp3 deleted file mode 100644 index 273f26b4b..000000000 Binary files a/audio/skill/jsrgyoujin1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgyoujin2.mp3 b/audio/skill/jsrgyoujin2.mp3 deleted file mode 100644 index 9ba6e0366..000000000 Binary files a/audio/skill/jsrgyoujin2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgzhendan1.mp3 b/audio/skill/jsrgzhendan1.mp3 deleted file mode 100644 index 2549ced4e..000000000 Binary files a/audio/skill/jsrgzhendan1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgzhendan2.mp3 b/audio/skill/jsrgzhendan2.mp3 deleted file mode 100644 index fd737a912..000000000 Binary files a/audio/skill/jsrgzhendan2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgzhubei1.mp3 b/audio/skill/jsrgzhubei1.mp3 deleted file mode 100644 index d2d6a75ee..000000000 Binary files a/audio/skill/jsrgzhubei1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgzhubei2.mp3 b/audio/skill/jsrgzhubei2.mp3 deleted file mode 100644 index cec6a27d4..000000000 Binary files a/audio/skill/jsrgzhubei2.mp3 and /dev/null differ diff --git a/audio/skill/jsrgzunwei1.mp3 b/audio/skill/jsrgzunwei1.mp3 deleted file mode 100644 index 67ce22ad3..000000000 Binary files a/audio/skill/jsrgzunwei1.mp3 and /dev/null differ diff --git a/audio/skill/jsrgzunwei2.mp3 b/audio/skill/jsrgzunwei2.mp3 deleted file mode 100644 index 55d2f5f72..000000000 Binary files a/audio/skill/jsrgzunwei2.mp3 and /dev/null differ diff --git a/audio/skill/miji1.mp3 b/audio/skill/miji1.mp3 index 169144798..69a4b83a3 100644 Binary files a/audio/skill/miji1.mp3 and b/audio/skill/miji1.mp3 differ diff --git a/audio/skill/miji2.mp3 b/audio/skill/miji2.mp3 index 67f97f58d..91e58f3bc 100644 Binary files a/audio/skill/miji2.mp3 and b/audio/skill/miji2.mp3 differ diff --git a/audio/skill/paoxiao_guanzhang1.mp3 b/audio/skill/paoxiao_guanzhang1.mp3 index 2ca8b1952..ed36d145f 100644 Binary files a/audio/skill/paoxiao_guanzhang1.mp3 and b/audio/skill/paoxiao_guanzhang1.mp3 differ diff --git a/audio/skill/paoxiao_guanzhang2.mp3 b/audio/skill/paoxiao_guanzhang2.mp3 index 2ca8b1952..ed36d145f 100644 Binary files a/audio/skill/paoxiao_guanzhang2.mp3 and b/audio/skill/paoxiao_guanzhang2.mp3 differ diff --git a/audio/skill/qiuyuan1.mp3 b/audio/skill/qiuyuan1.mp3 index 209464710..c74957298 100644 Binary files a/audio/skill/qiuyuan1.mp3 and b/audio/skill/qiuyuan1.mp3 differ diff --git a/audio/skill/qiuyuan2.mp3 b/audio/skill/qiuyuan2.mp3 index 883b07b6a..bb5510e0e 100644 Binary files a/audio/skill/qiuyuan2.mp3 and b/audio/skill/qiuyuan2.mp3 differ diff --git a/audio/skill/wusheng_guanzhang1.mp3 b/audio/skill/wusheng_guanzhang1.mp3 index a3c786f22..d8d28344d 100644 Binary files a/audio/skill/wusheng_guanzhang1.mp3 and b/audio/skill/wusheng_guanzhang1.mp3 differ diff --git a/audio/skill/wusheng_guanzhang2.mp3 b/audio/skill/wusheng_guanzhang2.mp3 index a3c786f22..d8d28344d 100644 Binary files a/audio/skill/wusheng_guanzhang2.mp3 and b/audio/skill/wusheng_guanzhang2.mp3 differ diff --git a/audio/skill/zhenlie1.mp3 b/audio/skill/zhenlie1.mp3 index 1ed4be5ea..546c8986a 100644 Binary files a/audio/skill/zhenlie1.mp3 and b/audio/skill/zhenlie1.mp3 differ diff --git a/audio/skill/zhenlie2.mp3 b/audio/skill/zhenlie2.mp3 index 3a1e41081..f15a624a6 100644 Binary files a/audio/skill/zhenlie2.mp3 and b/audio/skill/zhenlie2.mp3 differ diff --git a/audio/skill/zhuikong1.mp3 b/audio/skill/zhuikong1.mp3 index 6079b7437..d0b2593a8 100644 Binary files a/audio/skill/zhuikong1.mp3 and b/audio/skill/zhuikong1.mp3 differ diff --git a/audio/skill/zhuikong2.mp3 b/audio/skill/zhuikong2.mp3 index 292aca268..498b00ce5 100644 Binary files a/audio/skill/zhuikong2.mp3 and b/audio/skill/zhuikong2.mp3 differ diff --git a/audio/skill/zhuiyi1.mp3 b/audio/skill/zhuiyi1.mp3 index 5a59e37b2..4d37bffb2 100644 Binary files a/audio/skill/zhuiyi1.mp3 and b/audio/skill/zhuiyi1.mp3 differ diff --git a/audio/skill/zhuiyi2.mp3 b/audio/skill/zhuiyi2.mp3 index c98d925e4..98e648fb2 100644 Binary files a/audio/skill/zhuiyi2.mp3 and b/audio/skill/zhuiyi2.mp3 differ diff --git a/character/huicui.js b/character/huicui.js index 53fffbdc9..312c23e05 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -123,7 +123,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, enable:'phaseUse', filter(event,player){ - return player.getDiscardableCards(player,'h').some(card=>!player.getStorage('dcfuli').includes(get.type2(card))); + return player.countDiscardableCards(player,'h'); }, usable:1, async content(event,trigger,player){ @@ -133,11 +133,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(num===-1) num=3; return num; }; - const types=player.getDiscardableCards(player,'h').filter(card=>{ - return !player.getStorage('dcfuli').includes(get.type2(card)); - }).reduce((list,card)=>list.add(get.type2(card)),[]).sort((a,b)=>{ - return getNum(a)-getNum(b); - }); + const types=player.getDiscardableCards(player,'h').reduce((list,card)=>{ + return list.add(get.type2(card)); + },[]).sort((a,b)=>getNum(a)-getNum(b)); if(types.length){ const {result:{control}}=await player.chooseControl(types).set('ai',()=>{ const player=get.event('player'),types=get.event('controls').slice(); @@ -158,10 +156,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ })[0]; }).set('prompt','弃置一种类别的所有手牌，然后摸这些牌的名字字数之和的牌'); if(control){ - if(!player.storage.dcfuli){ - player.when({global:'phaseAfter'}).then(()=>delete player.storage.dcfuli); - } - player.markAuto('dcfuli',[control]); const cards=player.getDiscardableCards(player,'h').filter(card=>get.type2(card)==control); await player.discard(cards); const max=game.findPlayer(target=>target.isMaxHandcard()).countCards('h'); @@ -191,7 +185,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ order:1, result:{ player(player){ - const types=player.getDiscardableCards(player,'h').filter(card=>!player.getStorage('dcfuli').includes(get.type2(card))); + const types=player.getDiscardableCards(player,'h').reduce((list,card)=>{ + return list.add(get.type2(card)); + },[]); if(!types.some(type=>{ const cards=player.getDiscardableCards(player,'h').filter(card=>get.type2(card)==type); const countCards=(target,player,cards)=>{ @@ -1173,14 +1169,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return _status.currentPhase; }, prompt2:function(event,player){ - const num=player.hasSkill('dccaisi_more')?2:1; + const num=player.countMark('dccaisi_more')+1; return `从${player==_status.currentPhase?'牌堆':'弃牌'}堆中随机获得${get.cnNumber(num)}张非基本牌`; }, content:function*(event,map){ const player=map.player,trigger=map.trigger; const position=player==_status.currentPhase?'cardPile':'discardPile'; - let cards=[],num=player.hasSkill('dccaisi_more')?2:1; - player.removeSkill('dccaisi_more'); + let cards=[],num=player.countMark('dccaisi_more')+1; while(num>0){ num--; let card=get[position](card=>get.type(card)!='basic'&&!cards.includes(card)); @@ -1193,8 +1188,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ game.log(`但是${position=='discardPile'?'弃':''}牌堆里没有非基本牌！`); } player.addTempSkill('dccaisi_more'); + player.addMark('dccaisi_more',1,false); }, - subSkill:{more:{charlotte:true}}, + subSkill:{more:{charlotte:true,onremove:true}}, }, dczhuoli:{ audio:2, @@ -3033,11 +3029,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, enable:['chooseToUse','chooseToRespond'], hiddenCard:function(player,name){ - if(player.getStorage('dcgue').includes(_status.currentPhase)) return false; + if(player.hasSkill('dcgue_blocker',null,null,false)) return false; return name=='sha'||name=='shan'; }, filter:function(event,player){ - //if(event.dcgue||event.type=='wuxie'||player==_status.currentPhase||player.getStorage('dcgue').includes(_status.currentPhase)) return false; if(event.dcgue||event.type=='wuxie'||player==_status.currentPhase) return false; if(!player.countCards('h')||player.hasSkill('dcgue_blocker',null,null,false)) return false; for(var name of ['sha','shan']){ @@ -3081,7 +3076,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ delete evt.openskilldialog; return; } - //else player.markAuto('dcgue',[_status.currentPhase]); game.delayx(); }, } @@ -3091,14 +3085,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, subSkill:{blocker:{charlotte:true}}, - //intro:{content:'已于$的回合发动过技能'}, ai:{ order:1, respondSha:true, respondShan:true, - skillTagFilter:function(player,tag,arg){ - //if(player.getStorage('dcgue').includes(_status.currentPhase)) return false; - if(player.countCards('h',{name:['sha','shan']})>1) return false; + skillTagFilter:function(player){ + if(player.hasSkill('dcgue_blocker',null,null,false)) return false; }, result:{ player:function(player){ @@ -11987,7 +11979,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcqinghuang_info:'出牌阶段开始时，你可以减1点体力上限，然后你于本回合发动〖踏寂〗时额外随机执行一种效果。', dc_huojun:'霍峻', dcgue:'孤扼', - dcgue_info:'每回合限一次。当你需要使用或打出【杀】或【闪】时，若你有手牌，你可以展示之。若其中【杀】和【闪】的数量之和不超过1，你视为使用或打出此牌。', + dcgue_info:'每回合限一次。当你需要于回合外使用或打出【杀】或【闪】时，若你有手牌，你可以展示之。若其中【杀】和【闪】的数量之和不超过1，你视为使用或打出此牌。', dcsigong:'伺攻', dcsigong_info:'其他角色的回合结束时，若其于本回合内使用牌被响应过，你可以将手牌摸至或弃置至1，视为对其使用一张需使用X张【闪】抵消的【杀】，且此【杀】的伤害基数+1（X为你以此法弃置的牌数且至少为1）。当你以此法造成伤害后，该技能于本轮失效。', peiyuanshao:'裴元绍', @@ -12063,7 +12055,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcshizong_info:'当你需要使用一张基本牌时，你可以交给一名其他角色X张牌，然后其可以将一张牌置于牌堆底，视为你使用之。若其不为当前回合角色，此技能失效直到回合结束（X为你本回合发动〖恃纵〗的次数）。', pangshanmin:'庞山民', dccaisi:'才思', - dccaisi_info:'当你于回合内/回合外使用基本牌结算结束后，若你本回合以此法得到的牌数小于你的体力上限，你可以从牌堆/弃牌堆随机获得一张非基本牌，然后本回合下次发动此技能获得的牌数+1。', + dccaisi_info:'当你于回合内/回合外使用基本牌结算结束后，若你本回合以此法得到的牌数小于你的体力上限，你可以从牌堆/弃牌堆随机获得一张非基本牌，然后本回合发动此技能获得的牌数+1。', dczhuoli:'擢吏', dczhuoli_info:'锁定技。一名角色的回合结束时，若你本回合使用或获得的牌数大于体力值，你加1点体力上限（不能超过存活角色数），回复1点体力。', yue_caiyong:'乐蔡邕', @@ -12114,7 +12106,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcshoucheng_info:'一名角色于其回合外失去最后的手牌后，你可令其摸两张牌。', dc_liuli:'刘理', dcfuli:'抚黎', - dcfuli_info:'出牌阶段限一次，你可以展示手牌并弃置一种类别的所有手牌（每种类别每回合限一次），然后摸X张牌（X为这些牌的牌名字数和且X至多为场上手牌数最多的角色的手牌数）。若你因此弃置了伤害类卡牌，则你可以选择一名角色，令其攻击范围-1直到你的下个回合开始。', + dcfuli_info:'出牌阶段限一次，你可以展示手牌并弃置一种类别的所有手牌，然后摸X张牌（X为这些牌的牌名字数和且X至多为场上手牌数最多的角色的手牌数）。若你因此弃置了伤害类卡牌，则你可以选择一名角色，令其攻击范围-1直到你的下个回合开始。', dcdehua:'德化', dcdehua_info:'锁定技。①一轮游戏开始时，若有你可以使用的非延时类伤害类牌的牌名，你选择其中一个并视为使用之，然后你不能从手牌中使用此牌名的牌，然后若你已选择过所有的伤害类牌牌名，你失去〖德化〗。②你的手牌上限+Y（Y为你〖德化①〗选择过的牌名数）。', diff --git a/character/sp.js b/character/sp.js index 2a9e9bf4d..b44d53cdd 100755 --- a/character/sp.js +++ b/character/sp.js @@ -8144,7 +8144,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, //曹宪曹华 huamu:{ - audio:2, + audio:6, trigger:{player:'useCardAfter'}, locked:false, filter:function(event,player){ diff --git a/character/sp2.js b/character/sp2.js index dd945bd38..69cfd7cf1 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -162,7 +162,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ const type=get.type(card,player); if(type!='basic'&&type!='trick') return false; return lib.filter.cardUsable(card,player)&&game.hasPlayer(target=>{ - return lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target); + return lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/; }); }); if(!cards.length) return false; @@ -177,7 +177,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ const type=get.type(card,player); if(type!='basic'&&type!='trick') return false; return lib.filter.cardUsable(card,player)&&game.hasPlayer(target=>{ - return lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target); + return lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/; }); }); if(!cards.includes(card)) return false; @@ -195,14 +195,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){ else if(typeof select=='function') range=select(card,player); game.checkMod(card,player,range,'selectTarget',player); const cards=player.getCards('h',cardx=>card!=cardx&&get.suit(card,player)==get.suit(cardx,player)); - let targets=game.filterPlayer(target=>lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target)&&get.effect(target,card,player,player)>0); + let targets=game.filterPlayer(target=>lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/&&get.effect(target,card,player,player)>0); const max=range[1],max2=Math.min(cards.length,targets.length); if(max>max2) return 0; targets=targets.sort((a,b)=>get.effect(b,card,player,player)-get.effect(a,card,player,player)).slice(0,max2); const sum=targets.reduce((num,target)=>num+get.effect(target,card,player,player),0); if(max==-1){ if(game.filterPlayer(target=>{ - return lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target); + return lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/; }).reduce((num,target)=>num+get.effect(target,card,player,player),0)>sum) return 0; } return sum; @@ -217,7 +217,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ const cardx=new lib.element.VCard({name:get.name(card,player),nature:get.nature(card,player),cards:cards}); const {result:{bool,targets}}=await player.chooseTarget((card,player,target)=>{ //return player.canUse(get.event('cardx'),target); - return lib.filter.targetEnabled2(get.event('cardx'),player,target)&&lib.filter.targetInRange(get.event('cardx'),player,target); + return lib.filter.targetEnabled2(get.event('cardx'),player,target)/*&&lib.filter.targetInRange(get.event('cardx'),player,target)*/; },true).set('cardx',cardx).set('selectTarget',[1,cards.length]) .set('prompt','请选择'+(game.hasNature(cardx)?get.translation(get.nature(cardx)):'')+'【'+get.translation(cardx)+'】（'+get.translation(cards)+'）的目标') .set('ai',target=>{ @@ -11391,7 +11391,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ starxiaoyan:'硝焰', starxiaoyan_info:'锁定技，游戏开始时，你对所有其他角色各造成1点火属性伤害，然后这些角色可依次交给你一张牌并回复1点体力。', starzongshi:'纵势', - starzongshi_info:'出牌阶段，你可以展示一张可展示目标的基本牌或普通锦囊牌，然后你将手牌中所有与此牌花色相同的其他牌当作此牌使用，且此牌至多指定转化牌数的目标。', + starzongshi_info:'出牌阶段，你可以展示一张可展示目标的基本牌或普通锦囊牌，然后你将手牌中所有与此牌花色相同的其他牌当作此牌使用（无距离限制），且此牌至多指定转化牌数的目标。', starjiaowang:'骄妄', starjiaowang_info:'锁定技，非首轮游戏开始时，若上一轮没有角色死亡（因〖硝焰〗死亡的角色除外），则你失去1点体力并发动〖硝焰〗。', staraoshi:'傲势', diff --git a/character/xianding.js b/character/xianding.js index e05dc0318..72627c7f4 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -212,7 +212,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, frequent:true, async content(event,trigger,player){ - let cards=get.cards(3,true); + let cards=get.cards(3); const {result:{bool,links}}=await player.chooseButton(['灵慧：是否使用其中的一张牌并随机获得其中一张剩余牌？',cards]).set('ai',button=>{ return get.event('player').getUseValue(button.link); }); @@ -224,6 +224,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ await player.chooseUseTarget(true,card,false); if(cards.length) await player.gain(cards.randomGet(),'gain2'); } + if(cards.length){ + for(let i=cards.length-1;i--;i>=0){ + ui.cardPile.insertBefore(cards[i],ui.cardPile.firstChild); + } + } + game.updateRoundNumber(); }, }, dcxiace:{