Commit c13e779b authored by limingzhe's avatar limingzhe

fix: debug

parent 6ca998b9
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 663.875, "width": 502.095,
"height": 93.1 "height": 93.1
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -750,8 +750,8 @@ ...@@ -750,8 +750,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-29.191, 48.035,
332.774, 330.773,
0, 0,
0, 0,
0, 0,
...@@ -815,8 +815,8 @@ ...@@ -815,8 +815,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-218.8125,
0, 0,
24.499999999999996,
0, 0,
0, 0,
0, 0,
...@@ -883,7 +883,7 @@ ...@@ -883,7 +883,7 @@
"_enabled": false, "_enabled": false,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 1, "_alignFlags": 0,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 24.102000000000032, "_top": 24.102000000000032,
...@@ -941,7 +941,7 @@ ...@@ -941,7 +941,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 526.625, "width": 417.625,
"height": 44 "height": 44
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -953,8 +953,8 @@ ...@@ -953,8 +953,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
37.235000000000014,
0, 0,
-24.550000000000004,
0, 0,
0, 0,
0, 0,
...@@ -1015,7 +1015,7 @@ ...@@ -1015,7 +1015,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-182.725, -126.969,
1.058, 1.058,
0, 0,
0, 0,
...@@ -1110,7 +1110,7 @@ ...@@ -1110,7 +1110,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-239.024, -183.268,
0, 0,
0, 0,
0, 0,
...@@ -1204,7 +1204,7 @@ ...@@ -1204,7 +1204,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-239.024, -183.268,
0, 0,
0, 0,
0, 0,
...@@ -1296,7 +1296,7 @@ ...@@ -1296,7 +1296,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 342, "width": 240,
"height": 3 "height": 3
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -1308,7 +1308,7 @@ ...@@ -1308,7 +1308,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-147.078, -91.322,
0, 0,
0, 0,
0, 0,
...@@ -1561,7 +1561,7 @@ ...@@ -1561,7 +1561,7 @@
"__id__": 26 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 342, "_N$totalLength": 240,
"_N$barSprite": { "_N$barSprite": {
"__id__": 28 "__id__": 28
}, },
...@@ -1607,7 +1607,7 @@ ...@@ -1607,7 +1607,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
230.897, 182.11,
1.058, 1.058,
0, 0,
0, 0,
...@@ -1702,22 +1702,22 @@ ...@@ -1702,22 +1702,22 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 663.875, "width": 502.095,
"height": 93.1 "height": 93.1
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 2, "_N$layoutType": 1,
"_N$cellSize": { "_N$cellSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 40,
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 10, "_N$paddingLeft": 5,
"_N$paddingRight": 5, "_N$paddingRight": 5,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 60, "_N$spacingX": 20,
"_N$spacingY": 5, "_N$spacingY": 5,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
...@@ -1856,14 +1856,14 @@ ...@@ -1856,14 +1856,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-74.306, -74.306,
-54.13, -42.121,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
0.95, 0.92,
0.95, 0.92,
0.9 0.9
] ]
}, },
...@@ -2144,7 +2144,7 @@ ...@@ -2144,7 +2144,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
505.548, 505.548,
205.623, -54.13,
0, 0,
0, 0,
0, 0,
......
...@@ -586,7 +586,7 @@ cc.Class({ ...@@ -586,7 +586,7 @@ cc.Class({
const canvas = cc.find("Canvas"); const canvas = cc.find("Canvas");
const sx = canvas.width / bgContainer.width; const sx = canvas.width / bgContainer.width;
const sy = canvas.height / bgContainer.height; const sy = canvas.height / bgContainer.height;
bgContainer.scale = Math.min(sx, sy); bgContainer.scale = Math.min(sx, sy) * 1;
}, },
showBackBtn() { showBackBtn() {
...@@ -824,12 +824,13 @@ cc.Class({ ...@@ -824,12 +824,13 @@ cc.Class({
console.log('colorArr: ', colorArr); console.log('colorArr: ', colorArr);
const disX = 120; const disX = 120;
const disY = 100; const disY = 100 * this._mapScaleMin;
const colorPanel = cc.find('Canvas/bg_container/color_panel'); const colorPanel = cc.find('Canvas/bg_container/color_panel');
const colorBtnBase = cc.find('Canvas/bg_container/color_panel/color_btn'); const colorBtnBase = cc.find('Canvas/bg_container/color_panel/color_btn');
const colorObj = {}; const colorObj = {};
let len = 0; let len = 0;
let colorBtnsHeight = 0;
for (let i=0; i<colorArr.length; i++) { for (let i=0; i<colorArr.length; i++) {
const color = colorArr[i].code; const color = colorArr[i].code;
...@@ -847,6 +848,8 @@ cc.Class({ ...@@ -847,6 +848,8 @@ cc.Class({
colorBtn.x = 0; colorBtn.x = 0;
colorBtn.y = -i * disY; colorBtn.y = -i * disY;
colorBtnsHeight += colorBtn.height + disY;
const colorSpr = cc.find("spr", colorBtn); const colorSpr = cc.find("spr", colorBtn);
colorSpr.color = cc.Color.fromHEX(new cc.Color(), color); colorSpr.color = cc.Color.fromHEX(new cc.Color(), color);
...@@ -881,7 +884,8 @@ cc.Class({ ...@@ -881,7 +884,8 @@ cc.Class({
} }
// colorPanel.x = -(len - 1) * disX / 2; // colorPanel.x = -(len - 1) * disX / 2;
colorPanel.y = (len - 1) * disY / 2; const panel = cc.find('Canvas/bg_container/panel');
colorPanel.y = (len - 1) * disY / 2 + panel.y;
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment