From 02e8455f25f5b028cb096bc4f99a58412ee81b4d Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 29 Aug 2016 19:00:45 +0800 Subject: [PATCH] 1.9.0.1 --- card/standard.js | 2 +- character/hearth.js | 4 +-- character/ow.js | 2 +- character/yijiang.js | 2 +- game/config.js | 2 +- game/game.js | 58 +++++++++++++++++++++++++++++--- game/update.js | 17 +++++++--- layout/default/layout.css | 10 +++--- layout/mobile/layout.css | 26 +++++++------- layout/mode/chess.css | 4 +++ mode/brawl.js | 3 +- theme/style/card/default.css | 1 + theme/style/cardback/default.css | 1 + 13 files changed, 96 insertions(+), 36 deletions(-) diff --git a/card/standard.js b/card/standard.js index 56c3df208..810677b54 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1365,7 +1365,7 @@ card.standard={ },player); event.jiu=true; } - player.chooseToUse('是否发动青龙偃月刀？',{name:'sha'},trigger.target,-1).logSkill='qinglong'; + player.chooseToUse('是否发动青龙偃月刀？',{name:'sha'},trigger.target,-1).logSkill='qinglong_skill'; "step 1" if(result.bool); else if(event.jiu){ diff --git a/character/hearth.js b/character/hearth.js index 0deabe19a..f16871b47 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -4738,8 +4738,8 @@ character.hearth={ fengxing_info:'每当你使用一张杀，你可以摸一张牌', xinci:'心刺', xinci_info:'出牌阶段限一次，你可以弃置一张黑色牌令一名角色流失一点体力', - zhongjia:'重甲', - zhongjia_info:'锁定技，每当你受到一次伤害，你获得一点护甲值；当你的体力值大于1时，你的护甲不为你抵挡伤害', + zhongjia:'战甲', + zhongjia_info:'锁定技，每当你受到一次伤害，你获得一点护甲；当你的体力值大于1时，你的护甲不为你抵挡伤害', dunji:'盾击', dunji_info:'出牌阶段，你可以失去你的所有护甲，并对等量的其他角色各造成一点伤害', qiaodong:'巧动', diff --git a/character/ow.js b/character/ow.js index 93787d0bd..8b1ed37a4 100644 --- a/character/ow.js +++ b/character/ow.js @@ -2572,7 +2572,7 @@ character.ow={ translate:{ mengji:'猛击', mengji_info:'锁定技，当你没有护甲时，你的杀造成的伤害+1', - lzhongjia:'重甲', + lzhongjia:'重盾', lzhongjia_info:'游戏开始时，你获得8点护甲；出牌阶段限一次，你可以弃置一张牌并将一点护甲分给一名没有护甲的其他角色', paotai:'炮台', paotai2:'炮台', diff --git a/character/yijiang.js b/character/yijiang.js index 63ad8b9ee..45fdb19b2 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -2012,7 +2012,7 @@ character.yijiang={ event.jiu=true; } player.chooseToUse('是否对'+get.translation(trigger.target)+'再使用一张杀？', - {name:'sha'},trigger.target,-1).logSkill='qinglong'; + {name:'sha'},trigger.target,-1).logSkill='qinglong_skill'; "step 3" if(result.bool); else if(event.jiu){ diff --git a/game/config.js b/game/config.js index af48922ea..cd0a25c5d 100644 --- a/game/config.js +++ b/game/config.js @@ -24,7 +24,7 @@ window.config={ forbidchess:['hetaihou','swd_kangnalishi'], forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'], forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], - layoutfixed:['chess'], + layoutfixed:['chess','brawl'], all:{ stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang'], layout:['default','newlayout'], diff --git a/game/game.js b/game/game.js index 76e8d731d..92d59f354 100644 --- a/game/game.js +++ b/game/game.js @@ -6527,6 +6527,7 @@ else{ event.dialog.add('选择'+get.translation(target)+'的一张牌'); } + var directh=true; for(var i=0;i=cs.length){ + var select=get.select(event.selectButton); + if(event.forced&&select[0]>=cs.length){ event.result={ bool:true, buttons:event.dialog.buttons, links:cs } } + else if(event.forced&&directh&&select[0]==select[1]){ + event.result={ + bool:true, + buttons:event.dialog.buttons.randomGets(select[0]), + links:[] + } + for(var i=0;i=cs.length){ + var select=get.select(event.selectButton); + if(event.forced&&select[0]>=cs.length){ event.result={ bool:true, buttons:event.dialog.buttons, links:cs } } + else if(event.forced&&directh&&select[0]==select[1]){ + event.result={ + bool:true, + buttons:event.dialog.buttons.randomGets(select[0]), + links:[] + } + for(var i=0;i=cs.length){ + var select=get.select(event.selectButton); + if(event.forced&&select[0]>=cs.length){ event.result={ bool:true, buttons:event.dialog.buttons, links:cs } } + else if(event.forced&&directh&&select[0]==select[1]){ + event.result={ + bool:true, + buttons:event.dialog.buttons.randomGets(select[0]), + links:[] + } + for(var i=0;i#autonode{ + width: calc(5000% / 47 - 240px); + left:calc(-150% / 47 + 120px); +} #window.leftbar #arena:not(.chess)>#me, #window.leftbar #arena:not(.chess)>#mebg, #window.leftbar #arena:not(.chess)>#autonode, @@ -51,6 +41,10 @@ width: calc(5000% / 47 + 2500px / 47); left:calc(-150% / 47 - 50px - 75px / 47); } +#window.leftbar #arena:not(.chess)>#autonode{ + width: calc(5000% / 47 + 2500px / 47 - 240px); + left:calc(-150% / 47 - 50px - 75px / 47 + 120px); +} #window.rightbar #arena:not(.chess)>#me, #window.rightbar #arena:not(.chess)>#mebg, #window.rightbar #arena:not(.chess)>#autonode, @@ -58,6 +52,10 @@ width: calc(5000% / 47 + 2500px / 47); left:calc(-150% / 47 - 75px / 47); } +#window.rightbar #arena:not(.chess)>#autonode{ + width: calc(5000% / 47 + 2500px / 47 - 240px); + left:calc(-150% / 47 - 75px / 47 + 120px); +} #arena:not(.chess) #handcards1{ height:120px; padding:0; diff --git a/layout/mode/chess.css b/layout/mode/chess.css index b3a832dc4..b71541a64 100644 --- a/layout/mode/chess.css +++ b/layout/mode/chess.css @@ -12,6 +12,10 @@ top:auto; border-radius:0; } +#arena.chess>#autonode{ + width: calc(100% - 240px); + left: 120px; +} #me>.fakeme.avatar { width: 120px; height: 120px; diff --git a/mode/brawl.js b/mode/brawl.js index 70f4c778f..6548c632a 100644 --- a/mode/brawl.js +++ b/mode/brawl.js @@ -4,7 +4,7 @@ mode.brawl={ if(!lib.storage.scene){ lib.storage.scene={}; } - var dialog=ui.create.dialog(); + var dialog=ui.create.dialog('hidden'); dialog.classList.add('fixed'); dialog.classList.add('scroll1'); dialog.classList.add('scroll2'); @@ -16,6 +16,7 @@ mode.brawl={ dialog.style.overflow='hidden'; dialog.content.style.height='100%'; dialog.contentContainer.style.transition='all 0s'; + dialog.open(); var packnode=ui.create.div('.packnode',dialog); lib.setScroll(packnode); var clickCapt=function(){ diff --git a/theme/style/card/default.css b/theme/style/card/default.css index e69de29bb..34cf876a0 100644 --- a/theme/style/card/default.css +++ b/theme/style/card/default.css @@ -0,0 +1 @@ +/*default*/ diff --git a/theme/style/cardback/default.css b/theme/style/cardback/default.css index e69de29bb..34cf876a0 100644 --- a/theme/style/cardback/default.css +++ b/theme/style/cardback/default.css @@ -0,0 +1 @@ +/*default*/