Commit 8bee7421 authored by wangxin's avatar wangxin

1

parent 6f112848
...@@ -86,6 +86,9 @@ ...@@ -86,6 +86,9 @@
{ {
"__id__": 22 "__id__": 22
}, },
{
"__id__": 27
},
{ {
"__id__": 30 "__id__": 30
} }
...@@ -189,7 +192,7 @@ ...@@ -189,7 +192,7 @@
"array": [ "array": [
0, 0,
0, 0,
521.347293078232, 381.91720306893745,
0, 0,
0, 0,
0, 0,
...@@ -959,21 +962,17 @@ ...@@ -959,21 +962,17 @@
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [],
{
"__id__": 23
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 23
}, },
{ {
"__id__": 27 "__id__": 24
}, },
{ {
"__id__": 28 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1000,7 +999,7 @@ ...@@ -1000,7 +999,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
133.304, 133,
0, 0,
0, 0,
0, 0,
...@@ -1024,134 +1023,6 @@ ...@@ -1024,134 +1023,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "327N+7zilKcIgSjcKLUP7V" "_id": "327N+7zilKcIgSjcKLUP7V"
}, },
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 22
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
},
{
"__id__": 25
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 80,
"g": 123,
"b": 214,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1800,
"height": 160
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
0.5,
0.5,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "475BENpDZFBr+ql4aDJdye"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "",
"_N$string": "",
"_fontSize": 80,
"_lineHeight": 80,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "dab/NGA85CFqJIq1qBE8tf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": false,
"alignMode": 2,
"_target": null,
"_alignFlags": 42,
"_left": 71.5,
"_right": 71.5,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1800,
"_originalHeight": 0,
"_id": "70PMQ6MiNJUpmyd46SC3Jo"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -1194,10 +1065,10 @@ ...@@ -1194,10 +1065,10 @@
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 1, "_alignFlags": 41,
"_left": 118.5, "_left": 118.5,
"_right": 118.5, "_right": 118.5,
"_top": 134.196, "_top": 134.5,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -1225,7 +1096,7 @@ ...@@ -1225,7 +1096,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 29 "__id__": 26
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -1293,6 +1164,134 @@ ...@@ -1293,6 +1164,134 @@
"handler": "playQuestion", "handler": "playQuestion",
"customEventData": "" "customEventData": ""
}, },
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
},
{
"__id__": 29
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 80,
"g": 123,
"b": 214,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1800,
"height": 160
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
133,
0,
0,
0,
0,
1,
0.5,
0.5,
0.5
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "475BENpDZFBr+ql4aDJdye"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "",
"_N$string": "",
"_fontSize": 80,
"_lineHeight": 80,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "dab/NGA85CFqJIq1qBE8tf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 41,
"_left": 190,
"_right": 190,
"_top": 187,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1800,
"_originalHeight": 0,
"_id": "70PMQ6MiNJUpmyd46SC3Jo"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "options", "_name": "options",
...@@ -1334,7 +1333,7 @@ ...@@ -1334,7 +1333,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-156.42000000000002, -168.841,
0, 0,
0, 0,
0, 0,
...@@ -1371,7 +1370,7 @@ ...@@ -1371,7 +1370,7 @@
"_alignFlags": 1, "_alignFlags": 1,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 375.62, "_top": 388.041,
"_bottom": 43, "_bottom": 43,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -1479,7 +1478,7 @@ ...@@ -1479,7 +1478,7 @@
"__id__": 15 "__id__": 15
}, },
"question": { "question": {
"__id__": 24 "__id__": 28
}, },
"openMusic": { "openMusic": {
"__uuid__": "82894da6-cdf9-4aa2-be54-0d5f3b8c4ff6" "__uuid__": "82894da6-cdf9-4aa2-be54-0d5f3b8c4ff6"
......
...@@ -241,6 +241,7 @@ cc.Class({ ...@@ -241,6 +241,7 @@ cc.Class({
this.che.scale = this._mapScaleMax; this.che.scale = this._mapScaleMax;
this.cloud.scale = this._mapScaleMax; this.cloud.scale = this._mapScaleMax;
this.questionFrame.scale = this._mapScaleMin; this.questionFrame.scale = this._mapScaleMin;
this.question.node.scale = this._mapScaleMin;
}, },
// ------------------------------------------------ // ------------------------------------------------
......
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