From 2633b00bbc8697cd33fe05dff654f1f0b1f8c276 Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 10 Oct 2015 22:38:33 +0800 Subject: [PATCH] x --- CHANGELOG.MD | 1 + character/extra.js | 8 -------- character/hearth.js | 19 +++++-------------- character/swd.js | 18 +++++++++++++----- game/game.js | 22 +++++++++++----------- layout/default/layout.css | 4 ++-- mode/boss.js | 2 +- mode/versus.js | 2 +- 8 files changed, 34 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 330992d77..78c7f63bd 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,3 +2,4 @@ 战棋模式改进 单人控制改进 新武将 +修bug diff --git a/character/extra.js b/character/extra.js index a44330b62..422d22a04 100755 --- a/character/extra.js +++ b/character/extra.js @@ -769,14 +769,6 @@ character.extra={ } } }, - qinyin:{ - inherit:'swdqinyin', - trigger:{player:'phaseDiscardEnd'}, - direct:true, - filter:function(event,player){ - return event.cards&&event.cards.length>1 - }, - }, longhun:{ group:['longhun1','longhun2','longhun3','longhun4'], ai:{ diff --git a/character/hearth.js b/character/hearth.js index 99f9bc61f..41b075c58 100755 --- a/character/hearth.js +++ b/character/hearth.js @@ -174,22 +174,13 @@ character.hearth={ trigger:{global:'dieAfter'}, forced:true, filter:function(event,player){ - return !event.player.storage.bingshi&&event.player.skills.contains('bingshi'); + return event.player.skills.contains('bingshi'); }, content:function(){ - 'step 0' - event.targets=get.players(trigger.player); - event.targets.remove(trigger.player); - trigger.player.storage.bingshi=true; - 'step 1' - if(event.targets.length){ - var current=event.targets.shift(); - trigger.player.line(current,'thunder'); - current.damage('nosource','thunder').animate=false; - current.$damage(trigger.player); - current.$thunder(); - event.redo(); - } + trigger.player.line(player,'thunder'); + player.damage('nosource','thunder').animate=false; + player.$damage(trigger.player); + player.$thunder(); } }, huanwu:{ diff --git a/character/swd.js b/character/swd.js index 3dd5fbf76..f1f1a9c0b 100755 --- a/character/swd.js +++ b/character/swd.js @@ -2827,14 +2827,17 @@ character.swd={ player.draw(2); }, }, - swdqinyin:{ - trigger:{player:'phaseEnd'}, + qinyin:{ + trigger:{player:'phaseDiscardEnd'}, direct:true, filter:function(event,player){ - return !player.getStat('damage'); + return event.cards&&event.cards.length>1 }, content:function(){ "step 0" + if(typeof event.count!='number'){ + event.count=trigger.cards.length-1; + } var recover=0,lose=0; for(var i=0;irecover&&lose>0) return 0; if(lose0) return 1; @@ -2895,6 +2898,11 @@ character.swd={ event.num++; event.redo(); } + "step 3" + if(event.count>1){ + event.count--; + event.goto(0); + } }, ai:{ expose:0.1, @@ -7922,7 +7930,7 @@ character.swd={ yuhuo:'浴火', huanjian_info:'你可以将一张黑色手牌当作毒箭使用', shengshou_info:'你可以将一张黑色手牌当作草药使用', - susheng_info:'在任意一名角色即将死亡时，你可以弃置一张手牌防止其死亡，并将其体力回复至1，每合合限发动一次', + susheng_info:'在任意一名角色即将死亡时，你可以弃置一张手牌防止其死亡，并将其体力回复至1，每回合限发动一次', zhanlu_info:'出牌阶段，你可以弃置一张黑桃牌令至多３名角色各回复一点体力', kunlunjing_info:'回合开始前，你可以令场上所有牌还原到你上一回合结束时的位置，然后流失一点体力', swd_xiuluo_info:'回合开始阶段，你可以弃一张手牌来弃置你判断区里的一张延时类锦囊（必须花色相同）', diff --git a/game/game.js b/game/game.js index 6f44817c3..7cf265bb3 100755 --- a/game/game.js +++ b/game/game.js @@ -8202,17 +8202,17 @@ var node2=ui.create.div('#paused2',node); node2.innerHTML='已暂停'; - node2.listen(function(){ - _status.clicked=true; - if(ui.sidebar.classList.contains('hidden')){ - ui.sidebar.show(); - ui.sidebar3.show(); - } - else{ - ui.sidebar.hide(); - ui.sidebar3.hide(); - } - }); + // node2.listen(function(){ + // _status.clicked=true; + // if(ui.sidebar.classList.contains('hidden')){ + // ui.sidebar.show(); + // ui.sidebar3.show(); + // } + // else{ + // ui.sidebar.hide(); + // ui.sidebar3.hide(); + // } + // }); return node; }, button:function(item,type,position,noclick){ diff --git a/layout/default/layout.css b/layout/default/layout.css index 417bb561f..bedf939a8 100755 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -213,8 +213,8 @@ margin-bottom: 5px; text-shadow: black 0 0 1px, rgba(10, 155, 67, 1) 0 0 5px, rgba(10, 155, 67, 1) 0 0 10px; } .player>.avatar:not(.glow2)>.action{opacity: 0} -.player.fakeme{width:100px;height:120px;top:calc(100% - 140px)} -.player.fakeme>.avatar{width: 100%;height: 100%;box-shadow: none;left: 0;top: 0} +.player.controlfakeme{width:100px;height:120px;top:calc(100% - 140px)} +.player.controlfakeme>.avatar{width: 100%;height: 100%;box-shadow: none;left: 0;top: 0} .player{z-index: 4;width: 240px;height: 120px;} .player.minskin{width:120px;} .player.replaceme{-webkit-animation:replaceme 0.5s} diff --git a/mode/boss.js b/mode/boss.js index 6733a8670..108952a3e 100755 --- a/mode/boss.js +++ b/mode/boss.js @@ -177,7 +177,7 @@ mode.boss={ if(game.me!==boss){ game.singleHandcard=true; ui.arena.classList.add('single-handcard'); - ui.fakeme=ui.create.div('.player'); + ui.fakeme=ui.create.div('.player.controlfakeme'); ui.fakeme.dataset.position=0; ui.fakeme.line=lib.element.player.line; ui.fakemebg=ui.create.div('.avatar',ui.fakeme).hide(); diff --git a/mode/versus.js b/mode/versus.js index 0159802b2..339536c51 100755 --- a/mode/versus.js +++ b/mode/versus.js @@ -334,7 +334,7 @@ mode.versus={ } game.singleHandcard=true; ui.arena.classList.add('single-handcard'); - ui.fakeme=ui.create.div('.player.fakeme'); + ui.fakeme=ui.create.div('.player.controlfakeme'); ui.fakeme.line=lib.element.player.line; ui.fakemebg=ui.create.div('.avatar',ui.fakeme).hide(); }