diff --git a/CHANGELOG.MD b/CHANGELOG.MD new file mode 100644 index 000000000..711f33cd2 --- /dev/null +++ b/CHANGELOG.MD @@ -0,0 +1,3 @@ +1.2.10 +国战流离bug +明策、献州、密诏AI diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/audio/background/music_danji.mp3 b/audio/background/music_danji.mp3 old mode 100644 new mode 100755 diff --git a/audio/background/music_default.mp3 b/audio/background/music_default.mp3 old mode 100644 new mode 100755 diff --git a/audio/background/music_diaochan.mp3 b/audio/background/music_diaochan.mp3 old mode 100644 new mode 100755 diff --git a/audio/background/music_shezhan.mp3 b/audio/background/music_shezhan.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/default.mp3 b/audio/card/default.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/bingliang.mp3 b/audio/card/female/bingliang.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/guohe.mp3 b/audio/card/female/guohe.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/hongshui.mp3 b/audio/card/female/hongshui.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/huogong.mp3 b/audio/card/female/huogong.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/jiedao.mp3 b/audio/card/female/jiedao.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/jiu.mp3 b/audio/card/female/jiu.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/juedou.mp3 b/audio/card/female/juedou.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/lebu.mp3 b/audio/card/female/lebu.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/nanman.mp3 b/audio/card/female/nanman.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/sha.mp3 b/audio/card/female/sha.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/sha_fire.mp3 b/audio/card/female/sha_fire.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/sha_thunder.mp3 b/audio/card/female/sha_thunder.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/shan.mp3 b/audio/card/female/shan.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/shandian.mp3 b/audio/card/female/shandian.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/shunshou.mp3 b/audio/card/female/shunshou.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/taoyuan.mp3 b/audio/card/female/taoyuan.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/tiesuo.mp3 b/audio/card/female/tiesuo.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/wanjian.mp3 b/audio/card/female/wanjian.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/wugu.mp3 b/audio/card/female/wugu.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/wuxie.mp3 b/audio/card/female/wuxie.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/female/wuzhong.mp3 b/audio/card/female/wuzhong.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/bingliang.mp3 b/audio/card/male/bingliang.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/guohe.mp3 b/audio/card/male/guohe.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/huogong.mp3 b/audio/card/male/huogong.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/jiedao.mp3 b/audio/card/male/jiedao.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/jiu.mp3 b/audio/card/male/jiu.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/juedou.mp3 b/audio/card/male/juedou.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/lebu.mp3 b/audio/card/male/lebu.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/nanman.mp3 b/audio/card/male/nanman.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/sha.mp3 b/audio/card/male/sha.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/sha_fire.mp3 b/audio/card/male/sha_fire.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/sha_thunder.mp3 b/audio/card/male/sha_thunder.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/shan.mp3 b/audio/card/male/shan.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/shandian.mp3 b/audio/card/male/shandian.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/shunshou.mp3 b/audio/card/male/shunshou.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/taoyuan.mp3 b/audio/card/male/taoyuan.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/tiesuo.mp3 b/audio/card/male/tiesuo.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/wanjian.mp3 b/audio/card/male/wanjian.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/wugu.mp3 b/audio/card/male/wugu.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/wuxie.mp3 b/audio/card/male/wuxie.mp3 old mode 100644 new mode 100755 diff --git a/audio/card/male/wuzhong.mp3 b/audio/card/male/wuzhong.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/damage.mp3 b/audio/effect/damage.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/damage2.mp3 b/audio/effect/damage2.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/damage_female.mp3 b/audio/effect/damage_female.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/damage_male.mp3 b/audio/effect/damage_male.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/die_female.mp3 b/audio/effect/die_female.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/die_male.mp3 b/audio/effect/die_male.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/discard.mp3 b/audio/effect/discard.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/draw.mp3 b/audio/effect/draw.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/drawx.mp3 b/audio/effect/drawx.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/equip1.mp3 b/audio/effect/equip1.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/equip2.mp3 b/audio/effect/equip2.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/equip3.mp3 b/audio/effect/equip3.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/equip4.mp3 b/audio/effect/equip4.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/equip5.mp3 b/audio/effect/equip5.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/judge.mp3 b/audio/effect/judge.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/link.mp3 b/audio/effect/link.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/lose.mp3 b/audio/effect/lose.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/loseHp.mp3 b/audio/effect/loseHp.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/recover.mp3 b/audio/effect/recover.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/tie.mp3 b/audio/effect/tie.mp3 old mode 100644 new mode 100755 diff --git a/audio/effect/win.mp3 b/audio/effect/win.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/bagua_skill.mp3 b/audio/skill/bagua_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/baonue21.mp3 b/audio/skill/baonue21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/baonue22.mp3 b/audio/skill/baonue22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/bazhen1.mp3 b/audio/skill/bazhen1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/bazhen2.mp3 b/audio/skill/bazhen2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/beige1.mp3 b/audio/skill/beige1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/beige2.mp3 b/audio/skill/beige2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/benghuai1.mp3 b/audio/skill/benghuai1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/benghuai2.mp3 b/audio/skill/benghuai2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/biyue1.mp3 b/audio/skill/biyue1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/biyue2.mp3 b/audio/skill/biyue2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/buqu1.mp3 b/audio/skill/buqu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/buqu2.mp3 b/audio/skill/buqu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/chulao1.mp3 b/audio/skill/chulao1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/chulao2.mp3 b/audio/skill/chulao2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/cixiong_skill.mp3 b/audio/skill/cixiong_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/dimeng1.mp3 b/audio/skill/dimeng1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/dimeng2.mp3 b/audio/skill/dimeng2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/diyleiji1.mp3 b/audio/skill/diyleiji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/diyleiji2.mp3 b/audio/skill/diyleiji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/duanchang1.mp3 b/audio/skill/duanchang1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/duanchang2.mp3 b/audio/skill/duanchang2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/duanliang11.mp3 b/audio/skill/duanliang11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/duanliang12.mp3 b/audio/skill/duanliang12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fangquan1.mp3 b/audio/skill/fangquan1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fangquan2.mp3 b/audio/skill/fangquan2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fangzhu1.mp3 b/audio/skill/fangzhu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fangzhu2.mp3 b/audio/skill/fangzhu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fanjian1.mp3 b/audio/skill/fanjian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fanjian2.mp3 b/audio/skill/fanjian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fankui1.mp3 b/audio/skill/fankui1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fankui2.mp3 b/audio/skill/fankui2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fenji1.mp3 b/audio/skill/fenji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fenji2.mp3 b/audio/skill/fenji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fenwei1.mp3 b/audio/skill/fenwei1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/fenwei2.mp3 b/audio/skill/fenwei2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/ganglie1.mp3 b/audio/skill/ganglie1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/ganglie2.mp3 b/audio/skill/ganglie2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/gongxin1.mp3 b/audio/skill/gongxin1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/gongxin2.mp3 b/audio/skill/gongxin2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guanshi_skill.mp3 b/audio/skill/guanshi_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guanxing1.mp3 b/audio/skill/guanxing1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guanxing2.mp3 b/audio/skill/guanxing2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guding_skill.mp3 b/audio/skill/guding_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guicai1.mp3 b/audio/skill/guicai1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guicai2.mp3 b/audio/skill/guicai2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guidao1.mp3 b/audio/skill/guidao1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guidao2.mp3 b/audio/skill/guidao2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guose1.mp3 b/audio/skill/guose1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guzheng1.mp3 b/audio/skill/guzheng1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/guzheng2.mp3 b/audio/skill/guzheng2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/hanbing_skill.mp3 b/audio/skill/hanbing_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/haoshi1.mp3 b/audio/skill/haoshi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/haoshi2.mp3 b/audio/skill/haoshi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huangtian21.mp3 b/audio/skill/huangtian21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huangtian22.mp3 b/audio/skill/huangtian22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huashen21.mp3 b/audio/skill/huashen21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huashen22.mp3 b/audio/skill/huashen22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/hujia1.mp3 b/audio/skill/hujia1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/hujia2.mp3 b/audio/skill/hujia2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/hunzi1.mp3 b/audio/skill/hunzi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/hunzi2.mp3 b/audio/skill/hunzi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huoji1.mp3 b/audio/skill/huoji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huoji2.mp3 b/audio/skill/huoji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huoshou11.mp3 b/audio/skill/huoshou11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/huoshou12.mp3 b/audio/skill/huoshou12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jiang1.mp3 b/audio/skill/jiang1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jiang2.mp3 b/audio/skill/jiang2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jianxiong1.mp3 b/audio/skill/jianxiong1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jianxiong2.mp3 b/audio/skill/jianxiong2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jianyan1.mp3 b/audio/skill/jianyan1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jianyan2.mp3 b/audio/skill/jianyan2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jieming1.mp3 b/audio/skill/jieming1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jieming2.mp3 b/audio/skill/jieming2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jieyin1.mp3 b/audio/skill/jieyin1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jieyin2.mp3 b/audio/skill/jieyin2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiang11.mp3 b/audio/skill/jijiang11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiang12.mp3 b/audio/skill/jijiang12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiang21.mp3 b/audio/skill/jijiang21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiang22.mp3 b/audio/skill/jijiang22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiang3.mp3 b/audio/skill/jijiang3.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiang4.mp3 b/audio/skill/jijiang4.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiu1.mp3 b/audio/skill/jijiu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jijiu2.mp3 b/audio/skill/jijiu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jiuchi1.mp3 b/audio/skill/jiuchi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jiuchi2.mp3 b/audio/skill/jiuchi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jiuyuan1.mp3 b/audio/skill/jiuyuan1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jiuyuan2.mp3 b/audio/skill/jiuyuan2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jixi1.mp3 b/audio/skill/jixi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jixi2.mp3 b/audio/skill/jixi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jizhi1.mp3 b/audio/skill/jizhi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jizhi2.mp3 b/audio/skill/jizhi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/jushou.mp3 b/audio/skill/jushou.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/juxiang11.mp3 b/audio/skill/juxiang11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/juxiang12.mp3 b/audio/skill/juxiang12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/kanpo1.mp3 b/audio/skill/kanpo1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/kanpo2.mp3 b/audio/skill/kanpo2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/keji1.mp3 b/audio/skill/keji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/keji2.mp3 b/audio/skill/keji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/keji3.mp3 b/audio/skill/keji3.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/keji4.mp3 b/audio/skill/keji4.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/kuanggu1.mp3 b/audio/skill/kuanggu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/kuanggu2.mp3 b/audio/skill/kuanggu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/kurou1.mp3 b/audio/skill/kurou1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/kurou2.mp3 b/audio/skill/kurou2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/leiji1.mp3 b/audio/skill/leiji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/leiji2.mp3 b/audio/skill/leiji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lianhuan11.mp3 b/audio/skill/lianhuan11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lianhuan12.mp3 b/audio/skill/lianhuan12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lianhuan21.mp3 b/audio/skill/lianhuan21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lianhuan22.mp3 b/audio/skill/lianhuan22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lianying1.mp3 b/audio/skill/lianying1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lianying2.mp3 b/audio/skill/lianying2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/liegong1.mp3 b/audio/skill/liegong1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/liegong2.mp3 b/audio/skill/liegong2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lieren1.mp3 b/audio/skill/lieren1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lieren2.mp3 b/audio/skill/lieren2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lijian1.mp3 b/audio/skill/lijian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/lijian2.mp3 b/audio/skill/lijian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/liuli1.mp3 b/audio/skill/liuli1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/liuli2.mp3 b/audio/skill/liuli2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/longdan11.mp3 b/audio/skill/longdan11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/longdan12.mp3 b/audio/skill/longdan12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/longdan21.mp3 b/audio/skill/longdan21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/longdan22.mp3 b/audio/skill/longdan22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luanji1.mp3 b/audio/skill/luanji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luanji2.mp3 b/audio/skill/luanji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luanwu1.mp3 b/audio/skill/luanwu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luanwu2.mp3 b/audio/skill/luanwu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luoshen1.mp3 b/audio/skill/luoshen1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luoshen2.mp3 b/audio/skill/luoshen2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luoyi1.mp3 b/audio/skill/luoyi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/luoyi2.mp3 b/audio/skill/luoyi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/mengjin1.mp3 b/audio/skill/mengjin1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/mengjin2.mp3 b/audio/skill/mengjin2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/niepan1.mp3 b/audio/skill/niepan1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/niepan2.mp3 b/audio/skill/niepan2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiangxi1.mp3 b/audio/skill/qiangxi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiangxi2.mp3 b/audio/skill/qiangxi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qianxin1.mp3 b/audio/skill/qianxin1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qianxin2.mp3 b/audio/skill/qianxin2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian1.mp3 b/audio/skill/qiaobian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian11.mp3 b/audio/skill/qiaobian11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian12.mp3 b/audio/skill/qiaobian12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian2.mp3 b/audio/skill/qiaobian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian21.mp3 b/audio/skill/qiaobian21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian22.mp3 b/audio/skill/qiaobian22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian31.mp3 b/audio/skill/qiaobian31.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian32.mp3 b/audio/skill/qiaobian32.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian41.mp3 b/audio/skill/qiaobian41.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaobian42.mp3 b/audio/skill/qiaobian42.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaomeng1.mp3 b/audio/skill/qiaomeng1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qiaomeng2.mp3 b/audio/skill/qiaomeng2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qilin_skill.mp3 b/audio/skill/qilin_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qinggang_skill.mp3 b/audio/skill/qinggang_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qingguo1.mp3 b/audio/skill/qingguo1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qingguo2.mp3 b/audio/skill/qingguo2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qingjian1.mp3 b/audio/skill/qingjian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qingjian2.mp3 b/audio/skill/qingjian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qingnang1.mp3 b/audio/skill/qingnang1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qingnang2.mp3 b/audio/skill/qingnang2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qinxue1.mp3 b/audio/skill/qinxue1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qinxue2.mp3 b/audio/skill/qinxue2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qixi1.mp3 b/audio/skill/qixi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qixi2.mp3 b/audio/skill/qixi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qixi3.mp3 b/audio/skill/qixi3.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/qixi4.mp3 b/audio/skill/qixi4.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/quhu1.mp3 b/audio/skill/quhu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/quhu2.mp3 b/audio/skill/quhu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/refanjian1.mp3 b/audio/skill/refanjian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/refanjian2.mp3 b/audio/skill/refanjian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/refankui1.mp3 b/audio/skill/refankui1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/refankui2.mp3 b/audio/skill/refankui2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reganglie1.mp3 b/audio/skill/reganglie1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reganglie2.mp3 b/audio/skill/reganglie2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reguicai1.mp3 b/audio/skill/reguicai1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reguicai2.mp3 b/audio/skill/reguicai2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reguose1.mp3 b/audio/skill/reguose1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rejianxiong1.mp3 b/audio/skill/rejianxiong1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rejianxiong2.mp3 b/audio/skill/rejianxiong2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rejizhi1.mp3 b/audio/skill/rejizhi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rejizhi2.mp3 b/audio/skill/rejizhi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rekurou1.mp3 b/audio/skill/rekurou1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rekurou2.mp3 b/audio/skill/rekurou2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/relianying1.mp3 b/audio/skill/relianying1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/relianying2.mp3 b/audio/skill/relianying2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reluoyi1.mp3 b/audio/skill/reluoyi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reluoyi2.mp3 b/audio/skill/reluoyi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rende1.mp3 b/audio/skill/rende1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/rende2.mp3 b/audio/skill/rende2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/renwang_skill.mp3 b/audio/skill/renwang_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/retieji1.mp3 b/audio/skill/retieji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/retieji2.mp3 b/audio/skill/retieji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/retishen1.mp3 b/audio/skill/retishen1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/retishen2.mp3 b/audio/skill/retishen2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/retuxi1.mp3 b/audio/skill/retuxi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/retuxi2.mp3 b/audio/skill/retuxi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reyajiao1.mp3 b/audio/skill/reyajiao1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reyajiao2.mp3 b/audio/skill/reyajiao2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reyiji1.mp3 b/audio/skill/reyiji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reyiji2.mp3 b/audio/skill/reyiji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reyingzi1.mp3 b/audio/skill/reyingzi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/reyingzi2.mp3 b/audio/skill/reyingzi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/roulin1.mp3 b/audio/skill/roulin1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/roulin2.mp3 b/audio/skill/roulin2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/ruoyu1.mp3 b/audio/skill/ruoyu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/ruoyu2.mp3 b/audio/skill/ruoyu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/sanjian_skill.mp3 b/audio/skill/sanjian_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/shensu11.mp3 b/audio/skill/shensu11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/shensu12.mp3 b/audio/skill/shensu12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/shensu21.mp3 b/audio/skill/shensu21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/shensu22.mp3 b/audio/skill/shensu22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/shuangxiong.mp3 b/audio/skill/shuangxiong.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/shuangxiong2.mp3 b/audio/skill/shuangxiong2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/songwei21.mp3 b/audio/skill/songwei21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/songwei22.mp3 b/audio/skill/songwei22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tengjia1.mp3 b/audio/skill/tengjia1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tengjia2.mp3 b/audio/skill/tengjia2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tiandu1.mp3 b/audio/skill/tiandu1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tiandu2.mp3 b/audio/skill/tiandu2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tiandu3.mp3 b/audio/skill/tiandu3.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tiandu4.mp3 b/audio/skill/tiandu4.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tianxiang1.mp3 b/audio/skill/tianxiang1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tianxiang2.mp3 b/audio/skill/tianxiang2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tianyi1.mp3 b/audio/skill/tianyi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tianyi2.mp3 b/audio/skill/tianyi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tiaoxin1.mp3 b/audio/skill/tiaoxin1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tiaoxin2.mp3 b/audio/skill/tiaoxin2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tieji1.mp3 b/audio/skill/tieji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tieji2.mp3 b/audio/skill/tieji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tuntian1.mp3 b/audio/skill/tuntian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tuntian2.mp3 b/audio/skill/tuntian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tuxi1.mp3 b/audio/skill/tuxi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/tuxi2.mp3 b/audio/skill/tuxi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wangxi1.mp3 b/audio/skill/wangxi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wangxi2.mp3 b/audio/skill/wangxi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wusheng1.mp3 b/audio/skill/wusheng1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wusheng2.mp3 b/audio/skill/wusheng2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wusheng3.mp3 b/audio/skill/wusheng3.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wusheng4.mp3 b/audio/skill/wusheng4.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wusheng5.mp3 b/audio/skill/wusheng5.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wusheng6.mp3 b/audio/skill/wusheng6.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wushuang11.mp3 b/audio/skill/wushuang11.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wushuang12.mp3 b/audio/skill/wushuang12.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wushuang21.mp3 b/audio/skill/wushuang21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/wushuang22.mp3 b/audio/skill/wushuang22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xiangle1.mp3 b/audio/skill/xiangle1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xiangle2.mp3 b/audio/skill/xiangle2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xiaoji1.mp3 b/audio/skill/xiaoji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xingshang1.mp3 b/audio/skill/xingshang1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xingshang2.mp3 b/audio/skill/xingshang2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xinsheng1.mp3 b/audio/skill/xinsheng1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xinsheng2.mp3 b/audio/skill/xinsheng2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xunxun1.mp3 b/audio/skill/xunxun1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/xunxun2.mp3 b/audio/skill/xunxun2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yiji1.mp3 b/audio/skill/yiji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yiji2.mp3 b/audio/skill/yiji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yijue1.mp3 b/audio/skill/yijue1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yijue2.mp3 b/audio/skill/yijue2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yinghun1.mp3 b/audio/skill/yinghun1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yinghun2.mp3 b/audio/skill/yinghun2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yingzi1.mp3 b/audio/skill/yingzi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/yingzi2.mp3 b/audio/skill/yingzi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zaiqi1.mp3 b/audio/skill/zaiqi1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zaiqi2.mp3 b/audio/skill/zaiqi2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zaoxian1.mp3 b/audio/skill/zaoxian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zaoxian2.mp3 b/audio/skill/zaoxian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhangba_skill.mp3 b/audio/skill/zhangba_skill.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhaxiang1.mp3 b/audio/skill/zhaxiang1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhaxiang2.mp3 b/audio/skill/zhaxiang2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhiba21.mp3 b/audio/skill/zhiba21.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhiba22.mp3 b/audio/skill/zhiba22.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhiheng1.mp3 b/audio/skill/zhiheng1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhiheng2.mp3 b/audio/skill/zhiheng2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhiji1.mp3 b/audio/skill/zhiji1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhiji2.mp3 b/audio/skill/zhiji2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhijian1.mp3 b/audio/skill/zhijian1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhijian2.mp3 b/audio/skill/zhijian2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhuhai1.mp3 b/audio/skill/zhuhai1.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhuhai2.mp3 b/audio/skill/zhuhai2.mp3 old mode 100644 new mode 100755 diff --git a/audio/skill/zhuque_skill.mp3 b/audio/skill/zhuque_skill.mp3 old mode 100644 new mode 100755 diff --git a/card/compensate.js b/card/compensate.js old mode 100644 new mode 100755 diff --git a/card/ex.js b/card/ex.js old mode 100644 new mode 100755 diff --git a/card/extra.js b/card/extra.js old mode 100644 new mode 100755 index a5d21fe18..a313b1329 --- a/card/extra.js +++ b/card/extra.js @@ -18,7 +18,7 @@ card.extra={ else{ target.addTempSkill('jiu','phaseAfter'); if(card.clone&&card.clone.parentNode==ui.arena){ - card.clone.moveTo(player).delete(); + card.clone.moveTo(target).delete(); } } }, diff --git a/card/guozhan.js b/card/guozhan.js old mode 100644 new mode 100755 diff --git a/card/hearth.js b/card/hearth.js new file mode 100644 index 000000000..1e8bca181 --- /dev/null +++ b/card/hearth.js @@ -0,0 +1,17 @@ +'use strict'; +card.hearth={ + card:{ + shenenshu:{ + + } + }, + skill:{ + + }, + translate:{ + + }, + list:[ + + ], +} diff --git a/card/qimou.js b/card/qimou.js old mode 100644 new mode 100755 diff --git a/card/refresh.js b/card/refresh.js old mode 100644 new mode 100755 diff --git a/card/shenbing.js b/card/shenbing.js old mode 100644 new mode 100755 diff --git a/card/shenqi.js b/card/shenqi.js old mode 100644 new mode 100755 diff --git a/card/standard.js b/card/standard.js old mode 100644 new mode 100755 index 20d764622..759de888a --- a/card/standard.js +++ b/card/standard.js @@ -184,7 +184,7 @@ card.standard={ savable:true, selectTarget:-1, filterTarget:function(card,player,target){ - return target==player; + return target==player&&target.hp0&&ai.get.attitude(player,target)>0&&ai.get.attitude(target,player)>0){ return 0; } - var hs1=target.num('h','sha'); - var hs2=player.num('h','sha'); + var hs1=target.get('h','sha'); + var hs2=player.get('h','sha'); if(hs1.length>hs2.length+1){ return -2; } - if(hs1.length>hs2.length&&hs1[0].number>hs2[0].number){ + if(hs1.length>hs2.length&&(!hs2.length||hs1[0].number>hs2[0].number)){ return -2; } return -0.5; diff --git a/card/swd.js b/card/swd.js old mode 100644 new mode 100755 index 9151644a2..8aa39cd29 --- a/card/swd.js +++ b/card/swd.js @@ -112,9 +112,15 @@ card.swd={ }, content:function(){ "step 0" - target.chooseToDiscard({color:'black'},'弃置一张黑色手牌或受流失一点体力').ai=function(card){ - return 8-ai.get.value(card); - }; + if(!target.num('h',{color:'black'})){ + target.loseHp(); + event.finish(); + } + else{ + target.chooseToDiscard({color:'black'},'弃置一张黑色手牌或受流失一点体力').ai=function(card){ + return 8-ai.get.value(card); + }; + } "step 1" if(!result.bool){ target.loseHp(); @@ -255,7 +261,7 @@ card.swd={ else{ target.addTempSkill('tianxianjiu',['phaseAfter','shaAfter']); if(card.clone&&card.clone.parentNode==ui.arena){ - card.clone.moveTo(player).delete(); + card.clone.moveTo(target).delete(); } } }, @@ -363,7 +369,7 @@ card.swd={ zhufangshenshi:{ fullskin:true, chongzhu:true, - type:'basic', + type:'trick', enable:function(){ return game.players.length>2; }, diff --git a/card/yibao.js b/card/yibao.js old mode 100644 new mode 100755 diff --git a/card/zhenfa.js b/card/zhenfa.js old mode 100644 new mode 100755 index 3d44f736f..10466606e --- a/card/zhenfa.js +++ b/card/zhenfa.js @@ -192,7 +192,11 @@ card.zhenfa={ chongzhu:true, enable:function(card,player){ if(player.identity=='unknown'||player.identity=='ye') return false; - return (get.population(player.identity)>1) + if(get.population(player.identity)<=1) return false; + for(var i=0;i0; + }, + content:function(){ + player.draw(get.cardCount(true,player)); + }, + ai:{ + threaten:1.3 + } + }, + bingshuang:{ + trigger:{source:'damageEnd'}, + filter:function(event,player){ + return event.card&&get.type(event.card)=='trick'&&event.player.isAlive(); + }, + prompt:function(event,player){ + return '是否对'+get.translation(event.player)+'发动【冰霜】？'; + }, + check:function(event,player){ + return ai.get.attitude(player,event.player)<=0; + }, + content:function(){ + trigger.player.draw(2); + trigger.player.turnOver(); + } + }, + yanshu:{ + trigger:{player:'phaseUseBegin'}, + direct:true, + content:function(){ + 'step 0' + player.chooseTarget('将一张流星火雨交给任意一名角色').ai=function(target){ + return target==player?1:0; + }; + 'step 1' + if(result.bool){ + player.logSkill('yanshu'); + result.targets[0].gain(game.createCard('liuxinghuoyu'),'gain2'); + + } + }, + ai:{ + threaten:2 + } + }, + shengyan:{ + trigger:{global:'recoverEnd'}, + filter:function(event,player){ + return !player.skills.contains('shengyan2')&&event.player.hp0; + }, + content:function(){ + trigger.player.recover(); + player.addTempSkill('shengyan2','phaseAfter'); + }, + ai:{ + expose:0.2 + } + }, + shengyan2:{}, + liechao:{ + enable:'phaseUse', + usable:1, + filter:function(event,player){ + return !player.isTurnedOver()&&player.num('h')<=player.hp; + }, + content:function(){ + player.draw(4); + player.turnOver(); + player.skip('phaseDiscard'); + }, + ai:{ + order:10, + result:{ + player:1 + } + } + }, + qingliu:{ + trigger:{player:'damageBefore'}, + filter:function(event){ + return event.nature=='fire'; + }, + forced:true, + content:function(){ + trigger.untrigger(); + trigger.finish(); + }, + ai:{ + nofire:true, + effect:{ + target:function(card,player,target,current){ + if(get.tag(card,'fireDamage')) return 0; + } + } + } + }, zhongjia:{ trigger:{player:'damageEnd'}, forced:true, @@ -70,7 +255,7 @@ character.hearth={ } }, fengxing:{ - trigger:{player:['useCard','respondAfter']}, + trigger:{player:['useCard']}, frequent:true, filter:function(event){ return event.card&&event.card.name=='sha'; @@ -108,6 +293,9 @@ character.hearth={ qiaodong:{ enable:['chooseToRespond'], filterCard:{type:'equip'}, + filter:function(event,player){ + return player.num('he',{type:'equip'})>0; + }, viewAs:{name:'shan'}, position:'he', prompt:'将一张装备牌当闪使用或打出', @@ -125,6 +313,9 @@ character.hearth={ }, enable:'phaseUse', filterCard:{type:'equip'}, + filter:function(event,player){ + return player.num('h',{type:'equip'})>0; + }, check:function(){ return 1; }, @@ -280,14 +471,14 @@ character.hearth={ if(_status.currentPhase!=event.player) return false; if(!event.targets) return false; if(event.targets.length!=1) return false; + if(event.targets[0]==event.player) return false; var hs=player.get('h'); for(var i=0;i=1){ - return true; - } + var card=hs[i]; + if(card.name=='caoyao'||card.name=='dujian'||card.name=='sha'||card.name=='jiu'|| + card.name=='tianxianjiu'||card.name=='tao'||card.name=='xiangyuye'){ + return true; } } } @@ -299,17 +490,18 @@ character.hearth={ var eff=ai.get.effect(trigger.targets[0],trigger.card,trigger.player,player); var att=ai.get.attitude(player,trigger.player); player.chooseCard('是否发动【变形】？',function(card){ - if(card.name!=trigger.card.name&& - lib.filter.filterTarget(card,trigger.player,trigger.targets[0])){ - var select=get.select(get.info(card).selectTarget); - if(select[0]<=1&&select[1]>=1){ - return true; - } + if(card.name!=trigger.card.name){ + return card.name=='caoyao'||card.name=='dujian'||card.name=='sha'||card.name=='jiu'|| + card.name=='tianxianjiu'||card.name=='tao'||card.name=='xiangyuye'; } return false; }).ai=function(card){ if(att>=0) return 0; - return ai.get.effect(trigger.targets[0],card,trigger.player,player)-eff; + if(card.name=='tao'||card.name=='caoyao'){ + if(trigger.targets[0].hp==trigger.targets[0].maxHp) return 0; + } + if(eff>=0) return 0; + return ai.get.effect(trigger.targets[0],card,trigger.player,player); }; 'step 1' if(result.bool){ @@ -317,6 +509,7 @@ character.hearth={ player.lose(result.cards); event.cards=result.cards; player.logSkill('bianxing',trigger.player); + game.log(get.translation(player)+'将'+get.translation(trigger.card.name)+'变为'+get.translation(result.cards)); game.delay(0.5); trigger.untrigger(); trigger.card=card; @@ -329,6 +522,9 @@ character.hearth={ 'step 2' player.$throw(event.cards); game.delay(); + 'step 3' + // player.draw(); + 'step 4' trigger.trigger('useCard'); }, ai:{ @@ -341,7 +537,7 @@ character.hearth={ filter:function(event,player){ return !player.skills.contains('bingjia2'); }, - filterCard:{color:'black'}, + filterCard:true, check:function(card){ return 6-ai.get.value(card); }, @@ -365,7 +561,7 @@ character.hearth={ trigger:{target:'useCardToBegin'}, forced:true, filter:function(event,player){ - return event.player!=player&&event.card.number==player.storage.bingjia.number; + return event.player!=player&&get.suit(event.card)==get.suit(player.storage.bingjia); }, content:function(){ 'step 0' @@ -373,7 +569,7 @@ character.hearth={ 'step 1' ui.discardPile.appendChild(player.storage.bingjia); delete player.storage.bingjia; - player.changeHujia(2); + player.changeHujia(); player.removeSkill('bingjia2'); }, intro:{ @@ -464,6 +660,9 @@ character.hearth={ return -1; }, ai:{ + tag:{ + rejudge:0.1, + }, threaten:1.5, expose:0.1, order:10, @@ -663,6 +862,9 @@ character.hearth={ trigger.finish(); game.delay(); } + else{ + event.finish(); + } "step 2" trigger.player.$gain2(trigger.cards); trigger.player.gain(trigger.cards); @@ -740,7 +942,10 @@ character.hearth={ tzhenji:{ trigger:{player:'discardAfter'}, direct:true, - filter:function(event){ + filter:function(event,player){ + if(player.skills.contains('tzhenji2')){ + return false; + } if(event.cards){ for(var i=0;i0){ - return eff+(target.num('he')?1:0); - } - return 0; + var bool=ai.get.attitude(player,target)>0; + return ai.get.damageEffect(target,player,player,'thunder')-(bool?1:0); }; "step 1" if(result.bool){ game.delay(0.5); var target=result.targets[0]; player.logSkill('tzhenji',target,'thunder'); - target.damage('thunder',0); + target.damage('thunder'); var cs=target.get('he'); if(cs.length){ target.discard(cs.randomGet()); } + player.addTempSkill('tzhenji2','phaseAfter'); } }, ai:{ @@ -781,6 +984,7 @@ character.hearth={ }, } }, + tzhenji2:{}, tzhenji_old:{ trigger:{player:['useCard','respondEnd']}, filter:function(event){ @@ -883,10 +1087,6 @@ character.hearth={ tuteng:{ enable:'phaseUse', usable:1, - filterCard:true, - check:function(card){ - return 6-ai.get.value(card); - }, filter:function(event,player){ var rand=['tuteng1','tuteng2','tuteng3','tuteng4']; for(var i=0;i0; @@ -969,7 +1177,7 @@ character.hearth={ trigger:{source:'damageAfter'}, forced:true, content:function(){ - player.draw(); + player.draw(trigger.num); } }, tuteng3:{ @@ -989,12 +1197,12 @@ character.hearth={ tuteng4:{ mark:'image', intro:{ - content:'你的属性伤害+1' + content:'你的锦囊牌造成的伤害+1' }, trigger:{source:'damageBegin'}, forced:true, filter:function(event){ - return event.nature?true:false; + return event.card&&get.type(event.card)=='trick'; }, content:function(){ trigger.num++; @@ -1071,8 +1279,34 @@ character.hearth={ hs_thrall:'萨尔', hs_waleera:'瓦莉拉', + hs_neptulon:'耐普图隆', + hs_velen:'维纶', + hs_antonidas:'安东尼达斯', + + hs_ronghejuren:'熔核巨人', + hs_wujiyuansu:'无羁元素', + hs_mijiaojisi:'秘教祭司', + hs_huzhixiannv:'湖之仙女', + + jingmeng:'镜梦', + jingmeng_info:'每当你于回合内使用第一张牌时，你可以从牌堆中随机获得一张与之类型相同的牌', + kuixin:'窥心', + kuixin_info:'回合结束阶段，你可以将你的手牌与一名其他角色交换（手牌数之差不能多于1）', + wujiwuji:'无羁', + wujiwuji_info:'出牌阶段结束时，你可以摸X张牌，X为你本回合使用的卡牌数', + yanshu:'炎术', + yanshu_info:'出牌阶段开始时，你可以创造一张流星火雨并将其交给任意一名角色', + bingshuang:'冰霜', + bingshuang_info:'你使用锦囊牌造成伤害后，可令目标摸两张牌并翻面', + shengyan:'圣言', + shengyan_info:'任意一名角色回复体力后，你可以令其额外回复一点体力，每回合限发动一次', + qingliu:'清流', + qingliu_info:'锁定技，你防止即将受到的火焰伤害', + liechao:'猎潮', + liechao_info:'出牌阶阶段限一次，若你的武将牌正面朝上且手牌数不大于当前体力值，你可以翻面并摸四张牌，若如此做，你跳过本回合的弃牌阶段', + fengxing:'风行', - fengxing_info:'每当你使用或打出一张杀，你可以摸一张牌', + fengxing_info:'每当你使用一张杀，你可以摸一张牌', xinci:'心刺', xinci_info:'出牌阶段限一次，你可以弃置一张黑色牌令一名角色流失一点体力', zhongjia:'重甲', @@ -1093,9 +1327,9 @@ character.hearth={ shengguang_info:'出牌阶段限一次，你可以弃置一张红色牌令一名角色回复一点体力，若其仍处于受伤状态则摸一张牌', bingjia:'冰甲', bingjia2:'冰甲', - bingjia_info:'出牌阶段，若你武将牌上没有牌，你可以将一张黑色手牌背面朝上置于你的武将牌上，当你成为其他角色的与此牌点数相同的牌的目标时，你将此牌置于弃牌堆，并获得两点护甲值', + bingjia_info:'出牌阶段，若你武将牌上没有牌，你可以将一张手牌背面朝上置于你的武将牌上，当你成为其他角色的与此牌花色相同的牌的目标时，你将此牌置于弃牌堆，并获得一点护甲值', bianxing:'变形', - bianxing_info:'当一其他角色于回合内使用卡牌指定了惟一目标后，你可以用一张与之不同名的手牌替代此牌（使用者及目标必须合理），每名角色的回合限一次', + bianxing_info:'当一其他角色于回合内使用卡牌指定了惟一的其他目标后，你可以用一张合理的基本牌替代此牌，每名角色的回合限一次', xianzhi:'先知', xianzhi_info:'任意一名角色进行判定前，你可以观看牌堆顶的两张牌，并可以将其调换顺序', mdzhoufu:'诅咒', @@ -1107,13 +1341,13 @@ character.hearth={ jingxiang:'镜像', jingxiang_info:'每当你需要打出卡牌时，你可以观看一名随机角色的手牌并将其视为你的手牌打出', tuteng:'图腾', - tuteng_info:'出牌阶段限一次，你可以弃置一张牌并随机获得一个图腾；每当你受到一次伤害，你随机失去一个图腾', + tuteng_info:'出牌阶段限一次，你可以随机获得一个图腾，并令你本回合的手牌上限-1；每当你受到一次伤害，你随机失去一个图腾', tuteng1:'治疗图腾', tuteng2:'灼热图腾', tuteng3:'石爪图腾', tuteng4:'空气之怒图腾', tzhenji:'震击', - tzhenji_info:'每当你因弃置而失去黑色牌，可对一名角色造成0点雷电伤害，然后随机弃置其一张牌', + tzhenji_info:'每当你因弃置而失去黑色牌，可对一名角色造成1点雷电伤害，并随机弃置其一张牌，每回合限发动一次', fenliu:'分流', fenliu_info:'出牌阶段限一次，你可以失去一点体力并获得3张牌', hongxi:'虹吸', diff --git a/character/jiange.js b/character/jiange.js old mode 100644 new mode 100755 diff --git a/character/mountain.js b/character/mountain.js old mode 100644 new mode 100755 diff --git a/character/refresh.js b/character/refresh.js old mode 100644 new mode 100755 diff --git a/character/sp.js b/character/sp.js old mode 100644 new mode 100755 index 35a629788..e820e0cd5 --- a/character/sp.js +++ b/character/sp.js @@ -1633,6 +1633,9 @@ character.sp={ } return true; }, + filter:function(event,player){ + return player.num('h')>0; + }, content:function(){ "step 0" var cards=player.get('h'); @@ -2443,6 +2446,7 @@ character.sp={ discard:false, prepare:function(cards,player,targets){ player.$give(cards.length,targets[0]); + player.line(targets[0]); }, ai:{ order:1, @@ -2452,6 +2456,14 @@ character.sp={ if(player.num('h')>1){ return 1; } + for(var i=0;i0){ + return eff-10; + } + return eff; }; "step 2" if(result.targets.length){ event.target2=result.targets[0]; + event.target1.line(event.target2); event.target1.chooseToCompare(event.target2); } else{ diff --git a/character/standard.js b/character/standard.js old mode 100644 new mode 100755 index 4d7384124..e0e3f0bba --- a/character/standard.js +++ b/character/standard.js @@ -536,8 +536,9 @@ character.standard={ }, jijiang2:{ audio:2, - enable:'phaseUse', + enable:'chooseToUse', filter:function(event,player){ + if(event.filterCard&&!event.filterCard({name:'sha'},player)) return false; if(player!=game.zhu) return false; if(player!=game.me&&player.skills.contains('jijiang3')) return false; for(var i=0;i2||player.num('e',{color:'black'})){ + if(!target.hasFriend()){ + if(lib.config.mode=='guozhan'){ + if(!player.hasFriend()) return; + } + else{ + return; + } + } + if(target.num('h')>2||target.num('e',{color:'black'})){ return [1,0,0,-1]; } return [1,-0.5]; @@ -1912,7 +1923,7 @@ character.swd={ } }, liuhong:{ - trigger:{player:['useCard','respondAfter']}, + trigger:{player:['useCard']}, frequent:true, filter:function(event){ return event.card&&event.card.name=='sha'; @@ -2457,6 +2468,9 @@ character.swd={ selectTarget:2, multitarget:true, multiline:true, + filter:function(event,player){ + return player.num('h')>0; + }, prepare:function(cards,player,targets){ player.$throw(cards); player.line(targets); @@ -4262,6 +4276,7 @@ character.swd={ trigger:{player:'phaseBegin'}, forced:true, popup:false, + silent:true, content:function(){ if(player.storage.daixing){ player.changeHujia(-player.storage.daixing); @@ -4428,7 +4443,12 @@ character.swd={ return get.type(card,'trick')=='trick'; }, usable:1, - filter:function(event,player){return player.num('e')==0}, + filter:function(event,player){ + if(player.num('e')) return false; + if(player.num('h',{type:'trick'})) return true; + if(player.num('h',{type:'delay'})) return true; + return false; + }, selectCard:1, check:function(card){ return 8-ai.get.value(card); @@ -6830,7 +6850,7 @@ character.swd={ player.removeSkill('mailun8'); if(event.isMine()){ ui.auto.hide(); - event.dialog=ui.create.dialog('选择一个效果'); + event.dialog=ui.create.dialog('脉轮：选择一个效果'); var effects=lib.skill.mailun.effects; var clickItem=function(){ event.choice=this.link; @@ -6839,7 +6859,7 @@ character.swd={ for(var i=0;i<8;i++){ if(i==0&&player.maxHp==6) continue; var item=event.dialog.add('
【'+ - get.cnNumber(i+1,true)+'轮'+'】
'+effects[i]+'
'); + get.cnNumber(i+1,true)+'】
'+effects[i]+'
'); item.addEventListener('click',clickItem); item.link=i+1; @@ -7749,7 +7769,7 @@ character.swd={ gongshen_info:'任意一名其他角色使用一张基本牌或锦囊牌指定目标后，你可以弃置一张装备牌令其失效', liuhong:'流虹', - liuhong_info:'每当你使用或打出一张杀，可以摸一张牌', + liuhong_info:'每当你使用一张杀，可以摸一张牌', poyue:'破月', poyue_info:'锁定技，你的黑杀无视距离，红色不计入回合内的出杀限制且不可闪避', mojian:'墨剑', diff --git a/character/wind.js b/character/wind.js old mode 100644 new mode 100755 index 9996a0118..809851531 --- a/character/wind.js +++ b/character/wind.js @@ -139,12 +139,12 @@ character.wind={ return 10-ai.get.value(card); }, ai2:function(target){ + var att=ai.get.attitude(player,target); if(trigger.num>1){ - if(target.maxHp>5&&target.hp>1) return 0; + if(target.maxHp>5&&target.hp>1) return -att/10; return -att; } var eff=ai.get.damageEffect(target,trigger.source,target,trigger.nature); - var att=ai.get.attitude(player,target); if(att==0) return 0.1; if(eff>=0&&trigger.num==1){ return att; diff --git a/character/woods.js b/character/woods.js old mode 100644 new mode 100755 diff --git a/character/xianjian.js b/character/xianjian.js old mode 100644 new mode 100755 index 6014998c5..6f1133f76 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -80,7 +80,7 @@ character.xianjian={ effect:{ target:function(card,player,target){ if(get.tag(card,'thunderDamage')){ - if(target.hp<=1) return [0,0]; + if(target.hp<=1||!target.skills.contains('fenxin')) return [0,0]; return [0,1.5]; } } @@ -300,6 +300,11 @@ character.xianjian={ }; "step 1" if(result.bool){ + player.$throw(result.cards); + var clone=result.cards[0].clone; + setTimeout(function(){ + clone.moveTo(player,'flip').delete(); + },500); player.logSkill('shuiyun'); player.storage.shuiyun.push(result.cards[0]); player.lose(result.cards,ui.special); @@ -360,8 +365,8 @@ character.xianjian={ player.$throw(result.links); ui.discardPile.appendChild(result.links[0]); trigger.player.recover(); - if(player!=trigger.player){ - game.asyncDraw([trigger.player,player]); + if(trigger.player!=player){ + trigger.player.draw(); } player.logSkill('shuiyun5',trigger.player,'thunder'); } @@ -839,17 +844,27 @@ character.xianjian={ check:function(card){ return 7-ai.get.value(card); }, + multitarget:true, + multiline:true, content:function(){ - if(target.num('he')){ - player.discardPlayerCard(target,'he',true).ai=function(){ - if(ai.get.attitude(player,target)<0){ - return ai.get.buttonValue.apply(this,arguments); - } - return -1; - }; + 'step 0' + targets.sort(lib.sort.seat); + var target=targets[0]; + var cs=target.get('he'); + if(cs.length){ + target.discard(cs.randomGet()); + } + player.storage.zhuyue.add(target); + if(targets.length<2){ + event.finish(); + } + 'step 1' + var target=targets[1]; + var cs=target.get('he'); + if(cs.length){ + target.discard(cs.randomGet()); } player.storage.zhuyue.add(target); - }, ai:{ result:{ @@ -940,7 +955,7 @@ character.xianjian={ unique:true, enable:'phaseUse', filter:function(event,player){ - return !player.storage.guanri; + return !player.storage.guanri&&player.num('h',{color:'red'})>=2; }, check:function(card){ return 8-ai.get.value(card); @@ -1083,26 +1098,11 @@ character.xianjian={ var target=result.targets[0]; var card=get.cards()[0]; target.$draw(card); - if(get.type(card)=='equip'){ - game.delay(); - event.card=card; - event.target=target; - } - else{ - target.storage.zhimeng2=card; - target.addSkill('zhimeng2'); - event.finish(); - } + target.storage.zhimeng2=card; + target.addSkill('zhimeng2'); + event.finish(); player.logSkill('zhimeng',target); } - "step 2" - if(event.target){ - event.target.equip(event.card); - } - "step 3" - if(event.target){ - event.target.draw(); - } }, ai:{ expose:0.2 @@ -1164,21 +1164,21 @@ character.xianjian={ }, tannang:{ enable:'chooseToUse', + usable:1, filterCard:function(card){ return get.suit(card)=='club'; }, filter:function(event,player){ - return player.num('he',{suit:'club'}); + return player.num('h',{suit:'club'}); }, - position:'he', viewAs:{name:'shunshou'}, viewAsFilter:function(player){ - if(!player.num('he',{suit:'club'})) return false; + if(!player.num('h',{suit:'club'})) return false; }, prompt:'将一张装备牌当顺手牵羊使用', check:function(card){ var player=_status.currentPhase; - if(player.num('he',{subtype:get.subtype(card)})>1){ + if(player.num('h',{subtype:get.subtype(card)})>1){ return 11-ai.get.equipValue(card); } if(player.num('h')2&&ai.get.attitude(game.players[i],player)>2 ){ + bool=false;break; + } + } + if(bool) return -10; if(player.hp==1) return 1; if(game.phaseNumber1&&ai.get.attitude(game.players[i],player)>1){ + return 1; + } + } + return 0; + }, target:function(player,target){ if(ui.selected.targets.length){ return -0.1; @@ -1508,7 +1527,7 @@ character.yijiang={ ai2:function(target){ return ai.get.attitude(player,target)-2; }, - prompt:'将'+event.num+'张手牌交给一名其他角色', + prompt:'将'+get.cnNumber(event.num)+'张手牌交给一名其他角色', }); "step 2" if(result.bool){ diff --git a/character/yxs.js b/character/yxs.js old mode 100644 new mode 100755 index 067752e83..0ebf140be --- a/character/yxs.js +++ b/character/yxs.js @@ -123,14 +123,6 @@ character.yxs={ } } }, - kuixin:{ - trigger:{player:'judgeEnd'}, - forced:true, - content:function(){ - player.gain(trigger.result.card); - player.$gain2(trigger.result.card); - } - }, seyou:{ unique:true, mark:true, @@ -303,12 +295,14 @@ character.yxs={ } if(result.control!='cancel'){ player.addTempSkill('bolehuiyan4','phaseAfter'); + player.logSkill(['bolehuiyan',result.control],trigger.target); game.log(get.translation(player)+'预言'+result.control); player.storage.bolehuiyan=result.control; - player.popup(result.control); - player.line(trigger.target,'green'); game.delay(); } + }, + ai:{ + threaten:1.3 } }, bolehuiyan2:{ @@ -323,6 +317,10 @@ character.yxs={ player.popup('预言成功'); player.draw(); } + else{ + player.popup('预言失败'); + player.chooseToDiscard('预言失败，请弃置一张牌','he',true); + } delete player.storage.bolehuiyan; } }, @@ -338,6 +336,10 @@ character.yxs={ player.popup('预言成功'); player.draw(); } + else{ + player.popup('预言失败'); + player.chooseToDiscard('预言失败，请弃置一张牌','he',true); + } delete player.storage.bolehuiyan; } }, @@ -915,9 +917,7 @@ character.yxs={ yxs_aijiyanhou:'埃及艳后', yxs_diaochan:'貂蝉', yxs_yangyuhuan:'杨玉环', - - kuixin:'窥心', - kuixin_info:'锁定技，你立即获得你的判定牌', + weiyi:'威仪', weiyi_info:'每当你受到一次伤害，可以令伤害来源弃置两张牌', xieling:'挟令', @@ -937,7 +937,7 @@ character.yxs={ jianai:'兼爱', jianai_info:'每当你回复一点体力，可以令所有其他角色回复一点体力', bolehuiyan:'慧眼', - bolehuiyan_info:'当一名有手牌的其他角色成为来源不为你的杀的目标时，你可以预言此杀能否命中，若预言正确，你摸一张牌，每回合限发动一次', + bolehuiyan_info:'当一名有手牌的其他角色成为来源不为你的杀的目标时，你可以预言此杀能否命中，若预言正确，你摸一张牌，否则你须弃置一张牌。每回合限发动一次', xiangma:'相马', xiangma_info:'锁定技，只要你的体力值大于2点，你计算与其他角色的距离时，始终-1；只要你的体力值为2点或更低，其他角色计算与你的距离时，始终+1。', seyou:'色诱', diff --git a/character/zhuogui.js b/character/zhuogui.js old mode 100644 new mode 100755 diff --git a/font/huangcao.ttf b/font/huangcao.ttf old mode 100644 new mode 100755 diff --git a/font/xiaozhuan.ttf b/font/xiaozhuan.ttf old mode 100644 new mode 100755 diff --git a/game/background.js b/game/background.js old mode 100644 new mode 100755 diff --git a/game/config.js b/game/config.js old mode 100644 new mode 100755 index fc026c45f..13e6db79f --- a/game/config.js +++ b/game/config.js @@ -143,6 +143,8 @@ window.config={ image_background_filter_config:'背景效果', show_playerids_config:'显示身份按钮', + bottom_line_config:'指示线置底', + line_dash_config:'虚线指示线', show_replay_config:'显示重来按钮', show_pause_config:'显示暂停按钮', show_wuxie_config:'显示不询问无懈', diff --git a/game/game.js b/game/game.js old mode 100644 new mode 100755 index 1a3259918..84583f916 --- a/game/game.js +++ b/game/game.js @@ -287,6 +287,7 @@ }, translate:{ 'default':"默认", + zhenfa:'阵法', heart:"♥︎", diamond:"♦︎", spade:"♠︎", @@ -1690,31 +1691,33 @@ } } player.changeHp(-num,false); - if(source){ - if(player._damagetimeout!=source){ - player.$damage(source); - player._damagetimeout=source; - setTimeout(function(){ - delete player._damagetimeout; - },500); - } - if(player._damagepopup){ - player._damagepopup-=num; - player._damagenature=event.nature; - } - else{ - player._damagepopup=-num; - player._damagenature=event.nature; - setTimeout(function(){ - player.popup(player._damagepopup,player._damagenature); - delete player._damagepopup; - delete player._damagenature; - },300); - } - } - else{ - player.$damage(); - } + player.$damage(source); + player.popup(-num,event.nature); + // if(source){ + // if(player._damagetimeout!=source){ + // player.$damage(source); + // player._damagetimeout=source; + // setTimeout(function(){ + // delete player._damagetimeout; + // },500); + // } + // if(player._damagepopup){ + // player._damagepopup-=num; + // player._damagenature=event.nature; + // } + // else{ + // player._damagepopup=-num; + // player._damagenature=event.nature; + // setTimeout(function(){ + // player.popup(player._damagepopup,player._damagenature); + // delete player._damagepopup; + // delete player._damagenature; + // },300); + // } + // } + // else{ + // player.$damage(); + // } event.trigger('damage'); "step 1" if(player.hp<=0&&player.isAlive()){ @@ -3522,8 +3525,14 @@ }, logSkill:function(name,targets,nature){ if(get.itemtype(targets)=='player') targets=[targets]; + var nopop=false; + if(Array.isArray(name)){ + this.popup(name[1]); + name=name[0]; + nopop=true; + } if(lib.translate[name]){ - this.popup(name); + if(!nopop) this.popup(name); if(typeof targets=='object'&&targets.length){ var str=get.translation(this)+'对'+get.translation(targets[0]); for(var i=1;i2){ + if(!target.skills.contains('guidao')) return 0; + return [0,hastarget?target.num('h')/4:0]; + } + if(target.num('h')>3||(be&&target.num('h')>=2)){ + return [0,0]; + } + if(target.num('h')==0){ + return [1.5,0]; + } + if(target.num('h')==1&&!be){ + return [1.2,0]; + } + if(!target.skills.contains('guidao')) return [1,0.05]; + return [1,Math.min(0.5,(target.num('h')+be)/4)]; + } + } + } + } + }, wuqin:{ - trigger:{player:'phaseBegin'}, + trigger:{player:'phaseEnd'}, filter:function(event,player){ return player.num('h')==0; }, content:function(){ - player.draw(2) + player.draw(3) } }, boss_baolin:{ @@ -770,7 +839,7 @@ mode.boss={ event.finish(); } "step 2" - if(result.color=='red'){ + if(result.color=='black'){ event.target.damage('thunder'); } } @@ -799,8 +868,8 @@ mode.boss={ return ai.get.unuseful(card)+9; }, ai2:function(target){ - if(target.disabledSkills.boss_hujia) return 0.5; - return 1; + if(target.disabledSkills.boss_hujia) return Math.max(1,10-target.maxHp); + return 1/target.maxHp; }, prompt:'是否发动【胡笳】？' }); @@ -933,7 +1002,6 @@ mode.boss={ }, content:function(){ "step 0" - player.draw(); player.judge(); "step 1" if(result.color=='black'){ @@ -941,6 +1009,7 @@ mode.boss={ } else{ player.recover(); + player.draw(); } }, ai:{ @@ -992,6 +1061,7 @@ mode.boss={ forced:true, unique:true, content:function(){ + player.addSkill('kanpo'); player.addSkill('shenwei'); player.addSkill('zhuyu'); game.bossinfo.loopType=1; @@ -1030,6 +1100,13 @@ mode.boss={ game.players[i].forcemin=true; } } + }, + mod:{ + targetEnabled:function(card,player,target){ + if(get.type(card)=='delay'&&player!=target){ + return false; + } + } } }, fanghua:{ @@ -1236,11 +1313,11 @@ mode.boss={ boss_qiangzheng_info:'锁定技，回合结束阶段，你获得每个敌方角色的一张手牌', boss_baolin:'暴凌', guizhen:'归真', - guizhen_info:'每当你失去最后一张手牌，你可以所有敌人失去全部手牌（不触发技能）', + guizhen_info:'每当你失去最后一张手牌，你可以所有敌人失去全部手牌，没有手牌的角色失去一点体力（不触发技能）', boss_shengshou:'圣手', boss_shengshou_info:'每当你使用一张牌，你可以进行一次判定，若为红色，你回复一点体力', wuqin:'五禽戏', - wuqin_info:'回合开始阶段，若你没有手牌，可以摸两张牌', + wuqin_info:'回合结束阶段，若你没有手牌，可以摸三张牌', boss_konghun:'控心', boss_konghun_info:'回合结束阶段，你可以指定一名敌人令其进入混乱状态（不受对方控制，并将队友视为敌人）直到下一回合开始', @@ -1251,16 +1328,18 @@ mode.boss={ boss_wange:'笙歌', huanhua:'幻化', - huanhua_info:'锁定技，游戏开始时，你获得其他角色的所有技能，体力上限变为其他角色之和；其他角色于摸牌摸牌时，你摸等量的牌；其他角色于弃牌阶段弃牌时，你弃置等量的手牌', + huanhua_info:'锁定技，游戏开始时，你获得其他角色的所有技能，体力上限变为其他角色之和；其他角色于摸牌阶段摸牌时，你摸等量的牌；其他角色于弃牌阶段弃牌时，你弃置等量的手牌', + boss_leiji:'雷击', + boss_leiji_info:'每当你使用或打出一张【闪】，可令任意一名角色进行一次判定，若结果为黑色，其受到一点雷电伤害，然后你摸一张牌', jidian:'亟电', - jidian_info:'每当你造成一次伤害，可以指定距离受伤害角色1以内的一名其他角色进行判定，若结果为红色，该角色受到一点雷电伤害', + jidian_info:'每当你造成一次伤害，可以指定距离受伤害角色1以内的一名其他角色进行判定，若结果为黑色，该角色受到一点雷电伤害', tinqin:'听琴', boss_guihan:'归汉', boss_guihan_info:'限定技，濒死阶段，你可以将体力回复至体力上限，摸4张牌，令所有敌人的技能恢复，并获得技能【听琴】、【蕙质】', boss_huixin:'蕙质', - boss_huixin_info:'每当你于回合外失去牌，可以摸一张牌并进行一次判定，若为黑色，当前回合角色失去一点体力，否则你回复一点体力', + boss_huixin_info:'每当你于回合外失去牌，可以进行一次判定，若为黑色，当前回合角色失去一点体力，否则你回复一点体力并摸一张牌', boss_hujia:'胡笳', boss_hujia_info:'回合结束阶段，若你已受伤，可以弃置一张牌令一名其他角色的所有技能失效，若其所有技能已失效，改为令其失去一点体力上限', boss_honglian:'红莲', @@ -1270,8 +1349,8 @@ mode.boss={ boss_xianyin:'仙音', boss_xianyin_info:'每当你于回合外失去牌，你可以进行一次判定，若为红色，你令一名敌人失去一点体力', - boss_yuhuo:'浴火', - boss_yuhuo_info:'觉醒技，在你涅槃后，你获得技能【神威】、【朱羽】', + // boss_yuhuo:'浴火', + // boss_yuhuo_info:'觉醒技，在你涅槃后，你获得技能【神威】、【朱羽】', boss_tianyu:'天狱', boss_jizhi:'集智', @@ -1279,7 +1358,7 @@ mode.boss={ boss_guiyin:'归隐', boss_guiyin_info:'锁定技，体力值比你多的角色无法在回合内对你使用卡牌', boss_gongshen:'工神', - boss_gongshen_info:'锁定技，除你之外的角色没有装备区', + boss_gongshen_info:'锁定技，除你之外的角色没有装备区；你不能成为其他角色的的延时锦囊目标', fanghua:'芳华', fanghua_info:'回合结束阶段，你可以令所有已翻面角色流失一点体力', diff --git a/mode/chess.js b/mode/chess.js old mode 100644 new mode 100755 diff --git a/mode/guozhan.js b/mode/guozhan.js old mode 100644 new mode 100755 diff --git a/mode/identity.js b/mode/identity.js old mode 100644 new mode 100755 index 863b87960..3ac8b78d8 --- a/mode/identity.js +++ b/mode/identity.js @@ -580,7 +580,7 @@ mode.identity={ case 'zhong': switch(identity2){ case 'zhu': return 10; - case 'zhong': return get.population('fan')>0?4:0; + case 'zhong': return get.population('fan')>0?4:0.1; case 'nei': if(get.population('fan')==0) return -2; return Math.min(3,-situation); diff --git a/mode/stone.js b/mode/stone.js old mode 100644 new mode 100755 index 3c6281f22..3d6532f0f --- a/mode/stone.js +++ b/mode/stone.js @@ -3,7 +3,7 @@ mode.stone={ element:{ player:{ init:function(player){ - if(!player.isMin()){ + if(!player.isMin()||player.forcemin){ if(!player.node.actcount){ player.node.actcount=ui.create.div('.actcount.hp',player); } @@ -275,7 +275,8 @@ mode.stone={ } for(i in lib.card){ if(lib.card[i].type=='equip'){ - lib.card[i].chongzhu=true; + // lib.card[i].chongzhu=true; + lib.card[i].stoneact=0; } if(typeof lib.card[i].stoneact==='number'&&!lib.card[i].addinfo){ lib.card[i].addinfo='消耗 '+lib.card[i].stoneact; @@ -516,7 +517,7 @@ mode.stone={ type:'stonecard', fullskin:true, enable:true, - stoneact:2, + stoneact:1, filterTarget:function(card,player,target){ if(!target.isMin()) return false; if(ui.selected.targets.length){ @@ -581,17 +582,24 @@ mode.stone={ multiline:true, multitarget:true, content:function(){ + 'step 0' targets.sort(lib.sort.seat); for(var i=0;i0; }, content:function(){ - "step 0" - event.chooser=player.getLeader(); - event.enemy=player.getEnemy(); - event.chooser.choosePlayerCard(event.enemy,'e','吴兵：令对方主将将装备区中的一张牌收入手牌'); - player.line(event.chooser); - "step 1" - if(result.bool){ - event.chooser.line(event.enemy); + var enemy=player.getEnemy(); + var es=enemy.get('e'); + if(es.length){ + player.getLeader().line(enemy); game.delay(); - event.enemy.gain(result.links,'gain2'); - game.log(get.translation(event.enemy)+'将'+get.translation(result.links)+'收入手牌') + enemy.gain(es,'gain2'); + game.log(get.translation(event.enemy)+'将'+get.translation(es)+'收入手牌') } } }, @@ -1364,7 +1368,7 @@ mode.stone={ stone_shujiang_info:'你出场时，已方主将可视为对一名敌方角色使用一张杀', stone_wubing:'吴兵', - stone_wubing_info:'你出场时，已方主将可令敌方主将将装备区内的一张牌收入手牌', + stone_wubing_info:'你出场时，敌方主将将装备区内的所有牌收入手牌', stone_wuguan:'吴官', stone_wuguan_info:'你出场时，已方主将本回合手牌上限+1', stone_wujiang:'吴将', @@ -1418,7 +1422,7 @@ mode.stone={ miefafu:'灭法符', miefafu_info:'将目标随从翻面', liumangxingzhen:'六芒星阵', - liumangxingzhen_info:'令场上所有随从立即死亡（无法触发死亡技能）', + liumangxingzhen_info:'令场上所有随从立即死亡（无法触发死亡技能），回复两点体力', dianhaishenzhu:'颠海神珠', dianhaishenzhu_info:'令目标随从获得嘲讽', chaofeng:'嘲讽', @@ -1432,7 +1436,7 @@ mode.stone={ zhaohunfan:'招魂幡', zhaohunfan_info:'令双方各一名随从立即死亡', fengraozhijiao:'丰饶之角', - fengraozhijiao_info:'令一名随从回复一点体力', + fengraozhijiao_info:'令一名随从回复全部体力', stonecard:'法术' }, @@ -1453,12 +1457,12 @@ mode.stone={ config:['battle_number','double_character','double_hp','ban_weak','free_choose','change_choice'], help:{ '炉石模式':'
  • 游戏流程类似1v1，场上有两名主将进行对抗'+ - '
  • 主将出牌阶段的出牌数量（行动值）有上限，先手为2，后手为3
  • 游戏每进行一轮，主将的出牌上限+1，超过6时减至2并重新累加'+ + '
  • 主将出牌阶段的出牌数量（行动值）有上限，先手为2，后手为3，装备牌不计入出牌上限
  • 游戏每进行一轮，主将的出牌上限+1，超过6时减至2并重新累加'+ '
  • 牌堆中随机加入总量1/3的随从牌，使用之可召唤一个随从，随从出场时背面朝上。每一方在场的随从数不能超过4
  • 随从于摸牌阶段摸牌基数为1，随从的随从牌均视为闪，装备牌均视为杀
  • '+ '随从与其他所有角色相互距离基数为1
  • '+ '主将杀死对方随从后获得一个额外的行动值并摸两张牌，杀死己方随从无惩罚，随从杀死随从无效果'+ '
  • 牌堆中随机加入总量1/6的法术牌，效果主要与随从有关，法术牌根据强度不同可能会消耗额外的行动值'+ - '
  • 主将可重铸装备牌和随从牌，但回合内总的重铸次数不能超过3，随从不能重铸任何牌（包括铁索等默认可以重铸的牌）'+ + '
  • 主将可重铸随从牌，但回合内总的重铸次数不能超过3，随从不能重铸任何牌（包括铁索等默认可以重铸的牌）'+ '
  • 嘲讽：若一方阵营中有嘲讽角色，则同阵营的无嘲讽角色不以能成为杀或决斗的目标'+ '
  • 行动顺序为先主将后随从。主将或随从死亡后立即移出游戏，主将死亡后替补登场，替补登场时摸2+X张牌，X为对方存活的随从数，无替补时游戏结束' } diff --git a/mode/versus.js b/mode/versus.js old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/play/character.js b/play/character.js old mode 100644 new mode 100755 diff --git a/play/soldier.js b/play/soldier.js old mode 100644 new mode 100755 diff --git a/play/strategy.js b/play/strategy.js old mode 100644 new mode 100755 diff --git a/play/wuxing.js b/play/wuxing.js old mode 100644 new mode 100755 diff --git a/theme/archive/block/block.png b/theme/archive/block/block.png old mode 100644 new mode 100755 diff --git a/theme/archive/block/style.css b/theme/archive/block/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/default/.DS_Store b/theme/archive/default/.DS_Store old mode 100644 new mode 100755 diff --git a/theme/archive/default/oxygen.jpg b/theme/archive/default/oxygen.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/default/oxygen2.jpg b/theme/archive/default/oxygen2.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/default/style.css b/theme/archive/default/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/dock/dock.png b/theme/archive/dock/dock.png old mode 100644 new mode 100755 diff --git a/theme/archive/dock/dock2.png b/theme/archive/dock/dock2.png old mode 100644 new mode 100755 diff --git a/theme/archive/dock/grid.png b/theme/archive/dock/grid.png old mode 100644 new mode 100755 diff --git a/theme/archive/dock/oxygen.jpg b/theme/archive/dock/oxygen.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/dock/style.css b/theme/archive/dock/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/dock/wood.png b/theme/archive/dock/wood.png old mode 100644 new mode 100755 diff --git a/theme/archive/glass/blur.jpg b/theme/archive/glass/blur.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/glass/glow.png b/theme/archive/glass/glow.png old mode 100644 new mode 100755 diff --git a/theme/archive/glass/style.css b/theme/archive/glass/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/jeans/jeans.jpg b/theme/archive/jeans/jeans.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/jeans/style.css b/theme/archive/jeans/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/metro/style.css b/theme/archive/metro/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/round/bg_1.jpg b/theme/archive/round/bg_1.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/round/bg_2.jpg b/theme/archive/round/bg_2.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/round/block.png b/theme/archive/round/block.png old mode 100644 new mode 100755 diff --git a/theme/archive/round/dock.png b/theme/archive/round/dock.png old mode 100644 new mode 100755 diff --git a/theme/archive/round/dock2.png b/theme/archive/round/dock2.png old mode 100644 new mode 100755 diff --git a/theme/archive/round/grid.png b/theme/archive/round/grid.png old mode 100644 new mode 100755 diff --git a/theme/archive/round/jeans.jpg b/theme/archive/round/jeans.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/round/oxygen.jpg b/theme/archive/round/oxygen.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/round/p_4.png b/theme/archive/round/p_4.png old mode 100644 new mode 100755 diff --git a/theme/archive/round/style.css b/theme/archive/round/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/round/wood.jpg b/theme/archive/round/wood.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/round/wood.png b/theme/archive/round/wood.png old mode 100644 new mode 100755 diff --git a/theme/archive/simple/style.css b/theme/archive/simple/style.css old mode 100644 new mode 100755 diff --git a/theme/archive/white/grid.png b/theme/archive/white/grid.png old mode 100644 new mode 100755 diff --git a/theme/archive/white/oxygen.jpg b/theme/archive/white/oxygen.jpg old mode 100644 new mode 100755 diff --git a/theme/archive/white/style.css b/theme/archive/white/style.css old mode 100644 new mode 100755 diff --git a/theme/music/grid.png b/theme/music/grid.png old mode 100644 new mode 100755 diff --git a/theme/music/style.css b/theme/music/style.css old mode 100644 new mode 100755 diff --git a/theme/music/wood.png b/theme/music/wood.png old mode 100644 new mode 100755 diff --git a/theme/music/wood3.png b/theme/music/wood3.png old mode 100644 new mode 100755 diff --git a/theme/simple/card.png b/theme/simple/card.png old mode 100644 new mode 100755 diff --git a/theme/simple/grid.png b/theme/simple/grid.png old mode 100644 new mode 100755 diff --git a/theme/simple/style.css b/theme/simple/style.css old mode 100644 new mode 100755 diff --git a/theme/simple/wood.png b/theme/simple/wood.png old mode 100644 new mode 100755 diff --git a/theme/simple/wood3.png b/theme/simple/wood3.png old mode 100644 new mode 100755 diff --git a/theme/woodden/grid.png b/theme/woodden/grid.png old mode 100644 new mode 100755 diff --git a/theme/woodden/style.css b/theme/woodden/style.css old mode 100644 new mode 100755 diff --git a/theme/woodden/wood.jpg b/theme/woodden/wood.jpg old mode 100644 new mode 100755 diff --git a/theme/woodden/wood.png b/theme/woodden/wood.png old mode 100644 new mode 100755 diff --git a/theme/woodden/wood2.jpg b/theme/woodden/wood2.jpg old mode 100644 new mode 100755 diff --git a/theme/woodden/wood2.png b/theme/woodden/wood2.png old mode 100644 new mode 100755 diff --git a/theme/woodden/wood2.pxm b/theme/woodden/wood2.pxm old mode 100644 new mode 100755