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

del

This commit is contained in:
libccy 2015-12-09 13:52:03 +08:00
parent 051d8cf026
commit ca482370f4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/extra.js
View File

@ -501,7 +501,7 @@ character.extra={
} }
}, },
qixing:{ qixing:{
audio:3, audio:2,
unique:true, unique:true,
trigger:{global:'gameDrawAfter',player:'phaseBegin'}, trigger:{global:'gameDrawAfter',player:'phaseBegin'},
forced:true, forced:true,

15
game/game.js
View File

@ -8168,7 +8168,7 @@
if(info.popup!=false&&!info.direct){ if(info.popup!=false&&!info.direct){
if(info.popup){ if(info.popup){
player.popup(info.popup); player.popup(info.popup);
game.log(player,'发动了','【'+event.skill+'】'); game.log(player,'发动了','【'+get.translation(event.skill)+'】');
} }
else{ else{
player.logSkill(event.skill); player.logSkill(event.skill);
@ -19769,8 +19769,12 @@
return this; return this;
}; };
HTMLDivElement.prototype.delete=function(time){ HTMLDivElement.prototype.delete=function(time){
if(this.timeout){
clearTimeout(this.timeout);
delete this.timeout;
}
if(!this._listeningEnd||this._transitionEnded){ if(!this._listeningEnd||this._transitionEnded){
if(time==undefined) time=500; if(typeof time!='number') time=500;
this.classList.add('removing'); this.classList.add('removing');
var that=this; var that=this;
this.timeout=setTimeout(function(){ this.timeout=setTimeout(function(){
@ -19784,7 +19788,12 @@
return this; return this;
}; };
HTMLDivElement.prototype.goto=function(position,time){ HTMLDivElement.prototype.goto=function(position,time){
if(time==undefined) time=500; if(this.timeout){
clearTimeout(this.timeout);
delete this.timeout;
}
if(typeof time!='number') time=500;
this.classList.add('removing'); this.classList.add('removing');
var that=this; var that=this;