jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #17 from i2Echo/master

Browse Source 
fix gui layout
This commit is contained in:
Zhang Chen 2017-12-22 13:46:32 +08:00 committed by GitHub
commit c97c56fa72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drawMapGUI.html
View File

@ -8,6 +8,9 @@
font-family:Roboto,Helvetica,Arial,sans-serif; font-family:Roboto,Helvetica,Arial,sans-serif;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
::-webkit-scrollbar {
width: 5px;
}
.main { .main {
max-width: 100%; max-width: 100%;
min-height: 500px; min-height: 500px;
@ -43,6 +46,7 @@
margin-left: 22px; margin-left: 22px;
margin-top: 21px; margin-top: 21px;
line-height: 20px; line-height: 20px;
font: 400 13.3333px Arial;
} }
#editTip{ #editTip{
position: absolute; position: absolute;
@ -314,11 +318,10 @@
<div id="right"> <div id="right">
<div id="iconLib"> <div id="iconLib">
<canvas class='gameCanvas' id='data' width='416' height='416' style='z-index:0'></canvas> <canvas class='gameCanvas' id='data' width='416' height='416' style='z-index:0'></canvas>
<div id="selectBox">
<div id='dataSelection' v-show="isSelected" v-cloak></div>
</div>
</div> </div>
<div id="selectBox">
<div id='dataSelection' v-show="isSelected"></div>
</div>
</div> </div>
</div> </div>
@ -664,7 +667,6 @@
function locToPos(loc) { function locToPos(loc) {
pos = { 'x': ~~(loc.x / loc.size), 'y': ~~(loc.y / loc.size) } pos = { 'x': ~~(loc.x / loc.size), 'y': ~~(loc.y / loc.size) }
console.log(pos)
return pos; return pos;
} }
@ -806,8 +808,8 @@
selectBox.isSelected = true; selectBox.isSelected = true;
// console.log(pos,core.material.images[pos.images].height) // console.log(pos,core.material.images[pos.images].height)
dataSelection.style.left = (iconLib.offsetLeft+pos.x*32) +'px'; dataSelection.style.left = pos.x*32 +'px';
dataSelection.style.top = (iconLib.offsetTop + pos.y*32) +'px'; dataSelection.style.top = pos.y*32 +'px';
info={'images':pos.images,'y':pos.y}; info={'images':pos.images,'y':pos.y};
for (var ii=0;ii<ids.length;ii++){ for (var ii=0;ii<ids.length;ii++){
if(pos.images==ids[ii].images && pos.y==ids[ii].y) if(pos.images==ids[ii].images && pos.y==ids[ii].y)
@ -885,9 +887,12 @@
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
document.body.onmousedown = function(e){ document.body.onmousedown = function(e){
selectBox.isSelected = false; selectBox.isSelected = false;
info = {}; info = {};
canSelectAg = false;
} }
var exportM = new Vue({ var exportM = new Vue({
@ -944,7 +949,7 @@
watch: { watch: {
mapArr: function () { mapArr: function () {
var that = this; var that = this;
if(that.formatArr()){ if(that.mapArr !='' && that.formatArr()){
that.error = 0; that.error = 0;
clearTimeout(that.formatTimer); clearTimeout(that.formatTimer);
setTimeout(function(){ setTimeout(function(){
@ -957,10 +962,9 @@
}else{ }else{
that.error = 1; that.error = 1;
} }
}, },
error: function(){ error: function(){
console.log(editArea.mapArr);
} }
}, },
methods: { methods: {
@ -1049,7 +1053,9 @@
for(var ii=0;ii<fullX + 1 + fullY * (fullX + 1);ii++)map[ii]=0; for(var ii=0;ii<fullX + 1 + fullY * (fullX + 1);ii++)map[ii]=0;
ec = eventLayer.getContext('2d'); ec = eventLayer.getContext('2d');
ec.clearRect(0, 0, 416, 416); ec.clearRect(0, 0, 416, 416);
clearTimeout(editArea.formatTimer);
pout.value = ''; pout.value = '';
editArea.mapArr = '';
tip.whichShow = 4; tip.whichShow = 4;
editArea.error = 0; editArea.error = 0;
} }