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

v

This commit is contained in:
libccy 2017-05-31 16:43:00 +08:00
parent d2f990e1da
commit 0410788117
6 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
game/game.js
View File

@ -10584,7 +10584,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.addText('手牌'); 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)){
@ -10596,12 +10596,12 @@
} }
} }
else if(event.position[i]=='e'&&target.countCards('e')){ else if(event.position[i]=='e'&&target.countCards('e')){
event.dialog.addText('装备牌'); 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.addText('判定牌'); event.dialog.addText('判定区');
event.dialog.add(target.getCards('j')); event.dialog.add(target.getCards('j'));
directh=false; directh=false;
} }
@ -10678,7 +10678,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.addText('手牌'); 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)){
@ -10690,12 +10690,12 @@
} }
} }
else if(event.position[i]=='e'&&target.countCards('e')){ else if(event.position[i]=='e'&&target.countCards('e')){
event.dialog.addText('装备牌'); 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.addText('判定牌'); event.dialog.addText('判定区');
event.dialog.add(target.getCards('j')); event.dialog.add(target.getCards('j'));
directh=false; directh=false;
} }
@ -10789,7 +10789,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.addText('手牌'); 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)){
@ -10801,12 +10801,12 @@
} }
} }
else if(event.position[i]=='e'&&target.countCards('e')){ else if(event.position[i]=='e'&&target.countCards('e')){
event.dialog.addText('装备牌'); 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.addText('判定牌'); event.dialog.addText('判定区');
event.dialog.add(target.getCards('j')); event.dialog.add(target.getCards('j'));
directh=false; directh=false;
} }
@ -34442,13 +34442,16 @@
// return ui.create.characterDialog2.apply(this,arguments); // return ui.create.characterDialog2.apply(this,arguments);
// } // }
// } // }
var filter,str,noclick,thisiscard,seperate,expandall,onlypack; var filter,str,noclick,thisiscard,seperate,expandall,onlypack,heightset;
for(var i=0;i<arguments.length;i++){ for(var i=0;i<arguments.length;i++){
if(arguments[i]==='thisiscard'){ if(arguments[i]==='thisiscard'){
thisiscard=true; thisiscard=true;
} }
else if(arguments[i]==='expandall'){ else if(arguments[i]==='expandall'){
expandall=true; expandall=true;
}
else if(arguments[i]==='heightset'){
heightset=true;
} }
else if(typeof arguments[i]=='string'&&arguments[i].indexOf('onlypack:')==0){ else if(typeof arguments[i]=='string'&&arguments[i].indexOf('onlypack:')==0){
onlypack=arguments[i].slice(9); onlypack=arguments[i].slice(9);
@ -34947,6 +34950,10 @@
dialog.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(){ dialog.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(){
_status.clicked2=true; _status.clicked2=true;
}); });
if(heightset){
dialog.style.height=(game.layout=='long2'?410:360)+'px';
dialog._scrollset=true;
}
dialog.getCurrentCapt=function(link,capt,noalph){ dialog.getCurrentCapt=function(link,capt,noalph){
var currentcapt=noalph?this.currentcapt2:this.currentcapt; var currentcapt=noalph?this.currentcapt2:this.currentcapt;
if(this.seperatelist&&noalph){ if(this.seperatelist&&noalph){
@ -39969,7 +39976,7 @@
ui.dialog.classList.add('scroll1'); ui.dialog.classList.add('scroll1');
ui.dialog.classList.add('scroll2'); ui.dialog.classList.add('scroll2');
if(game.layout!='default'){ if(game.layout!='default'){
ui.dialog.style.height=Math.min(height1,410)+'px'; ui.dialog.style.height=Math.min(height1,(game.layout=='long2'&&ui.arena.classList.contains('choose-character'))?410:360)+'px';
ui.dialog._scrollset=true; ui.dialog._scrollset=true;
} }
} }

3
layout/default/layout.css
View File

@ -1459,6 +1459,9 @@ div:not(.handcards)>.card>.info>span,
position: relative; position: relative;
margin: 8px; margin: 8px;
} }
.content>.caption + .buttons{
margin: 0
}
.content>.config { .content>.config {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;

2
mode/guozhan.js
View File

@ -2411,7 +2411,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
ui.arena.classList.remove('selecting'); ui.arena.classList.remove('selecting');
}; };
var createCharacterDialog=function(){ var createCharacterDialog=function(){
event.dialogxx=ui.create.characterDialog(function(i){ event.dialogxx=ui.create.characterDialog('heightset',function(i){
if(i.indexOf('gz_shibing')==0) return true; if(i.indexOf('gz_shibing')==0) return true;
if(get.config('onlyguozhan')){ if(get.config('onlyguozhan')){
if(!lib.characterPack.mode_guozhan[i]) return true; if(!lib.characterPack.mode_guozhan[i]) return true;

4
mode/identity.js
View File

@ -1030,7 +1030,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}; };
if(lib.onfree){ if(lib.onfree){
lib.onfree.push(function(){ lib.onfree.push(function(){
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog('heightset');
if(ui.cheat2){ if(ui.cheat2){
ui.cheat2.animate('controlpressdownx',500); ui.cheat2.animate('controlpressdownx',500);
ui.cheat2.classList.remove('disabled'); ui.cheat2.classList.remove('disabled');
@ -1038,7 +1038,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}); });
} }
else{ else{
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog('heightset');
} }
ui.create.cheat2=function(){ ui.create.cheat2=function(){

6
mode/stone.js
View File

@ -1493,15 +1493,17 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}; };
if(lib.onfree){ if(lib.onfree){
lib.onfree.push(function(){ lib.onfree.push(function(){
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog('heightset');
if(ui.cheat2){ if(ui.cheat2){
ui.cheat2.animate('controlpressdownx',500); ui.cheat2.animate('controlpressdownx',500);
ui.cheat2.classList.remove('disabled'); ui.cheat2.classList.remove('disabled');
} }
event.dialogxx.style.height=(game.layout=='newlayout'?350:410)+'px';
event.dialogxx._scrollset=true;
}); });
} }
else{ else{
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog('heightset');
} }
ui.create.cheat2=function(){ ui.create.cheat2=function(){
ui.cheat2=ui.create.control('自由选将',function(){ ui.cheat2=ui.create.control('自由选将',function(){

14
mode/versus.js
View File

@ -634,7 +634,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
delete _status.createControl; delete _status.createControl;
} }
var createCharacterDialog=function(){ var createCharacterDialog=function(){
event.dialogxx=ui.create.characterDialog(function(name){ event.dialogxx=ui.create.characterDialog('heightset',function(name){
if(lib.character[name][4]){ if(lib.character[name][4]){
if(lib.character[name][4].contains('jiangeboss')) return true; if(lib.character[name][4].contains('jiangeboss')) return true;
if(lib.character[name][4].contains('jiangemech')) return true; if(lib.character[name][4].contains('jiangemech')) return true;
@ -887,7 +887,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
delete _status.createControl; delete _status.createControl;
} }
var createCharacterDialog=function(){ var createCharacterDialog=function(){
event.dialogxx=ui.create.characterDialog(function(name){ event.dialogxx=ui.create.characterDialog('heightset',function(name){
if(name==event.friendChoice) return true; if(name==event.friendChoice) return true;
if(lib.character[name][1]!=game.me.identity) return true; if(lib.character[name][1]!=game.me.identity) return true;
}); });
@ -1213,7 +1213,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}; };
if(lib.onfree){ if(lib.onfree){
lib.onfree.push(function(){ lib.onfree.push(function(){
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog('heightset');
if(ui.cheat2){ if(ui.cheat2){
ui.cheat2.animate('controlpressdownx',500); ui.cheat2.animate('controlpressdownx',500);
ui.cheat2.classList.remove('disabled'); ui.cheat2.classList.remove('disabled');
@ -1221,7 +1221,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}); });
} }
else{ else{
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog('heightset');
} }
ui.create.cheat2=function(){ ui.create.cheat2=function(){
ui.cheat2=ui.create.control('自由选将',function(){ ui.cheat2=ui.create.control('自由选将',function(){
@ -1432,10 +1432,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var dialog=event.xdialog; var dialog=event.xdialog;
if(!dialog){ if(!dialog){
if(get.config('expand_dialog')){ if(get.config('expand_dialog')){
dialog=event.xdialog||ui.create.characterDialog(event.filterChoice,'expandall'); dialog=event.xdialog||ui.create.characterDialog('heightset',event.filterChoice,'expandall');
} }
else{ else{
dialog=event.xdialog||ui.create.characterDialog(event.filterChoice); dialog=event.xdialog||ui.create.characterDialog('heightset',event.filterChoice);
} }
} }
var names=[]; var names=[];
@ -2235,7 +2235,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
event.videoId=lib.status.videoId++; event.videoId=lib.status.videoId++;
var func=function(filter,id,selected,map,choiceFour){ var func=function(filter,id,selected,map,choiceFour){
lib.choiceFour=choiceFour; lib.choiceFour=choiceFour;
var dialog=ui.create.characterDialog(filter,'expandall').open(); var dialog=ui.create.characterDialog('heightset',filter,'expandall').open();
dialog.videoId=id; dialog.videoId=id;
for(var i in map){ for(var i in map){
var player=lib.playerOL[i]; var player=lib.playerOL[i];