Commit bd502a50 authored by Tt's avatar Tt

Merge branch 'master' of http://120.27.1.210:43210/huiwan/boy04 into master

# Conflicts:
#	assets/BOY04/fonts/Muli_Bold.ttf.meta
#	assets/BOY04/scene/BOY04.fire
parents f10f593f 41238e10
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
"_is3DNode": true, "_is3DNode": true,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": true, "autoReleaseAssets": false,
"_id": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3" "_id": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3"
}, },
{ {
...@@ -688,9 +688,7 @@ ...@@ -688,9 +688,7 @@
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": null,
"__uuid__": "84d2c824-31a5-4cf4-8652-ff12206c65f8"
},
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
"_batchAsBitmap": false, "_batchAsBitmap": false,
...@@ -1545,7 +1543,7 @@ ...@@ -1545,7 +1543,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 132.34, "width": 120.69,
"height": 80 "height": 80
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -1607,7 +1605,7 @@ ...@@ -1607,7 +1605,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 93.34, "width": 81.69,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -1664,9 +1662,7 @@ ...@@ -1664,9 +1662,7 @@
"_fontSize": 30, "_fontSize": 30,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": null,
"__uuid__": "84d2c824-31a5-4cf4-8652-ff12206c65f8"
},
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
"_batchAsBitmap": false, "_batchAsBitmap": false,
...@@ -1723,7 +1719,7 @@ ...@@ -1723,7 +1719,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
122.84, 111.19,
7, 7,
0, 0,
0, 0,
...@@ -2005,7 +2001,7 @@ ...@@ -2005,7 +2001,7 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 132.34, "width": 120.69,
"height": 80 "height": 80
}, },
"_resize": 1, "_resize": 1,
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3", "uuid": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": false,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
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