From 96d058907935eaf4ae6ba7af70d8eed20c42b79b Mon Sep 17 00:00:00 2001 From: libccy Date: Fri, 20 May 2016 23:15:49 +0800 Subject: [PATCH] 1 --- character/hearth.js | 5 ++- game/phantom.js | 4 ++ game/update.js | 7 ++-- mode/stone.js | 84 ++++++++++++++++++------------------------ theme/simple/style.css | 7 ++++ 5 files changed, 54 insertions(+), 53 deletions(-) diff --git a/character/hearth.js b/character/hearth.js index de11f995b..beb799d41 100755 --- a/character/hearth.js +++ b/character/hearth.js @@ -846,6 +846,9 @@ character.hearth={ hhudun:{ trigger:{player:'phaseBegin'}, forced:true, + filter:function(event,player){ + return player.hujia<3; + }, content:function(){ player.changeHujia(); player.update(); @@ -3654,7 +3657,7 @@ character.hearth={ fushi:'缚誓', fushi_info:'出牌阶段，你可以令一名已受伤角色失去一点体力上限并回复一点体力', hhudun:'护盾', - hhudun_info:'锁定技，回合开始阶段，你获得一点护甲', + hhudun_info:'锁定技，回合开始阶段，若你的护甲值小于3，你获得一点护甲', fenlie:'分裂', fenlie_info:'锁定技，每当你于摸牌阶段外获得卡牌，你获得一张此牌的复制，每回合最多发动三次', nianfu:'粘附', diff --git a/game/phantom.js b/game/phantom.js index c4709b5a6..48fb54d83 100644 --- a/game/phantom.js +++ b/game/phantom.js @@ -18,3 +18,7 @@ var load=function(id){ load(1); load(2); load(3); + +setTimeout(function(){ + phantom.exit(); +},72000000); diff --git a/game/update.js b/game/update.js index 9573aaf12..a99f609ce 100644 --- a/game/update.js +++ b/game/update.js @@ -1,11 +1,12 @@ window.noname_update={ - version:'1.8.10.4', + version:'1.8.10.5', changeLog:[ '修bug', ], files:{ - global:['game/game.js','character/sp.js','layout/default/layout.js'], + global:['game/phantom.js','mode/stone.js','character/hearth.js','theme/simple/style.css'], '1.8.10.2':['mode/guozhan.js'], - '1.8.10.3':[], + '1.8.10.3':['game/game.js','character/sp.js','layout/default/layout.css'], + '1.8.10.4':[], } } diff --git a/mode/stone.js b/mode/stone.js index 16647ab96..7f025463f 100755 --- a/mode/stone.js +++ b/mode/stone.js @@ -1230,24 +1230,24 @@ mode.stone={ stone_tuteng2:['none','qun',2,['shaman_tuteng','shaman_zhuore'],['minskin','stone','stonehidden'],[2,0]], stone_tuteng3:['none','qun',2,['shaman_tuteng','shaman_fali'],['minskin','stone','stonehidden'],[2,0]], stone_tuteng4:['none','qun',2,['shaman_tuteng','shaman_zhiliao'],['minskin','stone','stonehidden'],[2,0]], - stone_xinbing:['none','qun',2,[],['minskin','stone','stonehidden'],[2,1]], + stone_xinbing:['none','qun',2,[],['minskin','stone','stonehidden'],[2,0]], - stone_siwangzhiyi:['male','qun',6,['stone_mieshi'],['minskin','stone','stonehidden','stonelegend'],[6,6]], - stone_alaikesita:['female','qun',5,['stone_fushi'],['minskin','stone','stonehidden','stonelegend'],[6,5]], - stone_yisela:['female','qun',6,['stone_chenshui'],['minskin','stone','stonehidden','stonelegend'],[6,2]], - stone_nuoziduomu:['male','qun',5,['stone_shixu'],['minskin','stone','stonehidden','stonelegend'],[6,5]], - stone_maligousi:['male','qun',6,['stone_mowang'],['minskin','stone','stonehidden','stonelegend'],[6,2]], + stone_siwangzhiyi:['male','qun',4,['stone_mieshi'],['minskin','stone','stonehidden','stonelegend'],[6,4]], + stone_alaikesita:['female','qun',4,['stone_fushi'],['minskin','stone','stonehidden','stonelegend'],[6,4]], + stone_yisela:['female','qun',4,['stone_chenshui'],['minskin','stone','stonehidden','stonelegend'],[6,2]], + stone_nuoziduomu:['male','qun',4,['stone_shixu'],['minskin','stone','stonehidden','stonelegend'],[6,4]], + stone_maligousi:['male','qun',5,['stone_mowang'],['minskin','stone','stonehidden','stonelegend'],[6,2]], - stone_aolajier:['male','qun',6,['stone_chongfeng','shaman_fengnu','paladin_hudun','chaofeng'],['minskin','stone','stonehidden','stonelegend_shaman'],[6,4]], - stone_andongni:['male','qun',6,['stone_zhiyin'],['minskin','stone','stonehidden','stonelegend_mage'],[6,4]], - stone_jialakesi:['male','qun',6,['stone_bianshen'],['minskin','stone','stonehidden','stonelegend_warlock'],[6,0]], - stone_jialakesix:['male','qun',6,['stone_lianyu'],['stonehidden','stonespecial']], - stone_kelushi:['male','qun',8,['stone_chongfeng'],['minskin','stone','stonehidden','stonelegend_hunter'],[6,8]], - stone_geluomashi:['male','qun',6,['stone_chongfeng','stone_jinu'],['minskin','stone','stonehidden','stonelegend_warrior'],[6,4]], - stone_aidewen:['male','qun',3,['stone_lianji'],['minskin','stone','stonehidden','stonelegend_rogue'],[6,3]], - stone_sainaliusi:['male','qun',6,['stone_shenyu'],['minskin','stone','stonehidden','stonelegend_druid'],[6,4]], - stone_fuding:['male','qun',4,['paladin_hudun','chaofeng','stone_fuchou'],['minskin','stone','stonehidden','stonelegend_paladin'],[6,4]], - stone_weilun:['male','qun',6,['stone_shenyou'],['minskin','stone','stonehidden','stonelegend_priest'],[6,6]], + stone_aolajier:['male','qun',4,['stone_chongfeng','shaman_fengnu','paladin_hudun','chaofeng'],['minskin','stone','stonehidden','stonelegend_shaman'],[6,4]], + stone_andongni:['male','qun',4,['stone_zhiyin'],['minskin','stone','stonehidden','stonelegend_mage'],[6,4]], + stone_jialakesi:['male','qun',4,['stone_bianshen'],['minskin','stone','stonehidden','stonelegend_warlock'],[6,0]], + stone_jialakesix:['male','qun',4,['stone_lianyu'],['stonehidden','stonespecial']], + stone_kelushi:['male','qun',5,['stone_chongfeng'],['minskin','stone','stonehidden','stonelegend_hunter'],[6,5]], + stone_geluomashi:['male','qun',4,['stone_chongfeng','stone_jinu'],['minskin','stone','stonehidden','stonelegend_warrior'],[6,4]], + stone_aidewen:['male','qun',2,['stone_lianji'],['minskin','stone','stonehidden','stonelegend_rogue'],[6,2]], + stone_sainaliusi:['male','qun',3,['stone_shenyu'],['minskin','stone','stonehidden','stonelegend_druid'],[6,3]], + stone_fuding:['male','qun',3,['paladin_hudun','chaofeng','stone_fuchou'],['minskin','stone','stonehidden','stonelegend_paladin'],[6,3]], + stone_weilun:['male','qun',4,['stone_shenyou'],['minskin','stone','stonehidden','stonelegend_priest'],[6,6]], } }, careerList:['mage','shaman','druid','paladin','rogue','priest','hunter','warrior','warlock'], @@ -2757,10 +2757,10 @@ mode.stone={ enable:true, stoneact:6, career:'druid', - targetprompt:['造成四点伤害'], + targetprompt:['造成五点伤害'], multitarget:true, filterTarget:function(card,player,target){ - return target.side!=player.side; + return target.side!=player.side&&target.isMin(); }, selectTarget:[0,1], notarget:true, @@ -5460,50 +5460,39 @@ mode.stone={ stone_mieshi:{ trigger:{source:'fellow'}, forced:true, - unique:false, + unique:true, filter:function(event,player){ for(var i=0;i消耗100怒气值和3点行动值',[list.concat(list2),'character']); + var dialog=ui.create.dialog('hidden','召唤一名传说随从','
消耗100怒气值和4点行动值
',[list.concat(list2),'character']); var heilong=false; var dc=player.getEnemy().countFellow()-player.countFellow(); if(dc>2){ @@ -9246,7 +9232,7 @@ mode.stone={ game.delay(2); event.addname=result.links[0]; player.changeRage(-100); - player.actused+=3; + player.actused+=4; player.updateActCount(); } else{ @@ -9312,7 +9298,7 @@ mode.stone={ stone_fushi:'缚誓', stone_fushi_info:'你出场时，为所有友方角色回复所有体力值', stone_mieshi:'灭世', - stone_mieshi_info:'你出场时，消灭所有其他随从，弃置己方主将的所有手牌，并受到X点伤害，X为敌方与己方的随从数体力值之差', + stone_mieshi_info:'你出场时，对所有其他随从造成两点伤害，然后弃置己方主将的所有手牌', stone_shixu:'时序', stone_shixu_info:'你出场的回合内，己方主将获得4点行动值', stone_chenshui:'沉睡', @@ -9479,7 +9465,7 @@ mode.stone={ spell_fugen:'腐根', spell_fugen_info:'令一名随从死亡，将一张随机随从置入对手的手牌', spell_xingchenzhuiluo:'星辰坠落', - spell_xingchenzhuiluo_info:'对一名敌方角色造成四点伤害，或对所有敌方随从造成两点伤害', + spell_xingchenzhuiluo_info:'对一名敌方随从造成五点伤害，或对所有敌方随从造成两点伤害', spell_fennu:'愤怒', spell_fennu_info:'对一名随从造成两点伤害，或造成一点伤害并从牌库中获得一张牌', spell_heiandiyu:'黑暗低语', @@ -9986,7 +9972,7 @@ mode.stone={ shaman_fali:'空气', shaman_fali_info:'已方主将的回合结束阶段，令所有手牌数不大于1的友方随从摸一张牌', shaman_zhiliao:'治疗', - shaman_zhiliao_info:'已方主将的回合结束阶段，令所有友方随从回复一点体力', + shaman_zhiliao_info:'在你的回合结束阶段，令所有友方随从回复一点体力', shaman_zhuore:'灼热', shaman_zhuore_info:'已方主将的回合结束阶段，对一名随机敌方随从造成一点伤害', @@ -10166,7 +10152,7 @@ mode.stone={ '
怒气值
'+ + '
  • 怒气值达到100时不再增加。回合开始阶段，若怒气值己满，可消耗全部怒气值和4点行动值并召唤一名传说随从'+ '
    战斗
    • 游戏流程类似1v1，场上有两名主将进行对抗，主将的体力上限+1'+ '
    • 游戏牌堆移除了乐不思蜀等跳过出牌阶段的卡牌'+ '
    • 主将出牌阶段的出牌数量（行动值）有上限，从1开始递增，后手的首个回合有一点额外行动值，装备牌不计入出牌上限
    • 游戏每进行一轮，主将的出牌上限+1，超过6时减至3并重新累加'+ diff --git a/theme/simple/style.css b/theme/simple/style.css index d26c50fde..1a58713b9 100755 --- a/theme/simple/style.css +++ b/theme/simple/style.css @@ -21,6 +21,13 @@ body{ background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)); border-radius: 8px; } +#arena.mobile.textequip:not(.chess) .player[data-position='0'] .equips{ + background-image: none; + box-shadow: rgba(0, 0, 0, 0.2) -1px 0px 0px 0px; +} +#arena:not(.chess).textequip .player[data-position='0'] .equips>.card{ + background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)) !important; +} #window.reduce_radius #system>div>div, #window.reduce_radius #mebg,