Commit 5b271f93 authored by liujiangnan's avatar liujiangnan

feat

parent 02578590
......@@ -305,43 +305,43 @@
"__id__": 17
},
{
"__id__": 19
"__id__": 20
},
{
"__id__": 23
"__id__": 24
},
{
"__id__": 27
"__id__": 28
},
{
"__id__": 29
"__id__": 30
},
{
"__id__": 42
"__id__": 43
},
{
"__id__": 51
"__id__": 52
},
{
"__id__": 54
"__id__": 55
},
{
"__id__": 79
"__id__": 80
},
{
"__id__": 81
"__id__": 82
},
{
"__id__": 85
"__id__": 86
}
],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 89
},
{
"__id__": 89
"__id__": 90
}
],
"_prefab": null,
......@@ -435,15 +435,15 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-584,
306,
-604.75,
326.75,
0,
0,
0,
0,
1,
1,
1,
0.5,
0.5,
1
]
},
......@@ -630,15 +630,15 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
381,
306,
465.177,
325.829,
0,
0,
0,
0,
1,
1,
1,
0.7,
0.7,
1
]
},
......@@ -735,8 +735,8 @@
"_target": null,
"_alignFlags": 33,
"_left": 20,
"_right": 221.5,
"_top": 17,
"_right": 148.57299999999998,
"_top": 8.271000000000015,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -794,6 +794,9 @@
"_components": [
{
"__id__": 18
},
{
"__id__": 19
}
],
"_prefab": null,
......@@ -819,8 +822,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
478.855,
306.605,
526.997,
331.082,
0,
0,
0,
......@@ -877,6 +880,33 @@
"_N$cacheMode": 0,
"_id": "b2M3EeRMFLUbACECBItXCP"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": 83.80799999999999,
"_top": 2.458000000000027,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "cfDPVpdOhNA6P/O5zgALYZ"
},
{
"__type__": "cc.Node",
"_name": "BtnRight",
......@@ -887,14 +917,14 @@
"_children": [],
"_active": false,
"_components": [
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
}
],
"_prefab": null,
......@@ -920,15 +950,15 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
576,
306,
594.351,
324.847,
0,
0,
0,
0,
1,
1,
1,
0.7,
0.7,
1
]
},
......@@ -950,7 +980,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1018,15 +1048,15 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 33,
"_left": 20,
"_right": 26.5,
"_top": 17,
"_right": 19.399,
"_top": 9.253000000000043,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -1045,7 +1075,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -1082,14 +1112,14 @@
"_children": [],
"_active": false,
"_components": [
{
"__id__": 24
},
{
"__id__": 25
},
{
"__id__": 26
},
{
"__id__": 27
}
],
"_prefab": null,
......@@ -1145,7 +1175,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"alignMode": 2,
......@@ -1172,7 +1202,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1240,7 +1270,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -1278,7 +1308,7 @@
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 29
}
],
"_prefab": null,
......@@ -1334,7 +1364,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 28
},
"_enabled": true,
"_layoutSize": {
......@@ -1370,19 +1400,19 @@
},
"_children": [
{
"__id__": 30
"__id__": 31
},
{
"__id__": 32
"__id__": 33
},
{
"__id__": 34
"__id__": 35
}
],
"_active": false,
"_components": [
{
"__id__": 41
"__id__": 42
}
],
"_prefab": null,
......@@ -1438,13 +1468,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 32
}
],
"_prefab": null,
......@@ -1500,7 +1530,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1532,13 +1562,13 @@
"_name": "loading_ske",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 34
}
],
"_prefab": null,
......@@ -1594,7 +1624,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1634,24 +1664,24 @@
"_name": "progress",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [
{
"__id__": 35
"__id__": 36
}
],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 39
},
{
"__id__": 39
"__id__": 40
}
],
"_prefab": {
"__id__": 40
"__id__": 41
},
"_opacity": 255,
"_color": {
......@@ -1705,17 +1735,17 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 35
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 37
}
],
"_prefab": {
"__id__": 37
"__id__": 38
},
"_opacity": 255,
"_color": {
......@@ -1769,7 +1799,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 36
},
"_enabled": true,
"_materials": [
......@@ -1799,7 +1829,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 34
"__id__": 35
},
"asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......@@ -1812,7 +1842,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1844,7 +1874,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"_id": "3eMT/DXoJNGZT/8Z3nuTUH"
......@@ -1852,7 +1882,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 34
"__id__": 35
},
"asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......@@ -1865,7 +1895,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 30
},
"_enabled": true,
"_id": "3aadbr2ilKYLzzvQrMvCTR"
......@@ -1879,16 +1909,16 @@
},
"_children": [
{
"__id__": 43
"__id__": 44
},
{
"__id__": 46
"__id__": 47
}
],
"_active": false,
"_components": [
{
"__id__": 50
"__id__": 51
}
],
"_prefab": null,
......@@ -1944,16 +1974,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 45
},
{
"__id__": 45
"__id__": 46
}
],
"_prefab": null,
......@@ -2009,7 +2039,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2041,7 +2071,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 44
},
"_enabled": true,
"alignMode": 1,
......@@ -2068,17 +2098,17 @@
"_name": "tips",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 43
},
"_children": [
{
"__id__": 47
"__id__": 48
}
],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 50
}
],
"_prefab": null,
......@@ -2134,13 +2164,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 47
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 49
}
],
"_prefab": null,
......@@ -2196,7 +2226,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2229,7 +2259,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2261,7 +2291,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 43
},
"_enabled": true,
"alignMode": 1,
......@@ -2294,10 +2324,10 @@
"_active": false,
"_components": [
{
"__id__": 52
"__id__": 53
},
{
"__id__": 53
"__id__": 54
}
],
"_prefab": null,
......@@ -2353,7 +2383,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2386,7 +2416,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 52
},
"_enabled": true,
"alignMode": 1,
......@@ -2417,19 +2447,19 @@
},
"_children": [
{
"__id__": 55
"__id__": 56
},
{
"__id__": 58
"__id__": 59
},
{
"__id__": 73
"__id__": 74
}
],
"_active": false,
"_components": [
{
"__id__": 78
"__id__": 79
}
],
"_prefab": null,
......@@ -2485,16 +2515,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 55
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 57
},
{
"__id__": 57
"__id__": 58
}
],
"_prefab": null,
......@@ -2550,7 +2580,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2582,7 +2612,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 56
},
"_enabled": true,
"alignMode": 1,
......@@ -2609,20 +2639,20 @@
"_name": "active_bg",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 55
},
"_children": [
{
"__id__": 59
"__id__": 60
},
{
"__id__": 61
"__id__": 62
}
],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 73
}
],
"_prefab": null,
......@@ -2678,13 +2708,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 61
}
],
"_prefab": null,
......@@ -2740,7 +2770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2773,23 +2803,23 @@
"_name": "active_input",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [
{
"__id__": 62
"__id__": 63
},
{
"__id__": 65
"__id__": 66
},
{
"__id__": 68
"__id__": 69
}
],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 72
}
],
"_prefab": null,
......@@ -2845,16 +2875,16 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 512,
"_parent": {
"__id__": 61
"__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 64
},
{
"__id__": 64
"__id__": 65
}
],
"_prefab": null,
......@@ -2910,7 +2940,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -2942,7 +2972,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 63
},
"_enabled": true,
"alignMode": 0,
......@@ -2969,16 +2999,16 @@
"_name": "TEXT_LABEL",
"_objFlags": 512,
"_parent": {
"__id__": 61
"__id__": 62
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 66
"__id__": 67
},
{
"__id__": 67
"__id__": 68
}
],
"_prefab": null,
......@@ -3034,7 +3064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3067,7 +3097,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 66
},
"_enabled": true,
"alignMode": 0,
......@@ -3094,16 +3124,16 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 512,
"_parent": {
"__id__": 61
"__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 70
},
{
"__id__": 70
"__id__": 71
}
],
"_prefab": null,
......@@ -3159,7 +3189,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3192,7 +3222,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 69
},
"_enabled": true,
"alignMode": 0,
......@@ -3219,7 +3249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 62
},
"_enabled": true,
"_string": "",
......@@ -3231,13 +3261,13 @@
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
"__id__": 66
"__id__": 67
},
"_N$placeholderLabel": {
"__id__": 69
"__id__": 70
},
"_N$background": {
"__id__": 63
"__id__": 64
},
"_N$inputFlag": 5,
"_N$inputMode": 6,
......@@ -3249,7 +3279,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -3281,20 +3311,20 @@
"_name": "active",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 55
},
"_children": [
{
"__id__": 74
"__id__": 75
}
],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 77
},
{
"__id__": 77
"__id__": 78
}
],
"_prefab": null,
......@@ -3350,13 +3380,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 76
}
],
"_prefab": null,
......@@ -3412,7 +3442,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3445,7 +3475,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3477,7 +3507,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 74
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3545,7 +3575,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 55
},
"_enabled": true,
"alignMode": 1,
......@@ -3578,7 +3608,7 @@
"_active": false,
"_components": [
{
"__id__": 80
"__id__": 81
}
],
"_prefab": null,
......@@ -3634,7 +3664,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3669,16 +3699,16 @@
"__id__": 8
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 82
},
{
"__id__": 83
},
{
"__id__": 84
},
{
"__id__": 85
}
],
"_prefab": null,
......@@ -3734,7 +3764,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3766,7 +3796,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 82
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3834,7 +3864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 82
},
"_enabled": true,
"alignMode": 1,
......@@ -3865,7 +3895,7 @@
},
"_children": [
{
"__id__": 86
"__id__": 87
}
],
"_active": true,
......@@ -3923,13 +3953,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 88
}
],
"_prefab": null,
......@@ -3985,7 +4015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"_clip": {
......
......@@ -153,14 +153,14 @@ export default class NewClass extends middleLayerBase {
if (this.courseIndex == 0) {
cc.find('middleLayer/BtnLeft').active = false;
} else {
cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/BtnLeft').active = true;
}
if (this.courseIndex == this.courses.length - 1) {
cc.find('middleLayer/BtnRight').active = false;
} else {
cc.find('middleLayer/BtnRight').active = true;
}
});
}, 0.7);
buttonOnClick(cc.find('middleLayer/BtnLeft'), () => {
if (this.isShowWaiting) {
......@@ -170,14 +170,14 @@ export default class NewClass extends middleLayerBase {
if (this.courseIndex == 0) {
cc.find('middleLayer/BtnLeft').active = false;
} else {
cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/BtnLeft').active = true;
}
if (this.courseIndex == this.courses.length - 1) {
cc.find('middleLayer/BtnRight').active = false;
} else {
cc.find('middleLayer/BtnRight').active = true;
}
});
}, 0.7);
buttonOnClick(cc.find('middleLayer/activeLayer/active'), async () => {
if (this.isShowWaiting) {
......
......@@ -239,6 +239,12 @@ export abstract class middleLayerBase extends cc.Component {
this.courses = data.rows;
this.courseIndex = data.index || 0;
this.courseItem = data.rows[this.courseIndex];
console.log('-----------------');
console.log("jfdlisjlfiasjdjl");
console.log('-----------------');
cc.find('middleLayer/Page').active = true;
cc.find(`middleLayer/Page`).getComponent(cc.Label).string = `1/${this.courses.length}`;
} else {
this.hideWaitingLetters();
this.showTips(`内容还未制作`);
......@@ -293,6 +299,7 @@ export abstract class middleLayerBase extends cc.Component {
(<any>window).courseware.freeAllOcMethod();
cc.find(`middleLayer/Page`).getComponent(cc.Label).string = `${index + 1}/${this.courses.length}`;
this.courseIndex = index;
this.courseItem = this.courses[this.courseIndex];
this.loadPageBundle();
......
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