Commit 11508b51 authored by Tt's avatar Tt

fix

parent 0c1b5a42
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 58
"__id__": 54
},
{
"__id__": 60
"__id__": 56
}
],
"_active": false,
......@@ -84,13 +84,13 @@
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 51
},
{
"__id__": 56
"__id__": 52
},
{
"__id__": 57
"__id__": 53
}
],
"_prefab": null,
......@@ -278,16 +278,13 @@
"__id__": 33
},
{
"__id__": 37
},
{
"__id__": 44
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 50
}
],
"_prefab": null,
......@@ -366,20 +363,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2176,
"height": 1600
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-800,
0,
0,
0,
......@@ -422,7 +419,7 @@
"__uuid__": "4c382c5d-0204-416a-abee-2642b026c231"
},
"_type": 0,
"_sizeMode": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -445,10 +442,10 @@
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_top": 440,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -459,7 +456,7 @@
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 2176,
"_originalHeight": 1074,
"_originalHeight": 720,
"_id": "f5ZeRXV15K3owADJO2BoLA"
},
{
......@@ -1081,7 +1078,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
2000,
2500,
-440,
0,
0,
......@@ -1240,206 +1237,6 @@
"_atlas": null,
"_id": "34Icsu0p9Dd5fBRvZ9Norx"
},
{
"__type__": "cc.Node",
"_name": "car_3",
"_objFlags": 0,
"_parent": {
"__id__": 5
},
"_children": [
{
"__id__": 26
}
],
"_active": true,
"_components": [
{
"__id__": 28
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1336,
"height": 614
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-2139.176,
-438.877,
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": "64MfxHfmJAI724WM+SSbpJ"
},
{
"__type__": "cc.Node",
"_name": "车尾气_ske",
"_objFlags": 0,
"_parent": {
"__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 27
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 145,
"height": 75
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
668.548,
-130.88,
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": "e8d1ZTn4tMfanXnNRTIQil"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "9c2bca4e-622f-40ef-95ab-477dfad4f10d#a64cc464-38e6-4ae8-a712-859896f7b052",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "9c2bca4e-622f-40ef-95ab-477dfad4f10d"
},
"_N$dragonAtlasAsset": {
"__uuid__": "a64cc464-38e6-4ae8-a712-859896f7b052"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "20CQqbwRJJTLbCSJgU5q0T"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3831f768-3f38-4e9f-a5de-08f753934b9b"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "e4osGv37FA57GquLFVJtS6"
},
{
"__type__": "cc.Node",
"_name": "btnSubmit",
......@@ -1451,13 +1248,13 @@
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 26
},
{
"__id__": 31
"__id__": 27
},
{
"__id__": 32
"__id__": 28
}
],
"_prefab": null,
......@@ -1513,7 +1310,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1545,7 +1342,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 25
},
"_enabled": true,
"alignMode": 1,
......@@ -1572,7 +1369,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 25
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1646,13 +1443,13 @@
"_active": false,
"_components": [
{
"__id__": 34
"__id__": 30
},
{
"__id__": 35
"__id__": 31
},
{
"__id__": 36
"__id__": 32
}
],
"_prefab": null,
......@@ -1708,7 +1505,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1740,7 +1537,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 29
},
"_enabled": true,
"alignMode": 1,
......@@ -1767,7 +1564,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 29
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1839,16 +1636,16 @@
},
"_children": [
{
"__id__": 38
"__id__": 34
},
{
"__id__": 40
"__id__": 36
}
],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 39
}
],
"_prefab": null,
......@@ -1904,13 +1701,13 @@
"_name": "CoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 35
}
],
"_prefab": null,
......@@ -1966,7 +1763,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -2006,16 +1803,16 @@
"_name": "BtnCoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 37
},
{
"__id__": 42
"__id__": 38
}
],
"_prefab": null,
......@@ -2071,7 +1868,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 36
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2139,7 +1936,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 36
},
"_enabled": true,
"alignMode": 1,
......@@ -2166,7 +1963,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 33
},
"_enabled": true,
"alignMode": 1,
......@@ -2197,25 +1994,25 @@
},
"_children": [
{
"__id__": 45
"__id__": 41
},
{
"__id__": 47
"__id__": 43
},
{
"__id__": 49
"__id__": 45
}
],
"_active": false,
"_components": [
{
"__id__": 51
"__id__": 47
},
{
"__id__": 52
"__id__": 48
},
{
"__id__": 53
"__id__": 49
}
],
"_prefab": null,
......@@ -2271,13 +2068,13 @@
"_name": "bg_circle2",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 42
}
],
"_prefab": null,
......@@ -2333,7 +2130,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -2365,13 +2162,13 @@
"_name": "bg_circle",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 44
}
],
"_prefab": null,
......@@ -2427,7 +2224,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2459,13 +2256,13 @@
"_name": "btn_replay",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 46
}
],
"_prefab": null,
......@@ -2521,7 +2318,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2553,7 +2350,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -2585,7 +2382,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 40
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2653,7 +2450,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 40
},
"_enabled": true,
"alignMode": 1,
......@@ -2767,7 +2564,7 @@
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 55
}
],
"_prefab": null,
......@@ -2823,7 +2620,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2858,6 +2655,12 @@
"__id__": 1
},
"_children": [
{
"__id__": 57
},
{
"__id__": 59
},
{
"__id__": 61
},
......@@ -2881,12 +2684,6 @@
},
{
"__id__": 75
},
{
"__id__": 77
},
{
"__id__": 79
}
],
"_active": true,
......@@ -2944,13 +2741,13 @@
"_name": "next",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 58
}
],
"_prefab": null,
......@@ -3006,7 +2803,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 57
},
"_enabled": true,
"_clip": {
......@@ -3025,13 +2822,13 @@
"_name": "boxJump",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 60
}
],
"_prefab": null,
......@@ -3087,7 +2884,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 59
},
"_enabled": true,
"_clip": {
......@@ -3106,13 +2903,13 @@
"_name": "jumpAll",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 62
}
],
"_prefab": null,
......@@ -3168,7 +2965,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 61
},
"_enabled": true,
"_clip": {
......@@ -3187,13 +2984,13 @@
"_name": "submit",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 64
}
],
"_prefab": null,
......@@ -3249,7 +3046,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 63
},
"_enabled": true,
"_clip": {
......@@ -3268,13 +3065,13 @@
"_name": "flyBack",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 66
}
],
"_prefab": null,
......@@ -3330,7 +3127,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 65
},
"_enabled": true,
"_clip": {
......@@ -3349,13 +3146,13 @@
"_name": "flyBackAll",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 68
}
],
"_prefab": null,
......@@ -3411,7 +3208,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 67
},
"_enabled": true,
"_clip": {
......@@ -3430,13 +3227,13 @@
"_name": "CoolCatRight",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 70
}
],
"_prefab": null,
......@@ -3492,7 +3289,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 69
},
"_enabled": true,
"_clip": {
......@@ -3511,13 +3308,13 @@
"_name": "CoolCatWrong",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 72
}
],
"_prefab": null,
......@@ -3573,7 +3370,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 71
},
"_enabled": true,
"_clip": {
......@@ -3592,13 +3389,13 @@
"_name": "CoolCatBegin",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 74
}
],
"_prefab": null,
......@@ -3654,7 +3451,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 73
},
"_enabled": true,
"_clip": {
......@@ -3673,13 +3470,13 @@
"_name": "CoolCatFinish",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 76
}
],
"_prefab": null,
......@@ -3735,7 +3532,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 75
},
"_enabled": true,
"_clip": {
......
......@@ -168,6 +168,7 @@ cc.Class({
this.refreshCoolCatPosition();
//TODO:copy
this.updateBg();
this.hideFlower();
this.firstCar();
......@@ -176,6 +177,16 @@ cc.Class({
this.jumpToQuestion(this.status.currentQuestionIdx);
});
},
updateBg() {
let bgSky = cc.find("Canvas/bg/bgSky");
if (bgSky.isScaled) return;
let scaleX = cc.winSize.width / bgSky.width;
let scaleY = cc.winSize.height / bgSky.height;
let scale = scaleX > scaleY ? scaleX : scaleY;
bgSky.isScaled = true;
bgSky.width *= scale
bgSky.height *= scale
},
refreshCoolCatPosition() {
......@@ -206,11 +217,12 @@ cc.Class({
optionNode.y = canvasHeight / 2 - box.y - 300;
optionNode.scale = 0;
optionNode.parent = box;
optionNode.targetScale = Math.min((maxOptionWidth * 0.80) / optionNode.width, maxOptionHeight / optionNode.height)
//TODO:copy---start
this.optionNodes.push(optionNode);
cc.tween(optionNode)
.to(0.2, { scale: Math.min((maxOptionWidth * 0.80) / optionNode.width * 1.05, maxOptionHeight / optionNode.height) * 1.05 })
.to(0.2, { scale: Math.min((maxOptionWidth * 0.80) / optionNode.width, maxOptionHeight / optionNode.height) })
.to(0.2, { scale: optionNode.targetScale * 1.05 })
.to(0.2, { scale: optionNode.targetScale })
.start();
//TODO:copy---end
});
......@@ -270,7 +282,7 @@ cc.Class({
}
cc.tween(optionNode)
.to(0.2, { x: 0, y: 100 }, cc.easing.quadOut)
.to(0.2, { x: 0, y: 100, scale: 0.6 }, cc.easing.quadOut)
.start();
this.boxJump();
......@@ -353,11 +365,10 @@ cc.Class({
//TODO:copy---start
firstCar() {
let pos1 = cc.v2(-30, -440);
let pos2 = cc.v2(2200, -440);
let pos3 = cc.v2(-2200, -440);
let pos2 = cc.v2(2500, -440);
let pos3 = cc.v2(-2500, -440);
const car1 = cc.find('Canvas/bg/car_1');
const car2 = cc.find('Canvas/bg/car_2');
const car3 = cc.find('Canvas/bg/car_3');
car1.x = pos2.x;
car1.y = pos2.y;
car2.x = pos2.x;
......@@ -365,17 +376,18 @@ cc.Class({
cc.tween(car1).to(1, { x: pos1.x }).start();
},
showFlower() {
for (let i = 1; i <= 3; i++) {
for (let i = 1; i <= 2; i++) {
const flower = cc.find(`Canvas/bg/car_${i}/车尾气_ske`);
const db = flower.getComponent(dragonBones.ArmatureDisplay)
db.playAnimation("normal", 1)
flower.active = true;
}
let pos1 = cc.v2(-30, -440);
let pos2 = cc.v2(2200, -440);
let pos3 = cc.v2(-2200, -440);
let pos2 = cc.v2(2500, -440);
let pos3 = cc.v2(-2500, -440);
const car1 = cc.find('Canvas/bg/car_1');
const car2 = cc.find('Canvas/bg/car_2');
const car3 = cc.find('Canvas/bg/car_3');
car1.x = pos1.x;
car1.y = pos2.y;
cc.tween(car1).by(0.2, { x: -60 }).by(0.2, { x: -100 }).by(0.2, { x: -120 }).by(0.2, { x: -140 }).by(0.2, { x: -180 }).to(1, { x: pos3.x }, cc.easing.quadIn).start();
......@@ -400,17 +412,16 @@ cc.Class({
}, 500);
},
hideFlower() {
for (let i = 1; i <= 3; i++) {
for (let i = 1; i <= 2; i++) {
const flower = cc.find(`Canvas/bg/car_${i}/车尾气_ske`);
flower.active = false;
}
let pos1 = cc.v2(-30, -440);
let pos2 = cc.v2(2200, -440);
let pos3 = cc.v2(-2200, -440);
let pos2 = cc.v2(2500, -440);
let pos3 = cc.v2(-2500, -440);
const car1 = cc.find('Canvas/bg/car_1');
const car2 = cc.find('Canvas/bg/car_2');
const car3 = cc.find('Canvas/bg/car_3');
car1.x = pos1.x;
car1.y = pos2.y;
car2.x = pos2.x;
......@@ -438,7 +449,7 @@ cc.Class({
.forEach(child => {
child.optionData.selected = false;
cc.tween(child)
.to(0.2, { x: child.startPos.x, y: child.startPos.y })
.to(0.2, { x: child.startPos.x, y: child.startPos.y, scale: child.targetScale })
.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