YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

f

This commit is contained in:
libccy 2017-09-02 16:00:05 +08:00
parent 7e595ebc2e
commit 3410a8b662
4 changed files with 121 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/ow.js
View File

@ -2003,7 +2003,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.storage.jijia=4; player.storage.jijia=4;
player.storage.jijia2=0; player.storage.jijia2=0;
player.markSkill('jijia'); player.markSkill('jijia');
if(lib.config.skill_animation){ if(lib.config.skill_animation_type!='off'){
player.logSkill('chongzhuang'); player.logSkill('chongzhuang');
player.$skill('重装') player.$skill('重装')
} }

2
game/config.js
View File

@ -117,7 +117,7 @@ window.config={
vertical_scroll:false, vertical_scroll:false,
handcard_scroll:0, handcard_scroll:0,
animation:true, animation:true,
skill_animation:true, skill_animation_type:'default',
paused:false, paused:false,
title:false, title:false,
button_press:true, button_press:true,

79
game/game.js
View File

@ -2317,11 +2317,16 @@
init:true, init:true,
unfrequent:true, unfrequent:true,
}, },
skill_animation:{ skill_animation_type:{
name:'技能特效', name:'技能特效',
intro:'开启后觉醒技、限定技将显示全屏文字', intro:'开启后觉醒技、限定技将显示全屏文字',
init:true, init:'default',
unfrequent:true, unfrequent:true,
item:{
default:'默认',
old:'旧版',
off:'关闭'
}
}, },
die_move:{ die_move:{
name:'阵亡效果', name:'阵亡效果',
@ -11717,8 +11722,8 @@
if(!info.direct){ if(!info.direct){
game.log(player,str,'【'+get.skillTranslation(skill,player)+'】'); game.log(player,str,'【'+get.skillTranslation(skill,player)+'】');
if(info.logv!==false) game.logv(player,skill,targets); if(info.logv!==false) game.logv(player,skill,targets);
if(lib.config.skill_animation&&lib.skill[skill]&&lib.skill[skill].skillAnimation){ if(lib.config.skill_animation_type!='off'&&lib.skill[skill]&&lib.skill[skill].skillAnimation){
player.$skill(lib.skill[skill].animationStr||lib.translate[skill],lib.skill[skill].skillAnimation,lib.skill[skill].animationColor); player.$skill(lib.skill[skill].animationStr||lib.translate[skill],lib.skill[skill].skillAnimation,lib.skill[skill].animationColor,lib.config.skill_animation_type=='default');
} }
else{ else{
player.popup(get.skillTranslation(skill,player)); player.popup(get.skillTranslation(skill,player));
@ -16085,8 +16090,8 @@
nopop=true; nopop=true;
} }
if(lib.translate[name]){ if(lib.translate[name]){
if(lib.config.skill_animation&&lib.skill[name]&&lib.skill[name].skillAnimation){ if(lib.config.skill_animation_type!='off'&&lib.skill[name]&&lib.skill[name].skillAnimation){
this.$skill(lib.skill[name].animationStr||lib.translate[name],lib.skill[name].skillAnimation,lib.skill[name].animationColor); this.$skill(lib.skill[name].animationStr||lib.translate[name],lib.skill[name].skillAnimation,lib.skill[name].animationColor,lib.config.skill_animation_type=='default');
} }
else if(!nopop) this.popup(get.skillTranslation(name,this)); else if(!nopop) this.popup(get.skillTranslation(name,this));
if(typeof targets=='object'&&targets.length){ if(typeof targets=='object'&&targets.length){
@ -18469,13 +18474,24 @@
return true; return true;
} }
}, },
$skill:function(name,type,color){ $skill:function(name,type,color,avatar){
if(typeof type!='string') type='legend'; if(typeof type!='string') type='legend';
game.delay(2); game.delay(2);
if(!avatar){
this.playerfocus(1500); this.playerfocus(1500);
}
else{
game.addVideo('playerfocus2');
game.broadcastAll(function(){
ui.arena.classList.add('playerfocus');
setTimeout(function(){
ui.arena.classList.remove('playerfocus');
},1500)
});
}
var that=this; var that=this;
setTimeout(function(){ setTimeout(function(){
game.broadcastAll(function(that,type,name,color){ game.broadcastAll(function(that,type,name,color,avatar){
if(lib.config.animation&&!lib.config.low_performance){ if(lib.config.animation&&!lib.config.low_performance){
if(game.chess){ if(game.chess){
that['$'+type+'2'](1200); that['$'+type+'2'](1200);
@ -18485,10 +18501,10 @@
} }
} }
if(name){ if(name){
that.$fullscreenpop(name,color); that.$fullscreenpop(name,color,avatar);
} }
},that,type,name,color); },that,type,name,color,avatar);
},300); },avatar?0:300);
}, },
$fire:function(){ $fire:function(){
game.addVideo('flame',this,'fire'); game.addVideo('flame',this,'fire');
@ -18645,19 +18661,44 @@
game.animate.flame(left+this.offsetWidth/2, game.animate.flame(left+this.offsetWidth/2,
top+this.offsetHeight-30,700,'recover'); top+this.offsetHeight-30,700,'recover');
}, },
$fullscreenpop:function(str,nature){ $fullscreenpop:function(str,nature,avatar){
game.broadcast(function(player,str,nature){ game.broadcast(function(player,str,nature){
player.$fullscreenpop(str,nature); player.$fullscreenpop(str,nature);
},this,str,nature); },this,str,nature);
game.addVideo('fullscreenpop',this,[str,nature]); game.addVideo('fullscreenpop',this,[str,nature,avatar]);
var node=ui.create.div('.damage',ui.window); var node=ui.create.div('.damage');
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('<br>'),ui.create.div(node));
node.firstChild.firstChild.style.backgroundImage=this.node.avatar.style.backgroundImage;
}
else{
node.innerHTML=str; node.innerHTML=str;
}
node.dataset.nature=nature||'soil'; node.dataset.nature=nature||'soil';
if(avatar){
var rect1=ui.window.getBoundingClientRect();
var rect2=this.getBoundingClientRect();
var dx=Math.round(2*rect2.left+rect2.width-rect1.width);
var dy=Math.round(2*rect2.top+rect2.height-rect1.height);
node.style.transform='scale(0.5) translate('+dx+'px,'+dy+'px)';
}
ui.window.appendChild(node);
ui.refresh(node); ui.refresh(node);
if(avatar){
node.style.transform='scale(1)';
node.style.opacity=1;
}
else{
node.classList.add('damageadded'); node.classList.add('damageadded');
}
setTimeout(function(){ setTimeout(function(){
node.delete(); node.delete();
},1000); },avatar?1300:1000);
}, },
$damagepop:function(num,nature,font){ $damagepop:function(num,nature,font){
if(typeof num=='number'||typeof num=='string'){ if(typeof num=='number'||typeof num=='string'){
@ -22787,6 +22828,12 @@
console.log(player); console.log(player);
} }
}, },
playerfocus2:function(){
ui.arena.classList.add('playerfocus');
setTimeout(function(){
ui.arena.classList.remove('playerfocus');
},1500)
},
identityText:function(player,str){ identityText:function(player,str){
if(player&&str){ if(player&&str){
player.node.identity.firstChild.innerHTML=str; player.node.identity.firstChild.innerHTML=str;
@ -23322,7 +23369,7 @@
}, },
fullscreenpop:function(player,content){ fullscreenpop:function(player,content){
if(player&&content){ if(player&&content){
player.$fullscreenpop(content[0],content[1]); player.$fullscreenpop(content[0],content[1],content[2]);
} }
else{ else{
console.log(player); console.log(player);

53
layout/default/layout.css
View File

@ -2004,6 +2004,59 @@ div:not(.handcards)>.card>.info>span,
#arena:not(.hide_turned):not(.oldlayout) .player.turnedover>.turned{ #arena:not(.hide_turned):not(.oldlayout) .player.turnedover>.turned{
opacity: 0.2; opacity: 0.2;
} }
#window>.damage.fullscreenavatar{
text-align: center;
font-family: 'xinwei';
top: calc(50% - 200px);
height: 400px;
transform-origin: center;
}
#window>.damage.fullscreenavatar>div{
width: 220px;
height: 100%;
left: calc(50% - 100px);
display: inline-block;
position: absolute;
top: 0;
}
#window>.damage.fullscreenavatar>div:first-child{
-webkit-mask-image: linear-gradient(transparent, black, black, transparent);
}
#window>.damage.fullscreenavatar>div:first-child>div{
background-size: cover;
background-position: 50%;
width: 200px;
left: 10px;
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>div:last-child{
display: table;
}
#window>.damage.fullscreenavatar>div:last-child>div{
display: block;
position: relative;
width: auto;
height: auto;
font-size: 90px;
text-align: right;
top: auto;
bottom: 30px;
position: absolute;
left: auto;
right: 30px;
}
#window>.damage.fullscreenavatar>.name>div{
display: block;
position: relative;
width: auto;
height: auto;
top: 30px;
position: absolute;
left: 20px;
font-size: 40px;
}
.player>.damage, .player>.damage,
#window>.damage { #window>.damage {
font-family: 'huangcao','xinwei'; font-family: 'huangcao','xinwei';