Commit c0a4b445 authored by 杨一航's avatar 杨一航

fix

parent 78d981b1
......@@ -87,31 +87,31 @@
"__id__": 131
},
{
"__id__": 148
"__id__": 149
},
{
"__id__": 156
"__id__": 157
},
{
"__id__": 173
"__id__": 174
},
{
"__id__": 175
"__id__": 176
},
{
"__id__": 194
"__id__": 195
}
],
"_active": true,
"_components": [
{
"__id__": 201
},
{
"__id__": 202
},
{
"__id__": 203
},
{
"__id__": 204
}
],
"_prefab": null,
......@@ -6464,22 +6464,84 @@
"__id__": 132
},
{
"__id__": 134
"__id__": 146
}
],
"_active": false,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2560,
"height": 1920
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f3eFAldKFPOKL3LWyqlrXW"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 131
},
"_children": [
{
"__id__": 133
},
{
"__id__": 136
"__id__": 135
},
{
"__id__": 138
"__id__": 137
},
{
"__id__": 140
"__id__": 139
},
{
"__id__": 145
"__id__": 141
}
],
"_active": false,
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
......@@ -6534,13 +6596,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 134
}
],
"_prefab": null,
......@@ -6596,7 +6658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -6628,13 +6690,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 136
}
],
"_prefab": null,
......@@ -6690,7 +6752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6722,13 +6784,13 @@
"_name": "pass",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 138
}
],
"_prefab": null,
......@@ -6784,7 +6846,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6816,13 +6878,13 @@
"_name": "loss",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 140
}
],
"_prefab": null,
......@@ -6878,7 +6940,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6910,20 +6972,20 @@
"_name": "probar",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 132
},
"_children": [
{
"__id__": 141
"__id__": 142
}
],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 144
},
{
"__id__": 144
"__id__": 145
}
],
"_prefab": null,
......@@ -6979,13 +7041,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 142
"__id__": 143
}
],
"_prefab": null,
......@@ -7041,7 +7103,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 142
},
"_enabled": true,
"_materials": [
......@@ -7073,7 +7135,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -7105,12 +7167,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"_N$totalLength": 770,
"_N$barSprite": {
"__id__": 142
"__id__": 143
},
"_N$mode": 0,
"_N$progress": 1,
......@@ -7128,10 +7190,10 @@
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 147
},
{
"__id__": 147
"__id__": 148
}
],
"_prefab": null,
......@@ -7180,14 +7242,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f80aUehp5HlIJHDQYp6ccR"
"_id": "33U1TyaRZBnpuy8uNbinSV"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 146
},
"_enabled": true,
"_materials": [
......@@ -7220,14 +7282,14 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "bbYRfD0aJNEot8/MDZFyAB"
"_id": "e2hLnFxURNIaa1ERlOqX7H"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 146
},
"_enabled": true,
"alignMode": 1,
......@@ -7247,7 +7309,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "77h7g4qVxG4aRDKIVz0ati"
"_id": "84i4xhVWFPFLD+N1Au/47o"
},
{
"__type__": "cc.Node",
......@@ -7258,13 +7320,13 @@
},
"_children": [
{
"__id__": 149
"__id__": 150
},
{
"__id__": 152
"__id__": 153
},
{
"__id__": 154
"__id__": 155
}
],
"_active": false,
......@@ -7322,16 +7384,16 @@
"_name": "endbg",
"_objFlags": 0,
"_parent": {
"__id__": 148
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 150
"__id__": 151
},
{
"__id__": 151
"__id__": 152
}
],
"_prefab": null,
......@@ -7387,7 +7449,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7419,7 +7481,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 150
},
"_enabled": true,
"alignMode": 1,
......@@ -7446,13 +7508,13 @@
"_name": "loss",
"_objFlags": 0,
"_parent": {
"__id__": 148
"__id__": 149
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 153
"__id__": 154
}
],
"_prefab": null,
......@@ -7508,7 +7570,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7540,13 +7602,13 @@
"_name": "win",
"_objFlags": 0,
"_parent": {
"__id__": 148
"__id__": 149
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 155
"__id__": 156
}
],
"_prefab": null,
......@@ -7602,7 +7664,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 155
},
"_enabled": true,
"_materials": [
......@@ -7638,19 +7700,19 @@
},
"_children": [
{
"__id__": 157
"__id__": 158
},
{
"__id__": 161
"__id__": 162
}
],
"_active": false,
"_components": [
{
"__id__": 171
"__id__": 172
},
{
"__id__": 172
"__id__": 173
}
],
"_prefab": null,
......@@ -7706,19 +7768,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 157
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 158
},
{
"__id__": 159
},
{
"__id__": 160
},
{
"__id__": 161
}
],
"_prefab": null,
......@@ -7774,7 +7836,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7806,7 +7868,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 158
},
"_enabled": true,
"alignMode": 2,
......@@ -7833,7 +7895,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 158
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7901,20 +7963,20 @@
"_name": "BtnFrame",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 157
},
"_children": [
{
"__id__": 162
"__id__": 163
},
{
"__id__": 166
"__id__": 167
}
],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 171
}
],
"_prefab": null,
......@@ -7970,19 +8032,19 @@
"_name": "BtnExit",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 163
},
{
"__id__": 164
},
{
"__id__": 165
},
{
"__id__": 166
}
],
"_prefab": null,
......@@ -8038,7 +8100,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -8070,7 +8132,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 163
},
"_enabled": true,
"alignMode": 1,
......@@ -8097,7 +8159,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 163
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8165,19 +8227,19 @@
"_name": "BtnPlayAgain",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 167
},
{
"__id__": 168
},
{
"__id__": 169
},
{
"__id__": 170
}
],
"_prefab": null,
......@@ -8233,7 +8295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -8265,7 +8327,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"alignMode": 1,
......@@ -8292,7 +8354,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8360,7 +8422,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8392,7 +8454,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"alignMode": 2,
......@@ -8419,7 +8481,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"_id": "09WU6NXc9OR4frB91TsN13"
......@@ -8435,7 +8497,7 @@
"_active": false,
"_components": [
{
"__id__": 174
"__id__": 175
}
],
"_prefab": null,
......@@ -8491,7 +8553,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 174
},
"_enabled": true,
"_materials": [
......@@ -8527,31 +8589,31 @@
},
"_children": [
{
"__id__": 176
"__id__": 177
},
{
"__id__": 178
"__id__": 179
},
{
"__id__": 180
"__id__": 181
},
{
"__id__": 182
"__id__": 183
},
{
"__id__": 184
"__id__": 185
},
{
"__id__": 186
"__id__": 187
},
{
"__id__": 188
"__id__": 189
},
{
"__id__": 190
"__id__": 191
},
{
"__id__": 192
"__id__": 193
}
],
"_active": true,
......@@ -8609,13 +8671,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 178
}
],
"_prefab": null,
......@@ -8671,7 +8733,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 177
},
"_enabled": true,
"_clip": {
......@@ -8690,13 +8752,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 180
}
],
"_prefab": null,
......@@ -8752,7 +8814,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 179
},
"_enabled": true,
"_clip": {
......@@ -8771,13 +8833,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 182
}
],
"_prefab": null,
......@@ -8833,7 +8895,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"_clip": {
......@@ -8852,13 +8914,13 @@
"_name": "win",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 183
"__id__": 184
}
],
"_prefab": null,
......@@ -8914,7 +8976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 183
},
"_enabled": true,
"_clip": {
......@@ -8933,13 +8995,13 @@
"_name": "loss",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 186
}
],
"_prefab": null,
......@@ -8995,7 +9057,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 184
"__id__": 185
},
"_enabled": true,
"_clip": {
......@@ -9014,13 +9076,13 @@
"_name": "piece",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 187
"__id__": 188
}
],
"_prefab": null,
......@@ -9076,7 +9138,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 187
},
"_enabled": true,
"_clip": {
......@@ -9095,13 +9157,13 @@
"_name": "match",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 190
}
],
"_prefab": null,
......@@ -9157,7 +9219,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 188
"__id__": 189
},
"_enabled": true,
"_clip": {
......@@ -9176,13 +9238,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 192
}
],
"_prefab": null,
......@@ -9238,7 +9300,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 191
},
"_enabled": true,
"_clip": {
......@@ -9257,13 +9319,13 @@
"_name": "grow",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 194
}
],
"_prefab": null,
......@@ -9319,7 +9381,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 193
},
"_enabled": true,
"_clip": {
......@@ -9342,10 +9404,10 @@
},
"_children": [
{
"__id__": 195
"__id__": 196
},
{
"__id__": 198
"__id__": 199
}
],
"_active": false,
......@@ -9403,11 +9465,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 194
"__id__": 195
},
"_children": [
{
"__id__": 196
"__id__": 197
}
],
"_active": true,
......@@ -9465,13 +9527,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 196
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 198
}
],
"_prefab": null,
......@@ -9527,7 +9589,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 197
},
"_enabled": true,
"_materials": [],
......@@ -9558,11 +9620,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 194
"__id__": 195
},
"_children": [
{
"__id__": 199
"__id__": 200
}
],
"_active": true,
......@@ -9620,13 +9682,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 198
"__id__": 199
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 201
}
],
"_prefab": null,
......@@ -9682,7 +9744,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 200
},
"_enabled": true,
"_materials": [],
......
......@@ -239,9 +239,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
const bgNode = cc.find('Canvas/bg');
bgNode.scale = this._mapScaleMax;
const cover = cc.find("Canvas/cover")
cover.width = cc.winSize.width;
cover.height = cc.winSize.height;
this.cover.width = cc.winSize.width;
this.cover.height = cc.winSize.height;
this.cover.getChildByName("bg").scale = this._mapScaleMax;
const endRoot = cc.find("Canvas/endRoot")
endRoot.scale = this._mapScaleMax;
......@@ -472,12 +472,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
async openCoursView(node, word) {
this.cover.active = true;
let probar = this.cover.getChildByName("probar");
let pass = this.cover.getChildByName("pass");
let loss = this.cover.getChildByName("loss");
this.cover.getChildByName("bar").removeAllChildren();
let probar = this.cover.getChildByName("bg").getChildByName("probar");
let pass = this.cover.getChildByName("bg").getChildByName("pass");
let loss = this.cover.getChildByName("bg").getChildByName("loss");
this.cover.getChildByName("bg").getChildByName("bar").removeAllChildren();
let icon = cc.instantiate(node);
icon.parent = this.cover.getChildByName("bar");
icon.parent = this.cover.getChildByName("bg").getChildByName("bar");
icon.x = 0;
icon.y = 0;
icon.scale = 1;
......@@ -542,7 +542,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.log("测评分数:" + score);
if (score >= 70) {
let pass = this.cover.getChildByName("pass");
let pass = this.cover.getChildByName("bg").getChildByName("pass");
pass.active = true;
pass.scale = 0;
cc.tween(pass).to(0.3, { scale: 0.5 }, { easing: "cubicIn" }).start();
......@@ -559,7 +559,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
} else {
let loss = this.cover.getChildByName("loss");
let loss = this.cover.getChildByName("bg").getChildByName("loss");
loss.active = true;
loss.scale = 0;
cc.tween(loss).to(0.3, { scale: 0.5 }, { easing: "cubicIn" }).start();
......
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