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

c

This commit is contained in:
libccy 2017-02-15 15:26:55 +08:00
parent a911fcd40a
commit 247f6f4873
3 changed files with 4 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/config.js
View File

@ -115,7 +115,6 @@ window.config={
skill_animation:true,
paused:false,
title:false,
right_sidebar:false,
button_press:true,
damage_shake:true,
log_highlight:true,

76
game/game.js
View File

@ -4224,20 +4224,6 @@
ui.tempnowuxie.classList.toggle('glow')
}
}
else if(e.keyCode==73){
// if(game.showIdentity){
// game.showIdentity();
// }
}
else if(e.keyCode==67){
// var node=ui.window.querySelector('#click');
// if(node){
// node.click();
// }
// else{
// ui.click.config();
// }
}
else if(e.keyCode==116||((e.ctrlKey||e.metaKey)&&e.keyCode==82)){
if(e.shiftKey){
if(confirm('是否重置游戏？')){
@ -30531,45 +30517,10 @@
ui.arena.appendChild(ui.canvas);
ui.canvas.id='canvas';
ui.ctx=ui.canvas.getContext('2d');
ui.configbg=ui.create.div("#click");
ui.configbg.listen(ui.click.config2);
if(!lib.config.touchscreen){
ui.configbg.oncontextmenu=ui.click.config2;
}
ui.config=ui.create.div('#sidebar2.content');
ui.config.listen(function(){
if(_status.reloading) return;
if(_status.choosing){
if(!_status.choosing.expand){
_status.choosing.parentNode.style.height='';
_status.choosing.nextSibling.delete();
_status.choosing.previousSibling.show();
delete _status.choosing;
}
}
_status.clicked=true;
if(ui.arena.classList.contains('selecting')){
game.check();
}
});
if(!lib.config.touchscreen){
ui.config.oncontextmenu=function(e){
e.stopPropagation();
return false;
};
}
ui.sidebar.ontouchstart=ui.click.touchStart;
ui.config.ontouchstart=ui.click.touchStart;
ui.sidebar.ontouchmove = ui.click.touchScroll;
ui.config.ontouchmove = ui.click.touchScroll;
ui.sidebar.style.WebkitOverflowScrolling='touch';
ui.config.style.WebkitOverflowScrolling='touch';
if(false&&lib.config.right_sidebar){
ui.sidebar.classList.add('right');
ui.sidebar3.classList.add('left');
ui.config.classList.add('right');
}
var zoom;
switch(lib.config.ui_zoom){
@ -33586,33 +33537,6 @@
ui.system1.classList.remove('shown');
ui.system2.classList.remove('shown');
},
config2:function(e){
_status.clicked=true;
ui.system.show();
ui.arena.classList.remove('right');
ui.arena.classList.remove('left');
ui.arena.classList.remove('paused2');
// ui.arena.classList.remove('paused');
this.remove();
if(ui.gameviewdialog){
if(ui.gameviewdialog.popped){
ui.gameviewdialog.popped.delete();
delete ui.gameviewdialog.popped;
}
ui.gameviewdialog.close();
delete ui.gameviewdialog;
ui.currentgameview.classList.remove('thundertext');
}
ui.config.delete();
if(_status.config2){
game.resume2();
}
// e.stopPropagation();
if(game.onresume2){
game.onresume2();
}
return false;
},
swap:function(){
if(_status.dragged) return;
if(this.classList.contains('dead')) return;

12
layout/default/layout.css
View File

@ -845,7 +845,7 @@ table {
transition: all 0.1s
}
.pausedbg,#click {
.pausedbg {
left: 0;
top: 0;
width: 100%;
@ -857,7 +857,7 @@ table {
top: calc(50% - 17px);
left: calc(50% - 45px);
}
#sidebar,#sidebar2,#sidebar3 {
#sidebar,#sidebar3 {
left: 0;
top: 0;
width: 200px;
@ -870,7 +870,7 @@ table {
#sidebar3 {
text-align: right
}
.pausedbg>#sidebar.right,#sidebar2.right,#sidebar3 {
.pausedbg>#sidebar.right,#sidebar3 {
left: calc(100% - 240px);
}
#sidebar3.left {
@ -878,8 +878,7 @@ table {
text-align: left;
}
.dialog.popped #sidebar,
.dialog.popped #sidebar2 {
.dialog.popped #sidebar {
padding: 0;
}
.dialog .poppedpile {
@ -2875,9 +2874,6 @@ div:hover>.intro {
.content>.config.line2 {
transform: translateX(-5px);
}
#sidebar2>.config:not(.line2) {
transform: translateX(5px);
}
.popup {
background: rgba(0,0,0,0.2);
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;