From 10eddf9741ddb286dfec67dcf3ef6ccda4efff9d Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 3 Jun 2017 21:29:09 +0800 Subject: [PATCH] x --- character/gwent.js | 4 ++-- character/swd.js | 12 +++++++----- character/xianjian.js | 1 - game/game.js | 1 + game/update.js | 2 +- layout/default/layout.css | 4 ++++ 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/character/gwent.js b/character/gwent.js index 8736dd750..99c56d686 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -16,7 +16,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_laduoweide:['male','wei',4,['gwxiaoshou']], gw_dagong:['male','qun',4,['tianbian']], - gw_bulanwang:['male','qun',4,['bolang']], + // gw_bulanwang:['male','qun',4,['bolang']], // gw_kuite:['male','qun',3,[]], // gw_fuertaisite:['male','qun',3,[]], // gw_hengsaite:['male','wei',4,['jinsheng']], @@ -1518,7 +1518,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ huihun:'回魂', huihun_info:'结束阶段，你可以从弃牌堆中获得本回合使用的前两张红色牌', lanquan:'远略', - lanquan_backup:'揽权', + lanquan_backup:'远略', lanquan_info:'出牌阶段限一次，你可以观看牌堆顶的6张牌，并选择一张使用', chaoyong:'潮涌', diff --git a/character/swd.js b/character/swd.js index e8979f24d..bf07166a8 100644 --- a/character/swd.js +++ b/character/swd.js @@ -7268,15 +7268,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){ line:'fire', filter:function(event,player){ return !player.storage.xuehuang&& - player.countCards('he',{color:'red'})>0&& - player.countCards('he',{color:'black'})==0; + player.countCards('h',{color:'red'})>0&& + player.countCards('h',{color:'black'})==0; }, content:function(){ 'step 0' player.storage.xuehuang=true; player.awakenSkill('xuehuang'); player.showHandcards(); - var cards=player.getCards('he'); + var cards=player.getCards('h'); player.discard(cards); event.num=cards.length; 'step 1' @@ -7295,7 +7295,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ order:9, result:{ player:function(player){ - if(player.countCards('he',{color:'red'})<2) return 0; + if(player.countCards('h',{color:'red'})<2) return 0; if(player.hasCard(function(card){ return get.color(card)=='red'&&get.value(card)>8; })){ @@ -8625,6 +8625,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(event.isMine()){ ui.auto.hide(); event.dialog=ui.create.dialog('脉轮：选择一个效果'); + event.dialog.forcebutton=true; + event.dialog.classList.add('forcebutton'); var effects=lib.skill.mailun.effects; var clickItem=function(){ event.choice=this.link; @@ -9737,7 +9739,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yulin_info:'每当你即将受到伤害，你可以弃置一张装备牌抵消此伤害', funiao_info:'出牌阶段限一次，你可以将一张手牌交给一名其他角色，然后摸一张牌', funiao_old_info:'出牌阶段，你可以交给一名角色一张手牌，然后观看其手牌，每个阶段对一名角色只能发动一次', - xuehuang_info:'限定技，出牌阶段，若你没有黑色牌，你可以展示并弃置所有牌，每弃置一张牌视为使用一张火杀，随机指定两名敌人为目标', + xuehuang_info:'限定技，出牌阶段，若你没有黑色手牌，你可以展示并弃置所有手牌，每弃置一张牌视为使用一张火杀，随机指定两名敌人为目标', zhuyu_info:'每当一名横置的角色即将受到伤害时，你可以弃置一张红色牌令此伤害+1并变为火属性', ningshuang_info:'每当你成为黑色牌的目标，你可以弃置一张黑色牌将其横置，并摸一张牌，若其已经模置则改为将其翻面', zaowu_old_info:'出牌阶段，你可以弃置三张不同类型的牌，创造任意两张牌并获得之', diff --git a/character/xianjian.js b/character/xianjian.js index b575667db..ec9d7aa64 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -890,7 +890,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ content:'limited' }, check:function(event,player){ - console.log(player.name,event.player.name); return get.attitude(player,event.player)>=3; }, filter:function(event,player){ diff --git a/game/game.js b/game/game.js index a59139769..f561755a8 100644 --- a/game/game.js +++ b/game/game.js @@ -10396,6 +10396,7 @@ item.firstChild.link=event.controls[i]; } event.dialog.forcebutton=true; + event.dialog.classList.add('forcebutton'); event.dialog.open(); } else{ diff --git a/game/update.js b/game/update.js index 03fb25f59..3b5265247 100644 --- a/game/update.js +++ b/game/update.js @@ -14,7 +14,7 @@ window.noname_update={ // 'card/*', // 'card/gwent.js', // 'character/*', - // 'character/sp.js', + 'character/gwent.js', // 'character/yijiang.js', 'mode/identity.js', 'mode/guozhan.js', diff --git a/layout/default/layout.css b/layout/default/layout.css index 2e479bc13..f86c017d3 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -1424,6 +1424,10 @@ div:not(.handcards)>.card>.info>span, bottom: auto !important; min-height: 0px !important; } +.dialog.forcebutton{ + width: 400px; + left: calc(50% - 200px); +} .dialog.nobutton .content>div:last-child { padding-bottom: 8px; }