diff --git a/card/guozhan.js b/card/guozhan.js index b3deefbb0..7c6a185fc 100755 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -126,7 +126,7 @@ card.guozhan={ var num=0; for(var i=0;i0; + if(event.target.hp==1) return att>0; if(event.target.hasSkillTag('maixie')){ return att<=0; } - if(event.target.hp==1) return att>0; if(player.skills.contains('tianxianjiu')) return false; return att<=0; }, diff --git a/character/hearth.js b/character/hearth.js index f630820e7..9b48521c6 100755 --- a/character/hearth.js +++ b/character/hearth.js @@ -1425,7 +1425,7 @@ character.hearth={ } 'step 1' if(result.bool){ - player.line(result.targets[0],'green'); + player.logSkill('fengyin',result.targets); result.targets[0].addTempSkill('fengyin2',{player:'phaseAfter'}); } } diff --git a/game/game.js b/game/game.js index 3ed478611..b2b651233 100755 --- a/game/game.js +++ b/game/game.js @@ -4762,7 +4762,7 @@ }, chooseToUse:function(){ "step 0" - var skills=player.get('s'); + var skills=player.get('s',true); game.expandSkills(skills); for(var i=0;i.card, +#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card{ + background: none !important; +} + .player,#mebg{ /*background:url('wood.png') left repeat-y,url('wood.png') right repeat-y,linear-gradient(#4b4b4b, #464646);*/ } diff --git a/theme/simple/style.css b/theme/simple/style.css index a2881a9a7..2c6a09485 100755 --- a/theme/simple/style.css +++ b/theme/simple/style.css @@ -65,6 +65,10 @@ body{ .player.unseen .equips:not(*:empty){ border-radius:4px; } +#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card, +#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card{ + background: none !important; +} #arena:not(.chess) .player[data-position='0']>.equips>.equip5 { border-radius: 4px; } diff --git a/theme/woodden/style.css b/theme/woodden/style.css index 3c3110704..c72c76495 100755 --- a/theme/woodden/style.css +++ b/theme/woodden/style.css @@ -41,11 +41,16 @@ html{ background:url('wood2.png'); } -.player.unseen .equips:not(*:empty){ +#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty), +#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty){ background: url('wood.png'); border-radius:4px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 2px 10px; } +#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card, +#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card{ + background: none !important; +} .coin_menu .content>.caption>.coin_buy>.menubutton{ box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(0, 0, 0, 0.3) 0 0 5px !important;