From 00acd453717bf93d84f4a4b1f89fc6806626deaf Mon Sep 17 00:00:00 2001 From: libccy Date: Sun, 3 May 2015 23:17:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=89=E7=9F=B3=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/extra.js | 7 +- card/qimou.js | 1 + character/mountain.js | 2 + character/sp.js | 5 +- character/swd.js | 10 +- character/yijiang.js | 2 +- character/yxs.js | 9 +- game/config.js | 3 +- game/game.js | 192 +++++---- image/character/default/shibing2.jpg | Bin 20702 -> 0 bytes .../default/{shibing3.jpg => shibing_qun.jpg} | Bin .../default/{shibing4.jpg => shibing_shu.jpg} | Bin .../default/{shibing5.jpg => shibing_wei.jpg} | Bin .../default/{shibing1.jpg => shibing_wu.jpg} | Bin image/character/default/stone_banxian.jpg | Bin 0 -> 18730 bytes image/character/default/stone_daogu.jpg | Bin 0 -> 16832 bytes image/character/default/stone_daoshi.jpg | Bin 0 -> 25873 bytes image/character/default/stone_feipin.jpg | Bin 0 -> 18230 bytes image/character/default/stone_genv.jpg | Bin 0 -> 19850 bytes image/character/default/stone_gongzhu.jpg | Bin 0 -> 17180 bytes image/character/default/stone_qunbing.jpg | Bin 0 -> 20857 bytes image/character/default/stone_qunguan.jpg | Bin 0 -> 16074 bytes image/character/default/stone_qunjiang.jpg | Bin 0 -> 16954 bytes image/character/default/stone_sanxian.jpg | Bin 0 -> 15171 bytes image/character/default/stone_shubing.jpg | Bin 0 -> 18120 bytes image/character/default/stone_shuguan.jpg | Bin 0 -> 17372 bytes image/character/default/stone_shujiang.jpg | Bin 0 -> 20685 bytes image/character/default/stone_wanghou.jpg | Bin 0 -> 18105 bytes image/character/default/stone_weibing.jpg | Bin 0 -> 19224 bytes image/character/default/stone_weiguan.jpg | Bin 0 -> 14274 bytes image/character/default/stone_weijiang.jpg | Bin 0 -> 18798 bytes image/character/default/stone_wubing.jpg | Bin 0 -> 18427 bytes image/character/default/stone_wuguan.jpg | Bin 0 -> 15442 bytes image/character/default/stone_wujiang.jpg | Bin 0 -> 20418 bytes image/character/default/stone_wunv.jpg | Bin 0 -> 23495 bytes image/character/default/stone_yiji.jpg | Bin 0 -> 14630 bytes image/character/default/stone_yinshi.jpg | Bin 0 -> 16838 bytes image/character/default/stone_yisheng.jpg | Bin 0 -> 15218 bytes layout/default/layout.css | 62 ++- layout/newlayout/layout.css | 69 ++- mode/guozhan.js | 5 +- mode/identity.js | 17 +- mode/stone.js | 394 ++++++++++++++++++ mode/versus.js | 12 +- play/character.js | 3 +- play/soldier.js | 1 + 46 files changed, 666 insertions(+), 128 deletions(-) delete mode 100644 image/character/default/shibing2.jpg rename image/character/default/{shibing3.jpg => shibing_qun.jpg} (100%) rename image/character/default/{shibing4.jpg => shibing_shu.jpg} (100%) rename image/character/default/{shibing5.jpg => shibing_wei.jpg} (100%) rename image/character/default/{shibing1.jpg => shibing_wu.jpg} (100%) create mode 100644 image/character/default/stone_banxian.jpg create mode 100644 image/character/default/stone_daogu.jpg create mode 100644 image/character/default/stone_daoshi.jpg create mode 100644 image/character/default/stone_feipin.jpg create mode 100644 image/character/default/stone_genv.jpg create mode 100644 image/character/default/stone_gongzhu.jpg create mode 100644 image/character/default/stone_qunbing.jpg create mode 100644 image/character/default/stone_qunguan.jpg create mode 100644 image/character/default/stone_qunjiang.jpg create mode 100644 image/character/default/stone_sanxian.jpg create mode 100644 image/character/default/stone_shubing.jpg create mode 100644 image/character/default/stone_shuguan.jpg create mode 100644 image/character/default/stone_shujiang.jpg create mode 100644 image/character/default/stone_wanghou.jpg create mode 100644 image/character/default/stone_weibing.jpg create mode 100644 image/character/default/stone_weiguan.jpg create mode 100644 image/character/default/stone_weijiang.jpg create mode 100644 image/character/default/stone_wubing.jpg create mode 100644 image/character/default/stone_wuguan.jpg create mode 100644 image/character/default/stone_wujiang.jpg create mode 100644 image/character/default/stone_wunv.jpg create mode 100644 image/character/default/stone_yiji.jpg create mode 100644 image/character/default/stone_yinshi.jpg create mode 100644 image/character/default/stone_yisheng.jpg create mode 100644 mode/stone.js diff --git a/card/extra.js b/card/extra.js index b4609bcc9..e985ee543 100644 --- a/card/extra.js +++ b/card/extra.js @@ -106,9 +106,12 @@ card.extra={ result:{ player:function(player){ var nh=player.num('h'); - if(nh==2&&player.hp==1) return 0; if(nh<=player.hp&& - _status.event.name=='chooseToUse'&&_status.event.filterCard({name:'huogong'})) return -10; + _status.event.name=='chooseToUse'&& + _status.event.filterCard({name:'huogong'})){ + return -10; + } + return 0; }, target:function(player,target){ if(target.skills.contains('huogong2')) return 0; diff --git a/card/qimou.js b/card/qimou.js index ee275b7ea..a7e71f1e5 100644 --- a/card/qimou.js +++ b/card/qimou.js @@ -116,6 +116,7 @@ card.qimou={ type:'trick', enable:true, filterTarget:function(card,player,target){ + if(target.isMin()) return false; if(ui.selected.targets.length){ return target.get('e',{subtype:'equip5'}).length==0; } diff --git a/character/mountain.js b/character/mountain.js index 668594bad..53aa8115d 100644 --- a/character/mountain.js +++ b/character/mountain.js @@ -314,6 +314,7 @@ character.mountain={ for(var i=0;i0; }, @@ -2692,8 +2693,8 @@ character.sp={ guiming:'归命', guiming_info:'主公技,其他吴势力角色于你的回合内视为已受伤的角色。', chixin:'赤心', - chixin1:'赤杀', - chixin2:'赤闪', + chixin1:'赤心', + chixin2:'赤心', chixin_info:'你可以将♦牌当【杀】或【闪】使用或打出。出牌阶段,你对你攻击范围内的每名角色均可使用一张【杀】。', suiren:'随仁', suiren_info:'限定技,准备阶段开始时,你可以失去技能“义从”,然后加1点体力上限并回复1点体力,再令一名角色摸三张牌。', diff --git a/character/swd.js b/character/swd.js index d4801a62d..806482001 100644 --- a/character/swd.js +++ b/character/swd.js @@ -901,6 +901,7 @@ character.swd={ }, fuyan:{ trigger:{player:'damageEnd'}, + frequent:true, filter:function(event){ return event.num>0; }, @@ -3952,7 +3953,7 @@ character.swd={ filter:function(event,player){ var content=player.storage.yishan; for(var i=0;i最近失去的牌'); var cards=[]; for(var i=0;i=4) break; } @@ -4012,7 +4014,7 @@ character.swd={ var str='最近失去的牌:'; var cards=[]; for(var i=0;i=4) break; } diff --git a/character/yijiang.js b/character/yijiang.js index 5f8238423..5f84b1b8a 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -2063,7 +2063,7 @@ character.yijiang={ "step 1" if(result.bool){ lib.skill.qice2.viewAs={name:result.buttons[0].link[2]}; - player.popup(result.buttons[0].link[2]); + // player.popup(result.buttons[0].link[2]); event.parent.parent.backup('qice2'); event.parent.parent.step=0; if(event.isMine()){ diff --git a/character/yxs.js b/character/yxs.js index 2289273f1..3c787126a 100644 --- a/character/yxs.js +++ b/character/yxs.js @@ -830,18 +830,15 @@ character.yxs={ var from=ui.selected.targets[0]; var judges=from.get('j'); for(var i=0;i0; diff --git a/game/config.js b/game/config.js index b7671bff9..aa894e312 100644 --- a/game/config.js +++ b/game/config.js @@ -7,7 +7,7 @@ window.config={ forbidversus:['swd_kangnalishi'], forbiddouble:['zhugedan','swd_kangnalishi','swd_nicole','dongzhuo','jg_simayi'], all:{ - mode:['identity','guozhan','versus'], + mode:['identity','guozhan','versus','stone'], characters:['standard','wind','fire','woods','mountain','extra','sp','yijiang','refresh','guozhan','jiange','zhuogui','diy','yxs','swd','xswd','gujian','xianjian'], cards:['standard','ex','extra','refresh','guozhan','zhenfa','qimou','yibao','shenbing','wanxiang','swd','shenqi','compensate'], plays:['character','soldier','wuxing'], @@ -28,6 +28,7 @@ window.config={ identity:'身份', guozhan:'国战', versus:'对决', + stone:'炉石', changjing:'场景', mowang:'魔王', infinity:'无限', diff --git a/game/game.js b/game/game.js index 73e862ea1..6756fbd79 100644 --- a/game/game.js +++ b/game/game.js @@ -29,7 +29,7 @@ window.play={}; frameId:0, }, help:{ - '关于':'无名杀 1.0.1