Commit 7ceb3c0c authored by yu's avatar yu

1

parent 69776e13
{
"ver": "1.1.2",
"uuid": "c35bb2f6-f24a-4850-ae44-643f2fdc7541",
"uuid": "0c16a277-a78f-4e9b-9f42-b254bc4d58f1",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.1.2",
"uuid": "cb9fa4ea-66ca-45af-ad31-e445c7b0ef32",
"uuid": "ae46500f-cfd3-4eb5-af41-f1d21837323a",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "2.0.1",
"uuid": "ed69b5af-07d8-4a24-b3eb-57bf1c7b7cc6",
"uuid": "882239f2-e6ab-44de-a72c-ecb1c3e6fe56",
"downloadMode": 0,
"duration": 1.764,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "9aea96dc-0ed1-4a3b-aee1-a981674e1e53",
"uuid": "fd804b61-799f-4202-8e18-3881a95ea026",
"downloadMode": 0,
"duration": 0.168,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "18e16f8e-7ef2-438f-ac07-0a68ea7b2fc9",
"uuid": "03c7ed7c-b6e3-4ea7-918f-ec98bfe37d59",
"downloadMode": 0,
"duration": 4.892,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "665e544c-fe92-4f24-bdcc-9475a763ff0c",
"uuid": "68cf0aa3-3290-4575-b130-56113063864f",
"downloadMode": 0,
"duration": 0.556563,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "c38a5b68-3f3b-415e-89ee-e6afb6fedbdf",
"uuid": "265fbba0-8944-4b90-b459-ec5bf6b20929",
"downloadMode": 0,
"duration": 2.52,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "ab03c99c-c830-45fa-a537-eaf8f1295c4d",
"uuid": "27df4965-f797-4418-8600-4f6eb2db074b",
"downloadMode": 0,
"duration": 4.146667,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "0eebd891-d79b-4b0f-87c8-613f7780d841",
"uuid": "3d1e2e0f-e071-437e-9edf-6ba720a8a0cf",
"downloadMode": 0,
"duration": 0.972,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "342d6b41-d606-43d5-9676-7b67f03d236f",
"uuid": "ee2d17be-2f54-4de5-bbe3-6a6703fb0b09",
"downloadMode": 0,
"duration": 0.938688,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "16a0bc5d-fd4e-443e-aeb0-80139b29574d",
"uuid": "5f08113a-1d26-461c-a1db-600dcb31719e",
"downloadMode": 0,
"duration": 3.787755,
"subMetas": {}
......
{
"ver": "2.0.1",
"uuid": "e187dccb-ea0a-45de-be95-53c50683cd19",
"uuid": "bde76bd4-72ea-4560-a793-282c59ad5716",
"downloadMode": 0,
"duration": 1.708286,
"subMetas": {}
......
{
"ver": "1.1.2",
"uuid": "0853721c-3f55-4eb2-873d-e3081cfadd4b",
"uuid": "ff9e1f68-64cf-4fac-b0a1-040893080231",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.0.1",
"uuid": "798dc639-44aa-43f5-8633-c41b650f52f3",
"uuid": "c7fc32f4-bc39-4dd9-87a6-2e1226e99811",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "b1e23e77-8349-4843-9061-3a4bd057cb93",
"uuid": "31b0f1e6-8f92-4f32-a122-25eac63cb4e8",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "b9bdbc54-4550-4d06-9e4f-49a009235a00",
"uuid": "d6104786-ff3c-4e82-9f71-d4ea87993ec2",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
......@@ -13,8 +13,8 @@
"subMetas": {
"guid_tex": {
"ver": "1.0.4",
"uuid": "d30dd787-4e2d-41a7-8258-38040017f35c",
"rawTextureUuid": "b9bdbc54-4550-4d06-9e4f-49a009235a00",
"uuid": "857c2921-0d75-4020-b2b9-922115f2cde2",
"rawTextureUuid": "d6104786-ff3c-4e82-9f71-d4ea87993ec2",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
......
{
"ver": "1.1.2",
"uuid": "20185448-a1ca-4de2-8b37-7bf6cdfccbae",
"uuid": "ea17199e-d82f-4bfc-a4e7-10a9f97a8aed",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.1.0",
"uuid": "f792997f-f029-4df1-9adb-5e28c3e1a1c4",
"uuid": "896894e9-8da7-49b4-8b1f-d3d76526005f",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "5d8c6a7f-89af-4150-a1e1-c687492e05c3",
"uuid": "01fce478-ba72-4e48-a23e-ecb5c8926f49",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "04c2b808-1c8a-499b-9152-128a1abe340a",
"uuid": "171c58e0-0f6a-494f-8ac5-9d54aaaa2cb5",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89",
"uuid": "b16daca2-8a1f-49b0-864b-0f84d5a1f4f5",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "e8bd16b0-3804-45a9-a8ca-f52c02224f55",
"uuid": "2b6566b9-b0ad-48a7-8147-49e5aa113f64",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
This diff is collapsed.
{
"ver": "1.2.8",
"uuid": "e9759136-33bc-45ff-be96-695974b7f179",
"ver": "1.2.9",
"uuid": "e46dc29a-1a9f-4577-bf26-da4fdfa1910d",
"asyncLoadAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
......
......@@ -687,18 +687,20 @@ cc.Class({
let layout_short = cc.find("layout_short", card_group);
let layout_long = cc.find("layout_long", card_group);
let normal_label = cc.find("normal_label", card_group);
let long_label = cc.find("long_label", card_group);
layout_short.removeAllChildren();
normal_label.removeAllChildren();
layout_long.removeAllChildren();
layout_long.active = content.length > 5;
layout_short.active = content.length <= 5;
let r = [239, 0, 135];
let l = [2, 171, 241];
let layout = content.length <= 5 ? layout_short : layout_long;
let itemLaebl = content.length <= 5 ? normal_label : long_label;
content.forEach((item, idx) => {
if (item.card.length > 1) {
let str = item.card.split("");
str.forEach((c) => {
let laebl = cc.instantiate(normal_label);
let laebl = cc.instantiate(itemLaebl);
layout.addChild(laebl);
laebl.getComponent(cc.Label).string = c;
laebl.active = true;
......@@ -706,7 +708,7 @@ cc.Class({
laebl.data = item;
})
} else {
let laebl = cc.instantiate(normal_label);
let laebl = cc.instantiate(itemLaebl);
layout.addChild(laebl);
laebl.getComponent(cc.Label).string = item.card;
laebl.active = true;
......
{
"ver": "1.0.8",
"uuid": "079b14c1-2b16-435a-8a77-6fecc373403a",
"uuid": "c5ea9f39-1da7-45b7-b3d8-cba34ab2be96",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "b15f80f1-6507-44eb-af5b-07bfb945bf0c",
"uuid": "2a84c622-6194-48d0-9254-e8aef28a8420",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "11f21116-6718-42e0-bd5e-a369c8a95b33",
"uuid": "876e475f-053d-4670-8e2f-417b4086ee24",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "4e93bb38-2b8e-4524-a0cf-ee046467baf5",
"uuid": "99d4bd78-351d-48bd-b851-0dbeb387d70d",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "2f000cc9-5e11-497b-b268-3dced7dde2a9",
"uuid": "7a142e20-e72a-4bc2-9508-ded867d8377b",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "2bc1b858-63dd-4bec-bb40-e6703d306bbc",
"uuid": "827d68a9-ea7e-457c-8e53-14520bcaa98f",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
......@@ -288,11 +288,11 @@ pg.load = {
});
})
},
loadNetRes: function (url) {
loadNetRes: function (res) {
return new Promise((resolve, reject) => {
cc.assetManager.loadRemote(url, (err, info) => {
cc.assetManager.loadRemote(res, (err, data) => {
if (err && !data) return resolve(pg.logger.w('loading loadRes warn-> ', res));
resolve(info);
resolve(data);
});
})
},
......
{
"ver": "1.0.8",
"uuid": "24305734-8e44-4e40-b9cf-802b2ae89e08",
"uuid": "b5ab5255-dc57-420c-8d7c-7b0f1967e7a1",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "bea9617c-f6be-43d4-8fcf-2472770a4244",
"uuid": "502fb49f-3d7a-4049-b97d-cbd928f7ff91",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "45e8ddf3-fcf2-4728-8f88-66f7e27c22cc",
"uuid": "bacac67a-72f1-4470-b53a-599ddd7cada7",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "85b1fa7a-77a0-4811-8b62-826a7ca77c7e",
"uuid": "fa4e7191-f04b-4ac0-9d12-58988fdedd05",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.1.2",
"uuid": "b0c008bc-cf92-463b-8360-0984e13c2e4d",
"uuid": "a0c18ee8-5c25-40f8-809b-7cc7c6ed25be",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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