diff --git a/game/game.js b/game/game.js index 6ce91d1b2..54d51fe3e 100644 --- a/game/game.js +++ b/game/game.js @@ -18671,12 +18671,13 @@ if(avatar&&lib.character[this.name]&&this.node&&this.node.avatar){ node.classList.add('fullscreenavatar'); ui.create.div('',ui.create.div(node)); - // if(this.node.name){ - // ui.create.div('.name',node).appendChild(this.node.name.cloneNode(true)); - // } - ui.create.div('',str.split('').join('
'),ui.create.div(node)); + // ui.create.div('',str.split('').join('
'),ui.create.div('.text.textbg',node)); + ui.create.div('',str.split('').join('
'),ui.create.div('.text',node)); node.firstChild.firstChild.style.backgroundImage=this.node.avatar.style.backgroundImage; node.dataset.nature=nature||'unknown'; + setTimeout(function(){ + node.classList.add('flashtext'); + },200); } else{ node.innerHTML=str; @@ -18700,6 +18701,7 @@ } setTimeout(function(){ node.delete(); + node.style.transform='scale(1.5)' },avatar?1300:1000); }, $damagepop:function(num,nature,font){ diff --git a/layout/default/layout.css b/layout/default/layout.css index 499b39d78..bb999d288 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -2049,10 +2049,10 @@ div:not(.handcards)>.card>.info>span, #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{ +#window>.damage.fullscreenavatar>.text{ display: table; } -#window>.damage.fullscreenavatar>div:last-child>div{ +#window>.damage.fullscreenavatar>.text>div{ display: block; position: relative; width: auto; @@ -2064,6 +2064,23 @@ div:not(.handcards)>.card>.info>span, position: absolute; left: auto; right: 165px; + transform: scale(2.5); + opacity: 0; +} +#window>.damage.fullscreenavatar>.textbg{ + transition: all 0s; + display: none; +} +#window>.damage.fullscreenavatar.flashtext>.textbg{ + display: block; +} +/*#window>.damage.fullscreenavatar.flashtext>.text:not(.textbg)>div{ + transform: scale(2); + opacity: 0; +}*/ +#window>.damage.fullscreenavatar.flashtext>.text>div{ + transform: none; + opacity: 1; } #window>.damage.fullscreenavatar>.name>div{ display: block; @@ -2075,6 +2092,9 @@ div:not(.handcards)>.card>.info>span, left: 20px; font-size: 40px; } +#window>.damage.fullscreenavatar.removing{ + transition: all 0.3s; +} .player>.damage, #window>.damage { font-family: 'huangcao','xinwei';