From 2233a5d4139edd49b5a5dea7ee5ddf0ace597b77 Mon Sep 17 00:00:00 2001 From: libccy Date: Sun, 3 Sep 2017 13:17:32 +0800 Subject: [PATCH] 3 --- game/game.js | 13 +++++++++-- layout/default/layout.css | 45 +++++++++++++++++++++++++++++++++++---- mode/chess.js | 2 ++ 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/game/game.js b/game/game.js index 3b71e44ed..6ce91d1b2 100644 --- a/game/game.js +++ b/game/game.js @@ -8363,6 +8363,7 @@ } } ui.arena.classList.remove('selecting'); + ui.arena.classList.remove('tempnoe'); }, p:function(name,i,skin){ var list=['swd','hs','pal','gjqt','ow','gw']; @@ -18675,11 +18676,12 @@ // } ui.create.div('',str.split('').join('
'),ui.create.div(node)); node.firstChild.firstChild.style.backgroundImage=this.node.avatar.style.backgroundImage; + node.dataset.nature=nature||'unknown'; } else{ node.innerHTML=str; + node.dataset.nature=nature||'soil'; } - node.dataset.nature=nature||'soil'; if(avatar){ var rect1=ui.window.getBoundingClientRect(); var rect2=this.getBoundingClientRect(); @@ -26018,6 +26020,9 @@ } else{ ui.arena.classList.add('selecting'); + if(event.filterTarget&&(!event.filterCard||!event.position||(typeof event.position=='string'&&event.position.indexOf('e')==-1))){ + ui.arena.classList.add('tempnoe'); + } game.countChoose(); if(!_status.noconfirm&&!_status.event.noconfirm){ if(!_status.mousedown||_status.mouseleft){ @@ -26081,6 +26086,7 @@ } if(args.length==0){ ui.arena.classList.remove('selecting'); + ui.arena.classList.remove('tempnoe'); _status.imchoosing=false; _status.lastdragchange.length=0; _status.mousedragging=null; @@ -42907,7 +42913,10 @@ uiintro.add(caption); uiintro.add('
'+content+'
'); } - else if(node.classList.contains('player')){ + else if(node.classList.contains('player')||node.linkplayer){ + if(node.linkplayer){ + node=node.link; + } var capt=get.translation(node.name); if(lib.character[node.name]&&lib.character[node.name][1]){ capt+='  '+lib.translate[lib.character[node.name][1]]; diff --git a/layout/default/layout.css b/layout/default/layout.css index 396ad1ffc..499b39d78 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -2012,9 +2012,9 @@ div:not(.handcards)>.card>.info>span, transform-origin: center; } #window>.damage.fullscreenavatar>div{ - width: 220px; + width: 500px; height: 100%; - left: calc(50% - 100px); + left: calc(50% - 250px); display: inline-block; position: absolute; top: 0; @@ -2026,11 +2026,29 @@ div:not(.handcards)>.card>.info>span, background-size: cover; background-position: 50%; width: 200px; - left: 10px; + left: 150px; top: 0; height: 100%; box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(0, 0, 0, 0.5) 0 0 10px; } +#window>.damage.fullscreenavatar[data-nature='thunder']:not(.noshadow)>div:first-child>div{ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0,0.5) 0 0 10px, rgba(0, 0, 0,0.3) 0 0 30px, rgba(100, 74, 139,1) 0 0 60px; +} +#window>.damage.fullscreenavatar[data-nature='metal']>div:first-child>div{ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0,0.5) 0 0 10px, rgba(255, 0, 0,0.1) 0 0 30px, rgba(255, 203, 0,0.6) 0 0 80px; +} +#window>.damage.fullscreenavatar[data-nature='wood']>div:first-child>div{ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0,0.5) 0 0 10px, rgba(0, 0, 0,0.3) 0 0 30px, rgba(57, 123, 4,1) 0 0 60px; +} +#window>.damage.fullscreenavatar[data-nature='water']>div:first-child>div{ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0,0.5) 0 0 10px, rgba(0, 0, 0,0.3) 0 0 30px, rgba(78, 117, 140,1) 0 0 60px, rgba(78, 117, 140,1) 0 0 60px; +} +#window>.damage.fullscreenavatar[data-nature='soil']>div:first-child>div{ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0,0.5) 0 0 10px, rgba(0, 0, 0,0.3) 0 0 30px, rgba(128, 59, 2,1) 0 0 60px; +} +#window>.damage.fullscreenavatar[data-nature='fire']>div:first-child>div{ + box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0,0.5) 0 0 20px, rgba(0, 0, 0,0.3) 0 0 40px, rgba(232, 53, 53, 1) 0 0 80px; +} #window>.damage.fullscreenavatar>div:last-child{ display: table; } @@ -2045,7 +2063,7 @@ div:not(.handcards)>.card>.info>span, bottom: 30px; position: absolute; left: auto; - right: 30px; + right: 165px; } #window>.damage.fullscreenavatar>.name>div{ display: block; @@ -3091,6 +3109,10 @@ div:not(.handcards)>.card>.info>span, opacity: 1; } +#arena.tempnoe .player.selectable .equips>.card{ + pointer-events: none; +} + .unselectable:not(.selected):not(.removing) { opacity: 0.6 !important } @@ -3504,6 +3526,10 @@ span[data-color="unknownm"] { text-shadow: rgba(0,0,0,0.5) 0 0 2px,rgba(0,0,0,0.2) 0 0 5px,rgba(0,0,0,0.2) 0 0 5px, rgba(0,0,0,0.2) 0 0 5px,black 0 0 1px; } +div[data-nature="unknown"] { + text-shadow: rgba(0, 0, 0,0.2) 0 0 2px,rgba(0, 0, 0,0.2) 0 0 5px,rgba(0, 0, 0,0.2) 0 0 10px, + rgba(0, 0, 0,0.2) 0 0 10px,rgba(0, 0, 0,0.2) 0 0 20px,rgba(0, 0, 0,0.2) 0 0 20px,rgba(0,0,0,0.6) 0 0 1px; +} div[data-decoration="gold"]::before, #arena:not(.autoframe)[data-framedecoration="gold"] .player>.framebg::before{ @@ -4120,6 +4146,17 @@ div:hover>.wunature { } /*--------动画--------*/ +@keyframes shadow_thunder { + 0% { + box-shadow: rgba(0, 0, 0,1) 0 0 1px, rgba(0, 0, 0,0.1) 0 0 40px, rgba(100, 74, 139,0.5) 0 0 60px, rgba(100, 74, 139, 0.5) 0 0 100px, black 0 0 1px; + } + 50% { + box-shadow: rgba(0, 0, 0,1) 0 0 1px, rgba(0, 0, 0,0.3) 0 0 40px, rgba(100, 74, 139,1) 0 0 60px, rgba(100, 74, 139,1) 0 0 100px, black 0 0 1px; + } + 100% { + box-shadow: rgba(0, 0, 0,1) 0 0 1px, rgba(0, 0, 0,0.1) 0 0 40px, rgba(100, 74, 139,0.5) 0 0 60px, rgba(100, 74, 139,0.5) 0 0 100px, black 0 0 1px; + } +} @keyframes cardeffect { 0% { opacity: 0; diff --git a/mode/chess.js b/mode/chess.js index d13bcbd57..ed41fb029 100644 --- a/mode/chess.js +++ b/mode/chess.js @@ -1975,6 +1975,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ node.style.backgroundImage=p.node.avatar.style.backgroundImage; node.link=p; node.listen(ui.click.chessInfo); + lib.setIntro(node); + node.linkplayer=true; p.instance=node; if(_status.currentPhase==p){ node.classList.add('glow2');