diff --git a/game/game.js b/game/game.js index a2415fff5..55ede8145 100644 --- a/game/game.js +++ b/game/game.js @@ -18470,34 +18470,6 @@ node.link=item; node.innerHTML=get.translation(item); node.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.control); - - if(lib.config.button_press){ - node.addEventListener(lib.config.touchscreen?'touchstart':'mousedown',function(){ - if(node.parentNode.classList.contains('disabled')) return; - // node.classList.add('controlthundertext'); - node.parentNode.classList.add('controlpressdown'); - node.parentNode.classList.add('controlpressdownx'); - if(typeof node.parentNode._offset=='number'){ - node.parentNode.style.transform='translateX('+node.parentNode._offset+'px) scale(0.97)'; - } - }); - node.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(){ - if(typeof node.parentNode._offset=='number'){ - node.parentNode.style.transform='translateX('+node.parentNode._offset+'px)'; - } - // node.classList.remove('controlthundertext'); - node.parentNode.classList.remove('controlpressdown'); - node.parentNode.classList.remove('controlpressdownx'); - }); - node.addEventListener(lib.config.touchscreen?'touchmove':'mousemove',function(){ - if(typeof node.parentNode._offset=='number'){ - node.parentNode.style.transform='translateX('+node.parentNode._offset+'px)'; - } - // node.classList.remove('controlthundertext'); - node.parentNode.classList.remove('controlpressdown'); - node.parentNode.classList.remove('controlpressdownx'); - }); - } }, close:function(){ ui.controls.remove(this); @@ -34357,6 +34329,25 @@ } control.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.control2); + + if(lib.config.button_press){ + control.addEventListener(lib.config.touchscreen?'touchstart':'mousedown',function(){ + if(this.classList.contains('disabled')) return; + this.classList.add('controlpressdown'); + this.classList.add('controlpressdownx'); + if(typeof this._offset=='number'){ + this.style.transform='translateX('+this._offset+'px) scale(0.97)'; + } + }); + control.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(){ + this.classList.remove('controlpressdown'); + this.classList.remove('controlpressdownx'); + if(typeof this._offset=='number'){ + this.style.transform='translateX('+this._offset+'px)'; + } + }); + } + ui.updatec(); return control; }, diff --git a/mode/boss.js b/mode/boss.js index 9cc574e7f..35dc2637d 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -414,7 +414,7 @@ game.import('mode',function(){ boss_qingmushilian:['male','',0,['boss_qingmu','boss_qingmu_intro1','boss_qingmu_intro2','boss_qingmu_intro3'],['boss'],'wu'], boss_qinglong:['male','shen',4,['boss_shenyi','releiji','boss_qingmu2'],['wu','hiddenboss','bossallowed']], boss_mushengoumang:['male','shen',5,['boss_shenyi','boss_buchun','boss_qingmu3'],['wu','hiddenboss','bossallowed']], - boss_shujing:['female','shen',2,['boss_cuidu','boss_zhongdu'],['wu','hiddenboss','bossallowed']], + boss_shujing:['female','shen',2,['boss_cuidu'],['wu','hiddenboss','bossallowed']], boss_taihao:['male','shen',6,['boss_shenyi','boss_shenen','boss_qingyi'],['wu','hiddenboss','bossallowed']], boss_zhuoguiquxie:['male','',0,['boss_bianshen','boss_bianshen_intro1','boss_bianshen_intro2','boss_bianshen_intro3','boss_bianshen_intro4'],['boss'],'shu'], @@ -880,9 +880,12 @@ game.import('mode',function(){ lib.inpile.remove('huoshan'); lib.inpile.remove('hongshui'); lib.inpile.remove('fulei'); + lib.inpile.add('honghuangzhili'); for(var i=0;i=2; + return !player.storage.boss_xingxia||game.roundNumber-player.storage.boss_xingxia>=2; }, filterTarget:function(card,player,target){ return target.name=='boss_yanling'; @@ -1643,10 +1643,135 @@ game.import('mode',function(){ trigger.num++; } }, - boss_buchun:{}, - boss_shenbuchun:{}, - boss_cuidu:{}, - boss_zhongdu:{}, + boss_buchun:{ + mode:['boss'], + group:['boss_buchun_recover','boss_buchun_revive'], + subSkill:{ + revive:{ + enable:'phaseUse', + filter:function(event,player){ + if(!player.storage.boss_buchun||game.roundNumber-player.storage.boss_buchun>=2){ + for(var i=0;i=3) return 1; + if(player.hp>=2&&player!=game.boss) return 1; + return 0; + } + } + } + }, + recover:{ + enable:'phaseUse', + filter:function(event,player){ + if(!player.storage.boss_buchun||game.roundNumber-player.storage.boss_buchun>=2){ + for(var i=0;i=2){ + num=1.5; + } + return 1.5*ai.get.recoverEffect(target,player,target); + } + } + } + } + } + }, + boss_cuidu:{ + trigger:{source:'damageEnd'}, + forced:true, + filter:function(event,player){ + return event.player.isIn()&&event.player.isEnemyOf(player)&&!event.player.hasSkill('boss_zhongdu'); + }, + logTarget:'player', + content:function(){ + trigger.player.addSkill('boss_zhongdu'); + var boss=game.findPlayer(function(current){ + return current.name=='boss_mushengoumang'; + }); + if(boss){ + boss.draw(); + } + } + }, + boss_zhongdu:{ + trigger:{player:'phaseBegin'}, + forced:true, + mark:true, + nopop:true, + intro:{ + content:'锁定技，回合开始时，你进行判定，若结果不为红桃，你受到1点无来源的伤害，若结果不为黑桃，你失去此技能' + }, + content:function(){ + 'step 0' + player.judge(function(card){ + var suit=get.suit(card); + if(suit=='spade') return -1; + if(suit=='heart') return 1; + return 0; + }); + 'step 1' + if(result.suit!='heart'){ + player.damage('nosource'); + } + if(result.suit!='spade'){ + player.removeSkill('boss_zhongdu'); + } + } + }, boss_qingyi:{}, boss_qizuo:{ trigger:{player:'useCardAfter'}, @@ -4490,6 +4615,7 @@ game.import('mode',function(){ boss_cuidu:'淬毒', boss_cuidu_info:'锁定技，你对敌方角色造成伤害后，若其没有“中毒”，你令其获得“中毒”，然后令木神勾芒摸一张牌', boss_zhongdu:'中毒', + boss_zhongdu_bg:'毒', boss_zhongdu_info:'锁定技，回合开始时，你进行判定，若结果不为红桃，你受到1点无来源的伤害，若结果不为黑桃，你失去此技能', boss_qingyi:'青仪', boss_qingyi_info:'锁定技，第三轮开始时，己方角色各回复1点体力；第五轮开始时，敌方角色各失去1点体力；第七轮开始时，复活木神勾芒和树精，使其各摸三张牌，各+1体力上限，然后各回复3点体力', diff --git a/theme/simple/style.css b/theme/simple/style.css index 0fcf91f50..4d3f8d875 100644 --- a/theme/simple/style.css +++ b/theme/simple/style.css @@ -128,7 +128,7 @@ body{ background-size: cover; } -#system>div>.glow{ +#system>div>.glow { background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1)); box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px !important; }