Commit c2dae8a7 authored by 李维's avatar 李维

调整旷工位置

修复最左边选项选择动画,旷工飞出屏幕的问题
parent 12aa1631
......@@ -93,25 +93,25 @@
"__id__": 38
},
{
"__id__": 90
"__id__": 93
},
{
"__id__": 92
"__id__": 95
},
{
"__id__": 95
"__id__": 98
}
],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 100
},
{
"__id__": 98
"__id__": 101
},
{
"__id__": 99
"__id__": 102
}
],
"_prefab": null,
......@@ -1835,10 +1835,10 @@
"__id__": 39
},
{
"__id__": 56
"__id__": 57
},
{
"__id__": 73
"__id__": 75
}
],
"_active": true,
......@@ -1866,7 +1866,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-100,
720,
0,
0,
......@@ -1907,7 +1907,11 @@
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 56
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1931,7 +1935,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-429.097,
-250,
93.053,
0,
0,
......@@ -2671,7 +2675,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-186.632,
163.118,
-56.555,
0,
0,
......@@ -2764,6 +2768,35 @@
"_N$target": null,
"_id": "3dz6rOwO9LnZSzfhHyIBQC"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 16,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": -350,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "eaRrdEFgZLQLPLP4RThli1"
},
{
"__type__": "cc.Node",
"_name": "NodeOption_1",
......@@ -2773,14 +2806,18 @@
},
"_children": [
{
"__id__": 57
"__id__": 58
},
{
"__id__": 59
"__id__": 60
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 74
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -2804,7 +2841,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-15.318,
100,
179.965,
0,
0,
......@@ -2834,13 +2871,13 @@
"_name": "ImgShadow",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 59
}
],
"_prefab": null,
......@@ -2896,7 +2933,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2928,32 +2965,32 @@
"_name": "BtnOption",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 57
},
"_children": [
{
"__id__": 60
"__id__": 61
},
{
"__id__": 62
"__id__": 63
},
{
"__id__": 64
"__id__": 65
},
{
"__id__": 66
"__id__": 67
},
{
"__id__": 69
"__id__": 70
},
{
"__id__": 71
"__id__": 72
}
],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 73
}
],
"_prefab": null,
......@@ -3009,13 +3046,13 @@
"_name": "ImgBg_2",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 61
"__id__": 62
}
],
"_prefab": null,
......@@ -3071,7 +3108,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 61
},
"_enabled": true,
"_materials": [
......@@ -3103,13 +3140,13 @@
"_name": "ImgBg_1",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 63
"__id__": 64
}
],
"_prefab": null,
......@@ -3165,7 +3202,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -3197,13 +3234,13 @@
"_name": "ImgBg_0",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 66
}
],
"_prefab": null,
......@@ -3259,7 +3296,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3291,16 +3328,16 @@
"_name": "LabelOption",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 68
},
{
"__id__": 68
"__id__": 69
}
],
"_prefab": null,
......@@ -3356,7 +3393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3391,7 +3428,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 67
},
"_enabled": true,
"_color": {
......@@ -3414,13 +3451,13 @@
"_name": "DragonBoneNodeSmoke",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 70
"__id__": 71
}
],
"_prefab": null,
......@@ -3476,7 +3513,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3516,7 +3553,7 @@
"_name": "NodeCharactorTarget",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": true,
......@@ -3574,7 +3611,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 60
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3637,6 +3674,35 @@
"_N$target": null,
"_id": "e1s/6yYMVDkoy7knI3Kv5z"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 16,
"_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": 0,
"_originalHeight": 0,
"_id": "b7KzJKOPNGILn7xJ5YEDno"
},
{
"__type__": "cc.Node",
"_name": "NodeOption_2",
......@@ -3646,14 +3712,18 @@
},
"_children": [
{
"__id__": 74
"__id__": 76
},
{
"__id__": 76
"__id__": 78
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 92
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -3677,7 +3747,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
372.01,
450,
87.386,
0,
0,
......@@ -3707,13 +3777,13 @@
"_name": "ImgShadow",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 77
}
],
"_prefab": null,
......@@ -3769,7 +3839,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3801,12 +3871,9 @@
"_name": "BtnOption",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 75
},
"_children": [
{
"__id__": 77
},
{
"__id__": 79
},
......@@ -3817,16 +3884,19 @@
"__id__": 83
},
{
"__id__": 86
"__id__": 85
},
{
"__id__": 88
},
{
"__id__": 90
}
],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 91
}
],
"_prefab": null,
......@@ -3882,13 +3952,13 @@
"_name": "ImgBg_2",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 78
"__id__": 80
}
],
"_prefab": null,
......@@ -3944,7 +4014,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3976,13 +4046,13 @@
"_name": "ImgBg_1",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 80
"__id__": 82
}
],
"_prefab": null,
......@@ -4038,7 +4108,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -4070,13 +4140,13 @@
"_name": "ImgBg_0",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 84
}
],
"_prefab": null,
......@@ -4132,7 +4202,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -4164,16 +4234,16 @@
"_name": "LabelOption",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 86
},
{
"__id__": 85
"__id__": 87
}
],
"_prefab": null,
......@@ -4229,7 +4299,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4264,7 +4334,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 85
},
"_enabled": true,
"_color": {
......@@ -4287,13 +4357,13 @@
"_name": "DragonBoneNodeSmoke",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 87
"__id__": 89
}
],
"_prefab": null,
......@@ -4349,7 +4419,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4389,7 +4459,7 @@
"_name": "NodeCharactorTarget",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": true,
......@@ -4447,7 +4517,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 78
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4510,6 +4580,35 @@
"_N$target": null,
"_id": "c5uwXEZL9HbKUSfjBvFqu0"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 16,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 350,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "3ed0xpe6hDTrJr4ghaFEiQ"
},
{
"__type__": "cc.Node",
"_name": "ImgStar",
......@@ -4521,7 +4620,7 @@
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 94
}
],
"_prefab": null,
......@@ -4577,7 +4676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 93
},
"_enabled": true,
"_materials": [
......@@ -4615,10 +4714,10 @@
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 96
},
{
"__id__": 94
"__id__": 97
}
],
"_prefab": null,
......@@ -4674,7 +4773,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4706,7 +4805,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 95
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4780,7 +4879,7 @@
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 99
}
],
"_prefab": null,
......@@ -4836,7 +4935,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 98
},
"_enabled": true,
"bgm": {
......
......@@ -144,15 +144,15 @@ cc.Class({
await this.charactorMoveToTarget(idx);
this.hideOtherOptions(idx);
await this.showCharactorAttack();
await this.showCharactorAttack(idx);
imgBg0.active = false;
imgBg1.active = true;
await this.showCharactorAttack();
await this.showCharactorAttack(idx);
imgBg1.active = false;
imgBg2.active = true;
await this.showCharactorAttack();
await this.showCharactorAttack(idx);
nodeOption.active = false;
this.showStar(idx);
......@@ -267,7 +267,7 @@ cc.Class({
this.showLight();
await this.charactorMoveToTarget(idx);
await this.showCharactorAttack();
await this.showCharactorAttack(idx);
this.showSmoke(idx);
this.playEffect('boom');
......@@ -286,12 +286,16 @@ cc.Class({
async charactorMoveToTarget(idx) {
const nodeCharactor = cc.find('Canvas/ImgCar/NodeCharactor');
nodeCharactor.scaleX = idx == 0 ? -1 : 1;
const nodeCharactorTarget = cc.find(`Canvas/NodeOptions/NodeOption_${idx}/BtnOption/NodeCharactorTarget`);
const targetPos = exchangeNodePos(nodeCharactor.parent, nodeCharactorTarget);
await asyncTweenTo(nodeCharactor, 0.5, { x: targetPos.x, y: targetPos.y }, { easing: 'cubicInOut' });
},
async showCharactorAttack() {
async showCharactorAttack(idx) {
const nodeCharactor = cc.find('Canvas/ImgCar/NodeCharactor');
nodeCharactor.scaleX = idx == 0 ? -1 : 1;
const imgCharactor = cc.find('Canvas/ImgCar/NodeCharactor/ImgCharactor');
const dragonBoneNodeCharactor = cc.find('Canvas/ImgCar/NodeCharactor/DragonBoneNodeCharactor');
......@@ -304,6 +308,8 @@ cc.Class({
imgCharactor.active = true;
dragonBoneNodeCharactor.active = false;
nodeCharactor.scaleX = 1;
},
async showSmoke(idx) {
......
......@@ -12,23 +12,5 @@ module.exports = {
wrongWordList: ['ao', 'arl'],
wrongAudioList: ['ao.mp3', 'arl.mp3'],
}]
}, {
audio: 'banana',
questionList: [{
rightAudio: 'baa',
rightWord: 'ba',
wrongWordList: ['pa', 'da'],
wrongAudioList: ['pa.mp3', 'da.mp3'],
}, {
rightAudio: 'na',
rightWord: 'na',
wrongWordList: ['ma', 'ha'],
wrongAudioList: ['ma.mp3', 'ha.mp3'],
}, {
rightAudio: 'na',
rightWord: 'na',
wrongWordList: ['ma', 'ha'],
wrongAudioList: ['ma.mp3', 'ha.mp3'],
}]
}],
}
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