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

s

This commit is contained in:
libccy 2017-05-31 14:33:30 +08:00
parent 7cb4221ec0
commit 058045c9ff
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
game/game.js
View File

@ -10582,7 +10582,7 @@
var directh=true; var directh=true;
for(var i=0;i<event.position.length;i++){ for(var i=0;i<event.position.length;i++){
if(event.position[i]=='h'&&target.countCards('h')){ if(event.position[i]=='h'&&target.countCards('h')){
event.dialog.add('手牌'); event.dialog.addText('手牌');
var hs=target.getCards('h'); var hs=target.getCards('h');
hs.randomSort(); hs.randomSort();
if(event.visible||target.isUnderControl(true)){ if(event.visible||target.isUnderControl(true)){
@ -10594,12 +10594,12 @@
} }
} }
else if(event.position[i]=='e'&&target.countCards('e')){ else if(event.position[i]=='e'&&target.countCards('e')){
event.dialog.add('装备牌'); event.dialog.addText('装备牌');
event.dialog.add(target.getCards('e')); event.dialog.add(target.getCards('e'));
directh=false; directh=false;
} }
else if(event.position[i]=='j'&&target.countCards('j')){ else if(event.position[i]=='j'&&target.countCards('j')){
event.dialog.add('判定牌'); event.dialog.addText('判定牌');
event.dialog.add(target.getCards('j')); event.dialog.add(target.getCards('j'));
directh=false; directh=false;
} }
@ -10676,7 +10676,7 @@
var directh=true; var directh=true;
for(var i=0;i<event.position.length;i++){ for(var i=0;i<event.position.length;i++){
if(event.position[i]=='h'&&target.countCards('h')){ if(event.position[i]=='h'&&target.countCards('h')){
event.dialog.add('手牌'); event.dialog.addText('手牌');
var hs=target.getCards('h'); var hs=target.getCards('h');
hs.randomSort(); hs.randomSort();
if(event.visible||target.isUnderControl(true)){ if(event.visible||target.isUnderControl(true)){
@ -10688,12 +10688,12 @@
} }
} }
else if(event.position[i]=='e'&&target.countCards('e')){ else if(event.position[i]=='e'&&target.countCards('e')){
event.dialog.add('装备牌'); event.dialog.addText('装备牌');
event.dialog.add(target.getCards('e')); event.dialog.add(target.getCards('e'));
directh=false; directh=false;
} }
else if(event.position[i]=='j'&&target.countCards('j')){ else if(event.position[i]=='j'&&target.countCards('j')){
event.dialog.add('判定牌'); event.dialog.addText('判定牌');
event.dialog.add(target.getCards('j')); event.dialog.add(target.getCards('j'));
directh=false; directh=false;
} }
@ -10787,7 +10787,7 @@
var directh=true; var directh=true;
for(var i=0;i<event.position.length;i++){ for(var i=0;i<event.position.length;i++){
if(event.position[i]=='h'&&target.countCards('h')){ if(event.position[i]=='h'&&target.countCards('h')){
event.dialog.add('手牌'); event.dialog.addText('手牌');
var hs=target.getCards('h'); var hs=target.getCards('h');
hs.randomSort(); hs.randomSort();
if(event.visible||target.isUnderControl(true)){ if(event.visible||target.isUnderControl(true)){
@ -10799,12 +10799,12 @@
} }
} }
else if(event.position[i]=='e'&&target.countCards('e')){ else if(event.position[i]=='e'&&target.countCards('e')){
event.dialog.add('装备牌'); event.dialog.addText('装备牌');
event.dialog.add(target.getCards('e')); event.dialog.add(target.getCards('e'));
directh=false; directh=false;
} }
else if(event.position[i]=='j'&&target.countCards('j')){ else if(event.position[i]=='j'&&target.countCards('j')){
event.dialog.add('判定牌'); event.dialog.addText('判定牌');
event.dialog.add(target.getCards('j')); event.dialog.add(target.getCards('j'));
directh=false; directh=false;
} }
@ -39959,13 +39959,17 @@
} }
} }
else{ else{
if(height1<=190||(height2>=height1&&height2>=210)){ if(!ui.dialog._scrollset&&(height1<=190||(height2>=height1&&height2>=210))){
ui.dialog.classList.remove('scroll1'); ui.dialog.classList.remove('scroll1');
ui.dialog.classList.remove('scroll2'); ui.dialog.classList.remove('scroll2');
} }
else{ else{
ui.dialog.classList.add('scroll1'); ui.dialog.classList.add('scroll1');
ui.dialog.classList.add('scroll2'); ui.dialog.classList.add('scroll2');
if(game.layout!='default'){
ui.dialog.style.height=Math.min(height1,400)+'px';
ui.dialog._scrollset=true;
}
} }
if(game.layout=='long2'){ if(game.layout=='long2'){
if(height1+240>=ui.arena.offsetHeight){ if(height1+240>=ui.arena.offsetHeight){

6
mode/guozhan.js
View File

@ -2314,8 +2314,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
} }
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder')); if(game.layout=='default'){
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder'));
}
}; };
var removeSetting=function(){ var removeSetting=function(){
var dialog=_status.event.dialog; var dialog=_status.event.dialog;

6
mode/identity.js
View File

@ -782,8 +782,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
} }
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder')); if(game.layout=='default'){
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder'));
}
}; };
var removeSetting=function(){ var removeSetting=function(){
var dialog=_status.event.dialog; var dialog=_status.event.dialog;

12
mode/versus.js
View File

@ -834,8 +834,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
} }
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder')); if(game.layout=='default'){
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder'));
}
}; };
var removeSetting=function(){ var removeSetting=function(){
var dialog=_status.event.dialog; var dialog=_status.event.dialog;
@ -1129,8 +1131,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
} }
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder')); if(game.layout=='default'){
dialog.add(ui.create.div('.placeholder')); dialog.add(ui.create.div('.placeholder'));
dialog.add(ui.create.div('.placeholder'));
}
}; };
var removeSetting=function(){ var removeSetting=function(){
var dialog=_status.event.dialog; var dialog=_status.event.dialog;