Commit c98d2178 authored by Chen Jiping's avatar Chen Jiping

feat:更换背景图片;调整单词默认的颜色

parent f25e3953
...@@ -75,25 +75,25 @@ ...@@ -75,25 +75,25 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 8 "__id__": 11
}, },
{ {
"__id__": 22 "__id__": 25
}, },
{ {
"__id__": 27 "__id__": 30
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 52
}, },
{ {
"__id__": 50 "__id__": 53
}, },
{ {
"__id__": 51 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -249,14 +249,18 @@ ...@@ -249,14 +249,18 @@
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [
{
"__id__": 6
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 6 "__id__": 9
}, },
{ {
"__id__": 7 "__id__": 10
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -307,6 +311,130 @@ ...@@ -307,6 +311,130 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "034rptRj5Fz5JwtpWhZ0d7" "_id": "034rptRj5Fz5JwtpWhZ0d7"
}, },
{
"__type__": "cc.Node",
"_name": "cloud",
"_objFlags": 0,
"_parent": {
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 7
},
{
"__id__": 8
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 102
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-309,
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": "1dgOZO6ExEOo/5YXfwAwfw"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "340552b0-d98e-4302-8122-a5c2bec9ef1c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "8dXK5qo5VFXprfx/LoeibE"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 20,
"_left": 0,
"_right": -353.5,
"_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": "farhpx16VGYJHGY/kdTZrx"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -323,7 +451,7 @@ ...@@ -323,7 +451,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "fc377763-613f-4f0d-aaf4-cfb96431d613" "__uuid__": "4ed203b6-e0b8-4ae9-9f76-d265f4e15334"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -375,16 +503,16 @@ ...@@ -375,16 +503,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 9 "__id__": 12
}, },
{ {
"__id__": 11 "__id__": 14
}, },
{ {
"__id__": 12 "__id__": 15
}, },
{ {
"__id__": 13 "__id__": 16
} }
], ],
"_active": true, "_active": true,
...@@ -442,13 +570,13 @@ ...@@ -442,13 +570,13 @@
"_name": "orange_plate", "_name": "orange_plate",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 10 "__id__": 13
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -504,7 +632,7 @@ ...@@ -504,7 +632,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 9 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -536,7 +664,7 @@ ...@@ -536,7 +664,7 @@
"_name": "pic_area", "_name": "pic_area",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -594,7 +722,7 @@ ...@@ -594,7 +722,7 @@
"_name": "row", "_name": "row",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -652,14 +780,14 @@ ...@@ -652,14 +780,14 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [ "_children": [
{ {
"__id__": 14 "__id__": 17
}, },
{ {
"__id__": 18 "__id__": 21
} }
], ],
"_active": true, "_active": true,
...@@ -717,19 +845,19 @@ ...@@ -717,19 +845,19 @@
"_name": "card_3", "_name": "card_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 15 "__id__": 18
}, },
{ {
"__id__": 16 "__id__": 19
}, },
{ {
"__id__": 17 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -785,7 +913,7 @@ ...@@ -785,7 +913,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 14 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -817,7 +945,7 @@ ...@@ -817,7 +945,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 14 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -844,7 +972,7 @@ ...@@ -844,7 +972,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 14 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -912,19 +1040,19 @@ ...@@ -912,19 +1040,19 @@
"_name": "card_4", "_name": "card_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 22
}, },
{ {
"__id__": 20 "__id__": 23
}, },
{ {
"__id__": 21 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -980,7 +1108,7 @@ ...@@ -980,7 +1108,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1012,7 +1140,7 @@ ...@@ -1012,7 +1140,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1039,7 +1167,7 @@ ...@@ -1039,7 +1167,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1111,16 +1239,16 @@ ...@@ -1111,16 +1239,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 23 "__id__": 26
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 28
}, },
{ {
"__id__": 26 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1176,13 +1304,13 @@ ...@@ -1176,13 +1304,13 @@
"_name": "click", "_name": "click",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 25
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1238,7 +1366,7 @@ ...@@ -1238,7 +1366,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1306,7 +1434,7 @@ ...@@ -1306,7 +1434,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1346,7 +1474,7 @@ ...@@ -1346,7 +1474,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1377,13 +1505,13 @@ ...@@ -1377,13 +1505,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 28 "__id__": 31
}, },
{ {
"__id__": 33 "__id__": 36
}, },
{ {
"__id__": 46 "__id__": 49
} }
], ],
"_active": false, "_active": false,
...@@ -1441,14 +1569,14 @@ ...@@ -1441,14 +1569,14 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 30
}, },
"_children": [ "_children": [
{ {
"__id__": 29 "__id__": 32
}, },
{ {
"__id__": 31 "__id__": 34
} }
], ],
"_active": true, "_active": true,
...@@ -1506,13 +1634,13 @@ ...@@ -1506,13 +1634,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 28 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1568,7 +1696,7 @@ ...@@ -1568,7 +1696,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1599,13 +1727,13 @@ ...@@ -1599,13 +1727,13 @@
"_name": "MuliBold_YzEVy", "_name": "MuliBold_YzEVy",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 28 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1661,7 +1789,7 @@ ...@@ -1661,7 +1789,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1692,26 +1820,26 @@ ...@@ -1692,26 +1820,26 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 30
}, },
"_children": [ "_children": [
{ {
"__id__": 34 "__id__": 37
}, },
{ {
"__id__": 36 "__id__": 39
}, },
{ {
"__id__": 38 "__id__": 41
}, },
{ {
"__id__": 40 "__id__": 43
}, },
{ {
"__id__": 42 "__id__": 45
}, },
{ {
"__id__": 44 "__id__": 47
} }
], ],
"_active": true, "_active": true,
...@@ -1769,13 +1897,13 @@ ...@@ -1769,13 +1897,13 @@
"_name": "card_1", "_name": "card_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1831,7 +1959,7 @@ ...@@ -1831,7 +1959,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1859,13 +1987,13 @@ ...@@ -1859,13 +1987,13 @@
"_name": "equal", "_name": "equal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1921,7 +2049,7 @@ ...@@ -1921,7 +2049,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1949,13 +2077,13 @@ ...@@ -1949,13 +2077,13 @@
"_name": "card_2", "_name": "card_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2011,7 +2139,7 @@ ...@@ -2011,7 +2139,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -2039,13 +2167,13 @@ ...@@ -2039,13 +2167,13 @@
"_name": "card_3", "_name": "card_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2101,7 +2229,7 @@ ...@@ -2101,7 +2229,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -2129,13 +2257,13 @@ ...@@ -2129,13 +2257,13 @@
"_name": "card_4", "_name": "card_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2191,7 +2319,7 @@ ...@@ -2191,7 +2319,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -2219,13 +2347,13 @@ ...@@ -2219,13 +2347,13 @@
"_name": "plus", "_name": "plus",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2281,7 +2409,7 @@ ...@@ -2281,7 +2409,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -2309,11 +2437,11 @@ ...@@ -2309,11 +2437,11 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 30
}, },
"_children": [ "_children": [
{ {
"__id__": 47 "__id__": 50
} }
], ],
"_active": true, "_active": true,
...@@ -2371,13 +2499,13 @@ ...@@ -2371,13 +2499,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2433,7 +2561,7 @@ ...@@ -2433,7 +2561,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
......
...@@ -415,6 +415,11 @@ export class WordArea2 extends WordGroup { ...@@ -415,6 +415,11 @@ export class WordArea2 extends WordGroup {
let data = this._data[i]; let data = this._data[i];
//如果是单词,修改字体颜色
if(i == 2){
data.fontColor = "#231f20";
}
let word = new Word2(this._cat, data); let word = new Word2(this._cat, data);
word.init(); word.init();
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "1771d850-0c23-42c6-a385-6edb8c2f0a5d", "uuid": "ff53696f-e589-4140-ada3-9131af3f7054",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg": { "bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "fc377763-613f-4f0d-aaf4-cfb96431d613", "uuid": "4ed203b6-e0b8-4ae9-9f76-d265f4e15334",
"rawTextureUuid": "1771d850-0c23-42c6-a385-6edb8c2f0a5d", "rawTextureUuid": "ff53696f-e589-4140-ada3-9131af3f7054",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{
"ver": "2.3.5",
"uuid": "06b0f471-cd09-43ab-b570-5c710dcf335f",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 573,
"height": 87,
"platformSettings": {},
"subMetas": {
"cloud": {
"ver": "1.0.4",
"uuid": "340552b0-d98e-4302-8122-a5c2bec9ef1c",
"rawTextureUuid": "06b0f471-cd09-43ab-b570-5c710dcf335f",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1280,
"height": 102,
"rawWidth": 1280,
"rawHeight": 102,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
...@@ -24,7 +24,7 @@ export class Exercises extends Obj{ ...@@ -24,7 +24,7 @@ export class Exercises extends Obj{
export class Word extends Obj{ export class Word extends Obj{
//字体颜色 //字体颜色
fontColor = "#02adf0"; fontColor = "#231f20";
} }
export function getDefExercises(){ export function getDefExercises(){
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="18" [nzOffset]="1"> <div nz-col [nzSpan]="18" [nzOffset]="1">
<nz-card nzTitle="题1" [nzHoverable]="true"> <nz-card nzTitle="词根" [nzHoverable]="true">
<nz-divider nzText="加号左边" nzOrientation="left"></nz-divider> <nz-divider nzText="加号左边" nzOrientation="left"></nz-divider>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2">内容</nz-form-label> <nz-form-label [nzSpan]="2">内容</nz-form-label>
......
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