From 6fc7f23e6fdbefa892502a998ef91548935b0a1f Mon Sep 17 00:00:00 2001 From: kL <328549495@qq.com> Date: Tue, 10 Aug 2021 23:11:27 +0800 Subject: [PATCH] update 2021/8/10 --- ListDemo-JS/assets/Atlas.meta | 3 +- ListDemo-JS/assets/Atlas/chat.plist.meta | 192 +++-- ListDemo-JS/assets/Atlas/chat.png.meta | 6 +- ListDemo-JS/assets/Prefab.meta | 3 +- ListDemo-JS/assets/Prefab/BagItem.prefab.meta | 3 +- ListDemo-JS/assets/Scene.meta | 3 +- ListDemo-JS/assets/Scene/Main.fire.meta | 3 +- .../assets/Scene/TestAdaptive.fire.meta | 3 +- ListDemo-JS/assets/Scene/TestBag.fire.meta | 3 +- ListDemo-JS/assets/Scene/TestCyclic.fire.meta | 3 +- .../assets/Scene/TestFrameByFrame.fire.meta | 3 +- ListDemo-JS/assets/Scene/TestLack.fire.meta | 3 +- ListDemo-JS/assets/Scene/TestPage.fire.meta | 3 +- ListDemo-JS/assets/Scene/TestWidget.fire.meta | 3 +- ListDemo-JS/assets/Script.meta | 3 +- ListDemo-JS/assets/Script/List.js | 4 +- ListDemo-JS/assets/Script/List.js.meta | 3 +- ListDemo-JS/assets/Script/ListItem.js.meta | 3 +- ListDemo-JS/assets/Script/Main.js.meta | 3 +- .../assets/Script/TestAdaptive.js.meta | 3 +- ListDemo-JS/assets/Script/TestBag.js.meta | 3 +- ListDemo-JS/assets/Script/TestCyclic.js.meta | 3 +- .../assets/Script/TestFrameByFrame.js.meta | 3 +- ListDemo-JS/assets/Script/TestLack.js.meta | 3 +- ListDemo-JS/assets/Script/TestPage.js.meta | 3 +- ListDemo-JS/assets/Script/TestWidget.js.meta | 3 +- ListDemo-JS/assets/Texture.meta | 3 +- ListDemo-JS/assets/Texture/avatar_1.png.meta | 6 +- ListDemo-JS/assets/Texture/avatar_2.png.meta | 6 +- ListDemo-JS/assets/Texture/avatar_bg.png.meta | 6 +- .../assets/Texture/chat_bubble_bg_1.png.meta | 6 +- .../assets/Texture/chat_bubble_bg_2.png.meta | 6 +- ListDemo-JS/assets/Texture/item_bg.png.meta | 6 +- ListDemo-JS/assets/Texture/item_bg_2.png.meta | 6 +- .../assets/Texture/selected_flag.png.meta | 6 +- ListDemo-JS/assets/migration.meta | 3 +- .../migration/use_reversed_rotateBy.js.meta | 3 +- ListDemo-JS/project.json | 2 +- ListDemo-TS/assets/Atlas.meta | 3 +- ListDemo-TS/assets/Atlas/chat.plist.meta | 192 +++-- ListDemo-TS/assets/Atlas/chat.png.meta | 6 +- ListDemo-TS/assets/Prefab.meta | 3 +- ListDemo-TS/assets/Prefab/BagItem.prefab.meta | 3 +- ListDemo-TS/assets/Scene.meta | 3 +- ListDemo-TS/assets/Scene/Main.fire.meta | 3 +- .../assets/Scene/TestAdaptive.fire.meta | 3 +- ListDemo-TS/assets/Scene/TestBag.fire.meta | 3 +- ListDemo-TS/assets/Scene/TestCyclic.fire.meta | 3 +- ListDemo-TS/assets/Scene/TestLack.fire.meta | 3 +- ListDemo-TS/assets/Scene/TestPage.fire.meta | 3 +- ListDemo-TS/assets/Scene/TestWidget.fire.meta | 3 +- ListDemo-TS/assets/Script.meta | 3 +- ListDemo-TS/assets/Script/List.ts | 22 +- ListDemo-TS/assets/Script/List.ts.meta | 3 +- ListDemo-TS/assets/Script/ListItem.ts.meta | 3 +- ListDemo-TS/assets/Script/Main.ts.meta | 3 +- .../assets/Script/TestAdaptive.ts.meta | 3 +- ListDemo-TS/assets/Script/TestBag.ts.meta | 3 +- ListDemo-TS/assets/Script/TestCyclic.ts.meta | 3 +- ListDemo-TS/assets/Script/TestLack.ts.meta | 3 +- ListDemo-TS/assets/Script/TestPage.ts.meta | 3 +- ListDemo-TS/assets/Script/TestWidget.ts.meta | 3 +- ListDemo-TS/assets/Texture.meta | 3 +- ListDemo-TS/assets/Texture/avatar_1.png.meta | 6 +- ListDemo-TS/assets/Texture/avatar_2.png.meta | 6 +- ListDemo-TS/assets/Texture/avatar_bg.png.meta | 6 +- .../assets/Texture/chat_bubble_bg_1.png.meta | 6 +- .../assets/Texture/chat_bubble_bg_2.png.meta | 6 +- ListDemo-TS/assets/Texture/item_bg.png.meta | 6 +- ListDemo-TS/assets/Texture/item_bg_2.png.meta | 6 +- ListDemo-TS/assets/migration.meta | 3 +- .../migration/use_reversed_rotateBy.js.meta | 3 +- ListDemo-TS/project.json | 2 +- .../.gitignore | 0 .../assets/Atlas.meta | 0 .../assets/Atlas/chat.plist | 0 .../assets/Atlas/chat.plist.meta | 315 +++++--- .../assets/Atlas/chat.png | Bin .../assets/Atlas/chat.png.meta | 13 +- .../assets/Prefab.meta | 0 .../assets/Prefab/BagItem.prefab | 36 +- .../assets/Prefab/BagItem.prefab.meta | 2 +- .../assets/Scene.meta | 0 .../assets/Scene/Main.scene | 546 +++++++------ .../assets/Scene/Main.scene.meta | 2 +- .../assets/Scene/TestAdaptive.scene | 755 +++++++++--------- .../assets/Scene/TestAdaptive.scene.meta | 11 + .../assets/Scene/TestBag.scene | 244 ++++-- ListDemo_3.x/assets/Scene/TestBag.scene.meta | 11 + .../assets/Scene/TestCyclic.scene | 379 +++++---- .../assets/Scene/TestCyclic.scene.meta | 11 + .../assets/Scene/TestLack.scene | 311 +++++--- ListDemo_3.x/assets/Scene/TestLack.scene.meta | 11 + .../assets/Scene/TestPage.scene | 378 +++++---- ListDemo_3.x/assets/Scene/TestPage.scene.meta | 11 + .../assets/Scene/TestWidget.scene | 247 ++++-- .../assets/Scene/TestWidget.scene.meta | 11 + .../assets/Script.meta | 0 .../assets/Script/List.ts | 70 +- .../assets/Script/List.ts.meta | 11 +- .../assets/Script/ListItem.ts | 2 +- .../assets/Script/ListItem.ts.meta | 11 +- .../assets/Script/Main.ts | 0 .../assets/Script/Main.ts.meta | 11 +- .../assets/Script/TestAdaptive.ts | 0 .../assets/Script/TestAdaptive.ts.meta | 11 +- .../assets/Script/TestBag.ts | 0 .../assets/Script/TestBag.ts.meta | 11 +- .../assets/Script/TestCyclic.ts | 0 .../assets/Script/TestCyclic.ts.meta | 11 +- .../assets/Script/TestLack.ts | 0 .../assets/Script/TestLack.ts.meta | 11 +- .../assets/Script/TestPage.ts | 0 .../assets/Script/TestPage.ts.meta | 11 +- .../assets/Script/TestWidget.ts | 0 .../assets/Script/TestWidget.ts.meta | 11 +- .../assets/Texture.meta | 0 .../assets/Texture/avatar_1.png | Bin .../assets/Texture/avatar_1.png.meta | 9 +- .../assets/Texture/avatar_2.png | Bin .../assets/Texture/avatar_2.png.meta | 9 +- .../assets/Texture/avatar_bg.png | Bin .../assets/Texture/avatar_bg.png.meta | 9 +- .../assets/Texture/chat_bubble_bg_1.png | Bin .../assets/Texture/chat_bubble_bg_1.png.meta | 9 +- .../assets/Texture/chat_bubble_bg_2.png | Bin .../assets/Texture/chat_bubble_bg_2.png.meta | 9 +- .../assets/Texture/item_bg.png | Bin .../assets/Texture/item_bg.png.meta | 9 +- .../assets/Texture/item_bg_2.png | Bin .../assets/Texture/item_bg_2.png.meta | 9 +- ListDemo_3.x/assets/migrate-canvas.ts | 88 ++ ListDemo_3.x/assets/migrate-canvas.ts.meta | 9 + .../package.json | 5 +- .../settings/v2/packages/builder.json | 3 + ListDemo_3.x/settings/v2/packages/device.json | 3 + .../settings/v2/packages/engine.json | 12 +- .../settings/v2/packages/program.json | 3 + .../settings/v2/packages/project.json | 8 +- .../tsconfig.json | 0 .../assets/Scene/TestAdaptive.scene.meta | 1 - .../assets/Scene/TestBag.scene.meta | 1 - .../assets/Scene/TestCyclic.scene.meta | 1 - .../assets/Scene/TestLack.scene.meta | 1 - .../assets/Scene/TestPage.scene.meta | 1 - .../assets/Scene/TestWidget.scene.meta | 1 - .../settings/v2/packages/builder.json | 3 - README.MD | 17 +- 148 files changed, 2618 insertions(+), 1733 deletions(-) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/.gitignore (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Atlas.meta (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Atlas/chat.plist (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Atlas/chat.plist.meta (93%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Atlas/chat.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Atlas/chat.png.meta (86%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Prefab.meta (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Prefab/BagItem.prefab (91%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Prefab/BagItem.prefab.meta (91%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene.meta (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/Main.scene (91%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/Main.scene.meta (89%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/TestAdaptive.scene (86%) create mode 100644 ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/TestBag.scene (90%) create mode 100644 ListDemo_3.x/assets/Scene/TestBag.scene.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/TestCyclic.scene (92%) create mode 100644 ListDemo_3.x/assets/Scene/TestCyclic.scene.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/TestLack.scene (91%) create mode 100644 ListDemo_3.x/assets/Scene/TestLack.scene.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/TestPage.scene (90%) create mode 100644 ListDemo_3.x/assets/Scene/TestPage.scene.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Scene/TestWidget.scene (91%) create mode 100644 ListDemo_3.x/assets/Scene/TestWidget.scene.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script.meta (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/List.ts (96%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/List.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/ListItem.ts (99%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/ListItem.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/Main.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/Main.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestAdaptive.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestAdaptive.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestBag.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestBag.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestCyclic.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestCyclic.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestLack.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestLack.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestPage.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestPage.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestWidget.ts (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Script/TestWidget.ts.meta (68%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture.meta (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/avatar_1.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/avatar_1.png.meta (95%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/avatar_2.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/avatar_2.png.meta (95%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/avatar_bg.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/avatar_bg.png.meta (95%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/chat_bubble_bg_1.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/chat_bubble_bg_1.png.meta (95%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/chat_bubble_bg_2.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/chat_bubble_bg_2.png.meta (95%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/item_bg.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/item_bg.png.meta (95%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/item_bg_2.png (100%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/assets/Texture/item_bg_2.png.meta (95%) create mode 100644 ListDemo_3.x/assets/migrate-canvas.ts create mode 100644 ListDemo_3.x/assets/migrate-canvas.ts.meta rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/package.json (62%) create mode 100644 ListDemo_3.x/settings/v2/packages/builder.json create mode 100644 ListDemo_3.x/settings/v2/packages/device.json rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/settings/v2/packages/engine.json (72%) create mode 100644 ListDemo_3.x/settings/v2/packages/program.json rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/settings/v2/packages/project.json (65%) rename {ListDemo_3_0_0_Preview => ListDemo_3.x}/tsconfig.json (100%) delete mode 100644 ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene.meta delete mode 100644 ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene.meta delete mode 100644 ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene.meta delete mode 100644 ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene.meta delete mode 100644 ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene.meta delete mode 100644 ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene.meta delete mode 100644 ListDemo_3_0_0_Preview/settings/v2/packages/builder.json diff --git a/ListDemo-JS/assets/Atlas.meta b/ListDemo-JS/assets/Atlas.meta index a428122..577d06a 100644 --- a/ListDemo-JS/assets/Atlas.meta +++ b/ListDemo-JS/assets/Atlas.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "7c847296-5c5a-4df7-ac86-f03fe767c139", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-JS/assets/Atlas/chat.plist.meta b/ListDemo-JS/assets/Atlas/chat.plist.meta index 895e52d..f508733 100644 --- a/ListDemo-JS/assets/Atlas/chat.plist.meta +++ b/ListDemo-JS/assets/Atlas/chat.plist.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.4", + "ver": "1.2.6", "uuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "importer": "sprite-atlas", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "size": { "width": 509, @@ -9,8 +10,9 @@ "type": "Texture Packer", "subMetas": { "48.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "138a7161-d77a-4536-a9c5-650b3a22386a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -31,8 +33,9 @@ "subMetas": {} }, "51.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a097bf75-5bd9-46c9-9b52-74819f038b19", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -53,8 +56,9 @@ "subMetas": {} }, "49.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a22888e7-7680-4aa4-ab6a-04143483135c", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -75,8 +79,9 @@ "subMetas": {} }, "50.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "fba3c2e6-db6f-4b2a-82f5-80939828e788", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -97,8 +102,9 @@ "subMetas": {} }, "05.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "1dde66af-043a-42ad-beac-5be9368a1560", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -119,8 +125,9 @@ "subMetas": {} }, "06.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d53c8b25-c9d0-4948-a087-5914bda58bf1", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -141,8 +148,9 @@ "subMetas": {} }, "07.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "67f25e3c-b1f2-49af-8efa-d4efd4b62dd8", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -163,8 +171,9 @@ "subMetas": {} }, "08.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5ff15adb-1b62-43eb-a9dc-d61c117d4168", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -185,8 +194,9 @@ "subMetas": {} }, "09.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "213727c6-02ea-45bd-9bcf-4728ccfdf91b", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -207,8 +217,9 @@ "subMetas": {} }, "10.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "eadc668c-66ab-4066-8b50-2fbc6eaca6ac", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -229,8 +240,9 @@ "subMetas": {} }, "11.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "0982f708-9918-4586-8c32-4b791d71c75c", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -251,8 +263,9 @@ "subMetas": {} }, "12.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "02df02c0-19cf-4b31-ad71-a5aee1422e93", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -273,8 +286,9 @@ "subMetas": {} }, "13.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "dcb85c22-13b8-48df-a1ad-14fe75fafcac", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -295,8 +309,9 @@ "subMetas": {} }, "14.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "db80bb9c-eab4-48d7-bd8d-ef1623ff4901", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -317,8 +332,9 @@ "subMetas": {} }, "15.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "05bb24b7-8fc4-455a-82cd-d98ae93988e5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -339,8 +355,9 @@ "subMetas": {} }, "16.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "1e2f7a48-e2d9-4e0e-b0e9-bdb8ac19915f", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -361,8 +378,9 @@ "subMetas": {} }, "17.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d47feead-8b1b-4e35-be23-edce92c2b6ba", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -383,8 +401,9 @@ "subMetas": {} }, "18.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d2255fe8-0706-41d0-8ee9-9e1f02036a92", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -405,8 +424,9 @@ "subMetas": {} }, "19.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d73e6d5e-7b23-4028-9a67-a9ac461ed28b", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -427,8 +447,9 @@ "subMetas": {} }, "20.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "e0ce08b3-54fd-4ec6-87a7-7f1e21a07d9d", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -449,8 +470,9 @@ "subMetas": {} }, "21.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "6cafd744-78d4-4022-aecc-26eca7b1eef3", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -471,8 +493,9 @@ "subMetas": {} }, "22.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "da7c9064-9653-4d57-b583-57915c5858e0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -493,8 +516,9 @@ "subMetas": {} }, "23.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "ce666ebf-af1b-4acd-9f0e-d613a9a09363", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -515,8 +539,9 @@ "subMetas": {} }, "24.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "fa31800a-7369-4f9f-b577-6d50cfabd703", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -537,8 +562,9 @@ "subMetas": {} }, "25.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f2560a59-9b92-4219-a764-9c06e0eb0aa9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -559,8 +585,9 @@ "subMetas": {} }, "26.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "fd6b94aa-3d8e-42fa-880d-a4e4842554b5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -581,8 +608,9 @@ "subMetas": {} }, "27.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "deba925c-0676-4836-9c9a-e6c6570fc0af", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -603,8 +631,9 @@ "subMetas": {} }, "28.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "c545f6b4-0497-42a1-bdbd-fe6d08aeabf0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -625,8 +654,9 @@ "subMetas": {} }, "29.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "426dd542-016c-41b3-83ff-f1cbb562849a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -647,8 +677,9 @@ "subMetas": {} }, "30.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5e3c0962-b6d1-44df-a09e-b1628298cf02", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -669,8 +700,9 @@ "subMetas": {} }, "31.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "c287f0ef-2593-45d2-b692-a95410e55a01", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -691,8 +723,9 @@ "subMetas": {} }, "32.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "9f3bcca1-be1c-4fe9-acbc-db6e566c1595", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -713,8 +746,9 @@ "subMetas": {} }, "33.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "caaed2f7-9507-4d1c-bed4-1c5aa804ce09", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -735,8 +769,9 @@ "subMetas": {} }, "34.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "df9c6f9f-c81d-4524-bf33-76541e307182", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -757,8 +792,9 @@ "subMetas": {} }, "35.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "890a4fab-9ce9-4146-b6f2-36578897fbd9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -779,8 +815,9 @@ "subMetas": {} }, "36.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "b0be79a7-f073-4dd4-9207-5a2a8a5067b9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -801,8 +838,9 @@ "subMetas": {} }, "37.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "acd938dd-53ac-42cd-ba4b-27926a476dc5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -823,8 +861,9 @@ "subMetas": {} }, "38.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "b5ac594e-9ab3-4113-acc9-d7ebc74ac0a0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -845,8 +884,9 @@ "subMetas": {} }, "39.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d7fb7201-5cd9-424d-938d-4804f6d9cf9f", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -867,8 +907,9 @@ "subMetas": {} }, "40.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "609697e6-5c74-4343-a556-44b58f96bfcc", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -889,8 +930,9 @@ "subMetas": {} }, "41.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "2315336f-024d-483e-b128-c711da60545c", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -911,8 +953,9 @@ "subMetas": {} }, "42.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5c5f8644-58e9-4878-8654-349a53174640", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -933,8 +976,9 @@ "subMetas": {} }, "43.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "42471a30-0d8e-4de6-a5bb-0295e3d728ea", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -955,8 +999,9 @@ "subMetas": {} }, "44.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "b6c48af0-cb23-432e-8ecd-cc2cb12630a6", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -977,8 +1022,9 @@ "subMetas": {} }, "45.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f68b773c-715d-4579-853c-3e56667618f0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -999,8 +1045,9 @@ "subMetas": {} }, "46.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "ea746e41-f122-47a3-ac44-b0e1166e895a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1021,8 +1068,9 @@ "subMetas": {} }, "47.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "26a859e0-3149-4313-aab7-3f65b2ebf203", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1043,8 +1091,9 @@ "subMetas": {} }, "02.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "60aca098-959f-4849-bb2a-bc36075bcf03", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1065,8 +1114,9 @@ "subMetas": {} }, "04.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "bae5fb7e-5ddb-44ae-9947-0660c6332416", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1087,8 +1137,9 @@ "subMetas": {} }, "03.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "81b01b38-e32d-4e2b-aed6-c49d7ef2c426", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1109,8 +1160,9 @@ "subMetas": {} }, "01.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a17b2d5e-c69c-46ae-99c7-c7105f4490c8", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1131,8 +1183,9 @@ "subMetas": {} }, "52.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "ca15990c-59c5-4e6c-b7d0-8c77253da13f", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1153,8 +1206,9 @@ "subMetas": {} }, "53.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "9a9c5f84-52ec-4cd8-b7d2-fd508aa5116d", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1175,8 +1229,9 @@ "subMetas": {} }, "54.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "014c7ccd-cca4-4f2f-bde6-a74cde865f21", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1197,8 +1252,9 @@ "subMetas": {} }, "55.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "9acfafe1-a3ab-47d1-b24e-d0405167a4fb", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1219,8 +1275,9 @@ "subMetas": {} }, "56.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "43c8d22d-071e-465d-8db3-3dba888102a5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1241,8 +1298,9 @@ "subMetas": {} }, "57.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5fd2b094-1e7f-4727-bf04-f7eb5c17d09a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1263,8 +1321,9 @@ "subMetas": {} }, "58.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "07a6f553-d606-4f09-a987-c4228db3d1b5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1285,8 +1344,9 @@ "subMetas": {} }, "59.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "db57d3fe-2a4f-4834-b883-8eb83dc95c70", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1307,8 +1367,9 @@ "subMetas": {} }, "60.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "de3f1e34-a034-42be-8306-e640ebddd2e9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1329,8 +1390,9 @@ "subMetas": {} }, "61.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "470ae262-9cad-499b-aa7d-d79e4229388e", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1351,8 +1413,9 @@ "subMetas": {} }, "62.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "8e209a5a-a63f-4069-947e-5899d62de390", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1373,8 +1436,9 @@ "subMetas": {} }, "63.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "0516f081-1826-4b41-bc56-10a91a82f5dd", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Atlas/chat.png.meta b/ListDemo-JS/assets/Atlas/chat.png.meta index 89f4623..4584cf2 100644 --- a/ListDemo-JS/assets/Atlas/chat.png.meta +++ b/ListDemo-JS/assets/Atlas/chat.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "chat": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f071e169-3f63-41ea-a141-b28da6ccc99b", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Prefab.meta b/ListDemo-JS/assets/Prefab.meta index 44df1a7..aa70c47 100644 --- a/ListDemo-JS/assets/Prefab.meta +++ b/ListDemo-JS/assets/Prefab.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "e4bfef4d-17a2-48ff-953e-f9f56a37a8a3", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-JS/assets/Prefab/BagItem.prefab.meta b/ListDemo-JS/assets/Prefab/BagItem.prefab.meta index f564649..f8df58b 100644 --- a/ListDemo-JS/assets/Prefab/BagItem.prefab.meta +++ b/ListDemo-JS/assets/Prefab/BagItem.prefab.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "bf47ba0a-9d5c-4226-a3f9-ff8a6764f5cb", + "importer": "prefab", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, "readonly": false, diff --git a/ListDemo-JS/assets/Scene.meta b/ListDemo-JS/assets/Scene.meta index c54d055..80df67b 100644 --- a/ListDemo-JS/assets/Scene.meta +++ b/ListDemo-JS/assets/Scene.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "7dffc509-4147-45fb-8814-696853d6af5b", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-JS/assets/Scene/Main.fire.meta b/ListDemo-JS/assets/Scene/Main.fire.meta index bc74a47..a6f43b9 100644 --- a/ListDemo-JS/assets/Scene/Main.fire.meta +++ b/ListDemo-JS/assets/Scene/Main.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "3156d91c-e3d5-48ba-9db7-b7a795c72578", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestAdaptive.fire.meta b/ListDemo-JS/assets/Scene/TestAdaptive.fire.meta index 55f9186..2a5d990 100644 --- a/ListDemo-JS/assets/Scene/TestAdaptive.fire.meta +++ b/ListDemo-JS/assets/Scene/TestAdaptive.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "b0376683-63b8-48e1-b23b-77af85567dbc", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestBag.fire.meta b/ListDemo-JS/assets/Scene/TestBag.fire.meta index e25fef3..efe32c4 100644 --- a/ListDemo-JS/assets/Scene/TestBag.fire.meta +++ b/ListDemo-JS/assets/Scene/TestBag.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "76387f56-7712-481b-a2ec-defcb229d241", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestCyclic.fire.meta b/ListDemo-JS/assets/Scene/TestCyclic.fire.meta index 0df0edc..1ecbb93 100644 --- a/ListDemo-JS/assets/Scene/TestCyclic.fire.meta +++ b/ListDemo-JS/assets/Scene/TestCyclic.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "613928f1-e88d-4f4b-9cae-d409d22fb7fc", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestFrameByFrame.fire.meta b/ListDemo-JS/assets/Scene/TestFrameByFrame.fire.meta index 4c32a64..3691d64 100644 --- a/ListDemo-JS/assets/Scene/TestFrameByFrame.fire.meta +++ b/ListDemo-JS/assets/Scene/TestFrameByFrame.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "f4c57900-ea24-477c-bc18-048b807d8953", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestLack.fire.meta b/ListDemo-JS/assets/Scene/TestLack.fire.meta index 752f414..a129acd 100644 --- a/ListDemo-JS/assets/Scene/TestLack.fire.meta +++ b/ListDemo-JS/assets/Scene/TestLack.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "f69f7e79-f825-4f22-a409-71ca9fc1592f", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestPage.fire.meta b/ListDemo-JS/assets/Scene/TestPage.fire.meta index b677cdf..1be1c86 100644 --- a/ListDemo-JS/assets/Scene/TestPage.fire.meta +++ b/ListDemo-JS/assets/Scene/TestPage.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "bf49412c-95a6-45e0-82af-da73fdebe821", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Scene/TestWidget.fire.meta b/ListDemo-JS/assets/Scene/TestWidget.fire.meta index f1fe80c..5e5acb2 100644 --- a/ListDemo-JS/assets/Scene/TestWidget.fire.meta +++ b/ListDemo-JS/assets/Scene/TestWidget.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "d10df436-8fc4-4655-bb0a-195694815023", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-JS/assets/Script.meta b/ListDemo-JS/assets/Script.meta index 3b6a46b..0e392aa 100644 --- a/ListDemo-JS/assets/Script.meta +++ b/ListDemo-JS/assets/Script.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "8d51d17a-67c0-4965-99d0-f791bde06bcd", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-JS/assets/Script/List.js b/ListDemo-JS/assets/Script/List.js index 6c45ac4..7b8399b 100644 --- a/ListDemo-JS/assets/Script/List.js +++ b/ListDemo-JS/assets/Script/List.js @@ -1230,7 +1230,7 @@ cc.Class({ }, // 触摸时 _onTouchStart(ev, captureListeners) { - if (this._scrollView._hasNestedViewGroup(ev, captureListeners)) + if (this._scrollView.hasNestedViewGroup(ev, captureListeners)) return; this.curScrollIsTouch = true; let isMe = ev.eventPhase === cc.Event.AT_TARGET && ev.target === this.node; @@ -1261,7 +1261,7 @@ cc.Class({ _onTouchCancelled(ev, captureListeners) { let t = this; - if (t._scrollView._hasNestedViewGroup(ev, captureListeners) || ev.simulate) + if (t._scrollView.hasNestedViewGroup(ev, captureListeners) || ev.simulate) return; t._scrollPos = null; diff --git a/ListDemo-JS/assets/Script/List.js.meta b/ListDemo-JS/assets/Script/List.js.meta index 6591bdc..ab64c3e 100644 --- a/ListDemo-JS/assets/Script/List.js.meta +++ b/ListDemo-JS/assets/Script/List.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "5132cd71-288e-449f-a423-93f5b5e90b7e", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/ListItem.js.meta b/ListDemo-JS/assets/Script/ListItem.js.meta index 596c283..1e9d032 100644 --- a/ListDemo-JS/assets/Script/ListItem.js.meta +++ b/ListDemo-JS/assets/Script/ListItem.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "5a969bcd-e3db-4d01-b767-c1f7ba75f7c4", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/Main.js.meta b/ListDemo-JS/assets/Script/Main.js.meta index 90a744b..11e3a97 100644 --- a/ListDemo-JS/assets/Script/Main.js.meta +++ b/ListDemo-JS/assets/Script/Main.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "909f195f-179f-48c0-ac0e-1805f26e9823", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestAdaptive.js.meta b/ListDemo-JS/assets/Script/TestAdaptive.js.meta index 30661e3..28bfea2 100644 --- a/ListDemo-JS/assets/Script/TestAdaptive.js.meta +++ b/ListDemo-JS/assets/Script/TestAdaptive.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "3991b4c7-dfde-4600-9d62-32bf5c605c71", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestBag.js.meta b/ListDemo-JS/assets/Script/TestBag.js.meta index 5e367af..3a74d8a 100644 --- a/ListDemo-JS/assets/Script/TestBag.js.meta +++ b/ListDemo-JS/assets/Script/TestBag.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "f9e8d480-e2b1-4a21-82c7-667af1277ea3", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestCyclic.js.meta b/ListDemo-JS/assets/Script/TestCyclic.js.meta index 5acab4f..cf90d19 100644 --- a/ListDemo-JS/assets/Script/TestCyclic.js.meta +++ b/ListDemo-JS/assets/Script/TestCyclic.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "cf9d0e6e-eac7-4df2-b958-ccc5f4e1c0e8", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestFrameByFrame.js.meta b/ListDemo-JS/assets/Script/TestFrameByFrame.js.meta index 7dc8416..b84a310 100644 --- a/ListDemo-JS/assets/Script/TestFrameByFrame.js.meta +++ b/ListDemo-JS/assets/Script/TestFrameByFrame.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "31322175-7706-4e54-84eb-f2c15df83ecd", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestLack.js.meta b/ListDemo-JS/assets/Script/TestLack.js.meta index 55e9df1..eff1de1 100644 --- a/ListDemo-JS/assets/Script/TestLack.js.meta +++ b/ListDemo-JS/assets/Script/TestLack.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "94cd99b3-4d77-4a17-8284-035abe4097df", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestPage.js.meta b/ListDemo-JS/assets/Script/TestPage.js.meta index a0d23dd..bc22e17 100644 --- a/ListDemo-JS/assets/Script/TestPage.js.meta +++ b/ListDemo-JS/assets/Script/TestPage.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "49ed1508-afbb-43f2-84df-c0a4b287a3bc", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Script/TestWidget.js.meta b/ListDemo-JS/assets/Script/TestWidget.js.meta index 69d6613..35ad1f8 100644 --- a/ListDemo-JS/assets/Script/TestWidget.js.meta +++ b/ListDemo-JS/assets/Script/TestWidget.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "7fe91518-13f3-42de-ad84-da0f37242130", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/assets/Texture.meta b/ListDemo-JS/assets/Texture.meta index e1d5c64..e287392 100644 --- a/ListDemo-JS/assets/Texture.meta +++ b/ListDemo-JS/assets/Texture.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "f2224b95-27b4-4ebf-a61f-c1c15b32e22c", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-JS/assets/Texture/avatar_1.png.meta b/ListDemo-JS/assets/Texture/avatar_1.png.meta index b3389c3..b1fa1c6 100644 --- a/ListDemo-JS/assets/Texture/avatar_1.png.meta +++ b/ListDemo-JS/assets/Texture/avatar_1.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "2f9a9632-0aa3-49d5-8573-159490ee5f37", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "avatar_1": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f430abc7-0521-400a-a983-6b716781b7eb", + "importer": "sprite-frame", "rawTextureUuid": "2f9a9632-0aa3-49d5-8573-159490ee5f37", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/avatar_2.png.meta b/ListDemo-JS/assets/Texture/avatar_2.png.meta index 5c6341d..847beeb 100644 --- a/ListDemo-JS/assets/Texture/avatar_2.png.meta +++ b/ListDemo-JS/assets/Texture/avatar_2.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "dceee5f4-3757-43ca-ad3c-557684edfc05", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "avatar_2": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "2bbb113e-8f38-4cd9-87ef-94df9092fa6f", + "importer": "sprite-frame", "rawTextureUuid": "dceee5f4-3757-43ca-ad3c-557684edfc05", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/avatar_bg.png.meta b/ListDemo-JS/assets/Texture/avatar_bg.png.meta index c076fad..4dac2eb 100644 --- a/ListDemo-JS/assets/Texture/avatar_bg.png.meta +++ b/ListDemo-JS/assets/Texture/avatar_bg.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "avatar_bg": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "16c3ed3f-77e0-4ecb-bae9-3ec02ddb1f70", + "importer": "sprite-frame", "rawTextureUuid": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/chat_bubble_bg_1.png.meta b/ListDemo-JS/assets/Texture/chat_bubble_bg_1.png.meta index 6c9a8b3..de45dfc 100644 --- a/ListDemo-JS/assets/Texture/chat_bubble_bg_1.png.meta +++ b/ListDemo-JS/assets/Texture/chat_bubble_bg_1.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "chat_bubble_bg_1": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "12049451-b781-4bc3-809d-dc132eacf068", + "importer": "sprite-frame", "rawTextureUuid": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/chat_bubble_bg_2.png.meta b/ListDemo-JS/assets/Texture/chat_bubble_bg_2.png.meta index af5af05..8e96e33 100644 --- a/ListDemo-JS/assets/Texture/chat_bubble_bg_2.png.meta +++ b/ListDemo-JS/assets/Texture/chat_bubble_bg_2.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "06804507-d856-4946-866b-9862935eeb86", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "chat_bubble_bg_2": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "2282af46-374d-4a87-b689-7b523514777a", + "importer": "sprite-frame", "rawTextureUuid": "06804507-d856-4946-866b-9862935eeb86", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/item_bg.png.meta b/ListDemo-JS/assets/Texture/item_bg.png.meta index b79040c..63f4ab5 100644 --- a/ListDemo-JS/assets/Texture/item_bg.png.meta +++ b/ListDemo-JS/assets/Texture/item_bg.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "818fd5de-6524-426f-9cb5-efd8639c25fc", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "item_bg": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "62834804-4f1c-429d-ace3-2ed244a3dfed", + "importer": "sprite-frame", "rawTextureUuid": "818fd5de-6524-426f-9cb5-efd8639c25fc", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/item_bg_2.png.meta b/ListDemo-JS/assets/Texture/item_bg_2.png.meta index 6898067..00a81a9 100644 --- a/ListDemo-JS/assets/Texture/item_bg_2.png.meta +++ b/ListDemo-JS/assets/Texture/item_bg_2.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "13fd9783-8b86-4922-ac56-c6d392873a17", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "item_bg_2": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "0652424a-cad1-45f5-b91d-426815438c24", + "importer": "sprite-frame", "rawTextureUuid": "13fd9783-8b86-4922-ac56-c6d392873a17", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/Texture/selected_flag.png.meta b/ListDemo-JS/assets/Texture/selected_flag.png.meta index cd3f0c0..c33edd8 100644 --- a/ListDemo-JS/assets/Texture/selected_flag.png.meta +++ b/ListDemo-JS/assets/Texture/selected_flag.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "5ca978df-d9b4-4e16-9753-58bfb91cd661", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "selected_flag": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a4f82071-df49-4dcb-bc3f-8aa0569b283a", + "importer": "sprite-frame", "rawTextureUuid": "5ca978df-d9b4-4e16-9753-58bfb91cd661", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-JS/assets/migration.meta b/ListDemo-JS/assets/migration.meta index 6f592e1..d6880d8 100644 --- a/ListDemo-JS/assets/migration.meta +++ b/ListDemo-JS/assets/migration.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "8a64065d-3284-4a3a-a786-ba3a59ecd281", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-JS/assets/migration/use_reversed_rotateBy.js.meta b/ListDemo-JS/assets/migration/use_reversed_rotateBy.js.meta index 193e0d7..debc9ed 100644 --- a/ListDemo-JS/assets/migration/use_reversed_rotateBy.js.meta +++ b/ListDemo-JS/assets/migration/use_reversed_rotateBy.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "a4674b45-1d1d-49eb-bc8f-98c2eeaa52d6", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-JS/project.json b/ListDemo-JS/project.json index fee2d43..3005133 100644 --- a/ListDemo-JS/project.json +++ b/ListDemo-JS/project.json @@ -1,7 +1,7 @@ { "engine": "cocos-creator-js", "packages": "packages", - "version": "2.4.3", + "version": "2.4.6", "id": "39000fd3-249c-41ac-afc4-ef0da3b9d972", "isNew": false } \ No newline at end of file diff --git a/ListDemo-TS/assets/Atlas.meta b/ListDemo-TS/assets/Atlas.meta index f0b1d61..a877255 100644 --- a/ListDemo-TS/assets/Atlas.meta +++ b/ListDemo-TS/assets/Atlas.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "702b0f13-007d-4148-9854-40cc8c8973db", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-TS/assets/Atlas/chat.plist.meta b/ListDemo-TS/assets/Atlas/chat.plist.meta index 895e52d..f508733 100644 --- a/ListDemo-TS/assets/Atlas/chat.plist.meta +++ b/ListDemo-TS/assets/Atlas/chat.plist.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.4", + "ver": "1.2.6", "uuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "importer": "sprite-atlas", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "size": { "width": 509, @@ -9,8 +10,9 @@ "type": "Texture Packer", "subMetas": { "48.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "138a7161-d77a-4536-a9c5-650b3a22386a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -31,8 +33,9 @@ "subMetas": {} }, "51.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a097bf75-5bd9-46c9-9b52-74819f038b19", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -53,8 +56,9 @@ "subMetas": {} }, "49.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a22888e7-7680-4aa4-ab6a-04143483135c", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -75,8 +79,9 @@ "subMetas": {} }, "50.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "fba3c2e6-db6f-4b2a-82f5-80939828e788", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -97,8 +102,9 @@ "subMetas": {} }, "05.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "1dde66af-043a-42ad-beac-5be9368a1560", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -119,8 +125,9 @@ "subMetas": {} }, "06.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d53c8b25-c9d0-4948-a087-5914bda58bf1", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -141,8 +148,9 @@ "subMetas": {} }, "07.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "67f25e3c-b1f2-49af-8efa-d4efd4b62dd8", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -163,8 +171,9 @@ "subMetas": {} }, "08.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5ff15adb-1b62-43eb-a9dc-d61c117d4168", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -185,8 +194,9 @@ "subMetas": {} }, "09.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "213727c6-02ea-45bd-9bcf-4728ccfdf91b", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -207,8 +217,9 @@ "subMetas": {} }, "10.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "eadc668c-66ab-4066-8b50-2fbc6eaca6ac", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -229,8 +240,9 @@ "subMetas": {} }, "11.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "0982f708-9918-4586-8c32-4b791d71c75c", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -251,8 +263,9 @@ "subMetas": {} }, "12.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "02df02c0-19cf-4b31-ad71-a5aee1422e93", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -273,8 +286,9 @@ "subMetas": {} }, "13.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "dcb85c22-13b8-48df-a1ad-14fe75fafcac", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -295,8 +309,9 @@ "subMetas": {} }, "14.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "db80bb9c-eab4-48d7-bd8d-ef1623ff4901", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -317,8 +332,9 @@ "subMetas": {} }, "15.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "05bb24b7-8fc4-455a-82cd-d98ae93988e5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -339,8 +355,9 @@ "subMetas": {} }, "16.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "1e2f7a48-e2d9-4e0e-b0e9-bdb8ac19915f", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -361,8 +378,9 @@ "subMetas": {} }, "17.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d47feead-8b1b-4e35-be23-edce92c2b6ba", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -383,8 +401,9 @@ "subMetas": {} }, "18.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d2255fe8-0706-41d0-8ee9-9e1f02036a92", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -405,8 +424,9 @@ "subMetas": {} }, "19.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d73e6d5e-7b23-4028-9a67-a9ac461ed28b", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -427,8 +447,9 @@ "subMetas": {} }, "20.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "e0ce08b3-54fd-4ec6-87a7-7f1e21a07d9d", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -449,8 +470,9 @@ "subMetas": {} }, "21.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "6cafd744-78d4-4022-aecc-26eca7b1eef3", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -471,8 +493,9 @@ "subMetas": {} }, "22.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "da7c9064-9653-4d57-b583-57915c5858e0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -493,8 +516,9 @@ "subMetas": {} }, "23.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "ce666ebf-af1b-4acd-9f0e-d613a9a09363", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -515,8 +539,9 @@ "subMetas": {} }, "24.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "fa31800a-7369-4f9f-b577-6d50cfabd703", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -537,8 +562,9 @@ "subMetas": {} }, "25.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f2560a59-9b92-4219-a764-9c06e0eb0aa9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -559,8 +585,9 @@ "subMetas": {} }, "26.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "fd6b94aa-3d8e-42fa-880d-a4e4842554b5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -581,8 +608,9 @@ "subMetas": {} }, "27.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "deba925c-0676-4836-9c9a-e6c6570fc0af", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -603,8 +631,9 @@ "subMetas": {} }, "28.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "c545f6b4-0497-42a1-bdbd-fe6d08aeabf0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -625,8 +654,9 @@ "subMetas": {} }, "29.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "426dd542-016c-41b3-83ff-f1cbb562849a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -647,8 +677,9 @@ "subMetas": {} }, "30.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5e3c0962-b6d1-44df-a09e-b1628298cf02", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -669,8 +700,9 @@ "subMetas": {} }, "31.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "c287f0ef-2593-45d2-b692-a95410e55a01", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -691,8 +723,9 @@ "subMetas": {} }, "32.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "9f3bcca1-be1c-4fe9-acbc-db6e566c1595", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -713,8 +746,9 @@ "subMetas": {} }, "33.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "caaed2f7-9507-4d1c-bed4-1c5aa804ce09", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -735,8 +769,9 @@ "subMetas": {} }, "34.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "df9c6f9f-c81d-4524-bf33-76541e307182", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -757,8 +792,9 @@ "subMetas": {} }, "35.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "890a4fab-9ce9-4146-b6f2-36578897fbd9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -779,8 +815,9 @@ "subMetas": {} }, "36.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "b0be79a7-f073-4dd4-9207-5a2a8a5067b9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -801,8 +838,9 @@ "subMetas": {} }, "37.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "acd938dd-53ac-42cd-ba4b-27926a476dc5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -823,8 +861,9 @@ "subMetas": {} }, "38.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "b5ac594e-9ab3-4113-acc9-d7ebc74ac0a0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -845,8 +884,9 @@ "subMetas": {} }, "39.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "d7fb7201-5cd9-424d-938d-4804f6d9cf9f", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -867,8 +907,9 @@ "subMetas": {} }, "40.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "609697e6-5c74-4343-a556-44b58f96bfcc", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -889,8 +930,9 @@ "subMetas": {} }, "41.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "2315336f-024d-483e-b128-c711da60545c", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -911,8 +953,9 @@ "subMetas": {} }, "42.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5c5f8644-58e9-4878-8654-349a53174640", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -933,8 +976,9 @@ "subMetas": {} }, "43.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "42471a30-0d8e-4de6-a5bb-0295e3d728ea", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -955,8 +999,9 @@ "subMetas": {} }, "44.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "b6c48af0-cb23-432e-8ecd-cc2cb12630a6", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -977,8 +1022,9 @@ "subMetas": {} }, "45.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f68b773c-715d-4579-853c-3e56667618f0", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -999,8 +1045,9 @@ "subMetas": {} }, "46.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "ea746e41-f122-47a3-ac44-b0e1166e895a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1021,8 +1068,9 @@ "subMetas": {} }, "47.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "26a859e0-3149-4313-aab7-3f65b2ebf203", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1043,8 +1091,9 @@ "subMetas": {} }, "02.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "60aca098-959f-4849-bb2a-bc36075bcf03", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1065,8 +1114,9 @@ "subMetas": {} }, "04.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "bae5fb7e-5ddb-44ae-9947-0660c6332416", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1087,8 +1137,9 @@ "subMetas": {} }, "03.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "81b01b38-e32d-4e2b-aed6-c49d7ef2c426", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1109,8 +1160,9 @@ "subMetas": {} }, "01.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "a17b2d5e-c69c-46ae-99c7-c7105f4490c8", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1131,8 +1183,9 @@ "subMetas": {} }, "52.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "ca15990c-59c5-4e6c-b7d0-8c77253da13f", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1153,8 +1206,9 @@ "subMetas": {} }, "53.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "9a9c5f84-52ec-4cd8-b7d2-fd508aa5116d", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1175,8 +1229,9 @@ "subMetas": {} }, "54.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "014c7ccd-cca4-4f2f-bde6-a74cde865f21", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1197,8 +1252,9 @@ "subMetas": {} }, "55.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "9acfafe1-a3ab-47d1-b24e-d0405167a4fb", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1219,8 +1275,9 @@ "subMetas": {} }, "56.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "43c8d22d-071e-465d-8db3-3dba888102a5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1241,8 +1298,9 @@ "subMetas": {} }, "57.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "5fd2b094-1e7f-4727-bf04-f7eb5c17d09a", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1263,8 +1321,9 @@ "subMetas": {} }, "58.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "07a6f553-d606-4f09-a987-c4228db3d1b5", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1285,8 +1344,9 @@ "subMetas": {} }, "59.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "db57d3fe-2a4f-4834-b883-8eb83dc95c70", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1307,8 +1367,9 @@ "subMetas": {} }, "60.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "de3f1e34-a034-42be-8306-e640ebddd2e9", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1329,8 +1390,9 @@ "subMetas": {} }, "61.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "470ae262-9cad-499b-aa7d-d79e4229388e", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1351,8 +1413,9 @@ "subMetas": {} }, "62.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "8e209a5a-a63f-4069-947e-5899d62de390", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, @@ -1373,8 +1436,9 @@ "subMetas": {} }, "63.png": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "0516f081-1826-4b41-bc56-10a91a82f5dd", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Atlas/chat.png.meta b/ListDemo-TS/assets/Atlas/chat.png.meta index 89f4623..4584cf2 100644 --- a/ListDemo-TS/assets/Atlas/chat.png.meta +++ b/ListDemo-TS/assets/Atlas/chat.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "chat": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f071e169-3f63-41ea-a141-b28da6ccc99b", + "importer": "sprite-frame", "rawTextureUuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Prefab.meta b/ListDemo-TS/assets/Prefab.meta index e364bc0..fd61611 100644 --- a/ListDemo-TS/assets/Prefab.meta +++ b/ListDemo-TS/assets/Prefab.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "774dceb7-d2a9-42c7-92f7-32cd6afddbd5", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-TS/assets/Prefab/BagItem.prefab.meta b/ListDemo-TS/assets/Prefab/BagItem.prefab.meta index f564649..f8df58b 100644 --- a/ListDemo-TS/assets/Prefab/BagItem.prefab.meta +++ b/ListDemo-TS/assets/Prefab/BagItem.prefab.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "bf47ba0a-9d5c-4226-a3f9-ff8a6764f5cb", + "importer": "prefab", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, "readonly": false, diff --git a/ListDemo-TS/assets/Scene.meta b/ListDemo-TS/assets/Scene.meta index 952252f..ff6a21e 100644 --- a/ListDemo-TS/assets/Scene.meta +++ b/ListDemo-TS/assets/Scene.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "9fe1825b-beec-4846-89f3-84b8987a7f04", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-TS/assets/Scene/Main.fire.meta b/ListDemo-TS/assets/Scene/Main.fire.meta index bc74a47..a6f43b9 100644 --- a/ListDemo-TS/assets/Scene/Main.fire.meta +++ b/ListDemo-TS/assets/Scene/Main.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "3156d91c-e3d5-48ba-9db7-b7a795c72578", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Scene/TestAdaptive.fire.meta b/ListDemo-TS/assets/Scene/TestAdaptive.fire.meta index 55f9186..2a5d990 100644 --- a/ListDemo-TS/assets/Scene/TestAdaptive.fire.meta +++ b/ListDemo-TS/assets/Scene/TestAdaptive.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "b0376683-63b8-48e1-b23b-77af85567dbc", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Scene/TestBag.fire.meta b/ListDemo-TS/assets/Scene/TestBag.fire.meta index e25fef3..efe32c4 100644 --- a/ListDemo-TS/assets/Scene/TestBag.fire.meta +++ b/ListDemo-TS/assets/Scene/TestBag.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "76387f56-7712-481b-a2ec-defcb229d241", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Scene/TestCyclic.fire.meta b/ListDemo-TS/assets/Scene/TestCyclic.fire.meta index c50fb45..2f05f17 100644 --- a/ListDemo-TS/assets/Scene/TestCyclic.fire.meta +++ b/ListDemo-TS/assets/Scene/TestCyclic.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "0975e49e-c0f7-43b0-bd88-76b70db9e102", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Scene/TestLack.fire.meta b/ListDemo-TS/assets/Scene/TestLack.fire.meta index f759640..c7f7a1e 100644 --- a/ListDemo-TS/assets/Scene/TestLack.fire.meta +++ b/ListDemo-TS/assets/Scene/TestLack.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "f46d5adf-b852-4174-8af3-bbf8e5b80738", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Scene/TestPage.fire.meta b/ListDemo-TS/assets/Scene/TestPage.fire.meta index 44c8169..e36d70b 100644 --- a/ListDemo-TS/assets/Scene/TestPage.fire.meta +++ b/ListDemo-TS/assets/Scene/TestPage.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "a03d369a-1ced-4b88-8d7d-902ba3ce38f7", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Scene/TestWidget.fire.meta b/ListDemo-TS/assets/Scene/TestWidget.fire.meta index 4e731f8..283988d 100644 --- a/ListDemo-TS/assets/Scene/TestWidget.fire.meta +++ b/ListDemo-TS/assets/Scene/TestWidget.fire.meta @@ -1,6 +1,7 @@ { - "ver": "1.2.9", + "ver": "1.3.2", "uuid": "174bcbc5-7430-4a3a-a206-92c18b5b9f26", + "importer": "scene", "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} diff --git a/ListDemo-TS/assets/Script.meta b/ListDemo-TS/assets/Script.meta index 77625f9..b1bc981 100644 --- a/ListDemo-TS/assets/Script.meta +++ b/ListDemo-TS/assets/Script.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "b3970511-620c-4e28-bdff-af9e1f6d3b95", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-TS/assets/Script/List.ts b/ListDemo-TS/assets/Script/List.ts index f50c7bc..613b782 100644 --- a/ListDemo-TS/assets/Script/List.ts +++ b/ListDemo-TS/assets/Script/List.ts @@ -566,7 +566,6 @@ export default class List extends cc.Component { * @param {Number} dt */ _processAutoScrolling(dt: number) { - // let isAutoScrollBrake = this._scrollView._isNecessaryAutoScrollBrake(); let brakingFactor: number = 1; this._scrollView['_autoScrollAccumulatedTime'] += dt * (1 / brakingFactor); @@ -579,7 +578,6 @@ export default class List extends cc.Component { let newPosition: any = this._scrollView['_autoScrollStartPosition'].add(this._scrollView['_autoScrollTargetDelta'].mul(percentage)); let EPSILON: number = this._scrollView['getScrollEndedEventTiming'](); let reachedEnd: boolean = Math.abs(percentage - 1) <= EPSILON; - // cc.log(reachedEnd, Math.abs(percentage - 1), EPSILON) let fireEvent: boolean = Math.abs(percentage - 1) <= this._scrollView['getScrollEndedEventTiming'](); if (fireEvent && !this._scrollView['_isScrollEndedWithThresholdEventFired']) { @@ -587,27 +585,11 @@ export default class List extends cc.Component { this._scrollView['_isScrollEndedWithThresholdEventFired'] = true; } - // if (this._scrollView.elastic && !reachedEnd) { - // let brakeOffsetPosition = newPosition.sub(this._scrollView._autoScrollBrakingStartPosition); - // if (isAutoScrollBrake) { - // brakeOffsetPosition = brakeOffsetPosition.mul(brakingFactor); - // } - // newPosition = this._scrollView._autoScrollBrakingStartPosition.add(brakeOffsetPosition); - // } else { - // let moveDelta = newPosition.sub(this._scrollView.getContentPosition()); - // let outOfBoundary = this._scrollView._getHowMuchOutOfBoundary(moveDelta); - // if (!outOfBoundary.fuzzyEquals(cc.v2(0, 0), EPSILON)) { - // newPosition = newPosition.add(outOfBoundary); - // reachedEnd = true; - // } - // } - if (reachedEnd) { this._scrollView['_autoScrolling'] = false; } let deltaMove: any = newPosition.sub(this._scrollView.getContentPosition()); - // cc.log(deltaMove) this._scrollView['_moveContent'](this._scrollView['_clampDelta'](deltaMove), reachedEnd); this._scrollView['_dispatchEvent']('scrolling'); @@ -1307,7 +1289,7 @@ export default class List extends cc.Component { } // 触摸时 _onTouchStart(ev, captureListeners) { - if (this._scrollView['_hasNestedViewGroup'](ev, captureListeners)) + if (this._scrollView['hasNestedViewGroup'](ev, captureListeners)) return; this.curScrollIsTouch = true; let isMe = ev.eventPhase === cc.Event.AT_TARGET && ev.target === this.node; @@ -1338,7 +1320,7 @@ export default class List extends cc.Component { _onTouchCancelled(ev, captureListeners) { let t = this; - if (t._scrollView['_hasNestedViewGroup'](ev, captureListeners) || ev.simulate) + if (t._scrollView['hasNestedViewGroup'](ev, captureListeners) || ev.simulate) return; t._scrollPos = null; diff --git a/ListDemo-TS/assets/Script/List.ts.meta b/ListDemo-TS/assets/Script/List.ts.meta index d30e503..373edd4 100644 --- a/ListDemo-TS/assets/Script/List.ts.meta +++ b/ListDemo-TS/assets/Script/List.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "1465a2b7-05e1-4445-8bcb-31169f2a75d1", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/ListItem.ts.meta b/ListDemo-TS/assets/Script/ListItem.ts.meta index 0f95e04..84ea10c 100644 --- a/ListDemo-TS/assets/Script/ListItem.ts.meta +++ b/ListDemo-TS/assets/Script/ListItem.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "e7dc6640-60f5-4b24-ac4d-716f1a4ced49", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/Main.ts.meta b/ListDemo-TS/assets/Script/Main.ts.meta index bfa5879..950239c 100644 --- a/ListDemo-TS/assets/Script/Main.ts.meta +++ b/ListDemo-TS/assets/Script/Main.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "f9675ce2-8152-4659-9094-e74913c7a7f0", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/TestAdaptive.ts.meta b/ListDemo-TS/assets/Script/TestAdaptive.ts.meta index 30661e3..8fcd6ac 100644 --- a/ListDemo-TS/assets/Script/TestAdaptive.ts.meta +++ b/ListDemo-TS/assets/Script/TestAdaptive.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "3991b4c7-dfde-4600-9d62-32bf5c605c71", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/TestBag.ts.meta b/ListDemo-TS/assets/Script/TestBag.ts.meta index e74d563..ba24fff 100644 --- a/ListDemo-TS/assets/Script/TestBag.ts.meta +++ b/ListDemo-TS/assets/Script/TestBag.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "5fde8e18-39d6-4fb9-8e01-878bccaec997", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/TestCyclic.ts.meta b/ListDemo-TS/assets/Script/TestCyclic.ts.meta index 96bc3af..d732cd5 100644 --- a/ListDemo-TS/assets/Script/TestCyclic.ts.meta +++ b/ListDemo-TS/assets/Script/TestCyclic.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "73e9bda8-5f24-46f8-9fb5-170e4ad1aa19", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/TestLack.ts.meta b/ListDemo-TS/assets/Script/TestLack.ts.meta index 73e2e83..b1336ea 100644 --- a/ListDemo-TS/assets/Script/TestLack.ts.meta +++ b/ListDemo-TS/assets/Script/TestLack.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "25c4b6e4-5363-4843-8929-fcb8deea584e", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/TestPage.ts.meta b/ListDemo-TS/assets/Script/TestPage.ts.meta index 881d695..21bde50 100644 --- a/ListDemo-TS/assets/Script/TestPage.ts.meta +++ b/ListDemo-TS/assets/Script/TestPage.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "1f04a1e6-17dc-439e-99d3-b4a0c12ee976", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Script/TestWidget.ts.meta b/ListDemo-TS/assets/Script/TestWidget.ts.meta index 6f9992d..62a1a86 100644 --- a/ListDemo-TS/assets/Script/TestWidget.ts.meta +++ b/ListDemo-TS/assets/Script/TestWidget.ts.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "b788ccc7-5bcc-4cc2-8b03-2c5ed73400da", + "importer": "typescript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/assets/Texture.meta b/ListDemo-TS/assets/Texture.meta index 5ebc41b..87d609f 100644 --- a/ListDemo-TS/assets/Texture.meta +++ b/ListDemo-TS/assets/Texture.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "8b4b9e71-b6d1-4055-bd3e-4697c4267e20", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-TS/assets/Texture/avatar_1.png.meta b/ListDemo-TS/assets/Texture/avatar_1.png.meta index b3389c3..b1fa1c6 100644 --- a/ListDemo-TS/assets/Texture/avatar_1.png.meta +++ b/ListDemo-TS/assets/Texture/avatar_1.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "2f9a9632-0aa3-49d5-8573-159490ee5f37", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "avatar_1": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "f430abc7-0521-400a-a983-6b716781b7eb", + "importer": "sprite-frame", "rawTextureUuid": "2f9a9632-0aa3-49d5-8573-159490ee5f37", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Texture/avatar_2.png.meta b/ListDemo-TS/assets/Texture/avatar_2.png.meta index 5c6341d..847beeb 100644 --- a/ListDemo-TS/assets/Texture/avatar_2.png.meta +++ b/ListDemo-TS/assets/Texture/avatar_2.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "dceee5f4-3757-43ca-ad3c-557684edfc05", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "avatar_2": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "2bbb113e-8f38-4cd9-87ef-94df9092fa6f", + "importer": "sprite-frame", "rawTextureUuid": "dceee5f4-3757-43ca-ad3c-557684edfc05", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Texture/avatar_bg.png.meta b/ListDemo-TS/assets/Texture/avatar_bg.png.meta index c076fad..4dac2eb 100644 --- a/ListDemo-TS/assets/Texture/avatar_bg.png.meta +++ b/ListDemo-TS/assets/Texture/avatar_bg.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "avatar_bg": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "16c3ed3f-77e0-4ecb-bae9-3ec02ddb1f70", + "importer": "sprite-frame", "rawTextureUuid": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Texture/chat_bubble_bg_1.png.meta b/ListDemo-TS/assets/Texture/chat_bubble_bg_1.png.meta index 6c9a8b3..de45dfc 100644 --- a/ListDemo-TS/assets/Texture/chat_bubble_bg_1.png.meta +++ b/ListDemo-TS/assets/Texture/chat_bubble_bg_1.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "chat_bubble_bg_1": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "12049451-b781-4bc3-809d-dc132eacf068", + "importer": "sprite-frame", "rawTextureUuid": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Texture/chat_bubble_bg_2.png.meta b/ListDemo-TS/assets/Texture/chat_bubble_bg_2.png.meta index af5af05..8e96e33 100644 --- a/ListDemo-TS/assets/Texture/chat_bubble_bg_2.png.meta +++ b/ListDemo-TS/assets/Texture/chat_bubble_bg_2.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "06804507-d856-4946-866b-9862935eeb86", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "chat_bubble_bg_2": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "2282af46-374d-4a87-b689-7b523514777a", + "importer": "sprite-frame", "rawTextureUuid": "06804507-d856-4946-866b-9862935eeb86", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Texture/item_bg.png.meta b/ListDemo-TS/assets/Texture/item_bg.png.meta index b79040c..63f4ab5 100644 --- a/ListDemo-TS/assets/Texture/item_bg.png.meta +++ b/ListDemo-TS/assets/Texture/item_bg.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "818fd5de-6524-426f-9cb5-efd8639c25fc", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "item_bg": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "62834804-4f1c-429d-ace3-2ed244a3dfed", + "importer": "sprite-frame", "rawTextureUuid": "818fd5de-6524-426f-9cb5-efd8639c25fc", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/Texture/item_bg_2.png.meta b/ListDemo-TS/assets/Texture/item_bg_2.png.meta index 6898067..00a81a9 100644 --- a/ListDemo-TS/assets/Texture/item_bg_2.png.meta +++ b/ListDemo-TS/assets/Texture/item_bg_2.png.meta @@ -1,6 +1,7 @@ { - "ver": "2.3.5", + "ver": "2.3.7", "uuid": "13fd9783-8b86-4922-ac56-c6d392873a17", + "importer": "texture", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -12,8 +13,9 @@ "platformSettings": {}, "subMetas": { "item_bg_2": { - "ver": "1.0.4", + "ver": "1.0.6", "uuid": "0652424a-cad1-45f5-b91d-426815438c24", + "importer": "sprite-frame", "rawTextureUuid": "13fd9783-8b86-4922-ac56-c6d392873a17", "trimType": "auto", "trimThreshold": 1, diff --git a/ListDemo-TS/assets/migration.meta b/ListDemo-TS/assets/migration.meta index 0b1eb21..3a2e9f3 100644 --- a/ListDemo-TS/assets/migration.meta +++ b/ListDemo-TS/assets/migration.meta @@ -1,6 +1,7 @@ { - "ver": "1.1.2", + "ver": "1.1.3", "uuid": "5eae3169-24cf-45f7-9582-31503e55538f", + "importer": "folder", "isBundle": false, "bundleName": "", "priority": 1, diff --git a/ListDemo-TS/assets/migration/use_reversed_rotateBy.js.meta b/ListDemo-TS/assets/migration/use_reversed_rotateBy.js.meta index d6af22a..0adaa84 100644 --- a/ListDemo-TS/assets/migration/use_reversed_rotateBy.js.meta +++ b/ListDemo-TS/assets/migration/use_reversed_rotateBy.js.meta @@ -1,6 +1,7 @@ { - "ver": "1.0.8", + "ver": "1.1.0", "uuid": "0605df37-8f61-4027-85f3-410de176d940", + "importer": "javascript", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/ListDemo-TS/project.json b/ListDemo-TS/project.json index 6d6cbbc..7f7473f 100644 --- a/ListDemo-TS/project.json +++ b/ListDemo-TS/project.json @@ -1,7 +1,7 @@ { "engine": "cocos-creator-js", "packages": "packages", - "version": "2.4.3", + "version": "2.4.6", "id": "5c9d660b-62cf-4e47-ab0a-15c70a3986cb", "isNew": false } \ No newline at end of file diff --git a/ListDemo_3_0_0_Preview/.gitignore b/ListDemo_3.x/.gitignore similarity index 100% rename from ListDemo_3_0_0_Preview/.gitignore rename to ListDemo_3.x/.gitignore diff --git a/ListDemo_3_0_0_Preview/assets/Atlas.meta b/ListDemo_3.x/assets/Atlas.meta similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Atlas.meta rename to ListDemo_3.x/assets/Atlas.meta diff --git a/ListDemo_3_0_0_Preview/assets/Atlas/chat.plist b/ListDemo_3.x/assets/Atlas/chat.plist similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Atlas/chat.plist rename to ListDemo_3.x/assets/Atlas/chat.plist diff --git a/ListDemo_3_0_0_Preview/assets/Atlas/chat.plist.meta b/ListDemo_3.x/assets/Atlas/chat.plist.meta similarity index 93% rename from ListDemo_3_0_0_Preview/assets/Atlas/chat.plist.meta rename to ListDemo_3.x/assets/Atlas/chat.plist.meta index 1c09e33..3635297 100644 --- a/ListDemo_3_0_0_Preview/assets/Atlas/chat.plist.meta +++ b/ListDemo_3.x/assets/Atlas/chat.plist.meta @@ -32,9 +32,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -65,9 +66,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -1925,9 +1927,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -1958,9 +1961,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -1991,9 +1995,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2024,9 +2029,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2057,9 +2063,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2090,9 +2097,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2123,9 +2131,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2156,9 +2165,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2189,9 +2199,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2222,9 +2233,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2255,9 +2267,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2288,9 +2301,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2321,9 +2335,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2354,9 +2369,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2387,9 +2403,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2420,9 +2437,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2453,9 +2471,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2486,9 +2505,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2519,9 +2539,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2552,9 +2573,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2585,9 +2607,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2618,9 +2641,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2651,9 +2675,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2684,9 +2709,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2717,9 +2743,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2750,9 +2777,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2783,9 +2811,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2816,9 +2845,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2849,9 +2879,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2882,9 +2913,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2915,9 +2947,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2948,9 +2981,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -2981,9 +3015,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3014,9 +3049,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3047,9 +3083,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3080,9 +3117,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3113,9 +3151,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3146,9 +3185,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3179,9 +3219,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3212,9 +3253,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3245,9 +3287,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3278,9 +3321,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3311,9 +3355,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3344,9 +3389,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3377,9 +3423,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3410,9 +3457,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3443,9 +3491,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3476,9 +3525,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3509,9 +3559,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3542,9 +3593,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3575,9 +3627,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3608,9 +3661,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3641,9 +3695,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3674,9 +3729,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3707,9 +3763,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3740,9 +3797,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3773,9 +3831,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3806,9 +3865,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3839,9 +3899,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3872,9 +3933,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" @@ -3905,9 +3967,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b@6c48a", - "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "atlasUuid": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Atlas/chat.png b/ListDemo_3.x/assets/Atlas/chat.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Atlas/chat.png rename to ListDemo_3.x/assets/Atlas/chat.png diff --git a/ListDemo_3_0_0_Preview/assets/Atlas/chat.png.meta b/ListDemo_3.x/assets/Atlas/chat.png.meta similarity index 86% rename from ListDemo_3_0_0_Preview/assets/Atlas/chat.png.meta rename to ListDemo_3.x/assets/Atlas/chat.png.meta index c6bc728..850d3ed 100644 --- a/ListDemo_3_0_0_Preview/assets/Atlas/chat.png.meta +++ b/ListDemo_3.x/assets/Atlas/chat.png.meta @@ -27,7 +27,14 @@ "borderBottom": 0, "borderLeft": 0, "borderRight": 0, - "subMetas": {} + "subMetas": {}, + "importer": "*", + "imported": false, + "files": [], + "userData": {}, + "displayName": "", + "id": "", + "name": "" }, "6c48a": { "importer": "texture", @@ -41,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Prefab.meta b/ListDemo_3.x/assets/Prefab.meta similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Prefab.meta rename to ListDemo_3.x/assets/Prefab.meta diff --git a/ListDemo_3_0_0_Preview/assets/Prefab/BagItem.prefab b/ListDemo_3.x/assets/Prefab/BagItem.prefab similarity index 91% rename from ListDemo_3_0_0_Preview/assets/Prefab/BagItem.prefab rename to ListDemo_3.x/assets/Prefab/BagItem.prefab index c72c71e..be4725c 100644 --- a/ListDemo_3_0_0_Preview/assets/Prefab/BagItem.prefab +++ b/ListDemo_3.x/assets/Prefab/BagItem.prefab @@ -133,7 +133,7 @@ "_id": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "90QpgFVKdK7bktNa6qGbtV" }, { @@ -177,7 +177,7 @@ "_id": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e5Zs5sgyRL+7SdtmQIC190" }, { @@ -188,12 +188,7 @@ "asset": { "__id__": 0 }, - "fileId": "f1Seho5ilMkpxeQatPoMYl", - "sync": false, - "_synced": { - "default": false, - "serializable": false - } + "fileId": "f1Seho5ilMkpxeQatPoMYl" }, { "__type__": "cc.UITransform", @@ -203,7 +198,9 @@ "__id__": 1 }, "_enabled": true, - "__prefab": null, + "__prefab": { + "__id__": 11 + }, "_priority": 0, "_contentSize": { "__type__": "cc.Size", @@ -225,7 +222,9 @@ "__id__": 1 }, "_enabled": true, - "__prefab": null, + "__prefab": { + "__id__": 12 + }, "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, @@ -263,11 +262,14 @@ "asset": { "__id__": 0 }, - "fileId": "36+HhIVsdEpL8BPylnKJTb", - "sync": false, - "_synced": { - "default": false, - "serializable": false - } + "fileId": "36+HhIVsdEpL8BPylnKJTb" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5FCbelaZIp4MZLI/tayR6" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85S6a0H1dE1bzro3DXIvHf" } -] \ No newline at end of file +] diff --git a/ListDemo_3_0_0_Preview/assets/Prefab/BagItem.prefab.meta b/ListDemo_3.x/assets/Prefab/BagItem.prefab.meta similarity index 91% rename from ListDemo_3_0_0_Preview/assets/Prefab/BagItem.prefab.meta rename to ListDemo_3.x/assets/Prefab/BagItem.prefab.meta index e4476c9..9e0d5f4 100644 --- a/ListDemo_3_0_0_Preview/assets/Prefab/BagItem.prefab.meta +++ b/ListDemo_3.x/assets/Prefab/BagItem.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.23", + "ver": "1.1.27", "importer": "prefab", "imported": true, "uuid": "662a1eb5-ae9b-4491-b95f-b925e9ab3645", diff --git a/ListDemo_3_0_0_Preview/assets/Scene.meta b/ListDemo_3.x/assets/Scene.meta similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Scene.meta rename to ListDemo_3.x/assets/Scene.meta diff --git a/ListDemo_3_0_0_Preview/assets/Scene/Main.scene b/ListDemo_3.x/assets/Scene/Main.scene similarity index 91% rename from ListDemo_3_0_0_Preview/assets/Scene/Main.scene rename to ListDemo_3.x/assets/Scene/Main.scene index 7f34ac9..0b1192e 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/Main.scene +++ b/ListDemo_3.x/assets/Scene/Main.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "Main", "_objFlags": 0, "_parent": null, "_children": [ @@ -19,13 +18,13 @@ "__id__": 2 }, { - "__id__": 237 + "__id__": 239 }, { - "__id__": 238 + "__id__": 240 }, { - "__id__": 239 + "__id__": 241 } ], "_active": true, @@ -33,7 +32,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 240 + "__id__": 242 }, "_id": "d36f11f0-22ca-40c7-a27f-dc4a142fea2d" }, @@ -62,21 +61,24 @@ }, { "__id__": 161 + }, + { + "__id__": 233 } ], "_active": true, "_components": [ { - "__id__": 233 + "__id__": 235 }, { - "__id__": 234 + "__id__": 236 }, { - "__id__": 235 + "__id__": 237 }, { - "__id__": 236 + "__id__": 238 } ], "_prefab": null, @@ -99,7 +101,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -155,7 +157,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -205,7 +207,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -255,7 +257,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -311,7 +313,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -360,7 +362,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -380,7 +382,6 @@ "__prefab": { "__id__": 9 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -394,7 +395,7 @@ "_id": "aejspW9/NEJLgxbJrhnWi0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -438,7 +439,7 @@ "_id": "439eg0gqBGX6uW/gROwH60" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -510,7 +511,7 @@ "y": 1.3, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -528,7 +529,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -562,7 +562,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -617,7 +618,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -651,7 +651,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -696,7 +697,6 @@ "__prefab": { "__id__": 21 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -710,7 +710,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -723,8 +723,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -739,7 +738,10 @@ "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -753,7 +755,6 @@ "__prefab": { "__id__": 24 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -767,7 +768,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -800,7 +801,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -814,7 +815,6 @@ "__prefab": { "__id__": 28 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -828,7 +828,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -854,7 +854,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -872,7 +873,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -904,7 +905,7 @@ "_id": "57rlB/VldEK6vGdVbe0ti2" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1040,7 +1041,6 @@ "__prefab": { "__id__": 37 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -1054,7 +1054,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -1080,7 +1080,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1098,7 +1099,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -1112,7 +1113,6 @@ "__prefab": { "__id__": 41 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -1126,7 +1126,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -1152,7 +1152,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1170,7 +1171,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -1205,11 +1206,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -1320,7 +1321,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1370,7 +1371,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1420,7 +1421,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1479,7 +1480,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1528,7 +1529,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1548,7 +1549,6 @@ "__prefab": { "__id__": 57 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 11.12, @@ -1562,7 +1562,7 @@ "_id": "07/Rgwdg5Fy7ENEly7fbue" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -1606,7 +1606,7 @@ "_id": "d9R6a15uRE85ZGmWCovICK" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -1678,7 +1678,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1696,7 +1696,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -1730,7 +1729,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1785,7 +1785,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 80, @@ -1819,7 +1818,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1896,7 +1896,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -1917,7 +1918,6 @@ "__prefab": { "__id__": 70 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 90, @@ -1931,7 +1931,7 @@ "_id": "caGm6aVq5CPYJdayYW0h9P" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1944,8 +1944,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1954,13 +1953,16 @@ "_startAxis": 0, "_paddingLeft": 5, "_paddingRight": 5, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 5, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "89jmh/6QZJc57JAlkUO8Zw" }, { @@ -1974,7 +1976,6 @@ "__prefab": { "__id__": 73 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1126, @@ -1988,7 +1989,7 @@ "_id": "a0Tb8nxthIFZfH5p2gdNUO" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -2021,7 +2022,7 @@ "_id": "4edH3OAFVHE7AtyivzqdnF" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -2035,7 +2036,6 @@ "__prefab": { "__id__": 77 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1126, @@ -2049,7 +2049,7 @@ "_id": "e3UqVodOtJtrYSSYEb14+a" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -2075,7 +2075,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2093,7 +2094,7 @@ "_id": "d7OIdEn5pMboV9i7HxriZx" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -2125,7 +2126,7 @@ "_id": "cb4Nu+GqNBl5rzqmHwvBcz" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -2238,7 +2239,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2288,7 +2289,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2338,7 +2339,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2397,7 +2398,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2446,7 +2447,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2466,7 +2467,6 @@ "__prefab": { "__id__": 92 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -2480,7 +2480,7 @@ "_id": "b2NroLqv1D5qzmfen8+H0l" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -2524,7 +2524,7 @@ "_id": "8d3YRat8hJBIZVwjFd9L5k" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -2596,7 +2596,7 @@ "y": 1.3, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2614,7 +2614,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -2648,7 +2647,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -2703,7 +2703,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -2737,7 +2736,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -2814,7 +2814,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -2835,11 +2836,10 @@ "__prefab": { "__id__": 105 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 560, - "height": 188 + "height": 183 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2849,7 +2849,7 @@ "_id": "d8+NIrVh1Lvbe7HRg9LEF9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -2862,8 +2862,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 3, - "_N$padding": 0, + "_layoutType": 3, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -2871,14 +2870,17 @@ }, "_startAxis": 0, "_paddingLeft": 5, - "_paddingRight": 5, + "_paddingRight": 0, "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingBottom": 0, "_spacingX": 9.6, "_spacingY": 9.6, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "0eSuApIHpCSoQ+bzdiyf5Z" }, { @@ -2892,7 +2894,6 @@ "__prefab": { "__id__": 108 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 560, @@ -2906,7 +2907,7 @@ "_id": "c44Ok8PRVLyZNitEs9S7Nb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -2939,7 +2940,7 @@ "_id": "cc/XkUtCdCQrGKpUumbe7X" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -2953,7 +2954,6 @@ "__prefab": { "__id__": 112 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 560, @@ -2967,7 +2967,7 @@ "_id": "61RtzzZdVAu4PX2UiLmTGI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -2993,7 +2993,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -3011,7 +3012,7 @@ "_id": "cd9e1EsP1G4Zt78agG1GXM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -3043,7 +3044,7 @@ "_id": "2a4fA/NgZEAqIxgxwbQdE5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -3156,7 +3157,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3206,7 +3207,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3256,7 +3257,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3315,7 +3316,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3364,7 +3365,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3384,7 +3385,6 @@ "__prefab": { "__id__": 127 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -3398,7 +3398,7 @@ "_id": "2dt0MOOFNJ8pcDlpHOtE9V" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -3442,7 +3442,7 @@ "_id": "f9jcIMdTxByJ/Ay7/lZ/3w" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -3514,7 +3514,7 @@ "y": 1.3, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3532,7 +3532,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -3566,7 +3565,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -3621,7 +3621,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 125, @@ -3655,7 +3654,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -3732,7 +3732,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -3753,10 +3754,9 @@ "__prefab": { "__id__": 140 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", - "width": 135, + "width": 130, "height": 538 }, "_anchorPoint": { @@ -3767,7 +3767,7 @@ "_id": "289/L3GpBKS7J8UroEivjN" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -3780,23 +3780,25 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 3, - "_N$padding": 0, + "_layoutType": 3, "_cellSize": { "__type__": "cc.Size", "width": 40, "height": 40 }, "_startAxis": 1, - "_paddingLeft": 5, + "_paddingLeft": 0, "_paddingRight": 5, - "_paddingTop": 5, + "_paddingTop": 0, "_paddingBottom": 5, "_spacingX": 9.6, "_spacingY": 9.6, "_verticalDirection": 0, "_horizontalDirection": 1, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "b1avQsbw9DraUJEl/5RFDP" }, { @@ -3810,7 +3812,6 @@ "__prefab": { "__id__": 143 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 560, @@ -3824,7 +3825,7 @@ "_id": "17Hq6sHjBH2o8psMCy3e4o" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -3857,7 +3858,7 @@ "_id": "56Ofc/0I9O+4juTK61UIEa" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -3871,7 +3872,6 @@ "__prefab": { "__id__": 147 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 560, @@ -3885,7 +3885,7 @@ "_id": "77L44wLYdKsoLLsswDgaRn" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -3911,7 +3911,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -3929,7 +3930,7 @@ "_id": "aaANcJFUZBO5E/ETdV3ZuA" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -3961,7 +3962,7 @@ "_id": "07WSyeAhhCyo6IcNn9XmKe" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -4064,7 +4065,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4084,7 +4085,6 @@ "__prefab": { "__id__": 158 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -4098,7 +4098,7 @@ "_id": "cd3ODYGGNKOLfzEWpGcfWo" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cd3ODYGGNKOLfzEWpGcfWo" }, { @@ -4142,7 +4142,7 @@ "_id": "66bpkiwgBC15ekyWxw3irf" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "66bpkiwgBC15ekyWxw3irf" }, { @@ -4198,7 +4198,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4251,7 +4251,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4297,7 +4297,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4317,7 +4317,6 @@ "__prefab": { "__id__": 165 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -4331,7 +4330,7 @@ "_id": "5dbPltFflEV5knwWgEIQ9k" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -4375,7 +4374,7 @@ "_id": "cdeF8pcgRJH4hRZNURIEml" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -4389,7 +4388,6 @@ "__prefab": { "__id__": 169 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -4403,7 +4401,7 @@ "_id": "98mxzD6oZKTpNcJKkqRqPj" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -4429,7 +4427,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -4447,7 +4446,7 @@ "_id": "0btuMgxJFJw6JnGO4xRfuz" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -4497,16 +4496,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -4516,7 +4519,7 @@ "_id": "7aAsKYPE1A8IOyqvOn+tFb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -4573,7 +4576,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4619,7 +4622,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4639,7 +4642,6 @@ "__prefab": { "__id__": 178 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -4653,7 +4655,7 @@ "_id": "8cijuazZ1LubNfCPWGy1xX" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -4697,7 +4699,7 @@ "_id": "4f5LkrynpLpp4+1YiPmQIa" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -4711,7 +4713,6 @@ "__prefab": { "__id__": 182 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -4725,7 +4726,7 @@ "_id": "c6zYfL5vNABrpWTh2nLmwI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -4751,7 +4752,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -4769,7 +4771,7 @@ "_id": "e3E4Rq0D1MTIgruHlWFNs9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -4819,16 +4821,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -4838,7 +4844,7 @@ "_id": "63drV3gzVFBrBoa+42rkSx" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -4895,7 +4901,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4941,7 +4947,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -4961,7 +4967,6 @@ "__prefab": { "__id__": 191 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -4975,7 +4980,7 @@ "_id": "07GDumHNtF8ZrpWzjEd0KO" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -5019,7 +5024,7 @@ "_id": "09CO4ODGpDypkUUcx356o7" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -5033,7 +5038,6 @@ "__prefab": { "__id__": 195 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -5047,7 +5051,7 @@ "_id": "75cAoY+eRH1640h/sQCVPi" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -5073,7 +5077,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -5091,7 +5096,7 @@ "_id": "84SG++9thPgKr0KLgvpit5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -5141,16 +5146,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -5160,7 +5169,7 @@ "_id": "ac5mszTEBJOIpzwD3vc2h5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -5220,7 +5229,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -5266,7 +5275,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -5286,7 +5295,6 @@ "__prefab": { "__id__": 204 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 158, @@ -5300,7 +5308,7 @@ "_id": "b5Gz7v0zBO7pCmQKwtPpo/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "b5Gz7v0zBO7pCmQKwtPpo/" }, { @@ -5344,7 +5352,7 @@ "_id": "dcJ8jpJ/hBHoLTn/HCBc6q" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "dcJ8jpJ/hBHoLTn/HCBc6q" }, { @@ -5384,7 +5392,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -5404,7 +5412,6 @@ "__prefab": { "__id__": 209 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 158, @@ -5418,7 +5425,7 @@ "_id": "ecv7Z8Y4dNvJqUEZnpyxFD" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "ecv7Z8Y4dNvJqUEZnpyxFD" }, { @@ -5462,7 +5469,7 @@ "_id": "e3hQB7UB9Ghoi8XFB7pyOu" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e3hQB7UB9Ghoi8XFB7pyOu" }, { @@ -5476,7 +5483,6 @@ "__prefab": { "__id__": 213 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 160, @@ -5490,7 +5496,7 @@ "_id": "51YYkUvzBPXqLIKwQgwcQ7" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "51YYkUvzBPXqLIKwQgwcQ7" }, { @@ -5516,7 +5522,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941" + "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -5534,7 +5541,7 @@ "_id": "67POaO/H1Lg7f4so/DEghs" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67POaO/H1Lg7f4so/DEghs" }, { @@ -5562,7 +5569,8 @@ "_string": "20", "_tabIndex": 0, "_backgroundImage": { - "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941" + "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_inputFlag": 5, "_inputMode": 6, @@ -5570,7 +5578,7 @@ "_id": "e4/xhHI/xEZoO+9gLrqFFZ" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e4/xhHI/xEZoO+9gLrqFFZ" }, { @@ -5617,7 +5625,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -5663,7 +5671,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -5683,7 +5691,6 @@ "__prefab": { "__id__": 221 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -5697,7 +5704,7 @@ "_id": "20jOt3ycNKNJR2p8Lktew0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -5741,7 +5748,7 @@ "_id": "7epibiynNALI74eCti4muJ" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -5755,7 +5762,6 @@ "__prefab": { "__id__": 225 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -5769,7 +5775,7 @@ "_id": "bc+qKGIKxHSLWQ8lrMHOvJ" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -5795,7 +5801,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -5813,7 +5820,7 @@ "_id": "634jo7JMxMY6KAk/CNSubq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -5863,16 +5870,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -5882,7 +5893,7 @@ "_id": "b5IZGze1xF7pA8QIsGY7ET" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -5904,7 +5915,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 580, @@ -5927,8 +5937,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -5943,9 +5952,96 @@ "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "8dnPq8jwBB4JtQlCs1OWOe" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 234 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "2d5CqP6oNFmIJpYkEhsqGK" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 233 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 510.311027332705, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "a68HeviRpOZaDvYcEilOLR" + }, { "__type__": "cc.UITransform", "_name": "", @@ -5955,7 +6051,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -5977,17 +6072,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 234 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -6168,16 +6256,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 241 + "__id__": 243 }, "shadows": { - "__id__": 242 + "__id__": 244 }, "_skybox": { - "__id__": 243 + "__id__": 245 }, "fog": { - "__id__": 244 + "__id__": 246 } }, { @@ -6219,6 +6307,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3_0_0_Preview/assets/Scene/Main.scene.meta b/ListDemo_3.x/assets/Scene/Main.scene.meta similarity index 89% rename from ListDemo_3_0_0_Preview/assets/Scene/Main.scene.meta rename to ListDemo_3.x/assets/Scene/Main.scene.meta index a4b14f2..b6d4272 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/Main.scene.meta +++ b/ListDemo_3.x/assets/Scene/Main.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.23", + "ver": "1.1.27", "importer": "scene", "imported": true, "uuid": "d36f11f0-22ca-40c7-a27f-dc4a142fea2d", diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene b/ListDemo_3.x/assets/Scene/TestAdaptive.scene similarity index 86% rename from ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene rename to ListDemo_3.x/assets/Scene/TestAdaptive.scene index 7777ffb..6163643 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene +++ b/ListDemo_3.x/assets/Scene/TestAdaptive.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "TestAdaptive", "_objFlags": 0, "_parent": null, "_children": [ @@ -24,7 +23,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 122 + "__id__": 121 }, "_id": "f112229f-3983-4019-9aef-f7bd49c4ed1f" }, @@ -40,14 +39,20 @@ "__id__": 3 }, { - "__id__": 69 + "__id__": 66 }, { - "__id__": 113 + "__id__": 110 + }, + { + "__id__": 115 } ], "_active": true, "_components": [ + { + "__id__": 117 + }, { "__id__": 118 }, @@ -56,9 +61,6 @@ }, { "__id__": 120 - }, - { - "__id__": 121 } ], "_prefab": null, @@ -81,7 +83,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -105,16 +107,16 @@ "_active": true, "_components": [ { - "__id__": 45 + "__id__": 42 }, { - "__id__": 47 + "__id__": 44 }, { - "__id__": 49 + "__id__": 46 }, { - "__id__": 65 + "__id__": 62 } ], "_prefab": null, @@ -137,7 +139,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -161,10 +163,10 @@ "_active": true, "_components": [ { - "__id__": 41 + "__id__": 38 }, { - "__id__": 43 + "__id__": 40 } ], "_prefab": null, @@ -187,7 +189,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -211,10 +213,10 @@ "_active": true, "_components": [ { - "__id__": 38 + "__id__": 35 }, { - "__id__": 40 + "__id__": 37 } ], "_prefab": null, @@ -237,7 +239,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -267,17 +269,17 @@ "_active": true, "_components": [ { - "__id__": 36 + "__id__": 33 }, { - "__id__": 37 + "__id__": 34 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -5, "z": 0 }, "_lrot": { @@ -293,7 +295,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -346,7 +348,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -392,7 +394,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -412,7 +414,6 @@ "__prefab": { "__id__": 10 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 42.5, @@ -426,7 +427,7 @@ "_id": "16sw/lQMhIxpcILrq76jgz" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "16sw/lQMhIxpcILrq76jgz" }, { @@ -470,7 +471,7 @@ "_id": "e93KdmualIj7Kl+0eoAFPi" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e93KdmualIj7Kl+0eoAFPi" }, { @@ -482,10 +483,9 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", - "width": 62.5, + "width": 56.5, "height": 20 }, "_anchorPoint": { @@ -516,7 +516,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -543,23 +544,25 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, "height": 40 }, "_startAxis": 0, - "_paddingLeft": 10, - "_paddingRight": 10, + "_paddingLeft": 7, + "_paddingRight": 7, "_paddingTop": 0, "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "9cLciXFBxMXozwTEGO96cp" }, { @@ -603,7 +606,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -649,7 +652,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -669,7 +672,6 @@ "__prefab": { "__id__": 19 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 57, @@ -683,7 +685,7 @@ "_id": "ddBBLG27BFFLZpWL25Ypdp" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "ddBBLG27BFFLZpWL25Ypdp" }, { @@ -709,7 +711,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2f9a9632-0aa3-49d5-8573-159490ee5f37@f9941" + "__uuid__": "2f9a9632-0aa3-49d5-8573-159490ee5f37@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -727,7 +730,7 @@ "_id": "42VpOqNiJBlJJPgZLR+N8K" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "42VpOqNiJBlJJPgZLR+N8K" }, { @@ -739,7 +742,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 68, @@ -773,7 +775,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb@f9941" + "__uuid__": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -802,16 +805,16 @@ "__id__": 25 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 33 + "__id__": 30 }, { - "__id__": 34 + "__id__": 31 }, { - "__id__": 35 + "__id__": 32 } ], "_prefab": null, @@ -834,7 +837,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -850,73 +853,23 @@ "_parent": { "__id__": 24 }, - "_children": [ - { - "__id__": 26 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 26 }, { - "__id__": 31 + "__id__": 28 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": -108, - "y": -7, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, "y": 0, "z": 0 }, - "_id": "8cFvg/DhhIabzlX97J1s6N" - }, - { - "__type__": "cc.PrivateNode", - "_name": "RICHTEXT_CHILD", - "_objFlags": 1024, - "_parent": { - "__id__": 25 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 27 - }, - { - "__id__": 28 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -31.5, - "z": 0 - }, "_lrot": { "__type__": "cc.Quat", "x": 0, @@ -930,74 +883,14 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 }, - "_id": "09KEH82Z5ODYWyNKjDj/ns" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 26 - }, - "_enabled": true, - "__prefab": null, - "_priority": 0, - "_contentSize": { - "__type__": "cc.Size", - "width": 160, - "height": 25 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "60NSCdtcdJg4UZUt85l3Vw" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 26 - }, - "_enabled": true, - "__prefab": null, - "_visFlags": 0, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 3, - "g": 3, - "b": 3, - "a": 255 - }, - "_string": "Hello, I'm List.", - "_horizontalAlign": 0, - "_verticalAlign": 0, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "SimHei", - "_lineHeight": 25, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 2, - "_id": "d6sR/S/dhCXrYN2RJlYj5G" + "_id": "8cFvg/DhhIabzlX97J1s6N" }, { "__type__": "cc.UITransform", @@ -1008,9 +901,8 @@ }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 27 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 230, @@ -1024,7 +916,7 @@ "_id": "8bzX9NGExGJ7X3L9eWhfdL" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8bzX9NGExGJ7X3L9eWhfdL" }, { @@ -1036,7 +928,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 29 }, "_lineHeight": 25, "_string": "Hello, I'm List.", @@ -1047,15 +939,16 @@ "_font": null, "_isSystemFontUsed": true, "_userDefinedFont": null, - "_cacheMode": 0, + "_cacheMode": 2, "_imageAtlas": { - "__uuid__": "fd43d01c-efcf-4a1d-ab31-462787ebb191" + "__uuid__": "fd43d01c-efcf-4a1d-ab31-462787ebb191", + "__expectedType__": "cc.SpriteAtlas" }, "_handleTouchEvent": false, "_id": "e61i9n6wlPV7SUX1qeHnlE" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e61i9n6wlPV7SUX1qeHnlE" }, { @@ -1067,11 +960,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 260, - "height": 45.5 + "height": 31.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1101,7 +993,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a@f9941" + "__uuid__": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1128,8 +1021,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1138,13 +1030,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 7, - "_paddingBottom": 7, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "f7CgY6ozRJ1biwuxsDan2M" }, { @@ -1156,7 +1051,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 430, @@ -1195,9 +1089,8 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 36 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 430, @@ -1211,7 +1104,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1224,8 +1117,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1234,13 +1126,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 10, + "_paddingTop": 5, + "_paddingBottom": 5, "_spacingX": 0, - "_spacingY": 0, + "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -1252,9 +1147,8 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 39 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 430, @@ -1268,7 +1162,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -1280,7 +1174,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 41 }, "_visFlags": 0, "_customMaterial": null, @@ -1301,7 +1195,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -1313,9 +1207,8 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 43 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 430, @@ -1329,7 +1222,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -1341,7 +1234,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 45 }, "_visFlags": 0, "_customMaterial": null, @@ -1355,7 +1248,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1373,7 +1267,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -1385,7 +1279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 47 }, "bounceDuration": 0.23, "brake": 0.5, @@ -1400,12 +1294,12 @@ }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 51 + "__id__": 48 }, "_id": "57rlB/VldEK6vGdVbe0ti2" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1413,17 +1307,17 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 61 }, "_scrollView": { - "__id__": 49 + "__id__": 46 }, "_handle": { - "__id__": 56 + "__id__": 53 }, "_direction": 1, "_enableAutoHide": false, @@ -1437,22 +1331,22 @@ "_parent": null, "_children": [ { - "__id__": 53 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 55 }, { - "__id__": 60 + "__id__": 57 }, { - "__id__": 62 + "__id__": 59 }, { - "__id__": 51 + "__id__": 48 } ], "_prefab": null, @@ -1489,16 +1383,16 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 52 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 51 }, { - "__id__": 56 + "__id__": 53 } ], "_prefab": null, @@ -1535,13 +1429,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 52 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -1555,7 +1448,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -1563,11 +1456,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 54 }, "_visFlags": 0, "_customMaterial": null, @@ -1581,7 +1474,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1599,7 +1493,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -1607,13 +1501,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 56 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -1627,7 +1520,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -1635,11 +1528,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 58 }, "_visFlags": 0, "_customMaterial": null, @@ -1653,7 +1546,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1671,7 +1565,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -1679,11 +1573,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 60 }, "_alignFlags": 37, "_target": null, @@ -1706,11 +1600,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -1730,7 +1624,7 @@ "_slideMode": 1, "pageDistance": 0.3, "pageChangeEvent": { - "__id__": 66 + "__id__": 63 }, "_virtual": true, "cyclic": false, @@ -1739,11 +1633,11 @@ "_updateRate": 0, "frameByFrameRenderNum": 0, "renderEvent": { - "__id__": 67 + "__id__": 64 }, "selectedMode": 0, "selectedEvent": { - "__id__": 68 + "__id__": 65 }, "repeatEventSingle": false, "_id": "b0jsVqddVGkp+LrgZ/MoNz" @@ -1783,22 +1677,22 @@ }, "_children": [ { - "__id__": 70 + "__id__": 67 }, { - "__id__": 83 + "__id__": 80 }, { - "__id__": 96 + "__id__": 93 } ], "_active": true, "_components": [ { - "__id__": 109 + "__id__": 106 }, { - "__id__": 111 + "__id__": 108 } ], "_prefab": null, @@ -1821,7 +1715,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": -350, @@ -1835,23 +1729,23 @@ "_name": "btnPlus10", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 66 }, "_children": [ { - "__id__": 71 + "__id__": 68 } ], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 73 }, { - "__id__": 78 + "__id__": 75 }, { - "__id__": 80 + "__id__": 77 } ], "_prefab": null, @@ -1874,7 +1768,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1888,16 +1782,16 @@ "_name": "Label", "_objFlags": 0, "_parent": { - "__id__": 70 + "__id__": 67 }, "_children": [], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 69 }, { - "__id__": 74 + "__id__": 71 } ], "_prefab": null, @@ -1920,7 +1814,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1934,13 +1828,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 71 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 70 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -1954,7 +1847,7 @@ "_id": "92tPR7HilLArJNVpsslmJW" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "92tPR7HilLArJNVpsslmJW" }, { @@ -1962,11 +1855,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 71 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 72 }, "_visFlags": 0, "_customMaterial": null, @@ -1998,7 +1891,7 @@ "_id": "46grrig3NCXYY2LvFUV7Kp" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "46grrig3NCXYY2LvFUV7Kp" }, { @@ -2006,13 +1899,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 74 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2026,7 +1918,7 @@ "_id": "5aLil6OKlPOpQKe6rY95Gj" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5aLil6OKlPOpQKe6rY95Gj" }, { @@ -2034,11 +1926,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 76 }, "_visFlags": 0, "_customMaterial": null, @@ -2052,7 +1944,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2070,7 +1963,7 @@ "_id": "16MtqpdwFEYJw3jruhdH6N" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "16MtqpdwFEYJw3jruhdH6N" }, { @@ -2078,15 +1971,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 78 }, "clickEvents": [ { - "__id__": 82 + "__id__": 79 } ], "_interactable": true, @@ -2120,26 +2013,30 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 70 + "__id__": 67 }, "_id": "ae56ZB5hFM1av4i34O5nds" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "ae56ZB5hFM1av4i34O5nds" }, { @@ -2157,23 +2054,23 @@ "_name": "btnPlus3", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 66 }, "_children": [ { - "__id__": 84 + "__id__": 81 } ], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 86 }, { - "__id__": 91 + "__id__": 88 }, { - "__id__": 93 + "__id__": 90 } ], "_prefab": null, @@ -2196,7 +2093,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2210,16 +2107,16 @@ "_name": "Label", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 85 + "__id__": 82 }, { - "__id__": 87 + "__id__": 84 } ], "_prefab": null, @@ -2242,7 +2139,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2256,13 +2153,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 83 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2276,7 +2172,7 @@ "_id": "42Q3DhCi9Fprr3nXNN7m5l" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "92tPR7HilLArJNVpsslmJW" }, { @@ -2284,11 +2180,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 85 }, "_visFlags": 0, "_customMaterial": null, @@ -2320,7 +2216,7 @@ "_id": "1dxCYs/W9I7YB53ucAWhZM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "46grrig3NCXYY2LvFUV7Kp" }, { @@ -2328,13 +2224,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 87 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2348,7 +2243,7 @@ "_id": "59ycxuf21LqIHwniNfoi3E" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5aLil6OKlPOpQKe6rY95Gj" }, { @@ -2356,11 +2251,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 89 }, "_visFlags": 0, "_customMaterial": null, @@ -2374,7 +2269,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2392,7 +2288,7 @@ "_id": "10sSBD6qZBx7TdsxhIN1Ij" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "16MtqpdwFEYJw3jruhdH6N" }, { @@ -2400,15 +2296,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 91 }, "clickEvents": [ { - "__id__": 95 + "__id__": 92 } ], "_interactable": true, @@ -2442,26 +2338,30 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 83 + "__id__": 80 }, "_id": "15gAceCbxEFItsmeV1BuVd" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "ae56ZB5hFM1av4i34O5nds" }, { @@ -2479,23 +2379,23 @@ "_name": "btnPlus1", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 66 }, "_children": [ { - "__id__": 97 + "__id__": 94 } ], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 99 }, { - "__id__": 104 + "__id__": 101 }, { - "__id__": 106 + "__id__": 103 } ], "_prefab": null, @@ -2518,7 +2418,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2532,16 +2432,16 @@ "_name": "Label", "_objFlags": 0, "_parent": { - "__id__": 96 + "__id__": 93 }, "_children": [], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 95 }, { - "__id__": 100 + "__id__": 97 } ], "_prefab": null, @@ -2564,7 +2464,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2578,13 +2478,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 97 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 96 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2598,7 +2497,7 @@ "_id": "f16VKko0BAQrfWVEkwVvHq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "92tPR7HilLArJNVpsslmJW" }, { @@ -2606,11 +2505,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 97 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 98 }, "_visFlags": 0, "_customMaterial": null, @@ -2642,7 +2541,7 @@ "_id": "bf9WnbXiNGZJiOh1vgNWlR" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "46grrig3NCXYY2LvFUV7Kp" }, { @@ -2650,13 +2549,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 100 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2670,7 +2568,7 @@ "_id": "9bxo57HGpHyKFph8WYy9B0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5aLil6OKlPOpQKe6rY95Gj" }, { @@ -2678,11 +2576,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 102 }, "_visFlags": 0, "_customMaterial": null, @@ -2696,7 +2594,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2714,7 +2613,7 @@ "_id": "a7SV7HxTJBxZxCfUtC5w35" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "16MtqpdwFEYJw3jruhdH6N" }, { @@ -2722,15 +2621,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 104 }, "clickEvents": [ { - "__id__": 108 + "__id__": 105 } ], "_interactable": true, @@ -2764,26 +2663,30 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 96 + "__id__": 93 }, "_id": "95e8lodyJEN7NRU/I1NdEH" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "ae56ZB5hFM1av4i34O5nds" }, { @@ -2801,13 +2704,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 107 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -2821,7 +2723,7 @@ "_id": "65K6hb0txI/pRe8KFxOaaY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "65K6hb0txI/pRe8KFxOaaY" }, { @@ -2829,15 +2731,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 109 }, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -2852,11 +2753,14 @@ "_spacingY": 10, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "18glHQAkFLUb+jAMzsqKla" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "18glHQAkFLUb+jAMzsqKla" }, { @@ -2870,10 +2774,10 @@ "_active": false, "_components": [ { - "__id__": 114 + "__id__": 111 }, { - "__id__": 116 + "__id__": 113 } ], "_prefab": null, @@ -2896,7 +2800,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2910,13 +2814,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 112 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 382, @@ -2930,7 +2833,7 @@ "_id": "1f8qCoce1MyYjuxYHfjAox" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "1f8qCoce1MyYjuxYHfjAox" }, { @@ -2938,11 +2841,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 114 }, "_visFlags": 0, "_customMaterial": null, @@ -2974,9 +2877,93 @@ "_id": "84K685o0VBO5uDpOkw+e9g" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "84K685o0VBO5uDpOkw+e9g" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 116 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "9bTz8z0LREgr9dKg+dVLYX" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 115 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 544.22649140546, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "b93AbOKEhHBrNIXbS//l5g" + }, { "__type__": "cc.UITransform", "_name": "", @@ -2986,7 +2973,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -3008,17 +2994,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 116 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -3060,35 +3039,39 @@ "_enabled": true, "__prefab": null, "list": { - "__id__": 65 + "__id__": 62 }, "avatar1SF": { - "__uuid__": "2f9a9632-0aa3-49d5-8573-159490ee5f37@f9941" + "__uuid__": "2f9a9632-0aa3-49d5-8573-159490ee5f37@f9941", + "__expectedType__": "cc.SpriteFrame" }, "avatar2SF": { - "__uuid__": "dceee5f4-3757-43ca-ad3c-557684edfc05@f9941" + "__uuid__": "dceee5f4-3757-43ca-ad3c-557684edfc05@f9941", + "__expectedType__": "cc.SpriteFrame" }, "bubble1SF": { - "__uuid__": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a@f9941" + "__uuid__": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a@f9941", + "__expectedType__": "cc.SpriteFrame" }, "bubble2SF": { - "__uuid__": "06804507-d856-4946-866b-9862935eeb86@f9941" + "__uuid__": "06804507-d856-4946-866b-9862935eeb86@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_id": "ccAWBhN7ZPlJZio0+VCw6O" }, { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 123 + "__id__": 122 }, "shadows": { - "__id__": 124 + "__id__": 123 }, "_skybox": { - "__id__": 125 + "__id__": 124 }, "fog": { - "__id__": 126 + "__id__": 125 } }, { @@ -3130,6 +3113,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta b/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta new file mode 100644 index 0000000..54fc46b --- /dev/null +++ b/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.27", + "importer": "scene", + "imported": true, + "uuid": "f112229f-3983-4019-9aef-f7bd49c4ed1f", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene b/ListDemo_3.x/assets/Scene/TestBag.scene similarity index 90% rename from ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene rename to ListDemo_3.x/assets/Scene/TestBag.scene index 4fc4070..a0ef104 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene +++ b/ListDemo_3.x/assets/Scene/TestBag.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "TestBag", "_objFlags": 0, "_parent": null, "_children": [ @@ -24,7 +23,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 83 + "__id__": 85 }, "_id": "d37f29c7-f15e-47e6-97c1-6cdcdc59e24d" }, @@ -41,21 +40,24 @@ }, { "__id__": 74 + }, + { + "__id__": 79 } ], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 81 }, { - "__id__": 80 + "__id__": 82 }, { - "__id__": 81 + "__id__": 83 }, { - "__id__": 82 + "__id__": 84 } ], "_prefab": null, @@ -78,7 +80,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -134,7 +136,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -184,7 +186,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -234,7 +236,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -280,7 +282,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -298,7 +300,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 319, @@ -321,8 +322,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 3, - "_N$padding": 0, + "_layoutType": 3, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -337,7 +337,10 @@ "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "f5nDa1gLRCjJmaeV977iU2" }, { @@ -351,7 +354,6 @@ "__prefab": { "__id__": 10 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 335, @@ -365,7 +367,7 @@ "_id": "d8+NIrVh1Lvbe7HRg9LEF9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -378,8 +380,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -388,13 +389,16 @@ "_startAxis": 0, "_paddingLeft": 8, "_paddingRight": 8, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 20, "_spacingY": 9.6, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "0eSuApIHpCSoQ+bzdiyf5Z" }, { @@ -408,7 +412,6 @@ "__prefab": { "__id__": 13 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 336, @@ -422,7 +425,7 @@ "_id": "c44Ok8PRVLyZNitEs9S7Nb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -455,7 +458,7 @@ "_id": "cc/XkUtCdCQrGKpUumbe7X" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -469,7 +472,6 @@ "__prefab": { "__id__": 17 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 336, @@ -483,7 +485,7 @@ "_id": "61RtzzZdVAu4PX2UiLmTGI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -509,7 +511,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -527,7 +530,7 @@ "_id": "cd9e1EsP1G4Zt78agG1GXM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -559,7 +562,7 @@ "_id": "2a4fA/NgZEAqIxgxwbQdE5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -695,7 +698,6 @@ "__prefab": { "__id__": 26 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -709,7 +711,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -735,7 +737,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -753,7 +756,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -767,7 +770,6 @@ "__prefab": { "__id__": 30 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -781,7 +783,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -807,7 +809,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -825,7 +828,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -860,11 +863,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -1165,7 +1168,6 @@ "__prefab": { "__id__": 43 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -1179,7 +1181,7 @@ "_id": "aejspW9/NEJLgxbJrhnWi0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -1223,7 +1225,7 @@ "_id": "439eg0gqBGX6uW/gROwH60" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -1313,7 +1315,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -1347,7 +1348,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1402,7 +1404,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -1436,7 +1437,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1481,7 +1483,6 @@ "__prefab": { "__id__": 55 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1495,7 +1496,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1508,8 +1509,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1518,13 +1518,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -1538,7 +1541,6 @@ "__prefab": { "__id__": 58 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -1552,7 +1554,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -1585,7 +1587,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -1599,7 +1601,6 @@ "__prefab": { "__id__": 62 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -1613,7 +1614,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -1639,7 +1640,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1657,7 +1659,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -1722,7 +1724,7 @@ "customEventData": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1825,7 +1827,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1845,7 +1847,6 @@ "__prefab": { "__id__": 76 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 121, @@ -1859,7 +1860,7 @@ "_id": "cd3ODYGGNKOLfzEWpGcfWo" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cd3ODYGGNKOLfzEWpGcfWo" }, { @@ -1903,9 +1904,93 @@ "_id": "66bpkiwgBC15ekyWxw3irf" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "66bpkiwgBC15ekyWxw3irf" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 80 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "723vRTMwVEwKNYU+AVe3Vj" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 79 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 510.311027332705, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "adGqCx/vFKVJ20fcPgRqlW" + }, { "__type__": "cc.UITransform", "_name": "", @@ -1915,7 +2000,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -1937,17 +2021,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 80 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -1992,7 +2069,8 @@ "__id__": 70 }, "bagItem": { - "__uuid__": "662a1eb5-ae9b-4491-b95f-b925e9ab3645" + "__uuid__": "662a1eb5-ae9b-4491-b95f-b925e9ab3645", + "__expectedType__": "cc.Prefab" }, "curPage": { "__id__": 77 @@ -2002,16 +2080,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 84 + "__id__": 86 }, "shadows": { - "__id__": 85 + "__id__": 87 }, "_skybox": { - "__id__": 86 + "__id__": 88 }, "fog": { - "__id__": 87 + "__id__": 89 } }, { @@ -2053,6 +2131,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3.x/assets/Scene/TestBag.scene.meta b/ListDemo_3.x/assets/Scene/TestBag.scene.meta new file mode 100644 index 0000000..e05b70f --- /dev/null +++ b/ListDemo_3.x/assets/Scene/TestBag.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.27", + "importer": "scene", + "imported": true, + "uuid": "d37f29c7-f15e-47e6-97c1-6cdcdc59e24d", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene b/ListDemo_3.x/assets/Scene/TestCyclic.scene similarity index 92% rename from ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene rename to ListDemo_3.x/assets/Scene/TestCyclic.scene index 61b7cf1..d619ff6 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene +++ b/ListDemo_3.x/assets/Scene/TestCyclic.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "TestCyclic", "_objFlags": 0, "_parent": null, "_children": [ @@ -24,7 +23,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 167 + "__id__": 169 }, "_id": "35ae4494-fef6-45b8-a140-13ffef719850" }, @@ -47,21 +46,24 @@ }, { "__id__": 135 + }, + { + "__id__": 163 } ], "_active": true, "_components": [ { - "__id__": 163 + "__id__": 165 }, { - "__id__": 164 + "__id__": 166 }, { - "__id__": 165 + "__id__": 167 }, { - "__id__": 166 + "__id__": 168 } ], "_prefab": null, @@ -84,7 +86,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -140,7 +142,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -190,7 +192,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -240,7 +242,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -290,7 +292,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -336,7 +338,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -356,7 +358,6 @@ "__prefab": { "__id__": 9 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -370,7 +371,7 @@ "_id": "079tUxbiRDRKxhMosI8Rze" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "079tUxbiRDRKxhMosI8Rze" }, { @@ -414,7 +415,7 @@ "_id": "883Y1lygRCyJu9UP1izT6D" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "883Y1lygRCyJu9UP1izT6D" }, { @@ -426,7 +427,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 190, @@ -460,7 +460,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -488,7 +489,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -502,7 +502,7 @@ "_id": "d8+NIrVh1Lvbe7HRg9LEF9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -515,23 +515,25 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, "height": 40 }, "_startAxis": 0, - "_paddingLeft": 8, - "_paddingRight": 8, + "_paddingLeft": 0, + "_paddingRight": 0, "_paddingTop": 5, "_paddingBottom": 5, "_spacingX": 20, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "0eSuApIHpCSoQ+bzdiyf5Z" }, { @@ -545,7 +547,6 @@ "__prefab": { "__id__": 18 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 200, @@ -559,7 +560,7 @@ "_id": "c44Ok8PRVLyZNitEs9S7Nb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -592,7 +593,7 @@ "_id": "cc/XkUtCdCQrGKpUumbe7X" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -606,7 +607,6 @@ "__prefab": { "__id__": 22 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 200, @@ -620,7 +620,7 @@ "_id": "61RtzzZdVAu4PX2UiLmTGI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -646,7 +646,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -664,7 +665,7 @@ "_id": "cd9e1EsP1G4Zt78agG1GXM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -694,7 +695,7 @@ "_id": "2a4fA/NgZEAqIxgxwbQdE5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -807,7 +808,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -857,7 +858,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -907,7 +908,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -957,7 +958,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1003,7 +1004,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1023,7 +1024,6 @@ "__prefab": { "__id__": 37 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1037,7 +1037,7 @@ "_id": "f1B7adY2tMVKPhXoqwjp1a" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "079tUxbiRDRKxhMosI8Rze" }, { @@ -1081,7 +1081,7 @@ "_id": "d2fUofjdFD87MSDefPh2Ji" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "883Y1lygRCyJu9UP1izT6D" }, { @@ -1093,7 +1093,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 190, @@ -1127,7 +1126,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1155,7 +1155,6 @@ "__prefab": { "__id__": 43 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1169,7 +1168,7 @@ "_id": "28ALCnjEtA5YHCrfiDim4F" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1182,23 +1181,25 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, "height": 40 }, "_startAxis": 0, - "_paddingLeft": 8, - "_paddingRight": 8, + "_paddingLeft": 0, + "_paddingRight": 0, "_paddingTop": 5, "_paddingBottom": 5, "_spacingX": 20, "_spacingY": 5, "_verticalDirection": 0, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "8eGuHagXxL+KNzdpzZ10jn" }, { @@ -1212,7 +1213,6 @@ "__prefab": { "__id__": 46 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 200, @@ -1226,7 +1226,7 @@ "_id": "d4yvmxo7xKfr5cR1G8tEIX" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -1259,7 +1259,7 @@ "_id": "b2JLe9wwJGyYiNlSYnMtvl" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -1273,7 +1273,6 @@ "__prefab": { "__id__": 50 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 200, @@ -1287,7 +1286,7 @@ "_id": "2d5NdiHLJMr7B8I43PyFNk" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -1313,7 +1312,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1331,7 +1331,7 @@ "_id": "7aoctM2k5N2KEKXMzYR0f3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -1361,7 +1361,7 @@ "_id": "9e88y/sm9A5YwQZ9RdGAVA" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1474,7 +1474,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1524,7 +1524,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1574,7 +1574,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1624,7 +1624,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1670,7 +1670,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -1690,7 +1690,6 @@ "__prefab": { "__id__": 65 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1704,7 +1703,7 @@ "_id": "edOCLU5PVOgolmYSbOhThD" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "079tUxbiRDRKxhMosI8Rze" }, { @@ -1748,7 +1747,7 @@ "_id": "ef6boWDodF1rn2VuZiAARy" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "883Y1lygRCyJu9UP1izT6D" }, { @@ -1760,7 +1759,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -1794,7 +1792,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1822,7 +1821,6 @@ "__prefab": { "__id__": 71 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 110, @@ -1836,7 +1834,7 @@ "_id": "8dvQrVHnFDc7qo1v8OJda5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1849,8 +1847,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1859,13 +1856,16 @@ "_startAxis": 0, "_paddingLeft": 5, "_paddingRight": 5, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 5, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "c9/8hS/lhPqK1+MhMDSpu5" }, { @@ -1879,7 +1879,6 @@ "__prefab": { "__id__": 74 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 480, @@ -1893,7 +1892,7 @@ "_id": "b9jUbq821ApYoD99zf0al1" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -1926,7 +1925,7 @@ "_id": "c75b+7NLRHpYN3KgjoDZKV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -1940,7 +1939,6 @@ "__prefab": { "__id__": 78 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 480, @@ -1954,7 +1952,7 @@ "_id": "aaA+Eh+yxISaeQ6beqIy6D" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -1980,7 +1978,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1998,7 +1997,7 @@ "_id": "88qqkP7WBLCI251XAyvtxO" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -2030,7 +2029,7 @@ "_id": "b9JMfgNqNKuZ3IsqdkhkK6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -2166,7 +2165,6 @@ "__prefab": { "__id__": 87 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -2180,7 +2178,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -2206,7 +2204,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2224,7 +2223,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -2238,7 +2237,6 @@ "__prefab": { "__id__": 91 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -2252,7 +2250,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -2278,7 +2276,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2296,7 +2295,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -2331,11 +2330,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -2636,7 +2635,6 @@ "__prefab": { "__id__": 104 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -2650,7 +2648,7 @@ "_id": "aejspW9/NEJLgxbJrhnWi0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -2694,7 +2692,7 @@ "_id": "439eg0gqBGX6uW/gROwH60" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -2784,7 +2782,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -2818,7 +2815,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -2873,7 +2871,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -2907,7 +2904,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -2952,7 +2950,6 @@ "__prefab": { "__id__": 116 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -2966,7 +2963,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -2979,8 +2976,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -2989,13 +2985,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -3009,7 +3008,6 @@ "__prefab": { "__id__": 119 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -3023,7 +3021,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -3056,7 +3054,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -3070,7 +3068,6 @@ "__prefab": { "__id__": 123 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -3084,7 +3081,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -3110,7 +3107,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -3128,7 +3126,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -3193,7 +3191,7 @@ "customEventData": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -3306,7 +3304,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3356,7 +3354,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3406,7 +3404,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3456,7 +3454,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3502,7 +3500,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3522,7 +3520,6 @@ "__prefab": { "__id__": 141 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -3536,7 +3533,7 @@ "_id": "1eGnziEhZPZb3q9q8SZTgh" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "079tUxbiRDRKxhMosI8Rze" }, { @@ -3580,7 +3577,7 @@ "_id": "7ciQvHGRJDc6VIY7nsAt6C" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "883Y1lygRCyJu9UP1izT6D" }, { @@ -3592,7 +3589,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -3626,7 +3622,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -3654,7 +3651,6 @@ "__prefab": { "__id__": 147 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 110, @@ -3668,7 +3664,7 @@ "_id": "0c+Hx8yEdEZJ4cMBbN4vt+" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -3681,8 +3677,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -3691,13 +3686,16 @@ "_startAxis": 0, "_paddingLeft": 5, "_paddingRight": 5, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 5, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 1, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "acm4yYIepJ7Y0Vn4FGFwwn" }, { @@ -3711,7 +3709,6 @@ "__prefab": { "__id__": 150 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 480, @@ -3725,7 +3722,7 @@ "_id": "60L0J9FbZMFa3nZgU8Urt4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -3758,7 +3755,7 @@ "_id": "f6byc1HhlIjrTIxAWBF4+2" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -3772,7 +3769,6 @@ "__prefab": { "__id__": 154 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 480, @@ -3786,7 +3782,7 @@ "_id": "26sOrty6tKBIaua4uqZUkd" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -3812,7 +3808,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941" + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -3830,7 +3827,7 @@ "_id": "37xZwydKBJ2LGe6S3GrpZQ" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -3862,7 +3859,7 @@ "_id": "93vaaMUJVFd4XMTUeAHnT1" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -3928,6 +3925,90 @@ "handler": "onPageChange", "customEventData": "" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 164 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "86Ogy7h+FNBq5NYfpnswNG" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 163 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 510.311027332705, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "20n7tV3l1G7LNYlq44g9PR" + }, { "__type__": "cc.UITransform", "_name": "", @@ -3937,7 +4018,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -3959,17 +4039,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 164 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -4027,16 +4100,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 168 + "__id__": 170 }, "shadows": { - "__id__": 169 + "__id__": 171 }, "_skybox": { - "__id__": 170 + "__id__": 172 }, "fog": { - "__id__": 171 + "__id__": 173 } }, { @@ -4078,6 +4151,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta b/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta new file mode 100644 index 0000000..02fdfaa --- /dev/null +++ b/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.27", + "importer": "scene", + "imported": true, + "uuid": "35ae4494-fef6-45b8-a140-13ffef719850", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene b/ListDemo_3.x/assets/Scene/TestLack.scene similarity index 91% rename from ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene rename to ListDemo_3.x/assets/Scene/TestLack.scene index 0653467..4a34534 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene +++ b/ListDemo_3.x/assets/Scene/TestLack.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "TestLack", "_objFlags": 0, "_parent": null, "_children": [ @@ -24,7 +23,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 125 + "__id__": 127 }, "_id": "5dba259c-5917-46df-a0fd-317aaf1072e4" }, @@ -41,21 +40,24 @@ }, { "__id__": 86 + }, + { + "__id__": 121 } ], "_active": true, "_components": [ { - "__id__": 121 + "__id__": 123 }, { - "__id__": 122 + "__id__": 124 }, { - "__id__": 123 + "__id__": 125 }, { - "__id__": 124 + "__id__": 126 } ], "_prefab": null, @@ -78,7 +80,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -134,7 +136,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -184,7 +186,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -234,7 +236,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -293,7 +295,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -342,7 +344,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -362,7 +364,6 @@ "__prefab": { "__id__": 9 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 11.12, @@ -376,7 +377,7 @@ "_id": "bb9vqn3lJJX5j2lZzVorgx" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -420,7 +421,7 @@ "_id": "21lUS9NlFKL4yDSLbwprPb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -492,7 +493,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -510,7 +511,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -544,7 +544,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -599,7 +600,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 80, @@ -633,7 +633,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -710,7 +711,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -731,10 +733,9 @@ "__prefab": { "__id__": 22 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", - "width": 90, + "width": 85, "height": 0 }, "_anchorPoint": { @@ -745,7 +746,7 @@ "_id": "d8+NIrVh1Lvbe7HRg9LEF9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -758,23 +759,25 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, "height": 40 }, "_startAxis": 0, - "_paddingLeft": 5, + "_paddingLeft": 0, "_paddingRight": 5, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 5, "_spacingY": 9.6, "_verticalDirection": 1, "_horizontalDirection": 1, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "0eSuApIHpCSoQ+bzdiyf5Z" }, { @@ -788,7 +791,6 @@ "__prefab": { "__id__": 25 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 640, @@ -802,7 +804,7 @@ "_id": "c44Ok8PRVLyZNitEs9S7Nb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -835,7 +837,7 @@ "_id": "cc/XkUtCdCQrGKpUumbe7X" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -849,7 +851,6 @@ "__prefab": { "__id__": 29 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 640, @@ -863,7 +864,7 @@ "_id": "61RtzzZdVAu4PX2UiLmTGI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -889,7 +890,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -907,7 +909,7 @@ "_id": "cd9e1EsP1G4Zt78agG1GXM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -939,7 +941,7 @@ "_id": "2a4fA/NgZEAqIxgxwbQdE5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1075,7 +1077,6 @@ "__prefab": { "__id__": 38 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -1089,7 +1090,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -1115,7 +1116,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1133,7 +1135,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -1147,7 +1149,6 @@ "__prefab": { "__id__": 42 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -1161,7 +1162,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -1187,7 +1188,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1205,7 +1207,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -1240,11 +1242,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -1545,7 +1547,6 @@ "__prefab": { "__id__": 55 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -1559,7 +1560,7 @@ "_id": "aejspW9/NEJLgxbJrhnWi0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -1603,7 +1604,7 @@ "_id": "439eg0gqBGX6uW/gROwH60" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -1693,7 +1694,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -1727,7 +1727,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1782,7 +1783,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -1816,7 +1816,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1861,7 +1862,6 @@ "__prefab": { "__id__": 67 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1875,7 +1875,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1888,8 +1888,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1898,13 +1897,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -1918,7 +1920,6 @@ "__prefab": { "__id__": 70 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -1932,7 +1933,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -1965,7 +1966,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -1979,7 +1980,6 @@ "__prefab": { "__id__": 74 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -1993,7 +1993,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -2019,7 +2019,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2037,7 +2038,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -2102,7 +2103,7 @@ "customEventData": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -2215,7 +2216,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2265,7 +2266,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2315,7 +2316,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2374,7 +2375,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2423,7 +2424,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2443,7 +2444,6 @@ "__prefab": { "__id__": 92 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 11.12, @@ -2457,7 +2457,7 @@ "_id": "abO5bZ5RZP2qdiQ4Di5/my" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -2501,7 +2501,7 @@ "_id": "83E1rLmh5L871ZIRuFuCVm" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -2573,7 +2573,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2591,7 +2591,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -2625,7 +2624,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -2680,7 +2680,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 80, @@ -2714,7 +2713,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -2791,7 +2791,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -2812,11 +2813,10 @@ "__prefab": { "__id__": 105 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, - "height": 120 + "height": 115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2826,7 +2826,7 @@ "_id": "d6roa3lZVA677KsN7D1fC7" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -2839,23 +2839,25 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, "height": 40 }, "_startAxis": 0, - "_paddingLeft": 8, - "_paddingRight": 8, + "_paddingLeft": 0, + "_paddingRight": 0, "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingBottom": 0, "_spacingX": 20, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "40wCney+1PkLWW6Iw4PEDf" }, { @@ -2869,7 +2871,6 @@ "__prefab": { "__id__": 108 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 90, @@ -2883,7 +2884,7 @@ "_id": "954GDOezhLP5OfMj9yjbwf" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -2916,7 +2917,7 @@ "_id": "2dpOEm3SpOkrbCRSUlEFps" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -2930,7 +2931,6 @@ "__prefab": { "__id__": 112 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 90, @@ -2944,7 +2944,7 @@ "_id": "5csadN96lInL8QKi5ey4ok" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -2970,7 +2970,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2988,7 +2989,7 @@ "_id": "8eUPnXR51GZ5RKiArmSSzI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -3020,7 +3021,7 @@ "_id": "05/j4EJrlMkpiJO2G2b/Yr" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -3086,6 +3087,90 @@ "handler": "onPageChange", "customEventData": "" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 122 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "72FopkZFVMoZ+CwyHF5rDX" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 121 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 510.311027332705, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "bfWru0RZFBVoqjnmZmhpzC" + }, { "__type__": "cc.UITransform", "_name": "", @@ -3095,7 +3180,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -3117,17 +3201,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 122 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -3179,16 +3256,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 126 + "__id__": 128 }, "shadows": { - "__id__": 127 + "__id__": 129 }, "_skybox": { - "__id__": 128 + "__id__": 130 }, "fog": { - "__id__": 129 + "__id__": 131 } }, { @@ -3230,6 +3307,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3.x/assets/Scene/TestLack.scene.meta b/ListDemo_3.x/assets/Scene/TestLack.scene.meta new file mode 100644 index 0000000..d0b659e --- /dev/null +++ b/ListDemo_3.x/assets/Scene/TestLack.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.27", + "importer": "scene", + "imported": true, + "uuid": "5dba259c-5917-46df-a0fd-317aaf1072e4", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene b/ListDemo_3.x/assets/Scene/TestPage.scene similarity index 90% rename from ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene rename to ListDemo_3.x/assets/Scene/TestPage.scene index c90a1ab..490c70c 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene +++ b/ListDemo_3.x/assets/Scene/TestPage.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "TestPage", "_objFlags": 0, "_parent": null, "_children": [ @@ -24,7 +23,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 148 + "__id__": 150 }, "_id": "d9b16f90-48e7-476f-bb72-1fefa4de298e" }, @@ -41,21 +40,24 @@ }, { "__id__": 85 + }, + { + "__id__": 144 } ], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 146 }, { - "__id__": 145 + "__id__": 147 }, { - "__id__": 146 + "__id__": 148 }, { - "__id__": 147 + "__id__": 149 } ], "_prefab": null, @@ -78,7 +80,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -134,7 +136,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -184,7 +186,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -234,7 +236,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -293,7 +295,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -342,7 +344,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -362,7 +364,6 @@ "__prefab": { "__id__": 9 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 55.62, @@ -376,7 +377,7 @@ "_id": "93RYCOCFVFuLWjQO8gwDi1" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -420,7 +421,7 @@ "_id": "3a0h1kN8dGVq26HXcb6MOT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -489,7 +490,7 @@ "y": 1.3, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -507,7 +508,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -541,7 +541,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -567,7 +568,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 590, @@ -601,7 +601,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -678,7 +679,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -699,7 +701,6 @@ "__prefab": { "__id__": 21 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 600, @@ -713,7 +714,7 @@ "_id": "d8+NIrVh1Lvbe7HRg9LEF9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -726,8 +727,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -736,13 +736,16 @@ "_startAxis": 0, "_paddingLeft": 5, "_paddingRight": 5, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 5, "_spacingY": 9.6, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "0eSuApIHpCSoQ+bzdiyf5Z" }, { @@ -756,7 +759,6 @@ "__prefab": { "__id__": 24 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 600, @@ -770,7 +772,7 @@ "_id": "c44Ok8PRVLyZNitEs9S7Nb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -803,7 +805,7 @@ "_id": "cc/XkUtCdCQrGKpUumbe7X" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -817,7 +819,6 @@ "__prefab": { "__id__": 28 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 600, @@ -831,7 +832,7 @@ "_id": "61RtzzZdVAu4PX2UiLmTGI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -857,7 +858,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -875,7 +877,7 @@ "_id": "cd9e1EsP1G4Zt78agG1GXM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -907,7 +909,7 @@ "_id": "2a4fA/NgZEAqIxgxwbQdE5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1043,7 +1045,6 @@ "__prefab": { "__id__": 37 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -1057,7 +1058,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -1083,7 +1084,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1101,7 +1103,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -1115,7 +1117,6 @@ "__prefab": { "__id__": 41 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -1129,7 +1130,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -1155,7 +1156,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1173,7 +1175,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -1208,11 +1210,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -1513,7 +1515,6 @@ "__prefab": { "__id__": 54 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -1527,7 +1528,7 @@ "_id": "aejspW9/NEJLgxbJrhnWi0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -1571,7 +1572,7 @@ "_id": "439eg0gqBGX6uW/gROwH60" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -1661,7 +1662,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -1695,7 +1695,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1750,7 +1751,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -1784,7 +1784,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1829,7 +1830,6 @@ "__prefab": { "__id__": 66 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1843,7 +1843,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1856,8 +1856,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1866,13 +1865,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -1886,7 +1888,6 @@ "__prefab": { "__id__": 69 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -1900,7 +1901,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -1933,7 +1934,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -1947,7 +1948,6 @@ "__prefab": { "__id__": 73 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -1961,7 +1961,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -1987,7 +1987,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2005,7 +2006,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -2070,7 +2071,7 @@ "customEventData": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -2186,7 +2187,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2239,7 +2240,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2285,7 +2286,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2305,7 +2306,6 @@ "__prefab": { "__id__": 89 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2319,7 +2319,7 @@ "_id": "76nfgE+UlNyI3p54PmhzSx" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -2363,7 +2363,7 @@ "_id": "f3c9gmfA5H/4cMcCK5LpbE" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -2377,7 +2377,6 @@ "__prefab": { "__id__": 93 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2391,7 +2390,7 @@ "_id": "c2us9PF+tI+qWNJX2eA4TI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -2417,7 +2416,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2435,7 +2435,7 @@ "_id": "eejWgbg/BAn74/9Agg2+Z5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -2485,16 +2485,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -2504,7 +2508,7 @@ "_id": "ddBUw4UnFKxbcAlpX3JU9y" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -2561,7 +2565,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2607,7 +2611,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2627,7 +2631,6 @@ "__prefab": { "__id__": 102 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2641,7 +2644,7 @@ "_id": "ceVajHMItJ25Cov76m+WCK" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -2685,7 +2688,7 @@ "_id": "27mOgELpVEQa4OJNHtJ36y" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -2699,7 +2702,6 @@ "__prefab": { "__id__": 106 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2713,7 +2715,7 @@ "_id": "84DDUCBh5IYr3gTwRpirMh" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -2739,7 +2741,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2757,7 +2760,7 @@ "_id": "2amUKOtxJJt5wmwNCLmmBI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -2807,16 +2810,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -2826,7 +2833,7 @@ "_id": "f2TmscVsVArIdDUSnF/RXD" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -2886,7 +2893,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2932,7 +2939,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -2952,7 +2959,6 @@ "__prefab": { "__id__": 115 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 158, @@ -2966,7 +2972,7 @@ "_id": "beXxTHV4xIfpfhDnsMhyfQ" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "b5Gz7v0zBO7pCmQKwtPpo/" }, { @@ -3010,7 +3016,7 @@ "_id": "62GgDiThdFmZHkBatbmc6A" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "dcJ8jpJ/hBHoLTn/HCBc6q" }, { @@ -3050,7 +3056,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3070,7 +3076,6 @@ "__prefab": { "__id__": 120 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 158, @@ -3084,7 +3089,7 @@ "_id": "ae+nfCw5pGv5lYTtbr9vnE" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "ecv7Z8Y4dNvJqUEZnpyxFD" }, { @@ -3128,7 +3133,7 @@ "_id": "03nXJ9tIxDfbf5XM6qF2Xs" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e3hQB7UB9Ghoi8XFB7pyOu" }, { @@ -3142,7 +3147,6 @@ "__prefab": { "__id__": 124 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 160, @@ -3156,7 +3160,7 @@ "_id": "56G8M8rzZJMIVRj4z04jCI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "51YYkUvzBPXqLIKwQgwcQ7" }, { @@ -3182,7 +3186,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941" + "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -3200,7 +3205,7 @@ "_id": "827VgflYxDG5vOWrqo7uxh" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67POaO/H1Lg7f4so/DEghs" }, { @@ -3228,7 +3233,8 @@ "_string": "10", "_tabIndex": 0, "_backgroundImage": { - "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941" + "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_inputFlag": 5, "_inputMode": 6, @@ -3236,7 +3242,7 @@ "_id": "4e2LIdl0hKtbkDIwAkMjOz" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "e4/xhHI/xEZoO+9gLrqFFZ" }, { @@ -3283,7 +3289,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3329,7 +3335,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -3349,7 +3355,6 @@ "__prefab": { "__id__": 132 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -3363,7 +3368,7 @@ "_id": "a15bMF8i1AWJozoSUl85cZ" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "5dbPltFflEV5knwWgEIQ9k" }, { @@ -3407,7 +3412,7 @@ "_id": "f0HF9E4XZDHLa6uRRkONaH" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "cdeF8pcgRJH4hRZNURIEml" }, { @@ -3421,7 +3426,6 @@ "__prefab": { "__id__": 136 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -3435,7 +3439,7 @@ "_id": "71O2a8dp5F3ZSHJBz/GKmP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "98mxzD6oZKTpNcJKkqRqPj" }, { @@ -3461,7 +3465,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -3479,7 +3484,7 @@ "_id": "a1RxigZRpAP76K3gXodx5b" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "0btuMgxJFJw6JnGO4xRfuz" }, { @@ -3529,16 +3534,20 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941" + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941" + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941" + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, "_zoomScale": 1.2, @@ -3548,7 +3557,7 @@ "_id": "a4BkjlVglJQbOYBpRq4T32" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "7aAsKYPE1A8IOyqvOn+tFb" }, { @@ -3570,7 +3579,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 475, @@ -3593,8 +3601,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -3609,9 +3616,96 @@ "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "80y4t6vK1I+p6k1mZWhIDT" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 145 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "eao//krE5IVL+eCd/y+nT7" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 144 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 510.311027332705, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "5dQts1rihMBJ6wXYH236ba" + }, { "__type__": "cc.UITransform", "_name": "", @@ -3621,7 +3715,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -3643,17 +3736,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 145 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -3705,16 +3791,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 149 + "__id__": 151 }, "shadows": { - "__id__": 150 + "__id__": 152 }, "_skybox": { - "__id__": 151 + "__id__": 153 }, "fog": { - "__id__": 152 + "__id__": 154 } }, { @@ -3756,6 +3842,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3.x/assets/Scene/TestPage.scene.meta b/ListDemo_3.x/assets/Scene/TestPage.scene.meta new file mode 100644 index 0000000..4a8cdd1 --- /dev/null +++ b/ListDemo_3.x/assets/Scene/TestPage.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.27", + "importer": "scene", + "imported": true, + "uuid": "d9b16f90-48e7-476f-bb72-1fefa4de298e", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene b/ListDemo_3.x/assets/Scene/TestWidget.scene similarity index 91% rename from ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene rename to ListDemo_3.x/assets/Scene/TestWidget.scene index a371b9f..6dd641f 100644 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene +++ b/ListDemo_3.x/assets/Scene/TestWidget.scene @@ -6,12 +6,11 @@ "_native": "", "scene": { "__id__": 1 - }, - "asyncLoadAssets": false + } }, { "__type__": "cc.Scene", - "_name": "", + "_name": "TestWidget", "_objFlags": 0, "_parent": null, "_children": [ @@ -24,7 +23,7 @@ "_prefab": null, "autoReleaseAssets": false, "_globals": { - "__id__": 94 + "__id__": 96 }, "_id": "82cfa3a0-b8fa-4de2-b0c7-5efa1174bb49" }, @@ -38,21 +37,24 @@ "_children": [ { "__id__": 3 + }, + { + "__id__": 90 } ], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 92 }, { - "__id__": 91 + "__id__": 93 }, { - "__id__": 92 + "__id__": 94 }, { - "__id__": 93 + "__id__": 95 } ], "_prefab": null, @@ -75,7 +77,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -134,7 +136,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -187,7 +189,7 @@ "y": 1, "z": 1 }, - "_layer": -301989889, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -240,7 +242,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -302,7 +304,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -351,7 +353,7 @@ "y": 1, "z": 1 }, - "_layer": 33554432, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -371,7 +373,6 @@ "__prefab": { "__id__": 9 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -385,7 +386,7 @@ "_id": "bb9vqn3lJJX5j2lZzVorgx" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -429,7 +430,7 @@ "_id": "21lUS9NlFKL4yDSLbwprPb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -501,7 +502,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 524288, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -519,7 +520,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -553,7 +553,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -608,7 +609,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -642,7 +642,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -719,7 +720,8 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": null, "_pressedSprite": null, @@ -769,7 +771,6 @@ "__prefab": { "__id__": 23 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 110, @@ -783,7 +784,7 @@ "_id": "d8+NIrVh1Lvbe7HRg9LEF9" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -796,8 +797,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 1, - "_N$padding": 0, + "_layoutType": 1, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -806,13 +806,16 @@ "_startAxis": 0, "_paddingLeft": 5, "_paddingRight": 5, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 5, "_spacingY": 9.6, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "0eSuApIHpCSoQ+bzdiyf5Z" }, { @@ -855,7 +858,6 @@ "__prefab": { "__id__": 27 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1270, @@ -869,7 +871,7 @@ "_id": "c44Ok8PRVLyZNitEs9S7Nb" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -902,7 +904,7 @@ "_id": "cc/XkUtCdCQrGKpUumbe7X" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -945,7 +947,6 @@ "__prefab": { "__id__": 32 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1270, @@ -959,7 +960,7 @@ "_id": "61RtzzZdVAu4PX2UiLmTGI" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -985,7 +986,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1003,7 +1005,7 @@ "_id": "cd9e1EsP1G4Zt78agG1GXM" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -1035,7 +1037,7 @@ "_id": "2a4fA/NgZEAqIxgxwbQdE5" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -1171,7 +1173,6 @@ "__prefab": { "__id__": 41 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 10, @@ -1185,7 +1186,7 @@ "_id": "57aABLW65L2qqsT1XNl8RT" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57aABLW65L2qqsT1XNl8RT" }, { @@ -1211,7 +1212,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941" + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1229,7 +1231,7 @@ "_id": "25I+N/W5RF6qpwJ6pGNkz6" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "25I+N/W5RF6qpwJ6pGNkz6" }, { @@ -1243,7 +1245,6 @@ "__prefab": { "__id__": 45 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 12, @@ -1257,7 +1258,7 @@ "_id": "f73m1ajGdEiLqvHOAICsq/" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "f73m1ajGdEiLqvHOAICsq/" }, { @@ -1283,7 +1284,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941" + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -1301,7 +1303,7 @@ "_id": "50RolHD+ZLp7EcPV5PL7S4" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "50RolHD+ZLp7EcPV5PL7S4" }, { @@ -1336,11 +1338,11 @@ "_id": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "36UjU0GrNL6ZQFAoziywTq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52Lr1ENkBB9LIACIRWPkKX" }, { @@ -1641,7 +1643,6 @@ "__prefab": { "__id__": 58 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 22.25, @@ -1655,7 +1656,7 @@ "_id": "aejspW9/NEJLgxbJrhnWi0" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "aejspW9/NEJLgxbJrhnWi0" }, { @@ -1699,7 +1700,7 @@ "_id": "439eg0gqBGX6uW/gROwH60" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "439eg0gqBGX6uW/gROwH60" }, { @@ -1789,7 +1790,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -1823,7 +1823,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941" + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1878,7 +1879,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 130, @@ -1912,7 +1912,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941" + "__uuid__": "df2c8964-aba1-47a1-82e2-1381a292802e@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1957,7 +1958,6 @@ "__prefab": { "__id__": 70 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 0, @@ -1971,7 +1971,7 @@ "_id": "6dBfpaklJJG4M7kWgJK4OP" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6dBfpaklJJG4M7kWgJK4OP" }, { @@ -1984,8 +1984,7 @@ "_enabled": true, "__prefab": null, "_resizeMode": 1, - "_N$layoutType": 2, - "_N$padding": 0, + "_layoutType": 2, "_cellSize": { "__type__": "cc.Size", "width": 40, @@ -1994,13 +1993,16 @@ "_startAxis": 0, "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 5, - "_paddingBottom": 5, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, "_affectedByScale": false, + "_isAlign": false, "_id": "92i148f8BNjqQM0bAiXvdR" }, { @@ -2014,7 +2016,6 @@ "__prefab": { "__id__": 73 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -2028,7 +2029,7 @@ "_id": "6aRDZufeFNyquP8wpwQliq" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "6aRDZufeFNyquP8wpwQliq" }, { @@ -2061,7 +2062,7 @@ "_id": "8dLCMgmcxPA7LjTEaGrlAY" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "8dLCMgmcxPA7LjTEaGrlAY" }, { @@ -2075,7 +2076,6 @@ "__prefab": { "__id__": 77 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -2089,7 +2089,7 @@ "_id": "67MiduGNZAG72RDWYkqZXV" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "67MiduGNZAG72RDWYkqZXV" }, { @@ -2115,7 +2115,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941" + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, @@ -2133,7 +2134,7 @@ "_id": "52sxpqX8RD0Kz5XxGQLom3" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "52sxpqX8RD0Kz5XxGQLom3" }, { @@ -2198,7 +2199,7 @@ "customEventData": "" }, { - "__type__": "cc.CompPrefabInfo ", + "__type__": "cc.CompPrefabInfo", "fileId": "57rlB/VldEK6vGdVbe0ti2" }, { @@ -2293,6 +2294,90 @@ "_lockFlags": 0, "_id": "f1goFS3rVIIZCdJPWjJyQF" }, + { + "__type__": "cc.Node", + "_name": "UICamera_Canvas", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 91 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 524288, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "a1iXaosJdME57x6Wv+9RPf" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 90 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 510.311027332705, + "_near": 1, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 6, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 42467328, + "_targetTexture": null, + "_id": "cb00V2uDFLa7REIm1d7nTo" + }, { "__type__": "cc.UITransform", "_name": "", @@ -2302,7 +2387,6 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 1280, @@ -2324,17 +2408,10 @@ }, "_enabled": true, "__prefab": null, - "_priority": 0, - "_targetTexture": null, - "_clearFlag": 6, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_cameraComponent": { + "__id__": 91 }, - "_renderMode": 0, + "_alignCanvasWithScreen": true, "_id": "b2UxhdfGFL7qei3rkOVHdv" }, { @@ -2383,16 +2460,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 95 + "__id__": 97 }, "shadows": { - "__id__": 96 + "__id__": 98 }, "_skybox": { - "__id__": 97 + "__id__": 99 }, "fog": { - "__id__": 98 + "__id__": 100 } }, { @@ -2434,6 +2511,10 @@ "_autoAdapt": true, "_pcf": 0, "_bias": 0.00001, + "_packing": false, + "_linear": true, + "_selfShadow": false, + "_normalBias": 0, "_near": 1, "_far": 30, "_aspect": 1, diff --git a/ListDemo_3.x/assets/Scene/TestWidget.scene.meta b/ListDemo_3.x/assets/Scene/TestWidget.scene.meta new file mode 100644 index 0000000..67f669f --- /dev/null +++ b/ListDemo_3.x/assets/Scene/TestWidget.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.27", + "importer": "scene", + "imported": true, + "uuid": "82cfa3a0-b8fa-4de2-b0c7-5efa1174bb49", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/assets/Script.meta b/ListDemo_3.x/assets/Script.meta similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script.meta rename to ListDemo_3.x/assets/Script.meta diff --git a/ListDemo_3_0_0_Preview/assets/Script/List.ts b/ListDemo_3.x/assets/Script/List.ts similarity index 96% rename from ListDemo_3_0_0_Preview/assets/Script/List.ts rename to ListDemo_3.x/assets/Script/List.ts index 2432d14..cdcac37 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/List.ts +++ b/ListDemo_3.x/assets/Script/List.ts @@ -6,7 +6,7 @@ ******************************************/ const { ccclass, property, disallowMultiple, menu, executionOrder, requireComponent } = _decorator; import { Node, Component, Enum, tween, _decorator, EventHandler, Tween, ScrollView, Prefab, Layout, Vec2, Size, NodePool, isValid, instantiate, Vec3, Widget, UITransform, CCFloat, CCBoolean, CCInteger } from 'cc'; -import { DEV } from 'cce.env'; +import { DEV } from 'cc/env'; import ListItem from './ListItem'; enum TemplateType { @@ -162,12 +162,6 @@ export default class List extends Component { }) public selectedMode: SelectedType = SelectedType.NONE; //触发选择事件 - // @property({ - // type: EventHandler, - // tooltip: DEV && '触发选择事件', - // // visible() { return this.selectedMode > SelectedType.NONE; } - // }) - // public selectedEvent: EventHandler = new EventHandler(); @property({ type: EventHandler, tooltip: DEV && '触发选择事件', @@ -512,9 +506,6 @@ export default class List extends Component { t._scrollView._startBounceBackIfNeeded = function () { return false; } - // t._scrollView._scrollChildren = function () { - // return false; - // } } switch (t._align) { @@ -580,38 +571,6 @@ export default class List extends Component { * @param {Number} dt */ _processAutoScrolling(dt: number) { - // let brakingFactor: number = 1; - // this._scrollView['_autoScrollAccumulatedTime'] += dt * (1 / brakingFactor); - - // let percentage: number = Math.min(1, this._scrollView['_autoScrollAccumulatedTime'] / this._scrollView['_autoScrollTotalTime']); - // if (this._scrollView['_autoScrollAttenuate']) { - // let time: number = percentage - 1; - // percentage = time * time * time * time * time + 1; - // } - // let newPosition: any = this._scrollView['_autoScrollStartPosition'].add(this._scrollView['_autoScrollTargetDelta'].multiply(percentage)); - // let EPSILON: number = this._scrollView['getScrollEndedEventTiming'](); - // let reachedEnd: boolean = Math.abs(percentage - 1) <= EPSILON; - // // cc.log(reachedEnd, Math.abs(percentage - 1), EPSILON) - - // let fireEvent: boolean = Math.abs(percentage - 1) <= this._scrollView['getScrollEndedEventTiming'](); - // if (fireEvent && !this._scrollView['_isScrollEndedWithThresholdEventFired']) { - // this._scrollView['_dispatchEvent']('scroll-ended-with-threshold'); - // this._scrollView['_isScrollEndedWithThresholdEventFired'] = true; - // } - - // if (reachedEnd) { - // this._scrollView['_autoScrolling'] = false; - // } - - // let deltaMove: any = newPosition.sub(this._scrollView.getContentPosition()); - // this._scrollView['_moveContent'](this._scrollView['_clampDelta'](deltaMove), reachedEnd); - // this._scrollView['_dispatchEvent']('scrolling'); - - // if (!this._scrollView['_autoScrolling']) { - // this._scrollView['_isBouncing'] = false; - // this._scrollView['_scrolling'] = false; - // this._scrollView['_dispatchEvent']('scroll-ended'); - // } // ------------- scroll-view 里定义的一些常量 ------------- const OUT_OF_BOUNDARY_BREAKING_FACTOR = 0.05; @@ -634,10 +593,10 @@ export default class List extends Component { percentage = quintEaseOut(percentage); } - const a = new Vec3(sv['_autoScrollTargetDelta']); - a.multiplyScalar(percentage); - const newPosition = new Vec3(sv['_autoScrollStartPosition']); - newPosition.add(a); + const clonedAutoScrollTargetDelta = sv['_autoScrollTargetDelta'].clone(); + clonedAutoScrollTargetDelta.multiplyScalar(percentage); + const clonedAutoScrollStartPosition = sv['_autoScrollStartPosition'].clone(); + clonedAutoScrollStartPosition.add(clonedAutoScrollTargetDelta); let reachedEnd = Math.abs(percentage - 1) <= EPSILON; const fireEvent = Math.abs(percentage - 1) <= sv['getScrollEndedEventTiming'](); @@ -647,19 +606,19 @@ export default class List extends Component { } if (sv['elastic']) { - const brakeOffsetPosition = new Vec3(newPosition); + const brakeOffsetPosition = clonedAutoScrollStartPosition.clone(); brakeOffsetPosition.subtract(sv['_autoScrollBrakingStartPosition']); if (isAutoScrollBrake) { brakeOffsetPosition.multiplyScalar(brakingFactor); } - newPosition.set(sv['_autoScrollBrakingStartPosition']); - newPosition.add(brakeOffsetPosition); + clonedAutoScrollStartPosition.set(sv['_autoScrollBrakingStartPosition']); + clonedAutoScrollStartPosition.add(brakeOffsetPosition); } else { - const moveDelta = new Vec3(newPosition); - moveDelta.subtract(sv['getContentPosition']()); + const moveDelta = clonedAutoScrollStartPosition.clone(); + moveDelta.subtract(sv['_getContentPosition']()); const outOfBoundary = sv['_getHowMuchOutOfBoundary'](moveDelta); if (!outOfBoundary.equals(ZERO, EPSILON)) { - newPosition.add(outOfBoundary); + clonedAutoScrollStartPosition.add(outOfBoundary); reachedEnd = true; } } @@ -668,9 +627,10 @@ export default class List extends Component { sv['_autoScrolling'] = false; } - const deltaMove = new Vec3(newPosition); - deltaMove.subtract(sv['getContentPosition']()); - sv['_moveContent'](sv['_clampDelta'](deltaMove), reachedEnd); + const deltaMove = new Vec3(clonedAutoScrollStartPosition); + deltaMove.subtract(sv['_getContentPosition']()); + sv['_clampDelta'](deltaMove); + sv['_moveContent'](deltaMove, reachedEnd); sv['_dispatchEvent'](ScrollView.EventType.SCROLLING); if (!sv['_autoScrolling']) { diff --git a/ListDemo_3_0_0_Preview/assets/Script/List.ts.meta b/ListDemo_3.x/assets/Script/List.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/List.ts.meta rename to ListDemo_3.x/assets/Script/List.ts.meta index b975977..c4a55de 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/List.ts.meta +++ b/ListDemo_3.x/assets/Script/List.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "1465a2b7-05e1-4445-8bcb-31169f2a75d1", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/List.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/ListItem.ts b/ListDemo_3.x/assets/Script/ListItem.ts similarity index 99% rename from ListDemo_3_0_0_Preview/assets/Script/ListItem.ts rename to ListDemo_3.x/assets/Script/ListItem.ts index cecdbd8..4a660d7 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/ListItem.ts +++ b/ListDemo_3.x/assets/Script/ListItem.ts @@ -8,7 +8,7 @@ ******************************************/ const { ccclass, property, disallowMultiple, menu, executionOrder } = _decorator; import { Node, Component, Enum, Sprite, SpriteFrame, tween, _decorator, EventHandler, Tween, Button, UITransform, Vec3 } from 'cc'; -import { DEV } from 'cce.env'; +import { DEV } from 'cc/env'; import List from './List'; enum SelectedType { diff --git a/ListDemo_3_0_0_Preview/assets/Script/ListItem.ts.meta b/ListDemo_3.x/assets/Script/ListItem.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/ListItem.ts.meta rename to ListDemo_3.x/assets/Script/ListItem.ts.meta index e5716ce..e30b141 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/ListItem.ts.meta +++ b/ListDemo_3.x/assets/Script/ListItem.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "e7dc6640-60f5-4b24-ac4d-716f1a4ced49", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/ListItem.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/Main.ts b/ListDemo_3.x/assets/Script/Main.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/Main.ts rename to ListDemo_3.x/assets/Script/Main.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/Main.ts.meta b/ListDemo_3.x/assets/Script/Main.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/Main.ts.meta rename to ListDemo_3.x/assets/Script/Main.ts.meta index 1a7cff4..9113c79 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/Main.ts.meta +++ b/ListDemo_3.x/assets/Script/Main.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "4f9b7c39-e1ee-4a9f-87c3-13cf837748eb", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/Main.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestAdaptive.ts b/ListDemo_3.x/assets/Script/TestAdaptive.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/TestAdaptive.ts rename to ListDemo_3.x/assets/Script/TestAdaptive.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestAdaptive.ts.meta b/ListDemo_3.x/assets/Script/TestAdaptive.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/TestAdaptive.ts.meta rename to ListDemo_3.x/assets/Script/TestAdaptive.ts.meta index a9fec5b..a491e63 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/TestAdaptive.ts.meta +++ b/ListDemo_3.x/assets/Script/TestAdaptive.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "fd942bfb-3676-4bde-a45a-8280cdd95314", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/TestAdaptive.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestBag.ts b/ListDemo_3.x/assets/Script/TestBag.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/TestBag.ts rename to ListDemo_3.x/assets/Script/TestBag.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestBag.ts.meta b/ListDemo_3.x/assets/Script/TestBag.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/TestBag.ts.meta rename to ListDemo_3.x/assets/Script/TestBag.ts.meta index 7f3813a..3e7442b 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/TestBag.ts.meta +++ b/ListDemo_3.x/assets/Script/TestBag.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "dfab5605-4abf-4a77-912c-928881e7ed72", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/TestBag.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestCyclic.ts b/ListDemo_3.x/assets/Script/TestCyclic.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/TestCyclic.ts rename to ListDemo_3.x/assets/Script/TestCyclic.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestCyclic.ts.meta b/ListDemo_3.x/assets/Script/TestCyclic.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/TestCyclic.ts.meta rename to ListDemo_3.x/assets/Script/TestCyclic.ts.meta index 2174a8f..197cab6 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/TestCyclic.ts.meta +++ b/ListDemo_3.x/assets/Script/TestCyclic.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "43bbffa3-1710-41b0-90e0-f6a0cc37f429", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/TestCyclic.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestLack.ts b/ListDemo_3.x/assets/Script/TestLack.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/TestLack.ts rename to ListDemo_3.x/assets/Script/TestLack.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestLack.ts.meta b/ListDemo_3.x/assets/Script/TestLack.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/TestLack.ts.meta rename to ListDemo_3.x/assets/Script/TestLack.ts.meta index fda6d79..8190b17 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/TestLack.ts.meta +++ b/ListDemo_3.x/assets/Script/TestLack.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "b280f781-5bb1-4bc2-a7cf-7b9a3fcceffa", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/TestLack.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestPage.ts b/ListDemo_3.x/assets/Script/TestPage.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/TestPage.ts rename to ListDemo_3.x/assets/Script/TestPage.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestPage.ts.meta b/ListDemo_3.x/assets/Script/TestPage.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/TestPage.ts.meta rename to ListDemo_3.x/assets/Script/TestPage.ts.meta index cb8bec6..9d51d2e 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/TestPage.ts.meta +++ b/ListDemo_3.x/assets/Script/TestPage.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "4a8a92de-d04a-4ab9-8166-0f62fd356a62", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/TestPage.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestWidget.ts b/ListDemo_3.x/assets/Script/TestWidget.ts similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Script/TestWidget.ts rename to ListDemo_3.x/assets/Script/TestWidget.ts diff --git a/ListDemo_3_0_0_Preview/assets/Script/TestWidget.ts.meta b/ListDemo_3.x/assets/Script/TestWidget.ts.meta similarity index 68% rename from ListDemo_3_0_0_Preview/assets/Script/TestWidget.ts.meta rename to ListDemo_3.x/assets/Script/TestWidget.ts.meta index d1a2eb0..e982970 100644 --- a/ListDemo_3_0_0_Preview/assets/Script/TestWidget.ts.meta +++ b/ListDemo_3.x/assets/Script/TestWidget.ts.meta @@ -1,17 +1,14 @@ { - "ver": "4.0.9", + "ver": "4.0.22", "importer": "typescript", "imported": true, "uuid": "933c959f-c963-426a-924c-255a12f8f12f", - "files": [ - ".js", - "editor.js", - ".trans" - ], + "files": [], "subMetas": {}, "userData": { "importAsPlugin": false, "moduleId": "project:///assets/Script/TestWidget.js", - "importerSettings": 7 + "importerSettings": 7, + "simulateGlobals": [] } } diff --git a/ListDemo_3_0_0_Preview/assets/Texture.meta b/ListDemo_3.x/assets/Texture.meta similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture.meta rename to ListDemo_3.x/assets/Texture.meta diff --git a/ListDemo_3_0_0_Preview/assets/Texture/avatar_1.png b/ListDemo_3.x/assets/Texture/avatar_1.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/avatar_1.png rename to ListDemo_3.x/assets/Texture/avatar_1.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/avatar_1.png.meta b/ListDemo_3.x/assets/Texture/avatar_1.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/avatar_1.png.meta rename to ListDemo_3.x/assets/Texture/avatar_1.png.meta index 89d5ccd..d369ceb 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/avatar_1.png.meta +++ b/ListDemo_3.x/assets/Texture/avatar_1.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "2f9a9632-0aa3-49d5-8573-159490ee5f37" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "2f9a9632-0aa3-49d5-8573-159490ee5f37@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Texture/avatar_2.png b/ListDemo_3.x/assets/Texture/avatar_2.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/avatar_2.png rename to ListDemo_3.x/assets/Texture/avatar_2.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/avatar_2.png.meta b/ListDemo_3.x/assets/Texture/avatar_2.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/avatar_2.png.meta rename to ListDemo_3.x/assets/Texture/avatar_2.png.meta index 62ed4bd..deb0982 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/avatar_2.png.meta +++ b/ListDemo_3.x/assets/Texture/avatar_2.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "dceee5f4-3757-43ca-ad3c-557684edfc05" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "dceee5f4-3757-43ca-ad3c-557684edfc05@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Texture/avatar_bg.png b/ListDemo_3.x/assets/Texture/avatar_bg.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/avatar_bg.png rename to ListDemo_3.x/assets/Texture/avatar_bg.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/avatar_bg.png.meta b/ListDemo_3.x/assets/Texture/avatar_bg.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/avatar_bg.png.meta rename to ListDemo_3.x/assets/Texture/avatar_bg.png.meta index 6454a45..8f04768 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/avatar_bg.png.meta +++ b/ListDemo_3.x/assets/Texture/avatar_bg.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 0, "isUuid": true, "imageUuidOrDatabaseUri": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_1.png b/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_1.png rename to ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_1.png.meta b/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_1.png.meta rename to ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta index 687780b..e23195e 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_1.png.meta +++ b/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 10, "isUuid": true, "imageUuidOrDatabaseUri": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_2.png b/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_2.png rename to ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_2.png.meta b/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_2.png.meta rename to ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta index 1724a4f..897dd75 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/chat_bubble_bg_2.png.meta +++ b/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "06804507-d856-4946-866b-9862935eeb86" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 32, "isUuid": true, "imageUuidOrDatabaseUri": "06804507-d856-4946-866b-9862935eeb86@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Texture/item_bg.png b/ListDemo_3.x/assets/Texture/item_bg.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/item_bg.png rename to ListDemo_3.x/assets/Texture/item_bg.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/item_bg.png.meta b/ListDemo_3.x/assets/Texture/item_bg.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/item_bg.png.meta rename to ListDemo_3.x/assets/Texture/item_bg.png.meta index 832ea82..d1fef04 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/item_bg.png.meta +++ b/ListDemo_3.x/assets/Texture/item_bg.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "df2c8964-aba1-47a1-82e2-1381a292802e" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 61, "isUuid": true, "imageUuidOrDatabaseUri": "df2c8964-aba1-47a1-82e2-1381a292802e@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3_0_0_Preview/assets/Texture/item_bg_2.png b/ListDemo_3.x/assets/Texture/item_bg_2.png similarity index 100% rename from ListDemo_3_0_0_Preview/assets/Texture/item_bg_2.png rename to ListDemo_3.x/assets/Texture/item_bg_2.png diff --git a/ListDemo_3_0_0_Preview/assets/Texture/item_bg_2.png.meta b/ListDemo_3.x/assets/Texture/item_bg_2.png.meta similarity index 95% rename from ListDemo_3_0_0_Preview/assets/Texture/item_bg_2.png.meta rename to ListDemo_3.x/assets/Texture/item_bg_2.png.meta index 0596d0a..cede427 100644 --- a/ListDemo_3_0_0_Preview/assets/Texture/item_bg_2.png.meta +++ b/ListDemo_3.x/assets/Texture/item_bg_2.png.meta @@ -48,11 +48,11 @@ "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", - "anisotropy": 1, + "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "13fd9783-8b86-4922-ac56-c6d392873a17" }, - "ver": "1.0.20", + "ver": "1.0.21", "imported": true, "files": [ ".json" @@ -83,9 +83,10 @@ "borderRight": 9, "isUuid": true, "imageUuidOrDatabaseUri": "13fd9783-8b86-4922-ac56-c6d392873a17@6c48a", - "atlasUuid": "" + "atlasUuid": "", + "packable": true }, - "ver": "1.0.8", + "ver": "1.0.9", "imported": true, "files": [ ".json" diff --git a/ListDemo_3.x/assets/migrate-canvas.ts b/ListDemo_3.x/assets/migrate-canvas.ts new file mode 100644 index 0000000..ac01940 --- /dev/null +++ b/ListDemo_3.x/assets/migrate-canvas.ts @@ -0,0 +1,88 @@ +/** + * UI 的渲染在 v3.0 变为使用 node.layer 来判断可见性，为了保证老版本项目升级后表现一致， + * Creator 会在运行时动态分配一个未使用的 layer 给常驻节点的 UI，避免常驻节点的 UI 与场景中 + * 的其他 UI 的 layer 发生冲突，当你确定不会发生冲突时，你可以移除此脚本. + * + * UI rendering has changed in v3.0 to use node.layer to determine visibility. + * To ensure consistent performance after upgrading old projects. + * Creator will dynamically assign an unused layer to the UI node in the persist node at + * runtime to avoid conflicts between the layer of UI in the persist node and the + * layer of other UI in the scene. You can remove this script when you + * are sure there is no conflict + */ + +import { _decorator, Node, director, Director, game, BaseNode, Canvas, Camera } from 'cc'; +import { EDITOR } from 'cc/env'; + +const customLayerMask = 0x000fffff; +const builtinLayerMask = 0xfff00000; + +director.on(Director.EVENT_AFTER_SCENE_LAUNCH, () => { + const roots = director.getScene()?.children as BaseNode[]; + let allCanvases = director.getScene()?.getComponentsInChildren(Canvas) as Canvas[]; + if (allCanvases.length <= 1) return; + allCanvases = allCanvases.filter(x => !!x.cameraComponent); + + let allCameras = director.getScene()?.getComponentsInChildren(Camera) as Camera[]; + let usedLayer = 0; + allCameras.forEach(x => usedLayer |= (x.visibility & customLayerMask)); + + const persistCanvas: Canvas[] = []; + for (let i = 0, l = roots.length; i < l; i++) { + const root = roots[i]; + if (!game.isPersistRootNode(root)) continue; + const canvases = root.getComponentsInChildren(Canvas); + if (canvases.length === 0) continue; + persistCanvas.push(...canvases.filter(x => !!x.cameraComponent)); + } + + persistCanvas.forEach((val) => { + const isLayerCollided = allCanvases.find(x => x !== val && (x.cameraComponent!.visibility & val.cameraComponent!.visibility & customLayerMask)); + if (isLayerCollided) { + const availableLayers = ~usedLayer; + const lastAvailableLayer = availableLayers & ~(availableLayers - 1); + val.cameraComponent!.visibility = lastAvailableLayer | (val.cameraComponent!.visibility & builtinLayerMask); + setChildrenLayer(val.node, lastAvailableLayer); + usedLayer |= availableLayers; + } + }); +}); + +function setChildrenLayer (node: Node, layer: number) { + for (let i = 0, l = node.children.length; i < l; i++) { + node.children[i].layer = layer; + setChildrenLayer(node.children[i], layer); + } +} + +let setParentEngine = Node.prototype.setParent; + +if(!EDITOR) { + Node.prototype.setParent = function(value, keepWorldTransform) { + setParentEngine.call(this, value, keepWorldTransform); + if (!value) return; + // find canvas + let layer = getCanvasCameraLayer(this); + if (layer) { + this.layer = layer; + setChildrenLayer(this, layer); + } + } +} + +function getCanvasCameraLayer (node: Node) { + let layer = 0; + let canvas = node.getComponent(Canvas); + if (canvas && canvas.cameraComponent) { + if (canvas.cameraComponent.visibility & canvas.node.layer) { + layer = canvas.node.layer; + } else { + layer = canvas.cameraComponent.visibility & ~(canvas.cameraComponent.visibility - 1); + } + return layer; + } + if (node.parent) { + layer = getCanvasCameraLayer(node.parent); + } + return layer; +} \ No newline at end of file diff --git a/ListDemo_3.x/assets/migrate-canvas.ts.meta b/ListDemo_3.x/assets/migrate-canvas.ts.meta new file mode 100644 index 0000000..f0eff07 --- /dev/null +++ b/ListDemo_3.x/assets/migrate-canvas.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.22", + "importer": "typescript", + "imported": true, + "uuid": "eca318dc-ec97-4b03-a2d2-8bc4ff5605bb", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/ListDemo_3_0_0_Preview/package.json b/ListDemo_3.x/package.json similarity index 62% rename from ListDemo_3_0_0_Preview/package.json rename to ListDemo_3.x/package.json index 94aec04..68baf96 100644 --- a/ListDemo_3_0_0_Preview/package.json +++ b/ListDemo_3.x/package.json @@ -2,5 +2,8 @@ "name": "ListDemo_3_0_0_Preview", "type": "3d", "uuid": "55e44737-4268-4e9e-bc7d-4398c3c39964", - "version": "3.0.0-preview.1" + "version": "3.2.1", + "creator": { + "version": "3.2.1" + } } diff --git a/ListDemo_3.x/settings/v2/packages/builder.json b/ListDemo_3.x/settings/v2/packages/builder.json new file mode 100644 index 0000000..af081f3 --- /dev/null +++ b/ListDemo_3.x/settings/v2/packages/builder.json @@ -0,0 +1,3 @@ +{ + "__version__": "1.2.8" +} diff --git a/ListDemo_3.x/settings/v2/packages/device.json b/ListDemo_3.x/settings/v2/packages/device.json new file mode 100644 index 0000000..70e599e --- /dev/null +++ b/ListDemo_3.x/settings/v2/packages/device.json @@ -0,0 +1,3 @@ +{ + "__version__": "1.0.1" +} diff --git a/ListDemo_3_0_0_Preview/settings/v2/packages/engine.json b/ListDemo_3.x/settings/v2/packages/engine.json similarity index 72% rename from ListDemo_3_0_0_Preview/settings/v2/packages/engine.json rename to ListDemo_3.x/settings/v2/packages/engine.json index c2d4be7..cd450e7 100644 --- a/ListDemo_3_0_0_Preview/settings/v2/packages/engine.json +++ b/ListDemo_3.x/settings/v2/packages/engine.json @@ -1,18 +1,20 @@ { - "__version__": "1.0.3", + "__version__": "1.0.5", "modules": { "cache": {}, "includeModules": [ "base", "gfx-webgl", "gfx-webgl2", + "3d", + "2d", "ui", "particle", - "physics-cannon", - "physics-framework", + "physics-ammo", "physics-2d-box2d", - "physics-2d-framework", "intersection-2d", + "primitive", + "profiler", "particle-2d", "audio", "video", @@ -21,7 +23,7 @@ "terrain", "tiled-map", "spine", - "dragonbones" + "dragon-bones" ] } } diff --git a/ListDemo_3.x/settings/v2/packages/program.json b/ListDemo_3.x/settings/v2/packages/program.json new file mode 100644 index 0000000..4d87e97 --- /dev/null +++ b/ListDemo_3.x/settings/v2/packages/program.json @@ -0,0 +1,3 @@ +{ + "__version__": "1.0.0" +} diff --git a/ListDemo_3_0_0_Preview/settings/v2/packages/project.json b/ListDemo_3.x/settings/v2/packages/project.json similarity index 65% rename from ListDemo_3_0_0_Preview/settings/v2/packages/project.json rename to ListDemo_3.x/settings/v2/packages/project.json index 4014faf..97cfb43 100644 --- a/ListDemo_3_0_0_Preview/settings/v2/packages/project.json +++ b/ListDemo_3.x/settings/v2/packages/project.json @@ -8,5 +8,11 @@ }, "script": { "loose": true - } + }, + "layer": [ + { + "name": "canvas_19", + "value": 524288 + } + ] } diff --git a/ListDemo_3_0_0_Preview/tsconfig.json b/ListDemo_3.x/tsconfig.json similarity index 100% rename from ListDemo_3_0_0_Preview/tsconfig.json rename to ListDemo_3.x/tsconfig.json diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene.meta b/ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene.meta deleted file mode 100644 index db7df93..0000000 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestAdaptive.scene.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"1.1.23","importer":"scene","imported":true,"uuid":"f112229f-3983-4019-9aef-f7bd49c4ed1f","files":[".json"],"subMetas":{},"userData":{}} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene.meta b/ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene.meta deleted file mode 100644 index 5b5c594..0000000 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestBag.scene.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"1.1.23","importer":"scene","imported":true,"uuid":"d37f29c7-f15e-47e6-97c1-6cdcdc59e24d","files":[".json"],"subMetas":{},"userData":{}} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene.meta b/ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene.meta deleted file mode 100644 index 1f96874..0000000 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestCyclic.scene.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"1.1.23","importer":"scene","imported":true,"uuid":"35ae4494-fef6-45b8-a140-13ffef719850","files":[".json"],"subMetas":{},"userData":{}} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene.meta b/ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene.meta deleted file mode 100644 index 305a6c2..0000000 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestLack.scene.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"1.1.23","importer":"scene","imported":true,"uuid":"5dba259c-5917-46df-a0fd-317aaf1072e4","files":[".json"],"subMetas":{},"userData":{}} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene.meta b/ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene.meta deleted file mode 100644 index 28befe4..0000000 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestPage.scene.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"1.1.23","importer":"scene","imported":true,"uuid":"d9b16f90-48e7-476f-bb72-1fefa4de298e","files":[".json"],"subMetas":{},"userData":{}} diff --git a/ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene.meta b/ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene.meta deleted file mode 100644 index 493e985..0000000 --- a/ListDemo_3_0_0_Preview/assets/Scene/TestWidget.scene.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"1.1.23","importer":"scene","imported":true,"uuid":"82cfa3a0-b8fa-4de2-b0c7-5efa1174bb49","files":[".json"],"subMetas":{},"userData":{}} diff --git a/ListDemo_3_0_0_Preview/settings/v2/packages/builder.json b/ListDemo_3_0_0_Preview/settings/v2/packages/builder.json deleted file mode 100644 index a00509f..0000000 --- a/ListDemo_3_0_0_Preview/settings/v2/packages/builder.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "__version__": "1.2.6" -} diff --git a/README.MD b/README.MD index 28b468b..1e448e5 100644 --- a/README.MD +++ b/README.MD @@ -25,7 +25,7 @@ Cocos 论坛帖子链接： - 动态删除 Item 项。 - ... -Last test by ccc_v2.4.3 +Last test by ccc_v2.4.6 and ccc_v3.2.1 我的邮箱：klk0@qq.com @@ -260,6 +260,21 @@ Item 总数，设置此属性后，List 会调用 renderEvent 以渲染 Item。 ## 更新日志 +### 2021/8/10 + +又是时隔大半年的更新，就...适配新版本。 + +示例项目升级至 ccc_v2.4.6。 +示例项目升级至 ccc_v3.2.1。 + +**仓库里也新增了3.0版本的List，估计坑很多，期望值别太高。** + +示例项目升级至 ccc_v2.4.3。 +- 感谢`妖怪香蕉`帮我修复了`分帧渲染`可能会重复渲染多次的问题。 +- 修复边距（Padding）较大时，`Item`回收判定错误的 BUG。（感谢 Cocos 论坛用户`@290027085`） +- 修复`PAGE`模式下，手动滑动到最后一页，再往后拖一下，使范围外的`Item`都被回收，然后再`scrollTo`到中间的页，会自动多跳一页的 BUG。（感谢 GitHub 用户`shangdibaozi`） +- 新增多选数据接口`getMultSelected`、`hasMultSelected`。（感谢 GitHub用户`@ckcfcc`提出建议） + ### 2020/12/8 时隔大半年的更新，主要还是填一些坑。