Skip to content

Commit

Permalink
add test case for text, tested by creator 1.9.0 (cocos2d#162)
Browse files Browse the repository at this point in the history
* using Creator 1.9 Import && Export

* add RichText test case
drelaptop authored and minggo committed Apr 8, 2018
1 parent 81dd1b2 commit ff2c341
Showing 6 changed files with 576 additions and 374 deletions.
2 changes: 1 addition & 1 deletion creator_project/assets/arial16.fnt.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ver": "2.0.0",
"ver": "2.1.0",
"uuid": "bffc9dd6-8114-4c3d-a0a6-03a4927e026c",
"textureUuid": "2c8df125-099b-4cc6-aa64-a27080e09ead",
"fontSize": 16,
136 changes: 119 additions & 17 deletions creator_project/assets/scenes/Label/CreatorLabels.fire
Original file line number Diff line number Diff line change
@@ -42,6 +42,9 @@
},
{
"__id__": 20
},
{
"__id__": 23
}
],
"_tag": -1,
@@ -175,7 +178,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 320.17,
"width": 320,
"height": 40
},
"_rotationX": 0,
@@ -325,7 +328,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 748.47,
"width": 748,
"height": 64
},
"_rotationX": 0,
@@ -401,7 +404,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 222.81,
"width": 223,
"height": 144
},
"_rotationX": 0,
@@ -477,7 +480,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 259.06,
"width": 259,
"height": 192
},
"_rotationX": 0,
@@ -553,7 +556,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 304.67,
"width": 305,
"height": 100
},
"_rotationX": 0,
@@ -586,7 +589,8 @@
"_N$font": null,
"_N$maxWidth": 0,
"_N$lineHeight": 50,
"_N$imageAtlas": null
"_N$imageAtlas": null,
"_N$handleTouchEvent": true
},
{
"__type__": "cc.Node",
@@ -621,7 +625,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 194.92,
"width": 195,
"height": 100
},
"_rotationX": 0,
@@ -656,7 +660,8 @@
},
"_N$maxWidth": 0,
"_N$lineHeight": 50,
"_N$imageAtlas": null
"_N$imageAtlas": null,
"_N$handleTouchEvent": true
},
{
"__type__": "cc.Node",
@@ -691,7 +696,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 217.93,
"width": 218,
"height": 100
},
"_rotationX": 0,
@@ -724,11 +729,12 @@
"_N$font": null,
"_N$maxWidth": 0,
"_N$lineHeight": 50,
"_N$imageAtlas": null
"_N$imageAtlas": null,
"_N$handleTouchEvent": true
},
{
"__type__": "cc.Node",
"_name": "label with outline",
"_name": "systemfont label with outline",
"_objFlags": 0,
"_parent": {
"__id__": 1
@@ -762,7 +768,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 313.1,
"width": 830,
"height": 40
},
"_rotationX": 0,
@@ -771,8 +777,8 @@
"_scaleY": 1,
"_position": {
"__type__": "cc.Vec2",
"x": 179,
"y": 334
"x": 433,
"y": 383
},
"_skewX": 0,
"_skewY": 0,
@@ -790,14 +796,14 @@
},
"_enabled": true,
"_useOriginalSize": false,
"_actualFontSize": 40,
"_fontSize": 40,
"_actualFontSize": 30,
"_fontSize": 30,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_N$string": "Label with outline",
"_N$string": "SystemFont Label with outline, Supported on iOS and Android",
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
@@ -819,5 +825,101 @@
"a": 255
},
"_width": 2
},
{
"__type__": "cc.Node",
"_name": "TTFFont label with outline",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [],
"_tag": -1,
"_active": true,
"_components": [
{
"__id__": 24
},
{
"__id__": 25
}
],
"_prefab": null,
"_id": "94BvN19+VHabRV4Z12zw8f",
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_cascadeOpacityEnabled": true,
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_contentSize": {
"__type__": "cc.Size",
"width": 539,
"height": 40
},
"_rotationX": 0,
"_rotationY": 0,
"_scaleX": 1,
"_scaleY": 1,
"_position": {
"__type__": "cc.Vec2",
"x": 296,
"y": 296
},
"_skewX": 0,
"_skewY": 0,
"_localZOrder": 0,
"_globalZOrder": 0,
"_opacityModifyRGB": false,
"groupIndex": 0
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"_useOriginalSize": false,
"_actualFontSize": 40,
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "27d18d5e-feac-410d-a9f8-8a9ddb7213c2"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_N$string": "TTFFont Label with outline",
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 233,
"g": 16,
"b": 16,
"a": 255
},
"_width": 2
}
]
400 changes: 242 additions & 158 deletions creator_project/assets/scenes/richtext/CreatorRichtext.fire

Large diffs are not rendered by default.

402 changes: 206 additions & 196 deletions creator_project/assets/scenes/toggle_group/toggle_group.fire

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion creator_project/settings/creator-luacpp-support.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"autoBuild": false,
"exportResourceDynamicallyLoaded": false,
"exportResourceOnly": false,
"path": "/Users/minggo/SourceCode/cocos2d-x/tests/lua-empty-test",
"path": "/Users/laptop/2d-x/tests/cpp-empty-test",
"setup": false
}
7 changes: 6 additions & 1 deletion creator_project/settings/project.json
Original file line number Diff line number Diff line change
@@ -25,5 +25,10 @@
},
"start-scene": "current",
"use-customize-simulator": false,
"use-project-simulator-setting": false
"use-project-simulator-setting": false,
"cocos-analytics": {
"enable": false,
"appID": "13798",
"appSecret": "959b3ac0037d0f3c2fdce94f8421a9b2"
}
}

0 comments on commit ff2c341

Please sign in to comment.