v1.10.11.3 [follow up v1.10.14]

跟进v1.10.14的更新内容（by 棘手怀念摧毁）
Syzygy5945 · Jul 15, 2024 · b137082 · b137082
1 parent 30a6173
commit b137082
Show file tree

Hide file tree

Showing 648 changed files with 11,181 additions and 2,642 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:18
+
+WORKDIR /app
+
+COPY ./docker/* ./
+
+RUN npm install body-parser express minimist
+
+COPY . .
+
+EXPOSE 8080
+EXPOSE 8089
+
+CMD [ "sh","./start.sh" ]
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@
 
 无名杀内置多种游戏模式和武将（及卡牌）包，拥有智能AI且可以实现单机、（弱）联机和局域网联机等多种游戏方式，并能通过扩展功能实现各种DIY设计，包括但不限于武将技能（含台词、配音）和卡牌设计、游戏模式设计、UI界面美化（含皮肤、特效）、功能扩展等
 
-主要交流平台——微信公众号：无名杀扩展交流、无名杀；百度贴吧：无名杀吧（现吧主：诗笺）；无名杀QQ群和QQ频道（略）；无名杀官网（略）等
+主要交流平台——无名杀GitHub官网；百度贴吧：无名杀吧（现吧主：诗笺）；无名杀QQ群、QQ频道、微信公众号等
 
 ★ 最重要的是：看教程，看教程，看教程！！！
 
@@ -165,23 +165,22 @@ bug反馈：
 
 ## Part Ⅱ 无名杀原版README
 
-noname-server.exe的源码见以下仓库：
+noname-server.exe 的源码见以下仓库：
 
 https://github.com/nonameShijian/noname-server
 
 ---
 
 贡献代码可阅读相关文档：
 
-[Git下载安装指南](https://github.com/libccy/noname/wiki/Git%E4%B8%8B%E8%BD%BD%E5%AE%89%E8%A3%85%E6%8C%87%E5%8D%97)
+[Git 下载安装指南](https://github.com/libccy/noname/wiki/Git%E4%B8%8B%E8%BD%BD%E5%AE%89%E8%A3%85%E6%8C%87%E5%8D%97)
 
-[Github桌面版客户端使用入门](https://docs.github.com/zh/desktop/overview/getting-started-with-github-desktop)
+[Github 桌面版客户端使用入门](https://docs.github.com/zh/desktop/overview/getting-started-with-github-desktop)
 
-[如何提交代码到《无名杀》Github仓库](https://github.com/libccy/noname/wiki/%E5%A6%82%E4%BD%95%E6%8F%90%E4%BA%A4%E4%BB%A3%E7%A0%81%E5%88%B0%E3%80%8A%E6%97%A0%E5%90%8D%E6%9D%80%E3%80%8BGithub%E4%BB%93%E5%BA%93)
+[如何提交代码到《无名杀》Github 仓库](https://github.com/libccy/noname/wiki/%E5%A6%82%E4%BD%95%E6%8F%90%E4%BA%A4%E4%BB%A3%E7%A0%81%E5%88%B0%E3%80%8A%E6%97%A0%E5%90%8D%E6%9D%80%E3%80%8BGithub%E4%BB%93%E5%BA%93)
 
 [《无名杀》项目 Pull Request 提交规范](https://github.com/libccy/noname/wiki/%E3%80%8A%E6%97%A0%E5%90%8D%E6%9D%80%E3%80%8B%E9%A1%B9%E7%9B%AE-Pull-Request-%E6%8F%90%E4%BA%A4%E8%A7%84%E8%8C%83)
 
-
 在线试玩：
 
 https://spmario233.github.io/noname/index.html (图片素材加载速度较慢，不推荐)
@@ -190,8 +189,10 @@ https://spmario233.github.io/noname/index.html (图片素材加载速度较慢
 
 GitHub： https://github.com/libccy/noname/releases/tag/chromium77-client
 
-网页端推荐使用Chrome系内核浏览器游玩，不推荐使用低版本Firefox浏览器
+docker: [docker.md](./docker/docker.md)
+
+网页端推荐使用 Chrome 系内核浏览器游玩，不推荐使用低版本 Firefox 浏览器
 
-请尽量保证游玩的Chrome系浏览器或手机Webview的`内核版本大于等于77`
+请尽量保证游玩的 Chrome 系浏览器或手机 Webview 的`内核版本大于等于77`
 
-提交Pull Request时请推送到"PR-Branch"分支！
+提交 Pull Request 时请推送到"PR-Branch"分支！
diff --git a/audio/die/caimao.mp3 b/audio/die/caimao.mp3
diff --git a/audio/die/dc_sb_guanping.mp3 b/audio/die/dc_sb_guanping.mp3
diff --git a/audio/die/dc_sb_lusu_shadow.mp3 b/audio/die/dc_sb_lusu_shadow.mp3
diff --git a/audio/die/dongzhuo.mp3 b/audio/die/dongzhuo.mp3
diff --git a/audio/die/fuqian.mp3 b/audio/die/fuqian.mp3
diff --git a/audio/die/guanyue.mp3 b/audio/die/guanyue.mp3
diff --git a/audio/die/gz_jun_caocao.mp3 b/audio/die/gz_jun_caocao.mp3
diff --git a/audio/die/gz_jun_liubei.mp3 b/audio/die/gz_jun_liubei.mp3
diff --git a/audio/die/gz_jun_sunquan.mp3 b/audio/die/gz_jun_sunquan.mp3
diff --git a/audio/die/gz_jun_zhangjiao.mp3 b/audio/die/gz_jun_zhangjiao.mp3
diff --git a/audio/die/gz_xusheng.mp3 b/audio/die/gz_xusheng.mp3
diff --git a/audio/die/junk_sunquan.mp3 b/audio/die/junk_sunquan.mp3
diff --git a/audio/die/mb_simafu.mp3 b/audio/die/mb_simafu.mp3
diff --git a/audio/die/mb_wangjing.mp3 b/audio/die/mb_wangjing.mp3
diff --git a/audio/die/mp_wangrong.mp3 b/audio/die/mp_wangrong.mp3
diff --git a/audio/die/ol_caifuren.mp3 b/audio/die/ol_caifuren.mp3
diff --git a/audio/die/ol_fazheng.mp3 b/audio/die/ol_fazheng.mp3
diff --git a/audio/die/ol_jiangwan.mp3 b/audio/die/ol_jiangwan.mp3
diff --git a/audio/die/ol_liwan.mp3 b/audio/die/ol_liwan.mp3
diff --git a/audio/die/ol_luyusheng.mp3 b/audio/die/ol_luyusheng.mp3
diff --git a/audio/die/ol_pangde.mp3 b/audio/die/ol_pangde.mp3
diff --git a/audio/die/ol_sb_pangtong.mp3 b/audio/die/ol_sb_pangtong.mp3
diff --git a/audio/die/ol_sb_pangtong2.mp3 b/audio/die/ol_sb_pangtong2.mp3
diff --git a/audio/die/ol_sb_pangtong3.mp3 b/audio/die/ol_sb_pangtong3.mp3
diff --git a/audio/die/ol_zhangliao.mp3 b/audio/die/ol_zhangliao.mp3
diff --git a/audio/die/old_huaxiong.mp3 b/audio/die/old_huaxiong.mp3
diff --git a/audio/die/old_zhoutai.mp3 b/audio/die/old_zhoutai.mp3
diff --git a/audio/die/quyuan.mp3 b/audio/die/quyuan.mp3
diff --git a/audio/die/re_lusu.mp3 b/audio/die/re_lusu.mp3
diff --git a/audio/die/re_yuji.mp3 b/audio/die/re_yuji.mp3
diff --git a/audio/die/sb_huangyueying.mp3 b/audio/die/sb_huangyueying.mp3
diff --git a/audio/die/sb_luxun.mp3 b/audio/die/sb_luxun.mp3
diff --git a/audio/die/sp_wenpin.mp3 b/audio/die/sp_wenpin.mp3
diff --git a/audio/die/sp_zhangjiao.mp3 b/audio/die/sp_zhangjiao.mp3
diff --git a/audio/die/star_sunshangxiang.mp3 b/audio/die/star_sunshangxiang.mp3
diff --git a/audio/die/sunli.mp3 b/audio/die/sunli.mp3
diff --git a/audio/die/wenpin.mp3 b/audio/die/wenpin.mp3
diff --git a/audio/die/wuhujiang.mp3 b/audio/die/wuhujiang.mp3
diff --git a/audio/die/wuhujiang2.mp3 b/audio/die/wuhujiang2.mp3
diff --git a/audio/die/wuhujiang3.mp3 b/audio/die/wuhujiang3.mp3
diff --git a/audio/die/wuhujiang4.mp3 b/audio/die/wuhujiang4.mp3
diff --git a/audio/die/wuhujiang5.mp3 b/audio/die/wuhujiang5.mp3
diff --git a/audio/die/ol_masu.mp3 → audio/die/xin_masu.mp3 b/audio/die/ol_masu.mp3 → audio/die/xin_masu.mp3
diff --git a/audio/die/xin_sunquan.mp3 b/audio/die/xin_sunquan.mp3
diff --git a/audio/die/xin_yujin.mp3 b/audio/die/xin_yujin.mp3
diff --git a/audio/die/xukun.mp3 b/audio/die/xukun.mp3
diff --git a/audio/die/xunyou.mp3 b/audio/die/xunyou.mp3
diff --git a/audio/die/xusheng.mp3 b/audio/die/xusheng.mp3
diff --git a/audio/die/yadan.mp3 b/audio/die/yadan.mp3
diff --git a/audio/die/yue_miheng.mp3 b/audio/die/yue_miheng.mp3
diff --git a/audio/die/zhangbu.mp3 b/audio/die/zhangbu.mp3
diff --git a/audio/die/zhangjiao.mp3 b/audio/die/zhangjiao.mp3
diff --git a/audio/die/zhangren.mp3 b/audio/die/zhangren.mp3
diff --git a/audio/die/zhupeilan.mp3 b/audio/die/zhupeilan.mp3
diff --git a/audio/skill/baonue21.mp3 b/audio/skill/baonue21.mp3
diff --git a/audio/skill/baonue22.mp3 b/audio/skill/baonue22.mp3
diff --git a/audio/skill/boss_baonu1.mp3 b/audio/skill/boss_baonu1.mp3
diff --git a/audio/skill/boss_baonu2.mp3 b/audio/skill/boss_baonu2.mp3
diff --git a/audio/skill/dccilv1.mp3 b/audio/skill/dccilv1.mp3
diff --git a/audio/skill/dccilv2.mp3 b/audio/skill/dccilv2.mp3
diff --git a/audio/skill/dcfenhui1.mp3 b/audio/skill/dcfenhui1.mp3
diff --git a/audio/skill/dcfenhui2.mp3 b/audio/skill/dcfenhui2.mp3
diff --git a/audio/skill/dchuanli1.mp3 b/audio/skill/dchuanli1.mp3
diff --git a/audio/skill/dchuanli2.mp3 b/audio/skill/dchuanli2.mp3
diff --git a/audio/skill/dchuiwan1.mp3 b/audio/skill/dchuiwan1.mp3
diff --git a/audio/skill/dchuiwan2.mp3 b/audio/skill/dchuiwan2.mp3
diff --git a/audio/skill/dcjieling2.mp3 b/audio/skill/dcjieling2.mp3
diff --git a/audio/skill/dcjigu1.mp3 b/audio/skill/dcjigu1.mp3
diff --git a/audio/skill/dcjigu2.mp3 b/audio/skill/dcjigu2.mp3
diff --git a/audio/skill/dclisao1.mp3 b/audio/skill/dclisao1.mp3
diff --git a/audio/skill/dclisao2.mp3 b/audio/skill/dclisao2.mp3
diff --git a/audio/skill/dcqiusuo1.mp3 b/audio/skill/dcqiusuo1.mp3
diff --git a/audio/skill/dcqiusuo2.mp3 b/audio/skill/dcqiusuo2.mp3
diff --git a/audio/skill/dcsbmengmou1.mp3 b/audio/skill/dcsbmengmou1.mp3
diff --git a/audio/skill/dcsbmengmou2.mp3 b/audio/skill/dcsbmengmou2.mp3
diff --git a/audio/skill/dcsbmengmou_dc_sb_lusu_shadow1.mp3 b/audio/skill/dcsbmengmou_dc_sb_lusu_shadow1.mp3
diff --git a/audio/skill/dcsbmengmou_dc_sb_lusu_shadow2.mp3 b/audio/skill/dcsbmengmou_dc_sb_lusu_shadow2.mp3
diff --git a/audio/skill/dcsbmingshi_dc_sb_lusu_shadow1.mp3 b/audio/skill/dcsbmingshi_dc_sb_lusu_shadow1.mp3
diff --git a/audio/skill/dcsbmingshi_dc_sb_lusu_shadow2.mp3 b/audio/skill/dcsbmingshi_dc_sb_lusu_shadow2.mp3
diff --git a/audio/skill/dcsbwuwei1.mp3 b/audio/skill/dcsbwuwei1.mp3
diff --git a/audio/skill/dcsbwuwei2.mp3 b/audio/skill/dcsbwuwei2.mp3
diff --git a/audio/skill/dcshouzhi1.mp3 b/audio/skill/dcshouzhi1.mp3
diff --git a/audio/skill/dcshouzhi2.mp3 b/audio/skill/dcshouzhi2.mp3
diff --git a/audio/skill/dcsirui1.mp3 b/audio/skill/dcsirui1.mp3
diff --git a/audio/skill/dcsirui2.mp3 b/audio/skill/dcsirui2.mp3
diff --git a/audio/skill/dcsuchou1.mp3 b/audio/skill/dcsuchou1.mp3
diff --git a/audio/skill/dcsuchou2.mp3 b/audio/skill/dcsuchou2.mp3
diff --git a/audio/skill/dctongdao1.mp3 b/audio/skill/dctongdao1.mp3
diff --git a/audio/skill/dctongdao2.mp3 b/audio/skill/dctongdao2.mp3
diff --git a/audio/skill/dcxingmen1.mp3 b/audio/skill/dcxingmen1.mp3
diff --git a/audio/skill/dcxingmen2.mp3 b/audio/skill/dcxingmen2.mp3
diff --git a/audio/skill/drlt_poshi2.mp3 b/audio/skill/drlt_poshi2.mp3
diff --git a/audio/skill/enyuan1.mp3 b/audio/skill/enyuan1.mp3
diff --git a/audio/skill/enyuan2.mp3 b/audio/skill/enyuan2.mp3
diff --git a/audio/skill/enyuan3.mp3 b/audio/skill/enyuan3.mp3
diff --git a/audio/skill/enyuan4.mp3 b/audio/skill/enyuan4.mp3
diff --git a/audio/skill/fazhu1.mp3 b/audio/skill/fazhu1.mp3
diff --git a/audio/skill/fazhu2.mp3 b/audio/skill/fazhu2.mp3
diff --git a/audio/skill/fencheng1.mp3 b/audio/skill/fencheng1.mp3
diff --git a/audio/skill/fencheng2.mp3 b/audio/skill/fencheng2.mp3
diff --git a/audio/skill/gz_jun_liubei.mp3 b/audio/skill/gz_jun_liubei.mp3
diff --git a/audio/skill/gz_jun_sunquan.mp3 b/audio/skill/gz_jun_sunquan.mp3
diff --git a/audio/skill/gzzongyu1.mp3 b/audio/skill/gzzongyu1.mp3
diff --git a/audio/skill/gzzongyu2.mp3 b/audio/skill/gzzongyu2.mp3
diff --git a/audio/skill/hongfa1.mp3 b/audio/skill/hongfa1.mp3
diff --git a/audio/skill/hongfa2.mp3 b/audio/skill/hongfa2.mp3
diff --git a/audio/skill/hongfa3.mp3 b/audio/skill/hongfa3.mp3
diff --git a/audio/skill/hongfa_hp.mp3 b/audio/skill/hongfa_hp.mp3
diff --git a/audio/skill/huangjintianbingfu1.mp3 b/audio/skill/huangjintianbingfu1.mp3
diff --git a/audio/skill/huangjintianbingfu2.mp3 b/audio/skill/huangjintianbingfu2.mp3
diff --git a/audio/skill/huangjintianbingfu3.mp3 b/audio/skill/huangjintianbingfu3.mp3
diff --git a/audio/skill/huibian1.mp3 b/audio/skill/huibian1.mp3
diff --git a/audio/skill/huibian2.mp3 b/audio/skill/huibian2.mp3
diff --git a/audio/skill/jiahe.mp3 b/audio/skill/jiahe.mp3
diff --git a/audio/skill/jiahe1.mp3 b/audio/skill/jiahe1.mp3
diff --git a/audio/skill/jiahe2.mp3 b/audio/skill/jiahe2.mp3
diff --git a/audio/skill/jiahe_duoshi1.mp3 b/audio/skill/jiahe_duoshi1.mp3
diff --git a/audio/skill/jiahe_duoshi2.mp3 b/audio/skill/jiahe_duoshi2.mp3
diff --git a/audio/skill/jiahe_haoshi1.mp3 b/audio/skill/jiahe_haoshi1.mp3
diff --git a/audio/skill/jiahe_haoshi2.mp3 b/audio/skill/jiahe_haoshi2.mp3
diff --git a/audio/skill/jiahe_put1.mp3 b/audio/skill/jiahe_put1.mp3
diff --git a/audio/skill/jiahe_put2.mp3 b/audio/skill/jiahe_put2.mp3
diff --git a/audio/skill/jiahe_reyingzi1.mp3 b/audio/skill/jiahe_reyingzi1.mp3
diff --git a/audio/skill/jiahe_reyingzi2.mp3 b/audio/skill/jiahe_reyingzi2.mp3
diff --git a/audio/skill/jiahe_shelie1.mp3 b/audio/skill/jiahe_shelie1.mp3
diff --git a/audio/skill/jiahe_shelie2.mp3 b/audio/skill/jiahe_shelie2.mp3
diff --git a/audio/skill/jianan.mp3 b/audio/skill/jianan.mp3
diff --git a/audio/skill/jianan1.mp3 b/audio/skill/jianan1.mp3
diff --git a/audio/skill/jianan2.mp3 b/audio/skill/jianan2.mp3
diff --git a/audio/skill/jianan_duanliang.mp3 b/audio/skill/jianan_duanliang.mp3
diff --git a/audio/skill/jianan_jieyue.mp3 b/audio/skill/jianan_jieyue.mp3
diff --git a/audio/skill/jianan_qiaobian.mp3 b/audio/skill/jianan_qiaobian.mp3
diff --git a/audio/skill/jianan_tuxi.mp3 b/audio/skill/jianan_tuxi.mp3
diff --git a/audio/skill/jianan_xiaoguo.mp3 b/audio/skill/jianan_xiaoguo.mp3
diff --git a/audio/skill/jijiang1_liushan1.mp3 b/audio/skill/jijiang1_liushan1.mp3
diff --git a/audio/skill/jijiang1_liushan2.mp3 b/audio/skill/jijiang1_liushan2.mp3
diff --git a/audio/skill/jiuchi1.mp3 b/audio/skill/jiuchi1.mp3
diff --git a/audio/skill/jiuchi2.mp3 b/audio/skill/jiuchi2.mp3
diff --git a/audio/skill/jizhao1.mp3 b/audio/skill/jizhao1.mp3
diff --git a/audio/skill/jizhao2.mp3 b/audio/skill/jizhao2.mp3
diff --git a/audio/skill/jubao1.mp3 b/audio/skill/jubao1.mp3
diff --git a/audio/skill/jubao2.mp3 b/audio/skill/jubao2.mp3
diff --git a/audio/skill/kangli1.mp3 b/audio/skill/kangli1.mp3
diff --git a/audio/skill/kangli2.mp3 b/audio/skill/kangli2.mp3
diff --git a/audio/skill/kunfen_ol_sb_jiangwei1.mp3 b/audio/skill/kunfen_ol_sb_jiangwei1.mp3
diff --git a/audio/skill/lianzi1.mp3 b/audio/skill/lianzi1.mp3
diff --git a/audio/skill/lianzi2.mp3 b/audio/skill/lianzi2.mp3
diff --git a/audio/skill/mbchengxiong1.mp3 b/audio/skill/mbchengxiong1.mp3
diff --git a/audio/skill/mbchengxiong2.mp3 b/audio/skill/mbchengxiong2.mp3
diff --git a/audio/skill/mbchenjie1.mp3 b/audio/skill/mbchenjie1.mp3
diff --git a/audio/skill/mbchenjie2.mp3 b/audio/skill/mbchenjie2.mp3
diff --git a/audio/skill/mbjiejian1.mp3 b/audio/skill/mbjiejian1.mp3
diff --git a/audio/skill/mbjiejian2.mp3 b/audio/skill/mbjiejian2.mp3
diff --git a/audio/skill/mbjiejian3.mp3 b/audio/skill/mbjiejian3.mp3
diff --git a/audio/skill/mbpanxiang1.mp3 b/audio/skill/mbpanxiang1.mp3
diff --git a/audio/skill/mbpanxiang2.mp3 b/audio/skill/mbpanxiang2.mp3
diff --git a/audio/skill/mbpanxiang3.mp3 b/audio/skill/mbpanxiang3.mp3
diff --git a/audio/skill/mbpanxiang4.mp3 b/audio/skill/mbpanxiang4.mp3
diff --git a/audio/skill/mbwangzhuang1.mp3 b/audio/skill/mbwangzhuang1.mp3
diff --git a/audio/skill/mbwangzhuang2.mp3 b/audio/skill/mbwangzhuang2.mp3
diff --git a/audio/skill/mbzujin1.mp3 b/audio/skill/mbzujin1.mp3
diff --git a/audio/skill/mbzujin2.mp3 b/audio/skill/mbzujin2.mp3
diff --git a/audio/skill/mbzujin3.mp3 b/audio/skill/mbzujin3.mp3
diff --git a/audio/skill/mpqianlin1.mp3 b/audio/skill/mpqianlin1.mp3
diff --git a/audio/skill/mpqianlin2.mp3 b/audio/skill/mpqianlin2.mp3
diff --git a/audio/skill/mpsixiao1.mp3 b/audio/skill/mpsixiao1.mp3
diff --git a/audio/skill/mpsixiao2.mp3 b/audio/skill/mpsixiao2.mp3
diff --git a/audio/skill/olcangxin1.mp3 b/audio/skill/olcangxin1.mp3
diff --git a/audio/skill/olcangxin2.mp3 b/audio/skill/olcangxin2.mp3
diff --git a/audio/skill/olenyuan1.mp3 b/audio/skill/olenyuan1.mp3
diff --git a/audio/skill/olenyuan2.mp3 b/audio/skill/olenyuan2.mp3
diff --git a/audio/skill/olhuyi1.mp3 b/audio/skill/olhuyi1.mp3
diff --git a/audio/skill/olhuyi2.mp3 b/audio/skill/olhuyi2.mp3
diff --git a/audio/skill/olhuyi3.mp3 b/audio/skill/olhuyi3.mp3
diff --git a/audio/skill/olhuyi4.mp3 b/audio/skill/olhuyi4.mp3
diff --git a/audio/skill/olhuyi5.mp3 b/audio/skill/olhuyi5.mp3
diff --git a/audio/skill/oljingzhou1.mp3 b/audio/skill/oljingzhou1.mp3
diff --git a/audio/skill/oljingzhou2.mp3 b/audio/skill/oljingzhou2.mp3
diff --git a/audio/skill/ollianju1.mp3 b/audio/skill/ollianju1.mp3
diff --git a/audio/skill/ollianju2.mp3 b/audio/skill/ollianju2.mp3
diff --git a/audio/skill/olqieting1.mp3 b/audio/skill/olqieting1.mp3
diff --git a/audio/skill/olqieting2.mp3 b/audio/skill/olqieting2.mp3
diff --git a/audio/skill/olqingya1.mp3 b/audio/skill/olqingya1.mp3
diff --git a/audio/skill/olqingya2.mp3 b/audio/skill/olqingya2.mp3
diff --git a/audio/skill/olrunwei1.mp3 b/audio/skill/olrunwei1.mp3
diff --git a/audio/skill/olrunwei2.mp3 b/audio/skill/olrunwei2.mp3
diff --git a/audio/skill/olsbhongtu1.mp3 b/audio/skill/olsbhongtu1.mp3
diff --git a/audio/skill/olsbhongtu2.mp3 b/audio/skill/olsbhongtu2.mp3
diff --git a/audio/skill/olsbhongtu3.mp3 b/audio/skill/olsbhongtu3.mp3
diff --git a/audio/skill/olsbhongtu4.mp3 b/audio/skill/olsbhongtu4.mp3
diff --git a/audio/skill/olsbhongtu5.mp3 b/audio/skill/olsbhongtu5.mp3
diff --git a/audio/skill/olsbhongtu6.mp3 b/audio/skill/olsbhongtu6.mp3
diff --git a/audio/skill/olsbqiwu1.mp3 b/audio/skill/olsbqiwu1.mp3
diff --git a/audio/skill/olsbqiwu2.mp3 b/audio/skill/olsbqiwu2.mp3
diff --git a/audio/skill/olsbqiwu3.mp3 b/audio/skill/olsbqiwu3.mp3
diff --git a/audio/skill/olsbqiwu4.mp3 b/audio/skill/olsbqiwu4.mp3
diff --git a/audio/skill/olsbqiwu5.mp3 b/audio/skill/olsbqiwu5.mp3
diff --git a/audio/skill/olsbqiwu6.mp3 b/audio/skill/olsbqiwu6.mp3
diff --git a/audio/skill/olsilv1.mp3 b/audio/skill/olsilv1.mp3
diff --git a/audio/skill/olsilv2.mp3 b/audio/skill/olsilv2.mp3
diff --git a/audio/skill/olxuanhuo1.mp3 b/audio/skill/olxuanhuo1.mp3
diff --git a/audio/skill/olxuanhuo2.mp3 b/audio/skill/olxuanhuo2.mp3
diff --git a/audio/skill/olxvfa1.mp3 b/audio/skill/olxvfa1.mp3
diff --git a/audio/skill/olxvfa2.mp3 b/audio/skill/olxvfa2.mp3
diff --git a/audio/skill/olziruo1.mp3 b/audio/skill/olziruo1.mp3
diff --git a/audio/skill/olziruo2.mp3 b/audio/skill/olziruo2.mp3
diff --git a/audio/skill/olzuolian1.mp3 b/audio/skill/olzuolian1.mp3
diff --git a/audio/skill/olzuolian2.mp3 b/audio/skill/olzuolian2.mp3
diff --git a/audio/skill/qinguo_lose1.mp3 b/audio/skill/qinguo_lose1.mp3
diff --git a/audio/skill/qinguo_lose2.mp3 b/audio/skill/qinguo_lose2.mp3
diff --git a/audio/skill/rejizhi_lukang2.mp3 b/audio/skill/rejizhi_lukang2.mp3
diff --git a/audio/skill/rerende_gz_jun_liubei1.mp3 b/audio/skill/rerende_gz_jun_liubei1.mp3
diff --git a/audio/skill/rerende_gz_jun_liubei2.mp3 b/audio/skill/rerende_gz_jun_liubei2.mp3
diff --git a/audio/skill/roulin1.mp3 b/audio/skill/roulin1.mp3
diff --git a/audio/skill/roulin2.mp3 b/audio/skill/roulin2.mp3
diff --git a/audio/skill/sbjizhi1.mp3 b/audio/skill/sbjizhi1.mp3
diff --git a/audio/skill/sbjizhi2.mp3 b/audio/skill/sbjizhi2.mp3
diff --git a/audio/skill/sblianying1.mp3 b/audio/skill/sblianying1.mp3
diff --git a/audio/skill/sblianying2.mp3 b/audio/skill/sblianying2.mp3
diff --git a/audio/skill/sbqianxun1.mp3 b/audio/skill/sbqianxun1.mp3
diff --git a/audio/skill/sbqianxun2.mp3 b/audio/skill/sbqianxun2.mp3
diff --git a/audio/skill/sbqicai1.mp3 b/audio/skill/sbqicai1.mp3
diff --git a/audio/skill/sbqicai2.mp3 b/audio/skill/sbqicai2.mp3
diff --git a/audio/skill/shouyue.mp3 b/audio/skill/shouyue.mp3
diff --git a/audio/skill/shouyue_liegong1.mp3 b/audio/skill/shouyue_liegong1.mp3
diff --git a/audio/skill/shouyue_liegong2.mp3 b/audio/skill/shouyue_liegong2.mp3
diff --git a/audio/skill/shouyue_longdan1.mp3 b/audio/skill/shouyue_longdan1.mp3
diff --git a/audio/skill/shouyue_longdan2.mp3 b/audio/skill/shouyue_longdan2.mp3
diff --git a/audio/skill/shouyue_paoxiao1.mp3 b/audio/skill/shouyue_paoxiao1.mp3
diff --git a/audio/skill/shouyue_paoxiao2.mp3 b/audio/skill/shouyue_paoxiao2.mp3
diff --git a/audio/skill/shouyue_tieji1.mp3 b/audio/skill/shouyue_tieji1.mp3
diff --git a/audio/skill/shouyue_tieji2.mp3 b/audio/skill/shouyue_tieji2.mp3
diff --git a/audio/skill/shouyue_wusheng1.mp3 b/audio/skill/shouyue_wusheng1.mp3
diff --git a/audio/skill/shouyue_wusheng2.mp3 b/audio/skill/shouyue_wusheng2.mp3
diff --git a/audio/skill/starjiaohao1.mp3 b/audio/skill/starjiaohao1.mp3
diff --git a/audio/skill/starjiaohao2.mp3 b/audio/skill/starjiaohao2.mp3
diff --git a/audio/skill/starsaying1.mp3 b/audio/skill/starsaying1.mp3
diff --git a/audio/skill/starsaying2.mp3 b/audio/skill/starsaying2.mp3
diff --git a/audio/skill/taoxi1.mp3 b/audio/skill/taoxi1.mp3
diff --git a/audio/skill/taoxi2.mp3 b/audio/skill/taoxi2.mp3
diff --git a/audio/skill/twshexhong1.mp3 b/audio/skill/twshexhong1.mp3
diff --git a/audio/skill/twshexhong2.mp3 b/audio/skill/twshexhong2.mp3
diff --git a/audio/skill/wendao1.mp3 b/audio/skill/wendao1.mp3
diff --git a/audio/skill/wendao2.mp3 b/audio/skill/wendao2.mp3
diff --git a/audio/skill/wuxin1.mp3 b/audio/skill/wuxin1.mp3
diff --git a/audio/skill/wuxin2.mp3 b/audio/skill/wuxin2.mp3
diff --git a/audio/skill/wuziliangjiangdao1.mp3 b/audio/skill/wuziliangjiangdao1.mp3
diff --git a/audio/skill/wuziliangjiangdao2.mp3 b/audio/skill/wuziliangjiangdao2.mp3
diff --git a/audio/skill/xianzhou_ol_caifuren1.mp3 b/audio/skill/xianzhou_ol_caifuren1.mp3
diff --git a/audio/skill/xianzhou_ol_caifuren2.mp3 b/audio/skill/xianzhou_ol_caifuren2.mp3
diff --git a/audio/skill/xinfu_xingzhao1.mp3 b/audio/skill/xinfu_xingzhao1.mp3
diff --git a/audio/skill/xinfu_xingzhao2.mp3 b/audio/skill/xinfu_xingzhao2.mp3
diff --git a/audio/skill/xinmieji1.mp3 b/audio/skill/xinmieji1.mp3
diff --git a/audio/skill/xinmieji2.mp3 b/audio/skill/xinmieji2.mp3
diff --git a/audio/skill/xinpojun1.mp3 b/audio/skill/xinpojun1.mp3
diff --git a/audio/skill/xinpojun2.mp3 b/audio/skill/xinpojun2.mp3
diff --git a/audio/skill/xz_xunxun1.mp3 b/audio/skill/xz_xunxun1.mp3
diff --git a/audio/skill/xz_xunxun2.mp3 b/audio/skill/xz_xunxun2.mp3
diff --git a/audio/skill/yuanjiangfenghuotu1.mp3 b/audio/skill/yuanjiangfenghuotu1.mp3
diff --git a/audio/skill/yuanjiangfenghuotu2.mp3 b/audio/skill/yuanjiangfenghuotu2.mp3
diff --git a/audio/skill/yuanjiangfenghuotu3.mp3 b/audio/skill/yuanjiangfenghuotu3.mp3
diff --git a/audio/skill/yuanjiangfenghuotu4.mp3 b/audio/skill/yuanjiangfenghuotu4.mp3
diff --git a/audio/skill/zhangwu1.mp3 b/audio/skill/zhangwu1.mp3
diff --git a/audio/skill/zhangwu2.mp3 b/audio/skill/zhangwu2.mp3
diff --git a/audio/skill/zhaxiang_ol_sb_jiangwei1.mp3 b/audio/skill/zhaxiang_ol_sb_jiangwei1.mp3
diff --git a/audio/skill/zhiheng_gz_jun_sunquan1.mp3 b/audio/skill/zhiheng_gz_jun_sunquan1.mp3
diff --git a/audio/skill/zhiheng_gz_jun_sunquan2.mp3 b/audio/skill/zhiheng_gz_jun_sunquan2.mp3
diff --git a/card/guozhan.js b/card/guozhan.js
@@ -1831,7 +1831,9 @@ game.import("card", function () {
 				mod: {
 					maxHandcard: function (player, num) {
 						if (get.mode() == "guozhan") {
-							if (player.hasSkill("huangjintianbingfu")) {
+							// if (player.hasSkill("hongfa")) {
+							// 村规
+							if (player.hasSkill("hongfa", null, null, false)) {
 								num += player.getExpansions("huangjintianbingfu").length;
 							}
 							return (

diff --git a/card/standard.js b/card/standard.js
@@ -608,6 +608,12 @@ game.import("card", function () {
 							if (target !== _status.event.dying) {
 								if (
 									!player.isPhaseUsing() ||
+									player.needsToDiscard(0, (i, player) => {
+										return (
+											!player.canIgnoreHandcard(i) &&
+											taos.includes(i)
+										);
+									}) ||
 									player.hasSkillTag(
 										"nokeep",
 										true,
@@ -619,7 +625,7 @@ game.import("card", function () {
 									)
 								)
 									return 2;
-								let min = 7.2 - (4 * player.hp) / player.maxHp,
+								let min = 8.1 - (4.5 * player.hp) / player.maxHp,
 									nd = player.needsToDiscard(0, (i, player) => {
 										return (
 											!player.canIgnoreHandcard(i) &&
@@ -1407,7 +1413,7 @@ game.import("card", function () {
 						return 1;
 					},
 					basic: {
-						order: 9,
+						order: 7.2,
 						useful: [5, 1],
 						value: 5,
 					},
@@ -1700,7 +1706,7 @@ game.import("card", function () {
 						return 1;
 					},
 					basic: {
-						order: 9,
+						order: 7.2,
 						useful: 1,
 						value: 5,
 					},
@@ -1843,7 +1849,7 @@ game.import("card", function () {
 						}
 					},
 					basic: {
-						order: 7.2,
+						order: 7,
 						useful: 4.5,
 						value: 9.2,
 					},
@@ -2111,12 +2117,13 @@ game.import("card", function () {
 							pos = get.position(button.link),
 							name = get.name(button.link);
 						if (pos == "j") {
-							if (name == "lebu") {
+							let viewAs = button.link.viewAs;
+							if (viewAs == "lebu") {
 								let needs = target.needsToDiscard(2);
 								btv *= 1.08 + 0.2 * needs;
-							} else if (name == "shandian" || name == "fulei" || name == "plague") btv /= 2;
+							} else if (viewAs == "shandian" || viewAs == "fulei") btv /= 2;
 						}
-						if (get.attitude(player, get.owner(button.link)) > 0) btv = -btv;
+						if (att > 0) btv = -btv;
 						if (pos != "e") {
 							if (pos == "h" && !player.hasSkillTag("viewHandcard", null, target, true))
 								return btv + 0.1;
@@ -2156,6 +2163,7 @@ game.import("card", function () {
 									return get.value(card, target) > 0 && card != target.getEquip('jinhe');
 								}) && !js.some(card => {
 									var cardj = card.viewAs ? { name: card.viewAs } : card;
+									if (cardj.name == "xumou_jsrg") return true;
 									return get.effect(target, cardj, target, player) < 0;
 								})) return 0;
 							}
@@ -2164,6 +2172,7 @@ game.import("card", function () {
 									return get.value(card, target) <= 0;
 								}) || js.some(card => {
 									var cardj = card.viewAs ? { name: card.viewAs } : card;
+									if (cardj.name == "xumou_jsrg") return false;
 									return get.effect(target, cardj, target, player) < 0;
 								})) ? 1.5 : 0;
 							}
@@ -2180,13 +2189,15 @@ game.import("card", function () {
 									return get.value(card, target) > 0 && card != target.getEquip('jinhe');
 								}) || js.some(card => {
 									var cardj = card.viewAs ? { name: card.viewAs } : card;
+									if (cardj.name == "xumou_jsrg") return true;
 									return get.effect(target, cardj, target, player) < 0;
 								})) ? -1.5 : 1.5;
 							}
 							return (es.some(card => {
 								return get.value(card, target) <= 0;
 							}) || js.some(card => {
 								var cardj = card.viewAs ? { name: card.viewAs } : card;
+								if (cardj.name == "xumou_jsrg") return false;
 								return get.effect(target, cardj, target, player) < 0;
 							})) ? 1.5 : -1.5;
 						},
@@ -2218,6 +2229,7 @@ game.import("card", function () {
 								}) ||
 									js.some((card) => {
 										var cardj = card.viewAs ? { name: card.viewAs } : card;
+										if (cardj.name == "xumou_jsrg") return true;
 										return get.effect(target, cardj, target, player) < 0;
 									})
 									? -1.5
@@ -2228,6 +2240,7 @@ game.import("card", function () {
 							}) ||
 								js.some((card) => {
 									var cardj = card.viewAs ? { name: card.viewAs } : card;
+									if (cardj.name == "xumou_jsrg") return false;
 									return get.effect(target, cardj, target, player) < 0;
 								})
 								? 1.5
@@ -2250,6 +2263,7 @@ game.import("card", function () {
 									}) &&
 									!js.some((card) => {
 										var cardj = card.viewAs ? { name: card.viewAs } : card;
+										if (cardj.name == "xumou_jsrg") return true;
 										return get.effect(target, cardj, target, player) < 0;
 									})
 								)
@@ -2260,6 +2274,7 @@ game.import("card", function () {
 								}) ||
 									js.some((card) => {
 										var cardj = card.viewAs ? { name: card.viewAs } : card;
+										if (cardj.name == "xumou_jsrg") return false;
 										return get.effect(target, cardj, target, player) < 0;
 									})
 									? 1.5
@@ -2423,12 +2438,13 @@ game.import("card", function () {
 							pos = get.position(button.link),
 							name = get.name(button.link);
 						if (pos === "j") {
-							if (name === "lebu") {
+							let viewAs = button.link.viewAs;
+							if (viewAs === "lebu") {
 								let needs = target.needsToDiscard(2);
 								val *= 1.08 + 0.2 * needs;
-							} else if (name == "shandian" || name == "fulei" || name == "plague") val /= 2;
+							} else if (viewAs == "shandian" || viewAs == "fulei") val /= 2;
 						}
-						if (get.attitude(player, get.owner(button.link)) > 0) val = -val;
+						if (att > 0) val = -val;
 						if (pos !== "e") return val;
 						let sub = get.subtypes(button.link);
 						if (sub.includes("equip1")) return (val * Math.min(3.6, target.hp)) / 3;
@@ -2466,6 +2482,7 @@ game.import("card", function () {
 							if (att > 0) {
 								if (js.some(card => {
 									const cardj = card.viewAs ? { name: card.viewAs } : card;
+									if (cardj.name == "xumou_jsrg") return false;
 									return get.effect(target, cardj, target, player) < 0;
 								})) return 3;
 								if (target.isDamaged() && es.some(card => card.name == 'baiyin') &&
@@ -2485,6 +2502,7 @@ game.import("card", function () {
 								}));
 								const noj = (js.length == 0 || !js.some(card => {
 									const cardj = card.viewAs ? { name: card.viewAs } : card;
+									if (cardj.name == "xumou_jsrg") return true;
 									return get.effect(target, cardj, target, player) < 0;
 								}))
 								if (noh && noe2 && noj) return 1.5;
@@ -2518,6 +2536,7 @@ game.import("card", function () {
 								if (
 									js.some((card) => {
 										const cardj = card.viewAs ? { name: card.viewAs } : card;
+										if (cardj.name == "xumou_jsrg") return false;
 										return get.effect(target, cardj, target, player) < 0;
 									})
 								)
@@ -2548,6 +2567,7 @@ game.import("card", function () {
 									js.length == 0 ||
 									!js.some((card) => {
 										const cardj = card.viewAs ? { name: card.viewAs } : card;
+										if (cardj.name == "xumou_jsrg") return true;
 										return get.effect(target, cardj, target, player) < 0;
 									});
 								if (noh && noe2 && noj) return 1.5;

diff --git a/card/yingbian.js b/card/yingbian.js
@@ -61,7 +61,7 @@ game.import("card", function () {
 						var base = 0;
 						if (get.cardtag(card, "yingbian_all")) {
 							if (
-								targets.filter(function (current) {
+								targets.some(function (current) {
 									var att = get.attitude(player, current);
 									if (att <= 0)
 										return (
@@ -74,7 +74,7 @@ game.import("card", function () {
 											return get.position(card) == "j" || get.value(card, current) <= 0;
 										}) > 1
 									);
-								}).length
+								})
 							)
 								base += 6;
 						}
@@ -138,13 +138,11 @@ game.import("card", function () {
 									? -1.5
 									: 1.5;
 							var js = target.getCards("j");
-							if (js.length) {
-								var jj = js[0].viewAs ? { name: js[0].viewAs } : js[0];
-								if (js.length == 1 && get.effect(target, jj, target, player) >= 0) {
-									return -1.5;
-								}
-								return 3;
-							}
+							if (js.length && js.some(i => {
+								let cardj = i.viewAs ? { name: i.viewAs } : i;
+								if (cardj.name == "xumou_jsrg") return false;
+								return get.effect(target, cardj, target, player) < 0;
+							})) return 3;
 							return -1.5;
 						},
 						player: function (player, target) {
@@ -159,13 +157,11 @@ game.import("card", function () {
 							}
 							if (get.attitude(player, target) > 1) {
 								var js = target.getCards("j");
-								if (js.length) {
-									var jj = js[0].viewAs ? { name: js[0].viewAs } : js[0];
-									if (js.length == 1 && get.effect(target, jj, target, player) >= 0) {
-										return 0;
-									}
-									return 1;
-								}
+								if (js.length && js.some(i => {
+									let cardj = i.viewAs ? { name: i.viewAs } : i;
+									if (cardj.name == "xumou_jsrg") return false;
+									return get.effect(target, cardj, target, player) < 0;
+								})) return 1;
 								return 0;
 							}
 							return 1;