From ad89ddcd47fcd5550a4c2c3bf1f37c1f997cddaa Mon Sep 17 00:00:00 2001 From: libccy Date: Fri, 1 May 2015 16:39:13 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Bug=E3=80=81AI=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 64b7d2f8f56dc17eaee651b188e0829716a0280b. --- card/standard.js | 17 ++--------------- character/standard.js | 4 ++-- image/card/hufu.png | Bin 9635 -> 8064 bytes mode/versus.js | 10 +++++----- theme/music/style.css | 8 +++++--- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/card/standard.js b/card/standard.js index 79e98d1e6..8a408ba0f 100644 --- a/card/standard.js +++ b/card/standard.js @@ -693,16 +693,9 @@ card.standard={ return (target.num('hej')>0); }, content:function(){ - "step 0" if(target.num('hej')){ - player.choosePlayerCard(target,true); + player.gainPlayerCard('hej',target,true); } - else{ - event.finish(); - } - "step 1" - player.gain(result.buttons[0].link); - target.$give(1,player); }, ai:{ wuxie:function(target,card,player,viewer){ @@ -748,15 +741,9 @@ card.standard={ return (target.num('hej')>0); }, content:function(){ - "step 0" if(target.num('hej')){ - player.choosePlayerCard(target,true); + player.discardPlayerCard('hej',target,true); } - else{ - event.finish(); - } - "step 1" - target.discard(result.buttons[0].link); }, ai:{ basic:{ diff --git a/character/standard.js b/character/standard.js index cd7788c5d..678eeca73 100644 --- a/character/standard.js +++ b/character/standard.js @@ -611,8 +611,8 @@ character.standard={ frequent:true, content:function(){ "step 0" - if(player.underControl()){ - game.swapPlayer(player); + if(player.isUnderControl()){ + game.modeSwapPlayer(player); } if(event.isMine()){ ui.auto.hide(); diff --git a/image/card/hufu.png b/image/card/hufu.png index d534ac9fd82b7c589520d1daf2af31ebbba88e37..c7d3701580019b7de0d00fcad20a9f8cfd7af507 100644 GIT binary patch literal 8064 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 A5C8xG literal 9635 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 diff --git a/mode/versus.js b/mode/versus.js index 09cf3b6c9..c5571c05e 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -584,7 +584,7 @@ mode.versus={ e.stopPropagation(); } else{ - game.versusSwapControl(this.link); + game.modeSwapPlayer(this.link); } }, versusCheckHandcards:function(){ @@ -838,7 +838,7 @@ mode.versus={ } } }, - versusSwapControl:function(player){ + modeSwapPlayer:function(player){ if(lib.storage.control_all){ game.swapControl(player); } @@ -928,20 +928,20 @@ mode.versus={ else{ if(ui.autoreplace.classList.contains('on')){ if(trigger.name!='phase'){ - game.versusSwapControl(player); + game.modeSwapPlayer(player); if(ui.dialog){ ui.dialog.style.display=''; } } } else if(trigger.name=='phase'){ - game.versusSwapControl(player); + game.modeSwapPlayer(player); } event.finish(); } "step 1" if(result.bool){ - game.versusSwapControl(player); + game.modeSwapPlayer(player); if(ui.dialog){ ui.dialog.style.display=''; } diff --git a/theme/music/style.css b/theme/music/style.css index 9711f9972..acf4794e8 100644 --- a/theme/music/style.css +++ b/theme/music/style.css @@ -31,11 +31,13 @@ html{ .selected{ box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(255, 0, 0, 0.8) 0 0 15px !important; } -.card.fullskin{ +.card:not(*:empty){ + color:rgb(77, 60, 51); + text-shadow:none; background: url('wood3.png'); } -.card{ - color: white; +#me>div>.card,#arena>.card:not(*:empty){ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px; } .fire{ color: rgb(255,119,63);