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

1

This commit is contained in:
libccy 2017-04-01 13:45:23 +08:00
parent f7dabbcf42
commit fd4e370bf8
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/rank.js
View File

@ -405,6 +405,7 @@ window.characterRank={
'hs_nozdormu', 'hs_nozdormu',
'zhoucang', 'zhoucang',
'hs_shifazhe', 'hs_shifazhe',
'guanyinping',
], ],
b:[ b:[
'sp_daqiao', 'sp_daqiao',
@ -499,7 +500,6 @@ window.characterRank={
'guohuai', 'guohuai',
'sunluban', 'sunluban',
'zhouyu', 'zhouyu',
'guanyinping',
'dingfeng', 'dingfeng',
'mayunlu', 'mayunlu',
'shen_guanyu', 'shen_guanyu',

36
game/game.js
View File

@ -17443,17 +17443,25 @@
} }
return this; return this;
}, },
updateTransform:function(bool){ updateTransform:function(bool,delay){
if(_status.event.player!=game.me) return; if(delay){
if(this._transform&&this.parentNode&&this.parentNode.parentNode&& var that=this;
this.parentNode.parentNode.parentNode==ui.me&& setTimeout(function(){
(!_status.mousedown||_status.mouseleft)&& that.updateTransform(that.classList.contains('selected'));
(!this.parentNode.parentNode.classList.contains('scrollh')||game.layout=='long2')){ },delay);
if(bool){ }
this.style.transform=this._transform+' translateY(-20px)'; else{
} if(_status.event.player!=game.me) return;
else{ if(this._transform&&this.parentNode&&this.parentNode.parentNode&&
this.style.transform=this._transform||''; this.parentNode.parentNode.parentNode==ui.me&&
(!_status.mousedown||_status.mouseleft)&&
(!this.parentNode.parentNode.classList.contains('scrollh')||game.layout=='long2')){
if(bool){
this.style.transform=this._transform+' translateY(-20px)';
}
else{
this.style.transform=this._transform||'';
}
} }
} }
}, },
@ -35496,6 +35504,9 @@
var itemtype=get.itemtype(item); var itemtype=get.itemtype(item);
if(itemtype=='card'||itemtype=='button'||itemtype=='player'){ if(itemtype=='card'||itemtype=='button'||itemtype=='player'){
_status.mouseleft=true; _status.mouseleft=true;
if(ui.selected.cards.length){
ui.selected.cards[0].updateTransform(true,100);
}
var ex=e.touches[0].clientX/game.documentZoom-ui.arena.offsetLeft; var ex=e.touches[0].clientX/game.documentZoom-ui.arena.offsetLeft;
var ey=e.touches[0].clientY/game.documentZoom-ui.arena.offsetTop; var ey=e.touches[0].clientY/game.documentZoom-ui.arena.offsetTop;
var exx=ex,eyy=ey; var exx=ex,eyy=ey;
@ -35865,6 +35876,9 @@
var itemtype=get.itemtype(item); var itemtype=get.itemtype(item);
if(itemtype=='card'||itemtype=='button'||itemtype=='player'){ if(itemtype=='card'||itemtype=='button'||itemtype=='player'){
_status.mouseleft=true; _status.mouseleft=true;
if(ui.selected.cards.length){
ui.selected.cards[0].updateTransform(true,100);
}
var ex=e.clientX/game.documentZoom-ui.arena.offsetLeft; var ex=e.clientX/game.documentZoom-ui.arena.offsetLeft;
var ey=e.clientY/game.documentZoom-ui.arena.offsetTop; var ey=e.clientY/game.documentZoom-ui.arena.offsetTop;
var exx=ex,eyy=ey; var exx=ex,eyy=ey;