Commit 3ca16b2a authored by liujiangnan's avatar liujiangnan

Merge branch 'master' of http://vcs.ireadabc.com/template/OP_03_2

parents 89adefa9 62afb169
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "c58ea9c7-40f6-4fdf-a423-cf8189186748", "uuid": "1fae0aec-afb7-4cdb-8d01-55d4d43cfeb4",
"downloadMode": 0, "downloadMode": 0,
"duration": 4.176, "duration": 4.176,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "58839a84-d8f6-4df3-aef2-ecaab688f0f3", "uuid": "ffdacb0a-3f46-47b6-a1f9-acd1280ad0e8",
"downloadMode": 0, "downloadMode": 0,
"duration": 5.84, "duration": 5.84,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "3f07060f-b7a8-46f7-9c84-e9dde678a660", "uuid": "3b338c99-521d-4360-99f3-91f5fd373556",
"downloadMode": 0, "downloadMode": 0,
"duration": 4.608, "duration": 4.608,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "77f54cb1-a7d6-4ad3-81d0-1b6aabc5873c", "uuid": "06284a35-ef15-475b-b578-2b41363de570",
"downloadMode": 0, "downloadMode": 0,
"duration": 3.996, "duration": 3.996,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "b3db0b11-8bb2-44f7-b32d-b4989c3b8197", "uuid": "acb4de65-22f4-46f1-af28-84efb46f317a",
"downloadMode": 0, "downloadMode": 0,
"duration": 3.384, "duration": 3.384,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "b77d16ca-097b-4106-bd9c-970aa3440fcf", "uuid": "50614dfc-e029-4304-b43d-d9be2dfc5d24",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.512, "duration": 1.512,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "e2d19430-02ec-4339-83f7-a982958bc60b", "uuid": "d88ea07b-d836-4a44-a71e-90ca26a361a3",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_id": "dc1f1180-1ff4-4e67-b2e5-ad8dd02745b0" "_id": "8e178e3c-d587-44c6-97ec-c3d158ee532b"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1222,7 +1222,7 @@ ...@@ -1222,7 +1222,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f8596c89-5b5a-48b3-b789-1c54ad3a137c" "__uuid__": "0059b384-2ff4-4455-bfe5-fd838fa92056"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1913,7 +1913,7 @@ ...@@ -1913,7 +1913,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "e2d19430-02ec-4339-83f7-a982958bc60b" "__uuid__": "d88ea07b-d836-4a44-a71e-90ca26a361a3"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2063,7 +2063,7 @@ ...@@ -2063,7 +2063,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a3fb2157-3337-409b-84ca-bd8b9f6ebe0f" "__uuid__": "88b69e90-4153-4f14-948c-a2e5eeefd62a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2314,7 +2314,7 @@ ...@@ -2314,7 +2314,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "58839a84-d8f6-4df3-aef2-ecaab688f0f3" "__uuid__": "ffdacb0a-3f46-47b6-a1f9-acd1280ad0e8"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2395,7 +2395,7 @@ ...@@ -2395,7 +2395,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "b77d16ca-097b-4106-bd9c-970aa3440fcf" "__uuid__": "50614dfc-e029-4304-b43d-d9be2dfc5d24"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2476,7 +2476,7 @@ ...@@ -2476,7 +2476,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "c58ea9c7-40f6-4fdf-a423-cf8189186748" "__uuid__": "1fae0aec-afb7-4cdb-8d01-55d4d43cfeb4"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2557,7 +2557,7 @@ ...@@ -2557,7 +2557,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "b3db0b11-8bb2-44f7-b32d-b4989c3b8197" "__uuid__": "acb4de65-22f4-46f1-af28-84efb46f317a"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2638,7 +2638,7 @@ ...@@ -2638,7 +2638,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "77f54cb1-a7d6-4ad3-81d0-1b6aabc5873c" "__uuid__": "06284a35-ef15-475b-b578-2b41363de570"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2719,7 +2719,7 @@ ...@@ -2719,7 +2719,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "3f07060f-b7a8-46f7-9c84-e9dde678a660" "__uuid__": "3b338c99-521d-4360-99f3-91f5fd373556"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3154,7 +3154,7 @@ ...@@ -3154,7 +3154,7 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "c996fBq9WFKlqgRnI49Y++/", "__type__": "8b08f/pjC1DHZX67aqxEir/",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "dc1f1180-1ff4-4e67-b2e5-ad8dd02745b0", "uuid": "8e178e3c-d587-44c6-97ec-c3d158ee532b",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": false, "autoReleaseAssets": false,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "c996f06a-f561-4a96-a811-9c8e3d63efbf", "uuid": "8b08ffe9-8c2d-431d-95fa-edaab1122aff",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
"height": 251, "height": 251,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_photo": { "btn_photo_op03_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a3fb2157-3337-409b-84ca-bd8b9f6ebe0f", "uuid": "88b69e90-4153-4f14-948c-a2e5eeefd62a",
"rawTextureUuid": "7b1cc5c6-f935-4c49-a4b4-1d73942429d4", "rawTextureUuid": "7b1cc5c6-f935-4c49-a4b4-1d73942429d4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "460f7d1f-91a0-48bb-88cc-16d953c47aab", "uuid": "d69bbb21-85c4-492c-ad63-b3e778f676a4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
"height": 98, "height": 98,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"text2_bg": { "text2_bg_op03_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f8596c89-5b5a-48b3-b789-1c54ad3a137c", "uuid": "0059b384-2ff4-4455-bfe5-fd838fa92056",
"rawTextureUuid": "460f7d1f-91a0-48bb-88cc-16d953c47aab", "rawTextureUuid": "d69bbb21-85c4-492c-ad63-b3e778f676a4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
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