Update 22/1/28

ye-admin · Jan 28, 2022 · a0c9cc3 · a0c9cc3
1 parent adfc58b
commit a0c9cc3
Show file tree

Hide file tree

Showing 39 changed files with 549 additions and 254 deletions.
diff --git 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
@@ -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"
   }
-]
+]
diff --git 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
@@ -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"
   }
 ]
diff --git 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
@@ -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"
   }
 ]
diff --git 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",