Commit 52ebafda authored by jeff's avatar jeff

修改布局

parent 5579fc40
......@@ -75,25 +75,25 @@
"__id__": 5
},
{
"__id__": 8
"__id__": 7
},
{
"__id__": 18
"__id__": 17
},
{
"__id__": 28
"__id__": 26
}
],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 38
},
{
"__id__": 41
"__id__": 39
},
{
"__id__": 42
"__id__": 40
}
],
"_prefab": null,
......@@ -254,9 +254,6 @@
"_components": [
{
"__id__": 6
},
{
"__id__": 7
}
],
"_prefab": null,
......@@ -339,33 +336,6 @@
"_atlas": null,
"_id": "eaS1JEsKZJk5kn9K13PwO5"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "e9wM7H6ndJabDtH2T6E5Sw"
},
{
"__type__": "cc.Node",
"_name": "pic",
......@@ -375,22 +345,22 @@
},
"_children": [
{
"__id__": 9
"__id__": 8
},
{
"__id__": 12
"__id__": 11
},
{
"__id__": 13
"__id__": 12
},
{
"__id__": 15
"__id__": 14
}
],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 16
}
],
"_prefab": null,
......@@ -446,16 +416,16 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 10
"__id__": 9
},
{
"__id__": 11
"__id__": 10
}
],
"_prefab": null,
......@@ -511,7 +481,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 8
},
"_enabled": true,
"_materials": [
......@@ -541,7 +511,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 8
},
"_enabled": true,
"alignMode": 1,
......@@ -568,7 +538,7 @@
"_name": "items",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 7
},
"_children": [],
"_active": true,
......@@ -626,13 +596,13 @@
"_name": "bg_move",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 13
}
],
"_prefab": null,
......@@ -658,7 +628,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-626,
-639.807,
0,
0,
0,
......@@ -688,7 +658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -720,13 +690,13 @@
"_name": "bg_move",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 16
"__id__": 15
}
],
"_prefab": null,
......@@ -752,7 +722,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
626,
640.413,
0,
0,
0,
......@@ -782,7 +752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 14
},
"_enabled": true,
"_materials": [
......@@ -814,7 +784,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
"__id__": 7
},
"_enabled": true,
"hitPre": {
......@@ -822,10 +792,10 @@
},
"borders": [
{
"__id__": 13
"__id__": 12
},
{
"__id__": 15
"__id__": 14
}
],
"_id": "25htXxEOZC+47ROkvoLV/U"
......@@ -839,22 +809,22 @@
},
"_children": [
{
"__id__": 19
"__id__": 18
},
{
"__id__": 22
"__id__": 20
},
{
"__id__": 23
"__id__": 21
},
{
"__id__": 25
"__id__": 23
}
],
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 25
}
],
"_prefab": null,
......@@ -910,16 +880,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
},
{
"__id__": 21
"__id__": 19
}
],
"_prefab": null,
......@@ -975,7 +942,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -1000,39 +967,12 @@
"_atlas": null,
"_id": "0eSa63fVNKKLV/1Jn+eg8n"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_left": 7,
"_right": 7,
"_top": 7,
"_bottom": 7,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 650,
"_originalHeight": 410,
"_id": "fbCrzYGGRFTKesyrZuyvHE"
},
{
"__type__": "cc.Node",
"_name": "items",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 17
},
"_children": [],
"_active": true,
......@@ -1090,13 +1030,13 @@
"_name": "bg_move",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 22
}
],
"_prefab": null,
......@@ -1152,7 +1092,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -1184,13 +1124,13 @@
"_name": "bg_move",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 24
}
],
"_prefab": null,
......@@ -1246,7 +1186,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 23
},
"_enabled": true,
"_materials": [
......@@ -1278,7 +1218,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 17
},
"_enabled": true,
"hitPre": {
......@@ -1286,10 +1226,10 @@
},
"borders": [
{
"__id__": 23
"__id__": 21
},
{
"__id__": 25
"__id__": 23
}
],
"_id": "89aCQ7yHtOn4s8onn5MbAu"
......@@ -1303,19 +1243,19 @@
},
"_children": [
{
"__id__": 29
"__id__": 27
},
{
"__id__": 31
"__id__": 29
},
{
"__id__": 35
"__id__": 33
}
],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 37
}
],
"_prefab": null,
......@@ -1371,13 +1311,13 @@
"_name": "bg_bottom",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 26
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 28
}
],
"_prefab": null,
......@@ -1433,7 +1373,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1465,16 +1405,16 @@
"_name": "btn_left",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 26
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 30
},
{
"__id__": 34
"__id__": 32
}
],
"_prefab": null,
......@@ -1530,7 +1470,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 29
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1539,7 +1479,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 33
"__id__": 31
}
],
"_N$interactable": true,
......@@ -1612,7 +1552,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1644,16 +1584,16 @@
"_name": "btn_right",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 26
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 34
},
{
"__id__": 38
"__id__": 36
}
],
"_prefab": null,
......@@ -1709,7 +1649,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1718,7 +1658,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 37
"__id__": 35
}
],
"_N$interactable": true,
......@@ -1791,7 +1731,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1823,7 +1763,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 26
},
"_enabled": true,
"alignMode": 1,
......@@ -1898,16 +1838,16 @@
},
"_enabled": true,
"picNode": {
"__id__": 8
"__id__": 7
},
"picTempNode": {
"__id__": 18
"__id__": 17
},
"leftNode": {
"__id__": 31
"__id__": 29
},
"rightNode": {
"__id__": 35
"__id__": 33
},
"btnClip": {
"__uuid__": "39ef1939-3bf9-4d21-a67a-bc1dede521a9"
......
......@@ -77,7 +77,7 @@ cc.Class({
getData((data) => {
console.log('data:', data);
this.data = data.length ? data : this.getDefaultData();
this.data = (data && data.length) ? data : this.getDefaultData();
this.data = JSON.parse(JSON.stringify(this.data))
this.preloadItem()
})
......@@ -156,6 +156,7 @@ cc.Class({
initBg() {
const bgNode = cc.find('Canvas/bg');
bgNode.scale = this._mapScaleMax;
// cc.find('Canvas/bottomPart').scale = this._mapScaleMin
},
initPic() {
......@@ -260,7 +261,7 @@ cc.Class({
})
.start();
},
stopAudio(){
stopAudio() {
cc.systemEvent.emit('stopMusic')
},
......
{
"last-module-event-record-time": 1600677246969,
"last-module-event-record-time": 1620757263933,
"migrate-history": [
"cloud-function"
]
......
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