From a0c9cc333989b5b6212e143c7a194ebee4e022e3 Mon Sep 17 00:00:00 2001 From: kL <328549495@qq.com> Date: Fri, 28 Jan 2022 08:13:24 +0800 Subject: [PATCH] Update 22/1/28 Update 22/1/28 --- ListDemo_3.x/assets/Atlas/chat.png.meta | 2 +- ListDemo_3.x/assets/Prefab/BagItem.prefab | 29 +++--- .../assets/Prefab/BagItem.prefab.meta | 2 +- ListDemo_3.x/assets/Scene/Main.scene | 90 +++++++++++++------ ListDemo_3.x/assets/Scene/Main.scene.meta | 2 +- ListDemo_3.x/assets/Scene/TestAdaptive.scene | 90 +++++++++++++------ .../assets/Scene/TestAdaptive.scene.meta | 2 +- ListDemo_3.x/assets/Scene/TestBag.scene | 90 +++++++++++++------ ListDemo_3.x/assets/Scene/TestBag.scene.meta | 2 +- ListDemo_3.x/assets/Scene/TestCyclic.scene | 90 +++++++++++++------ .../assets/Scene/TestCyclic.scene.meta | 2 +- ListDemo_3.x/assets/Scene/TestLack.scene | 90 +++++++++++++------ ListDemo_3.x/assets/Scene/TestLack.scene.meta | 2 +- ListDemo_3.x/assets/Scene/TestPage.scene | 90 +++++++++++++------ ListDemo_3.x/assets/Scene/TestPage.scene.meta | 2 +- ListDemo_3.x/assets/Scene/TestWidget.scene | 90 +++++++++++++------ .../assets/Scene/TestWidget.scene.meta | 2 +- ListDemo_3.x/assets/Script/List.ts | 20 ++--- ListDemo_3.x/assets/Script/List.ts.meta | 3 +- ListDemo_3.x/assets/Script/ListItem.ts.meta | 3 +- ListDemo_3.x/assets/Script/Main.ts.meta | 3 +- .../assets/Script/TestAdaptive.ts.meta | 3 +- ListDemo_3.x/assets/Script/TestBag.ts.meta | 3 +- ListDemo_3.x/assets/Script/TestCyclic.ts.meta | 3 +- ListDemo_3.x/assets/Script/TestLack.ts.meta | 3 +- ListDemo_3.x/assets/Script/TestPage.ts.meta | 3 +- ListDemo_3.x/assets/Script/TestWidget.ts.meta | 3 +- ListDemo_3.x/assets/Texture/avatar_1.png.meta | 6 +- ListDemo_3.x/assets/Texture/avatar_2.png.meta | 6 +- .../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_3.x/assets/Texture/item_bg.png.meta | 6 +- .../assets/Texture/item_bg_2.png.meta | 6 +- ListDemo_3.x/assets/migrate-canvas.ts.meta | 2 +- ListDemo_3.x/package.json | 8 +- .../settings/v2/packages/builder.json | 2 +- .../settings/v2/packages/cocos-service.json | 22 +++++ ListDemo_3.x/settings/v2/packages/engine.json | 3 +- 39 files changed, 549 insertions(+), 254 deletions(-) create mode 100644 ListDemo_3.x/settings/v2/packages/cocos-service.json diff --git a/ListDemo_3.x/assets/Atlas/chat.png.meta b/ListDemo_3.x/assets/Atlas/chat.png.meta index 850d3ed..e72a541 100644 --- a/ListDemo_3.x/assets/Atlas/chat.png.meta +++ b/ListDemo_3.x/assets/Atlas/chat.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "30b524c2-ce91-4c3a-8ede-4e04bbd8272b", diff --git a/ListDemo_3.x/assets/Prefab/BagItem.prefab b/ListDemo_3.x/assets/Prefab/BagItem.prefab index be4725c..5a3220d 100644 --- a/ListDemo_3.x/assets/Prefab/BagItem.prefab +++ b/ListDemo_3.x/assets/Prefab/BagItem.prefab @@ -8,7 +8,8 @@ "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false + "asyncLoadAssets": false, + "persistent": false }, { "__type__": "cc.Node", @@ -26,11 +27,11 @@ "__id__": 8 }, { - "__id__": 9 + "__id__": 10 } ], "_prefab": { - "__id__": 10 + "__id__": 12 }, "_lpos": { "__type__": "cc.Vec3", @@ -199,7 +200,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 9 }, "_priority": 0, "_contentSize": { @@ -214,6 +215,10 @@ }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5FCbelaZIp4MZLI/tayR6" + }, { "__type__": "cc.Sprite", "_name": "", @@ -223,7 +228,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 11 }, "_visFlags": 0, "_customMaterial": null, @@ -254,6 +259,10 @@ "_atlas": null, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85S6a0H1dE1bzro3DXIvHf" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -263,13 +272,5 @@ "__id__": 0 }, "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.x/assets/Prefab/BagItem.prefab.meta b/ListDemo_3.x/assets/Prefab/BagItem.prefab.meta index 9e0d5f4..e9c9134 100644 --- a/ListDemo_3.x/assets/Prefab/BagItem.prefab.meta +++ b/ListDemo_3.x/assets/Prefab/BagItem.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "prefab", "imported": true, "uuid": "662a1eb5-ae9b-4491-b95f-b925e9ab3645", diff --git a/ListDemo_3.x/assets/Scene/Main.scene b/ListDemo_3.x/assets/Scene/Main.scene index 0b1192e..c6b735d 100644 --- a/ListDemo_3.x/assets/Scene/Main.scene +++ b/ListDemo_3.x/assets/Scene/Main.scene @@ -29,7 +29,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 247 + }, "autoReleaseAssets": false, "_globals": { "__id__": 242 @@ -6271,20 +6273,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -6304,39 +6336,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -6345,6 +6380,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "d36f11f0-22ca-40c7-a27f-dc4a142fea2d" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/Main.scene.meta b/ListDemo_3.x/assets/Scene/Main.scene.meta index b6d4272..73d5d4d 100644 --- a/ListDemo_3.x/assets/Scene/Main.scene.meta +++ b/ListDemo_3.x/assets/Scene/Main.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "d36f11f0-22ca-40c7-a27f-dc4a142fea2d", diff --git a/ListDemo_3.x/assets/Scene/TestAdaptive.scene b/ListDemo_3.x/assets/Scene/TestAdaptive.scene index 6163643..b383cb5 100644 --- a/ListDemo_3.x/assets/Scene/TestAdaptive.scene +++ b/ListDemo_3.x/assets/Scene/TestAdaptive.scene @@ -20,7 +20,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 126 + }, "autoReleaseAssets": false, "_globals": { "__id__": 121 @@ -3077,20 +3079,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -3110,39 +3142,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -3151,6 +3186,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "f112229f-3983-4019-9aef-f7bd49c4ed1f" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta b/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta index 54fc46b..a7a790b 100644 --- a/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta +++ b/ListDemo_3.x/assets/Scene/TestAdaptive.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "f112229f-3983-4019-9aef-f7bd49c4ed1f", diff --git a/ListDemo_3.x/assets/Scene/TestBag.scene b/ListDemo_3.x/assets/Scene/TestBag.scene index a0ef104..384e3a7 100644 --- a/ListDemo_3.x/assets/Scene/TestBag.scene +++ b/ListDemo_3.x/assets/Scene/TestBag.scene @@ -20,7 +20,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 90 + }, "autoReleaseAssets": false, "_globals": { "__id__": 85 @@ -2095,20 +2097,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -2128,39 +2160,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -2169,6 +2204,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "d37f29c7-f15e-47e6-97c1-6cdcdc59e24d" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/TestBag.scene.meta b/ListDemo_3.x/assets/Scene/TestBag.scene.meta index e05b70f..1a154a6 100644 --- a/ListDemo_3.x/assets/Scene/TestBag.scene.meta +++ b/ListDemo_3.x/assets/Scene/TestBag.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "d37f29c7-f15e-47e6-97c1-6cdcdc59e24d", diff --git a/ListDemo_3.x/assets/Scene/TestCyclic.scene b/ListDemo_3.x/assets/Scene/TestCyclic.scene index d619ff6..e830ac8 100644 --- a/ListDemo_3.x/assets/Scene/TestCyclic.scene +++ b/ListDemo_3.x/assets/Scene/TestCyclic.scene @@ -20,7 +20,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 174 + }, "autoReleaseAssets": false, "_globals": { "__id__": 169 @@ -4115,20 +4117,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -4148,39 +4180,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -4189,6 +4224,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "35ae4494-fef6-45b8-a140-13ffef719850" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta b/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta index 02fdfaa..86b9e83 100644 --- a/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta +++ b/ListDemo_3.x/assets/Scene/TestCyclic.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "35ae4494-fef6-45b8-a140-13ffef719850", diff --git a/ListDemo_3.x/assets/Scene/TestLack.scene b/ListDemo_3.x/assets/Scene/TestLack.scene index 4a34534..648093f 100644 --- a/ListDemo_3.x/assets/Scene/TestLack.scene +++ b/ListDemo_3.x/assets/Scene/TestLack.scene @@ -20,7 +20,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 132 + }, "autoReleaseAssets": false, "_globals": { "__id__": 127 @@ -3271,20 +3273,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -3304,39 +3336,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -3345,6 +3380,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "5dba259c-5917-46df-a0fd-317aaf1072e4" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/TestLack.scene.meta b/ListDemo_3.x/assets/Scene/TestLack.scene.meta index d0b659e..fbf7312 100644 --- a/ListDemo_3.x/assets/Scene/TestLack.scene.meta +++ b/ListDemo_3.x/assets/Scene/TestLack.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "5dba259c-5917-46df-a0fd-317aaf1072e4", diff --git a/ListDemo_3.x/assets/Scene/TestPage.scene b/ListDemo_3.x/assets/Scene/TestPage.scene index 490c70c..28f491b 100644 --- a/ListDemo_3.x/assets/Scene/TestPage.scene +++ b/ListDemo_3.x/assets/Scene/TestPage.scene @@ -20,7 +20,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 155 + }, "autoReleaseAssets": false, "_globals": { "__id__": 150 @@ -3806,20 +3808,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -3839,39 +3871,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -3880,6 +3915,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "d9b16f90-48e7-476f-bb72-1fefa4de298e" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/TestPage.scene.meta b/ListDemo_3.x/assets/Scene/TestPage.scene.meta index 4a8cdd1..53bc845 100644 --- a/ListDemo_3.x/assets/Scene/TestPage.scene.meta +++ b/ListDemo_3.x/assets/Scene/TestPage.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "d9b16f90-48e7-476f-bb72-1fefa4de298e", diff --git a/ListDemo_3.x/assets/Scene/TestWidget.scene b/ListDemo_3.x/assets/Scene/TestWidget.scene index 6dd641f..fa1a2f4 100644 --- a/ListDemo_3.x/assets/Scene/TestWidget.scene +++ b/ListDemo_3.x/assets/Scene/TestWidget.scene @@ -20,7 +20,9 @@ ], "_active": true, "_components": [], - "_prefab": null, + "_prefab": { + "__id__": 101 + }, "autoReleaseAssets": false, "_globals": { "__id__": 96 @@ -2475,20 +2477,50 @@ { "__type__": "cc.AmbientInfo", "_skyColor": { - "__type__": "cc.Color", - "r": 51, - "g": 128, - "b": 204, - "a": 1 + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 }, "_skyIllum": 20000, "_groundAlbedo": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - } + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5019607843137255, + "z": 0.8, + "w": 0.520833125 + }, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + }, + "_skyIllumLDR": 0.78125, + "_skyIllumHDR": 20000 }, { "__type__": "cc.ShadowsInfo", @@ -2508,39 +2540,42 @@ "b": 76, "a": 255 }, - "_autoAdapt": true, "_pcf": 0, - "_bias": 0.00001, - "_packing": false, - "_linear": true, - "_selfShadow": false, + "_bias": 0.1, "_normalBias": 0, "_near": 1, "_far": 30, - "_aspect": 1, "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - } + }, + "_saturation": 1, + "_fixedArea": false, + "_firstSetCSM": true }, { "__type__": "cc.SkyboxInfo", "_envmap": null, - "_isRGBE": false, "_enabled": false, - "_useIBL": false + "_useIBL": false, + "_useHDR": true, + "_envmapLDR": null, + "_envmapHDR": null, + "_diffuseMapLDR": null, + "_diffuseMapHDR": null, + "_applyDiffuseMap": false }, { "__type__": "cc.FogInfo", "_type": 0, "_fogColor": { "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, + "r": 225, + "g": 225, + "b": 225, "a": 255 }, "_enabled": false, @@ -2549,6 +2584,11 @@ "_fogEnd": 300, "_fogAtten": 5, "_fogTop": 1.5, - "_fogRange": 1.2 + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.PrefabInfo", + "fileId": "82cfa3a0-b8fa-4de2-b0c7-5efa1174bb49" } ] \ No newline at end of file diff --git a/ListDemo_3.x/assets/Scene/TestWidget.scene.meta b/ListDemo_3.x/assets/Scene/TestWidget.scene.meta index 67f669f..2bffce2 100644 --- a/ListDemo_3.x/assets/Scene/TestWidget.scene.meta +++ b/ListDemo_3.x/assets/Scene/TestWidget.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.27", + "ver": "1.1.35", "importer": "scene", "imported": true, "uuid": "82cfa3a0-b8fa-4de2-b0c7-5efa1174bb49", diff --git a/ListDemo_3.x/assets/Script/List.ts b/ListDemo_3.x/assets/Script/List.ts index cdcac37..5b93cf4 100644 --- a/ListDemo_3.x/assets/Script/List.ts +++ b/ListDemo_3.x/assets/Script/List.ts @@ -426,23 +426,23 @@ export default class List extends Component { //注册事件 _registerEvent() { let t: any = this; - t.node.on(Node.EventType.TOUCH_START, t._onTouchStart, t, true); + t.node.on(Node.EventType.TOUCH_START, t._onTouchStart, t); t.node.on('touch-up', t._onTouchUp, t); - t.node.on(Node.EventType.TOUCH_CANCEL, t._onTouchCancelled, t, true); - t.node.on('scroll-began', t._onScrollBegan, t, true); - t.node.on('scroll-ended', t._onScrollEnded, t, true); - t.node.on('scrolling', t._onScrolling, t, true); + t.node.on(Node.EventType.TOUCH_CANCEL, t._onTouchCancelled, t); + t.node.on('scroll-began', t._onScrollBegan, t); + t.node.on('scroll-ended', t._onScrollEnded, t); + t.node.on('scrolling', t._onScrolling, t); t.node.on(Node.EventType.SIZE_CHANGED, t._onSizeChanged, t); } //卸载事件 _unregisterEvent() { let t: any = this; - t.node.off(Node.EventType.TOUCH_START, t._onTouchStart, t, true); + t.node.off(Node.EventType.TOUCH_START, t._onTouchStart, t); t.node.off('touch-up', t._onTouchUp, t); - t.node.off(Node.EventType.TOUCH_CANCEL, t._onTouchCancelled, t, true); - t.node.off('scroll-began', t._onScrollBegan, t, true); - t.node.off('scroll-ended', t._onScrollEnded, t, true); - t.node.off('scrolling', t._onScrolling, t, true); + t.node.off(Node.EventType.TOUCH_CANCEL, t._onTouchCancelled, t); + t.node.off('scroll-began', t._onScrollBegan, t); + t.node.off('scroll-ended', t._onScrollEnded, t); + t.node.off('scrolling', t._onScrolling, t); t.node.off(Node.EventType.SIZE_CHANGED, t._onSizeChanged, t); } //初始化各种.. diff --git a/ListDemo_3.x/assets/Script/List.ts.meta b/ListDemo_3.x/assets/Script/List.ts.meta index c4a55de..e5f21fe 100644 --- a/ListDemo_3.x/assets/Script/List.ts.meta +++ b/ListDemo_3.x/assets/Script/List.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "1465a2b7-05e1-4445-8bcb-31169f2a75d1", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/List.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/ListItem.ts.meta b/ListDemo_3.x/assets/Script/ListItem.ts.meta index e30b141..908d44b 100644 --- a/ListDemo_3.x/assets/Script/ListItem.ts.meta +++ b/ListDemo_3.x/assets/Script/ListItem.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "e7dc6640-60f5-4b24-ac4d-716f1a4ced49", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/ListItem.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/Main.ts.meta b/ListDemo_3.x/assets/Script/Main.ts.meta index 9113c79..df6b257 100644 --- a/ListDemo_3.x/assets/Script/Main.ts.meta +++ b/ListDemo_3.x/assets/Script/Main.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "4f9b7c39-e1ee-4a9f-87c3-13cf837748eb", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/Main.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/TestAdaptive.ts.meta b/ListDemo_3.x/assets/Script/TestAdaptive.ts.meta index a491e63..460f0b9 100644 --- a/ListDemo_3.x/assets/Script/TestAdaptive.ts.meta +++ b/ListDemo_3.x/assets/Script/TestAdaptive.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "fd942bfb-3676-4bde-a45a-8280cdd95314", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/TestAdaptive.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/TestBag.ts.meta b/ListDemo_3.x/assets/Script/TestBag.ts.meta index 3e7442b..fea3886 100644 --- a/ListDemo_3.x/assets/Script/TestBag.ts.meta +++ b/ListDemo_3.x/assets/Script/TestBag.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "dfab5605-4abf-4a77-912c-928881e7ed72", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/TestBag.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/TestCyclic.ts.meta b/ListDemo_3.x/assets/Script/TestCyclic.ts.meta index 197cab6..bb9a968 100644 --- a/ListDemo_3.x/assets/Script/TestCyclic.ts.meta +++ b/ListDemo_3.x/assets/Script/TestCyclic.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "43bbffa3-1710-41b0-90e0-f6a0cc37f429", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/TestCyclic.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/TestLack.ts.meta b/ListDemo_3.x/assets/Script/TestLack.ts.meta index 8190b17..94b5e50 100644 --- a/ListDemo_3.x/assets/Script/TestLack.ts.meta +++ b/ListDemo_3.x/assets/Script/TestLack.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "b280f781-5bb1-4bc2-a7cf-7b9a3fcceffa", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/TestLack.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/TestPage.ts.meta b/ListDemo_3.x/assets/Script/TestPage.ts.meta index 9d51d2e..f9471d3 100644 --- a/ListDemo_3.x/assets/Script/TestPage.ts.meta +++ b/ListDemo_3.x/assets/Script/TestPage.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "4a8a92de-d04a-4ab9-8166-0f62fd356a62", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/TestPage.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Script/TestWidget.ts.meta b/ListDemo_3.x/assets/Script/TestWidget.ts.meta index e982970..21b6f54 100644 --- a/ListDemo_3.x/assets/Script/TestWidget.ts.meta +++ b/ListDemo_3.x/assets/Script/TestWidget.ts.meta @@ -1,12 +1,11 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "933c959f-c963-426a-924c-255a12f8f12f", "files": [], "subMetas": {}, "userData": { - "importAsPlugin": false, "moduleId": "project:///assets/Script/TestWidget.js", "importerSettings": 7, "simulateGlobals": [] diff --git a/ListDemo_3.x/assets/Texture/avatar_1.png.meta b/ListDemo_3.x/assets/Texture/avatar_1.png.meta index d369ceb..ebbe3e8 100644 --- a/ListDemo_3.x/assets/Texture/avatar_1.png.meta +++ b/ListDemo_3.x/assets/Texture/avatar_1.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "2f9a9632-0aa3-49d5-8573-159490ee5f37", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/Texture/avatar_2.png.meta b/ListDemo_3.x/assets/Texture/avatar_2.png.meta index deb0982..5d24341 100644 --- a/ListDemo_3.x/assets/Texture/avatar_2.png.meta +++ b/ListDemo_3.x/assets/Texture/avatar_2.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "dceee5f4-3757-43ca-ad3c-557684edfc05", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/Texture/avatar_bg.png.meta b/ListDemo_3.x/assets/Texture/avatar_bg.png.meta index 8f04768..d40926f 100644 --- a/ListDemo_3.x/assets/Texture/avatar_bg.png.meta +++ b/ListDemo_3.x/assets/Texture/avatar_bg.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "8c0b73fe-0f0b-4f10-a71e-6636fd8f10bb", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta b/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta index e23195e..193f32a 100644 --- a/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta +++ b/ListDemo_3.x/assets/Texture/chat_bubble_bg_1.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "5ccdb2a1-715e-4315-90cf-d13ed7c30d6a", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta b/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta index 897dd75..b19a620 100644 --- a/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta +++ b/ListDemo_3.x/assets/Texture/chat_bubble_bg_2.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "06804507-d856-4946-866b-9862935eeb86", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/Texture/item_bg.png.meta b/ListDemo_3.x/assets/Texture/item_bg.png.meta index d1fef04..49fa27c 100644 --- a/ListDemo_3.x/assets/Texture/item_bg.png.meta +++ b/ListDemo_3.x/assets/Texture/item_bg.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "df2c8964-aba1-47a1-82e2-1381a292802e", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/Texture/item_bg_2.png.meta b/ListDemo_3.x/assets/Texture/item_bg_2.png.meta index cede427..0f786ed 100644 --- a/ListDemo_3.x/assets/Texture/item_bg_2.png.meta +++ b/ListDemo_3.x/assets/Texture/item_bg_2.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.21", + "ver": "1.0.22", "importer": "image", "imported": true, "uuid": "13fd9783-8b86-4922-ac56-c6d392873a17", @@ -43,8 +43,8 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", diff --git a/ListDemo_3.x/assets/migrate-canvas.ts.meta b/ListDemo_3.x/assets/migrate-canvas.ts.meta index f0eff07..c8c56b4 100644 --- a/ListDemo_3.x/assets/migrate-canvas.ts.meta +++ b/ListDemo_3.x/assets/migrate-canvas.ts.meta @@ -1,5 +1,5 @@ { - "ver": "4.0.22", + "ver": "4.0.23", "importer": "typescript", "imported": true, "uuid": "eca318dc-ec97-4b03-a2d2-8bc4ff5605bb", diff --git a/ListDemo_3.x/package.json b/ListDemo_3.x/package.json index 68baf96..9b99d5e 100644 --- a/ListDemo_3.x/package.json +++ b/ListDemo_3.x/package.json @@ -1,9 +1,9 @@ { + "creator": { + "version": "3.4.1" + }, "name": "ListDemo_3_0_0_Preview", "type": "3d", "uuid": "55e44737-4268-4e9e-bc7d-4398c3c39964", - "version": "3.2.1", - "creator": { - "version": "3.2.1" - } + "version": "3.4.1" } diff --git a/ListDemo_3.x/settings/v2/packages/builder.json b/ListDemo_3.x/settings/v2/packages/builder.json index af081f3..be7f363 100644 --- a/ListDemo_3.x/settings/v2/packages/builder.json +++ b/ListDemo_3.x/settings/v2/packages/builder.json @@ -1,3 +1,3 @@ { - "__version__": "1.2.8" + "__version__": "1.3.0" } diff --git a/ListDemo_3.x/settings/v2/packages/cocos-service.json b/ListDemo_3.x/settings/v2/packages/cocos-service.json new file mode 100644 index 0000000..2870a0c --- /dev/null +++ b/ListDemo_3.x/settings/v2/packages/cocos-service.json @@ -0,0 +1,22 @@ +{ + "game": { + "name": "未知游戏", + "app_id": "UNKNOW", + "c_id": "0" + }, + "appConfigMaps": [ + { + "app_id": "UNKNOW", + "config_id": "7f3644" + } + ], + "configs": [ + { + "app_id": "UNKNOW", + "config_id": "7f3644", + "config_name": "Default", + "config_remarks": "", + "services": [] + } + ] +} diff --git a/ListDemo_3.x/settings/v2/packages/engine.json b/ListDemo_3.x/settings/v2/packages/engine.json index cd450e7..5c2b11b 100644 --- a/ListDemo_3.x/settings/v2/packages/engine.json +++ b/ListDemo_3.x/settings/v2/packages/engine.json @@ -23,7 +23,8 @@ "terrain", "tiled-map", "spine", - "dragon-bones" + "dragon-bones", + "marionette" ] } }