This commit is contained in:
libccy 2017-02-11 09:12:32 +08:00
parent 0de6c3340c
commit 146bae518f
3 changed files with 20 additions and 3 deletions

View File

@ -468,8 +468,8 @@ character.hearth={
if(get.tag(card,'damage')){ if(get.tag(card,'damage')){
if(player.hasSkill('jueqing')) return [1,-2]; if(player.hasSkill('jueqing')) return [1,-2];
if(!target.hasFriend()) return; if(!target.hasFriend()) return;
if(target.hp>=4) return [1,get.tag(card,'damage')*1.5]; if(target.hp>=4) return [1,get.tag(card,'damage')*2];
if(target.hp==3) return [1,get.tag(card,'damage')*1]; if(target.hp==3) return [1,get.tag(card,'damage')*1.5];
if(target.hp==2) return [1,get.tag(card,'damage')*0.5]; if(target.hp==2) return [1,get.tag(card,'damage')*0.5];
} }
} }

View File

@ -3947,6 +3947,22 @@
}) })
return this; return this;
}; };
HTMLDivElement.prototype.listenTransition=function(func){
if(!Array.isArray(this._transitionlist)){
this._transitionList=[];
}
var id=get.id();
var that=this;
var callback=function(){
if(that._transitionList.contains(id)){
that._transitionList.remove(id);
func.call(that);
}
};
this._transitionList.push(id);
this.addEventListener('webkitTransitionEnd',callback);
setTimeout(callback,1000);
};
HTMLDivElement.prototype.setPosition=function(){ HTMLDivElement.prototype.setPosition=function(){
var position; var position;
if(arguments.length==4){ if(arguments.length==4){

View File

@ -747,7 +747,7 @@ table {
opacity: 0; opacity: 0;
pointer-events: none pointer-events: none
} }
#arena.auto #handcards1,#arena.auto #handcards2 { #arena.auto #me .card{
opacity: 0.5 opacity: 0.5
} }
#autonode>div { #autonode>div {
@ -2784,6 +2784,7 @@ div:hover>.intro {
} }
#window>.choosedouble.character { #window>.choosedouble.character {
transform-origin: top left; transform-origin: top left;
transition-property: opacity, transform;
} }
#window>.choosedouble.character.moved { #window>.choosedouble.character.moved {
z-index: 1; z-index: 1;