Bläddra i källkod

feat:极致性能优化

zouwuqiang 2 år sedan
förälder
incheckning
00d9b7468a
29 ändrade filer med 1443 tillägg och 2567 borttagningar
  1. BIN
      assets/bundle/game/model/bg/bg.fbx
  2. 57 893
      assets/bundle/game/model/bg/bg.fbx.meta
  3. BIN
      assets/bundle/game/model/bg/house.fbx
  4. 177 0
      assets/bundle/game/model/bg/house.fbx.meta
  5. BIN
      assets/bundle/game/model/bg/house.png
  6. 42 0
      assets/bundle/game/model/bg/house.png.meta
  7. 10 0
      assets/bundle/game/model/man/man.FBX.meta
  8. BIN
      assets/bundle/game/model/obstacle/obstacle.fbx
  9. 136 21
      assets/bundle/game/model/obstacle/obstacle.fbx.meta
  10. BIN
      assets/bundle/game/model/obstacle/obstale.png
  11. 42 0
      assets/bundle/game/model/obstacle/obstale.png.meta
  12. 14 1
      assets/bundle/game/model/vehicle/airplane.FBX.meta
  13. 10 0
      assets/bundle/game/model/vehicle/car1.fbx.meta
  14. 14 1
      assets/bundle/game/model/vehicle/car2.FBX.meta
  15. 23 395
      assets/bundle/game/prefab/airplane.prefab
  16. 27 396
      assets/bundle/game/prefab/car1.prefab
  17. 20 392
      assets/bundle/game/prefab/car2.prefab
  18. 187 121
      assets/bundle/game/prefab/level.prefab
  19. 108 98
      assets/bundle/game/prefab/obstacle.prefab
  20. 226 230
      assets/bundle/gui/game/game.prefab
  21. 3 0
      assets/bundle/gui/game/texture/auto-atlas.pac
  22. 36 0
      assets/bundle/gui/game/texture/auto-atlas.pac.meta
  23. 162 17
      assets/main.scene
  24. 2 1
      assets/script/game/account/bll/AccountInit.ts
  25. 1 1
      assets/script/game/checkpoint/bll/InitCheckpoint.ts
  26. 3 0
      assets/script/game/initialize/bll/InitRes.ts
  27. 9 0
      assets/textrue.meta
  28. BIN
      assets/textrue/loadingbg.png
  29. 134 0
      assets/textrue/loadingbg.png.meta

BIN
assets/bundle/game/model/bg/bg.fbx


+ 57 - 893
assets/bundle/game/model/bg/bg.fbx.meta

@@ -2,18 +2,18 @@
   "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
-  "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2",
+  "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e",
   "files": [],
   "subMetas": {
-    "44b97": {
+    "c4192": {
       "importer": "gltf-mesh",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@44b97",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@c4192",
       "displayName": "",
-      "id": "44b97",
-      "name": "Mesh.005.mesh",
+      "id": "c4192",
+      "name": "Mesh.013.mesh",
       "userData": {
         "gltfIndex": 0,
-        "triangleCount": 1424
+        "triangleCount": 366
       },
       "ver": "1.1.1",
       "imported": true,
@@ -23,12 +23,12 @@
       ],
       "subMetas": {}
     },
-    "e6821": {
+    "d90a4": {
       "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@e6821",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@d90a4",
       "displayName": "",
-      "id": "e6821",
-      "name": "16 - Default.material",
+      "id": "d90a4",
+      "name": "01 - Default.material",
       "userData": {
         "gltfIndex": 0
       },
@@ -39,12 +39,12 @@
       ],
       "subMetas": {}
     },
-    "ac35e": {
+    "5de44": {
       "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@ac35e",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@5de44",
       "displayName": "",
-      "id": "ac35e",
-      "name": "02 - Default.001.material",
+      "id": "5de44",
+      "name": "05 - Default.material",
       "userData": {
         "gltfIndex": 1
       },
@@ -55,126 +55,14 @@
       ],
       "subMetas": {}
     },
-    "47ad3": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@47ad3",
-      "displayName": "",
-      "id": "47ad3",
-      "name": "04 - Default.material",
-      "userData": {
-        "gltfIndex": 2
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "1ef3c": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@1ef3c",
-      "displayName": "",
-      "id": "1ef3c",
-      "name": "17 - Default.material",
-      "userData": {
-        "gltfIndex": 3
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f3e98": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@f3e98",
-      "displayName": "",
-      "id": "f3e98",
-      "name": "06 - Default.material",
-      "userData": {
-        "gltfIndex": 4
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "6363a": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@6363a",
-      "displayName": "",
-      "id": "6363a",
-      "name": "03 - Default.material",
-      "userData": {
-        "gltfIndex": 5
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "883e3": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@883e3",
-      "displayName": "",
-      "id": "883e3",
-      "name": "14 - Default.material",
-      "userData": {
-        "gltfIndex": 6
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "808ae": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@808ae",
-      "displayName": "",
-      "id": "808ae",
-      "name": "15 - Default.material",
-      "userData": {
-        "gltfIndex": 7
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "c5fbc": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@c5fbc",
-      "displayName": "",
-      "id": "c5fbc",
-      "name": "14___Default.material",
-      "userData": {
-        "gltfIndex": 8
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
     "c4114": {
       "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@c4114",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@c4114",
       "displayName": "",
       "id": "c4114",
       "name": "07 - Default.material",
       "userData": {
-        "gltfIndex": 9
+        "gltfIndex": 2
       },
       "ver": "1.0.14",
       "imported": true,
@@ -185,28 +73,12 @@
     },
     "db4d2": {
       "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@db4d2",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@db4d2",
       "displayName": "",
       "id": "db4d2",
       "name": "02 - Default.material",
       "userData": {
-        "gltfIndex": 10
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "d90a4": {
-      "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@d90a4",
-      "displayName": "",
-      "id": "d90a4",
-      "name": "01 - Default.material",
-      "userData": {
-        "gltfIndex": 11
+        "gltfIndex": 3
       },
       "ver": "1.0.14",
       "imported": true,
@@ -215,14 +87,14 @@
       ],
       "subMetas": {}
     },
-    "5de44": {
+    "f3e98": {
       "importer": "gltf-material",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@5de44",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@f3e98",
       "displayName": "",
-      "id": "5de44",
-      "name": "05 - Default.material",
+      "id": "f3e98",
+      "name": "06 - Default.material",
       "userData": {
-        "gltfIndex": 12
+        "gltfIndex": 4
       },
       "ver": "1.0.14",
       "imported": true,
@@ -233,7 +105,7 @@
     },
     "d4793": {
       "importer": "gltf-scene",
-      "uuid": "8f90d19a-85f5-4649-8444-b4ab32b867c2@d4793",
+      "uuid": "c492d598-720d-4e54-9b3e-92c8db012e5e@d4793",
       "displayName": "",
       "id": "d4793",
       "name": "bg.prefab",
@@ -253,7 +125,7 @@
     "fbx": {
       "smartMaterialEnabled": true
     },
-    "redirect": "8f90d19a-85f5-4649-8444-b4ab32b867c2@d4793",
+    "redirect": "c492d598-720d-4e54-9b3e-92c8db012e5e@d4793",
     "lods": {
       "enable": false,
       "hasBuiltinLOD": false,
@@ -274,31 +146,23 @@
     },
     "assetFinder": {
       "meshes": [
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@44b97"
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@c4192"
       ],
       "skeletons": [],
       "textures": [],
       "materials": [
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@e6821",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@ac35e",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@47ad3",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@1ef3c",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@f3e98",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@6363a",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@883e3",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@808ae",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@c5fbc",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@c4114",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@db4d2",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@d90a4",
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@5de44"
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@d90a4",
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@5de44",
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@c4114",
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@db4d2",
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@f3e98"
       ],
       "scenes": [
-        "8f90d19a-85f5-4649-8444-b4ab32b867c2@d4793"
+        "c492d598-720d-4e54-9b3e-92c8db012e5e@d4793"
       ]
     },
     "materials": {
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@e6821": {
+      "c492d598-720d-4e54-9b3e-92c8db012e5e@d90a4": {
         "__type__": "cc.Material",
         "_name": "",
         "_objFlags": 0,
@@ -310,7 +174,10 @@
         },
         "_techIdx": 0,
         "_defines": [
-          {},
+          {
+            "DCC_APP_NAME": 2,
+            "HAS_EXPORTED_METALLIC": true
+          },
           {},
           {},
           {}
@@ -357,88 +224,37 @@
           {
             "mainColor": {
               "__type__": "cc.Color",
-              "r": 106,
-              "g": 170,
-              "b": 224,
+              "r": 189,
+              "g": 189,
+              "b": 189,
               "a": 255
-            }
+            },
+            "emissiveScale": 0,
+            "shininessExponent": 2.000000605892538,
+            "specularFactor": 0,
+            "transparencyFactor": 0
           },
           {},
           {},
           {}
         ]
       },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@ac35e": {
+      "c492d598-720d-4e54-9b3e-92c8db012e5e@c4114": {
         "__type__": "cc.Material",
         "_name": "",
         "_objFlags": 0,
         "__editorExtras__": {},
         "_native": "",
         "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
+          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
           "__expectedType__": "cc.EffectAsset"
         },
         "_techIdx": 0,
         "_defines": [
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
           {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 177,
-              "g": 177,
-              "b": 177,
-              "a": 255
-            }
+            "DCC_APP_NAME": 2,
+            "HAS_EXPORTED_METALLIC": true
           },
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@47ad3": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
           {},
           {},
           {}
@@ -453,56 +269,6 @@
               ]
             }
           },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 115,
-              "g": 189,
-              "b": 202,
-              "a": 255
-            }
-          },
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@1ef3c": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {}
-        ],
-        "_states": [
           {
             "rasterizerState": {},
             "depthStencilState": {},
@@ -535,619 +301,17 @@
           {
             "mainColor": {
               "__type__": "cc.Color",
-              "r": 133,
-              "g": 139,
-              "b": 190,
+              "r": 213,
+              "g": 220,
+              "b": 228,
               "a": 255
-            }
+            },
+            "emissiveScale": 0,
+            "shininessExponent": 2.000000605892538,
+            "specularFactor": 0,
+            "transparencyFactor": 0
           },
           {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@f3e98": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 191,
-              "g": 209,
-              "b": 223,
-              "a": 255
-            }
-          },
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@6363a": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {},
-          {},
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@883e3": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 221,
-              "g": 197,
-              "b": 83,
-              "a": 255
-            }
-          },
-          {},
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@c5fbc": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 255,
-              "g": 196,
-              "b": 122,
-              "a": 255
-            }
-          },
-          {},
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@c4114": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 200,
-              "g": 207,
-              "b": 215,
-              "a": 255
-            }
-          },
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@db4d2": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 158,
-              "g": 170,
-              "b": 196,
-              "a": 255
-            }
-          },
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@d90a4": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 189,
-              "g": 189,
-              "b": 189,
-              "a": 255
-            }
-          },
-          {},
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@5de44": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "c8f66d17-351a-48da-a12c-0212d28575c4",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 142,
-              "g": 148,
-              "b": 198,
-              "a": 255
-            },
-            "albedoScale": {
-              "__type__": "cc.Vec3",
-              "x": 0.7,
-              "y": 0.7,
-              "z": 0.7
-            },
-            "roughness": 1
-          },
-          {},
-          {},
-          {},
-          {},
-          {}
-        ]
-      },
-      "8f90d19a-85f5-4649-8444-b4ab32b867c2@808ae": {
-        "__type__": "cc.Material",
-        "_name": "",
-        "_objFlags": 0,
-        "__editorExtras__": {},
-        "_native": "",
-        "_effectAsset": {
-          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-          "__expectedType__": "cc.EffectAsset"
-        },
-        "_techIdx": 0,
-        "_defines": [
-          {},
-          {},
-          {}
-        ],
-        "_states": [
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          },
-          {
-            "rasterizerState": {},
-            "depthStencilState": {},
-            "blendState": {
-              "targets": [
-                {}
-              ]
-            }
-          }
-        ],
-        "_props": [
-          {
-            "mainColor": {
-              "__type__": "cc.Color",
-              "r": 248,
-              "g": 246,
-              "b": 243,
-              "a": 255
-            }
-          },
           {},
           {}
         ]

BIN
assets/bundle/game/model/bg/house.fbx


+ 177 - 0
assets/bundle/game/model/bg/house.fbx.meta

@@ -0,0 +1,177 @@
+{
+  "ver": "2.3.12",
+  "importer": "fbx",
+  "imported": true,
+  "uuid": "39745771-ef67-4bcb-bf21-5e70199dfd6a",
+  "files": [],
+  "subMetas": {
+    "39b7c": {
+      "importer": "gltf-mesh",
+      "uuid": "39745771-ef67-4bcb-bf21-5e70199dfd6a@39b7c",
+      "displayName": "",
+      "id": "39b7c",
+      "name": "Mesh.027.mesh",
+      "userData": {
+        "gltfIndex": 0,
+        "triangleCount": 1058
+      },
+      "ver": "1.1.1",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "0e32e": {
+      "importer": "gltf-material",
+      "uuid": "39745771-ef67-4bcb-bf21-5e70199dfd6a@0e32e",
+      "displayName": "",
+      "id": "0e32e",
+      "name": "Box082.002_Baked.material",
+      "userData": {
+        "gltfIndex": 0
+      },
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "87aed": {
+      "importer": "gltf-scene",
+      "uuid": "39745771-ef67-4bcb-bf21-5e70199dfd6a@87aed",
+      "displayName": "",
+      "id": "87aed",
+      "name": "house.prefab",
+      "userData": {
+        "gltfIndex": 0
+      },
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "imageMetas": [],
+    "fbx": {
+      "smartMaterialEnabled": true
+    },
+    "redirect": "39745771-ef67-4bcb-bf21-5e70199dfd6a@87aed",
+    "lods": {
+      "enable": false,
+      "hasBuiltinLOD": false,
+      "options": [
+        {
+          "screenRatio": 0.25,
+          "faceCount": 1
+        },
+        {
+          "screenRatio": 0.125,
+          "faceCount": 0.25
+        },
+        {
+          "screenRatio": 0.01,
+          "faceCount": 0.1
+        }
+      ]
+    },
+    "assetFinder": {
+      "meshes": [
+        "39745771-ef67-4bcb-bf21-5e70199dfd6a@39b7c"
+      ],
+      "skeletons": [],
+      "textures": [],
+      "materials": [
+        "39745771-ef67-4bcb-bf21-5e70199dfd6a@0e32e"
+      ],
+      "scenes": [
+        "39745771-ef67-4bcb-bf21-5e70199dfd6a@87aed"
+      ]
+    },
+    "materials": {
+      "39745771-ef67-4bcb-bf21-5e70199dfd6a@0e32e": {
+        "__type__": "cc.Material",
+        "_name": "",
+        "_objFlags": 0,
+        "__editorExtras__": {},
+        "_native": "",
+        "_effectAsset": {
+          "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
+          "__expectedType__": "cc.EffectAsset"
+        },
+        "_techIdx": 0,
+        "_defines": [
+          {
+            "USE_TEXTURE": true
+          },
+          {},
+          {}
+        ],
+        "_states": [
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          }
+        ],
+        "_props": [
+          {
+            "mainTexture": {
+              "__uuid__": "6202136b-c6c8-4f48-9015-e7cfaba042bb@6c48a",
+              "__expectedType__": "cc.Texture2D"
+            },
+            "mainColor": {
+              "__type__": "cc.Color",
+              "r": 231,
+              "g": 231,
+              "b": 231,
+              "a": 255
+            }
+          },
+          {},
+          {}
+        ]
+      }
+    },
+    "meshOptimize": {
+      "enable": true,
+      "overdraw": true,
+      "vertexFetch": true,
+      "vertexCache": true
+    },
+    "meshCompress": {
+      "compress": true
+    },
+    "legacyFbxImporter": false,
+    "allowMeshDataAccess": true,
+    "addVertexColor": false,
+    "generateLightmapUVNode": false
+  }
+}

BIN
assets/bundle/game/model/bg/house.png


+ 42 - 0
assets/bundle/game/model/bg/house.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "6202136b-c6c8-4f48-9015-e7cfaba042bb",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "6202136b-c6c8-4f48-9015-e7cfaba042bb@6c48a",
+      "displayName": "house",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "6202136b-c6c8-4f48-9015-e7cfaba042bb",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": false,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": true,
+    "redirect": "6202136b-c6c8-4f48-9015-e7cfaba042bb@6c48a"
+  }
+}

+ 10 - 0
assets/bundle/game/model/man/man.FBX.meta

@@ -260,6 +260,16 @@
           {}
         ]
       }
+    },
+    "meshOptimize": {
+      "enable": true,
+      "vertexCache": true,
+      "vertexFetch": true,
+      "overdraw": true
+    },
+    "meshCompress": {
+      "enable": true,
+      "compress": true
     }
   }
 }

BIN
assets/bundle/game/model/obstacle/obstacle.fbx


+ 136 - 21
assets/bundle/game/model/obstacle/obstacle.fbx.meta

@@ -5,12 +5,12 @@
   "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3",
   "files": [],
   "subMetas": {
-    "8a6b5": {
+    "94ea0": {
       "importer": "gltf-mesh",
-      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@8a6b5",
+      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@94ea0",
       "displayName": "",
-      "id": "8a6b5",
-      "name": "Mesh.030.mesh",
+      "id": "94ea0",
+      "name": "Mesh.034.mesh",
       "userData": {
         "gltfIndex": 0,
         "triangleCount": 176
@@ -23,30 +23,57 @@
       ],
       "subMetas": {}
     },
-    "db4d2": {
-      "importer": "gltf-material",
-      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@db4d2",
+    "48b02": {
+      "importer": "gltf-embeded-image",
+      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@48b02",
       "displayName": "",
-      "id": "db4d2",
-      "name": "02 - Default.material",
+      "id": "48b02",
+      "name": "base_color_texture.image",
       "userData": {
-        "gltfIndex": 0
+        "gltfIndex": 0,
+        "fixAlphaTransparencyArtifacts": true,
+        "hasAlpha": false,
+        "type": "texture"
       },
-      "ver": "1.0.14",
+      "ver": "1.0.3",
+      "imported": true,
+      "files": [
+        ".json",
+        ".png"
+      ],
+      "subMetas": {}
+    },
+    "7d6ab": {
+      "importer": "texture",
+      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@7d6ab",
+      "displayName": "",
+      "id": "7d6ab",
+      "name": "base_color_texture.texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "3a649517-2486-4e8c-9a4d-422506b467f3@48b02"
+      },
+      "ver": "1.0.22",
       "imported": true,
       "files": [
         ".json"
       ],
       "subMetas": {}
     },
-    "d90a4": {
+    "f5de6": {
       "importer": "gltf-material",
-      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@d90a4",
+      "uuid": "3a649517-2486-4e8c-9a4d-422506b467f3@f5de6",
       "displayName": "",
-      "id": "d90a4",
-      "name": "01 - Default.material",
+      "id": "f5de6",
+      "name": "Cylinder002_Baked.material",
       "userData": {
-        "gltfIndex": 1
+        "gltfIndex": 0
       },
       "ver": "1.0.14",
       "imported": true,
@@ -73,7 +100,12 @@
     }
   },
   "userData": {
-    "imageMetas": [],
+    "imageMetas": [
+      {
+        "name": "base_color_texture",
+        "uri": "3a649517-2486-4e8c-9a4d-422506b467f3@48b02"
+      }
+    ],
     "fbx": {
       "smartMaterialEnabled": true
     },
@@ -98,13 +130,14 @@
     },
     "assetFinder": {
       "meshes": [
-        "3a649517-2486-4e8c-9a4d-422506b467f3@8a6b5"
+        "3a649517-2486-4e8c-9a4d-422506b467f3@94ea0"
       ],
       "skeletons": [],
-      "textures": [],
+      "textures": [
+        "3a649517-2486-4e8c-9a4d-422506b467f3@7d6ab"
+      ],
       "materials": [
-        "3a649517-2486-4e8c-9a4d-422506b467f3@db4d2",
-        "3a649517-2486-4e8c-9a4d-422506b467f3@d90a4"
+        "3a649517-2486-4e8c-9a4d-422506b467f3@f5de6"
       ],
       "scenes": [
         "3a649517-2486-4e8c-9a4d-422506b467f3@a9070"
@@ -243,6 +276,88 @@
           {},
           {}
         ]
+      },
+      "3a649517-2486-4e8c-9a4d-422506b467f3@f5de6": {
+        "__type__": "cc.Material",
+        "_name": "",
+        "_objFlags": 0,
+        "__editorExtras__": {},
+        "_native": "",
+        "_effectAsset": {
+          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+          "__expectedType__": "cc.EffectAsset"
+        },
+        "_techIdx": 0,
+        "_defines": [
+          {
+            "USE_INSTANCING": true,
+            "DCC_APP_NAME": 2,
+            "USE_ALBEDO_MAP": true,
+            "HAS_EXPORTED_METALLIC": true
+          },
+          {},
+          {},
+          {}
+        ],
+        "_states": [
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          }
+        ],
+        "_props": [
+          {
+            "mainTexture": {
+              "__uuid__": "3a649517-2486-4e8c-9a4d-422506b467f3@7d6ab",
+              "__expectedType__": "cc.Texture2D"
+            },
+            "mainColor": {
+              "__type__": "cc.Color",
+              "r": 231,
+              "g": 231,
+              "b": 231,
+              "a": 255
+            },
+            "shininessExponent": 25,
+            "specularFactor": 0.25,
+            "transparencyFactor": 0
+          },
+          {},
+          {},
+          {}
+        ]
       }
     }
   }

BIN
assets/bundle/game/model/obstacle/obstale.png


+ 42 - 0
assets/bundle/game/model/obstacle/obstale.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "b2a5142e-5e6a-41eb-aca7-1c4b76845dd3",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "b2a5142e-5e6a-41eb-aca7-1c4b76845dd3@6c48a",
+      "displayName": "obstale",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b2a5142e-5e6a-41eb-aca7-1c4b76845dd3",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": false,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": true,
+    "redirect": "b2a5142e-5e6a-41eb-aca7-1c4b76845dd3@6c48a"
+  }
+}

+ 14 - 1
assets/bundle/game/model/vehicle/airplane.FBX.meta

@@ -178,6 +178,19 @@
       "scenes": [
         "f0202cb8-1515-4fb0-9802-29c6160d71a3@d403c"
       ]
-    }
+    },
+    "meshOptimize": {
+      "enable": true,
+      "vertexCache": true,
+      "vertexFetch": true,
+      "overdraw": true
+    },
+    "meshCompress": {
+      "compress": true
+    },
+    "legacyFbxImporter": false,
+    "allowMeshDataAccess": true,
+    "addVertexColor": false,
+    "generateLightmapUVNode": false
   }
 }

+ 10 - 0
assets/bundle/game/model/vehicle/car1.fbx.meta

@@ -819,6 +819,16 @@
           {}
         ]
       }
+    },
+    "meshOptimize": {
+      "enable": true,
+      "overdraw": true,
+      "vertexFetch": true,
+      "vertexCache": true
+    },
+    "meshCompress": {
+      "enable": true,
+      "compress": true
     }
   }
 }

+ 14 - 1
assets/bundle/game/model/vehicle/car2.FBX.meta

@@ -259,6 +259,19 @@
       "scenes": [
         "3b44fef7-6379-4e48-b21d-f82716d5a331@8a1f0"
       ]
-    }
+    },
+    "meshOptimize": {
+      "enable": true,
+      "vertexCache": true,
+      "vertexFetch": true,
+      "overdraw": true
+    },
+    "meshCompress": {
+      "compress": true
+    },
+    "legacyFbxImporter": false,
+    "allowMeshDataAccess": true,
+    "addVertexColor": false,
+    "generateLightmapUVNode": false
   }
 }

+ 23 - 395
assets/bundle/game/prefab/airplane.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 45
       },
       {
-        "__id__": 78
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -324,7 +324,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -427,45 +427,21 @@
       "__id__": 35
     },
     "bursts": [],
-    "_renderCulling": false,
+    "_renderCulling": true,
     "_cullingMode": 0,
-    "_aabbHalfX": 8.5,
-    "_aabbHalfY": 1,
-    "_aabbHalfZ": 1.0000000000000018,
-    "_dataCulling": false,
-    "enableCulling": false,
-    "_colorOverLifetimeModule": {
-      "__id__": 36
-    },
-    "_shapeModule": {
-      "__id__": 38
-    },
+    "_aabbHalfX": 0.3904545454545454,
+    "_aabbHalfY": 0.29999999999999993,
+    "_aabbHalfZ": 1,
+    "_dataCulling": true,
+    "enableCulling": true,
     "_sizeOvertimeModule": {
-      "__id__": 40
-    },
-    "_velocityOvertimeModule": {
-      "__id__": 46
-    },
-    "_forceOvertimeModule": {
-      "__id__": 51
-    },
-    "_limitVelocityOvertimeModule": {
-      "__id__": 55
-    },
-    "_rotationOvertimeModule": {
-      "__id__": 60
-    },
-    "_textureAnimationModule": {
-      "__id__": 64
+      "__id__": 36
     },
     "_noiseModule": {
-      "__id__": 68
-    },
-    "_trailModule": {
-      "__id__": 69
+      "__id__": 42
     },
     "renderer": {
-      "__id__": 74
+      "__id__": 43
     },
     "_prewarm": false,
     "_capacity": 10,
@@ -559,97 +535,28 @@
     "constant": 0,
     "multiplier": 1
   },
-  {
-    "__type__": "cc.ColorOvertimeModule",
-    "_enable": false,
-    "color": {
-      "__id__": 37
-    }
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.ShapeModule",
-    "_enable": false,
-    "_shapeType": 2,
-    "shapeType": 2,
-    "emitFrom": 0,
-    "alignToDirection": false,
-    "randomDirectionAmount": 0,
-    "sphericalDirectionAmount": 0,
-    "randomPositionAmount": 0,
-    "radius": 0.1,
-    "radiusThickness": 1,
-    "arcMode": 0,
-    "arcSpread": 0,
-    "arcSpeed": {
-      "__id__": 39
-    },
-    "length": 5,
-    "boxThickness": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_rotation": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_arc": 6.283185307179586,
-    "_angle": 0.4363323129985824
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 1,
-    "multiplier": 1
-  },
   {
     "__type__": "cc.SizeOvertimeModule",
     "_enable": true,
     "separateAxes": false,
     "size": {
-      "__id__": 41
+      "__id__": 37
     },
     "x": {
-      "__id__": 43
+      "__id__": 39
     },
     "y": {
-      "__id__": 44
+      "__id__": 40
     },
     "z": {
-      "__id__": 45
+      "__id__": 41
     }
   },
   {
     "__type__": "cc.CurveRange",
     "mode": 1,
     "spline": {
-      "__id__": 42
+      "__id__": 38
     },
     "multiplier": 1
   },
@@ -706,225 +613,6 @@
     "constant": 0,
     "multiplier": 1
   },
-  {
-    "__type__": "cc.VelocityOvertimeModule",
-    "_enable": false,
-    "x": {
-      "__id__": 47
-    },
-    "y": {
-      "__id__": 48
-    },
-    "z": {
-      "__id__": 49
-    },
-    "speedModifier": {
-      "__id__": 50
-    },
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 1,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.ForceOvertimeModule",
-    "_enable": false,
-    "x": {
-      "__id__": 52
-    },
-    "y": {
-      "__id__": 53
-    },
-    "z": {
-      "__id__": 54
-    },
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.LimitVelocityOvertimeModule",
-    "_enable": false,
-    "limitX": {
-      "__id__": 56
-    },
-    "limitY": {
-      "__id__": 57
-    },
-    "limitZ": {
-      "__id__": 58
-    },
-    "limit": {
-      "__id__": 59
-    },
-    "dampen": 3,
-    "separateAxes": false,
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.RotationOvertimeModule",
-    "_enable": false,
-    "_separateAxes": false,
-    "x": {
-      "__id__": 61
-    },
-    "y": {
-      "__id__": 62
-    },
-    "z": {
-      "__id__": 63
-    }
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.TextureAnimationModule",
-    "_enable": false,
-    "_numTilesX": 0,
-    "numTilesX": 0,
-    "_numTilesY": 0,
-    "numTilesY": 0,
-    "_mode": 0,
-    "animation": 0,
-    "frameOverTime": {
-      "__id__": 65
-    },
-    "startFrame": {
-      "__id__": 67
-    },
-    "cycleCount": 0,
-    "_flipU": 0,
-    "_flipV": 0,
-    "_uvChannelMask": -1,
-    "randomRow": false,
-    "rowIndex": 0
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 1,
-    "spline": {
-      "__id__": 66
-    },
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      1
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 2,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 0,
-        "leftTangent": 0,
-        "leftTangentWeight": 0,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 2,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 0,
-        "leftTangent": 0,
-        "leftTangentWeight": 0,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
   {
     "__type__": "cc.NoiseModule",
     "_enable": true,
@@ -942,66 +630,6 @@
     "_octaveMultiplier": 0.5,
     "_octaveScale": 2
   },
-  {
-    "__type__": "cc.TrailModule",
-    "_enable": false,
-    "mode": 0,
-    "lifeTime": {
-      "__id__": 70
-    },
-    "_minParticleDistance": 0.1,
-    "existWithParticles": true,
-    "textureMode": 0,
-    "widthFromParticle": true,
-    "widthRatio": {
-      "__id__": 71
-    },
-    "colorFromParticle": false,
-    "colorOverTrail": {
-      "__id__": 72
-    },
-    "colorOvertime": {
-      "__id__": 73
-    },
-    "_space": 0,
-    "_particleSystem": {
-      "__id__": 21
-    }
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0.3,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
   {
     "__type__": "cc.ParticleSystemRenderer",
     "_renderMode": 0,
@@ -1043,7 +671,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 46
     },
     "ske": null,
     "_id": ""
@@ -1062,7 +690,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 48
     },
     "_material": null,
     "_isTrigger": false,
@@ -1096,7 +724,7 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 81
+        "__id__": 50
       }
     ],
     "nestedPrefabInstanceRoots": [
@@ -1108,7 +736,7 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 76
+      "__id__": 45
     },
     "sourceInfo": null,
     "propertyPath": [
@@ -1118,7 +746,7 @@
       "__id__": 2
     },
     "targetInfo": {
-      "__id__": 82
+      "__id__": 51
     }
   },
   {

+ 27 - 396
assets/bundle/game/prefab/car1.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 48
       },
       {
-        "__id__": 81
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -360,7 +360,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -463,45 +463,21 @@
       "__id__": 38
     },
     "bursts": [],
-    "_renderCulling": false,
+    "_renderCulling": true,
     "_cullingMode": 0,
-    "_aabbHalfX": 8.5,
-    "_aabbHalfY": 1,
-    "_aabbHalfZ": 1.0000000000000018,
-    "_dataCulling": false,
-    "enableCulling": false,
-    "_colorOverLifetimeModule": {
-      "__id__": 39
-    },
-    "_shapeModule": {
-      "__id__": 41
-    },
+    "_aabbHalfX": 0.35045454545454546,
+    "_aabbHalfY": 0.3,
+    "_aabbHalfZ": 1,
+    "_dataCulling": true,
+    "enableCulling": true,
     "_sizeOvertimeModule": {
-      "__id__": 43
-    },
-    "_velocityOvertimeModule": {
-      "__id__": 49
-    },
-    "_forceOvertimeModule": {
-      "__id__": 54
-    },
-    "_limitVelocityOvertimeModule": {
-      "__id__": 58
-    },
-    "_rotationOvertimeModule": {
-      "__id__": 63
-    },
-    "_textureAnimationModule": {
-      "__id__": 67
+      "__id__": 39
     },
     "_noiseModule": {
-      "__id__": 71
-    },
-    "_trailModule": {
-      "__id__": 72
+      "__id__": 45
     },
     "renderer": {
-      "__id__": 77
+      "__id__": 46
     },
     "_prewarm": false,
     "_capacity": 10,
@@ -595,97 +571,28 @@
     "constant": 0,
     "multiplier": 1
   },
-  {
-    "__type__": "cc.ColorOvertimeModule",
-    "_enable": false,
-    "color": {
-      "__id__": 40
-    }
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.ShapeModule",
-    "_enable": false,
-    "_shapeType": 2,
-    "shapeType": 2,
-    "emitFrom": 0,
-    "alignToDirection": false,
-    "randomDirectionAmount": 0,
-    "sphericalDirectionAmount": 0,
-    "randomPositionAmount": 0,
-    "radius": 0.1,
-    "radiusThickness": 1,
-    "arcMode": 0,
-    "arcSpread": 0,
-    "arcSpeed": {
-      "__id__": 42
-    },
-    "length": 5,
-    "boxThickness": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_rotation": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_arc": 6.283185307179586,
-    "_angle": 0.4363323129985824
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 1,
-    "multiplier": 1
-  },
   {
     "__type__": "cc.SizeOvertimeModule",
     "_enable": true,
     "separateAxes": false,
     "size": {
-      "__id__": 44
+      "__id__": 40
     },
     "x": {
-      "__id__": 46
+      "__id__": 42
     },
     "y": {
-      "__id__": 47
+      "__id__": 43
     },
     "z": {
-      "__id__": 48
+      "__id__": 44
     }
   },
   {
     "__type__": "cc.CurveRange",
     "mode": 1,
     "spline": {
-      "__id__": 45
+      "__id__": 41
     },
     "multiplier": 1
   },
@@ -742,225 +649,6 @@
     "constant": 0,
     "multiplier": 1
   },
-  {
-    "__type__": "cc.VelocityOvertimeModule",
-    "_enable": false,
-    "x": {
-      "__id__": 50
-    },
-    "y": {
-      "__id__": 51
-    },
-    "z": {
-      "__id__": 52
-    },
-    "speedModifier": {
-      "__id__": 53
-    },
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 1,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.ForceOvertimeModule",
-    "_enable": false,
-    "x": {
-      "__id__": 55
-    },
-    "y": {
-      "__id__": 56
-    },
-    "z": {
-      "__id__": 57
-    },
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.LimitVelocityOvertimeModule",
-    "_enable": false,
-    "limitX": {
-      "__id__": 59
-    },
-    "limitY": {
-      "__id__": 60
-    },
-    "limitZ": {
-      "__id__": 61
-    },
-    "limit": {
-      "__id__": 62
-    },
-    "dampen": 3,
-    "separateAxes": false,
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.RotationOvertimeModule",
-    "_enable": false,
-    "_separateAxes": false,
-    "x": {
-      "__id__": 64
-    },
-    "y": {
-      "__id__": 65
-    },
-    "z": {
-      "__id__": 66
-    }
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.TextureAnimationModule",
-    "_enable": false,
-    "_numTilesX": 0,
-    "numTilesX": 0,
-    "_numTilesY": 0,
-    "numTilesY": 0,
-    "_mode": 0,
-    "animation": 0,
-    "frameOverTime": {
-      "__id__": 68
-    },
-    "startFrame": {
-      "__id__": 70
-    },
-    "cycleCount": 0,
-    "_flipU": 0,
-    "_flipV": 0,
-    "_uvChannelMask": -1,
-    "randomRow": false,
-    "rowIndex": 0
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 1,
-    "spline": {
-      "__id__": 69
-    },
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      1
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 2,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 0,
-        "leftTangent": 0,
-        "leftTangentWeight": 0,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 2,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 0,
-        "leftTangent": 0,
-        "leftTangentWeight": 0,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
   {
     "__type__": "cc.NoiseModule",
     "_enable": true,
@@ -978,66 +666,6 @@
     "_octaveMultiplier": 0.5,
     "_octaveScale": 2
   },
-  {
-    "__type__": "cc.TrailModule",
-    "_enable": false,
-    "mode": 0,
-    "lifeTime": {
-      "__id__": 73
-    },
-    "_minParticleDistance": 0.1,
-    "existWithParticles": true,
-    "textureMode": 0,
-    "widthFromParticle": true,
-    "widthRatio": {
-      "__id__": 74
-    },
-    "colorFromParticle": false,
-    "colorOverTrail": {
-      "__id__": 75
-    },
-    "colorOvertime": {
-      "__id__": 76
-    },
-    "_space": 0,
-    "_particleSystem": {
-      "__id__": 24
-    }
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0.3,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
   {
     "__type__": "cc.ParticleSystemRenderer",
     "_renderMode": 0,
@@ -1048,7 +676,10 @@
       "__uuid__": "ea7478b0-408d-4052-b703-f0d2355e095f",
       "__expectedType__": "cc.Material"
     },
-    "_gpuMaterial": null,
+    "_gpuMaterial": {
+      "__uuid__": "14da1725-c4c2-42b4-ab08-ee0aeb6898b3",
+      "__expectedType__": "cc.Material"
+    },
     "_mainTexture": {
       "__uuid__": "b5b27ab1-e740-4398-b407-848fc2b2c897@6c48a",
       "__expectedType__": "cc.Texture2D"
@@ -1079,7 +710,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 49
     },
     "ske": null,
     "_id": ""
@@ -1098,7 +729,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 51
     },
     "_material": null,
     "_isTrigger": false,
@@ -1132,7 +763,7 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 84
+        "__id__": 53
       }
     ],
     "nestedPrefabInstanceRoots": [
@@ -1144,7 +775,7 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 79
+      "__id__": 48
     },
     "sourceInfo": null,
     "propertyPath": [
@@ -1154,7 +785,7 @@
       "__id__": 2
     },
     "targetInfo": {
-      "__id__": 85
+      "__id__": 54
     }
   },
   {

+ 20 - 392
assets/bundle/game/prefab/car2.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 59
       },
       {
-        "__id__": 92
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 63
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -946,7 +946,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1049,45 +1049,21 @@
       "__id__": 49
     },
     "bursts": [],
-    "_renderCulling": false,
+    "_renderCulling": true,
     "_cullingMode": 0,
-    "_aabbHalfX": 8.5,
-    "_aabbHalfY": 1,
-    "_aabbHalfZ": 1.0000000000000018,
-    "_dataCulling": false,
-    "enableCulling": false,
-    "_colorOverLifetimeModule": {
-      "__id__": 50
-    },
-    "_shapeModule": {
-      "__id__": 52
-    },
+    "_aabbHalfX": 0.3904545454545455,
+    "_aabbHalfY": 0.3,
+    "_aabbHalfZ": 1,
+    "_dataCulling": true,
+    "enableCulling": true,
     "_sizeOvertimeModule": {
-      "__id__": 54
-    },
-    "_velocityOvertimeModule": {
-      "__id__": 60
-    },
-    "_forceOvertimeModule": {
-      "__id__": 65
-    },
-    "_limitVelocityOvertimeModule": {
-      "__id__": 69
-    },
-    "_rotationOvertimeModule": {
-      "__id__": 74
-    },
-    "_textureAnimationModule": {
-      "__id__": 78
+      "__id__": 50
     },
     "_noiseModule": {
-      "__id__": 82
-    },
-    "_trailModule": {
-      "__id__": 83
+      "__id__": 56
     },
     "renderer": {
-      "__id__": 88
+      "__id__": 57
     },
     "_prewarm": false,
     "_capacity": 10,
@@ -1181,97 +1157,28 @@
     "constant": 0,
     "multiplier": 1
   },
-  {
-    "__type__": "cc.ColorOvertimeModule",
-    "_enable": false,
-    "color": {
-      "__id__": 51
-    }
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.ShapeModule",
-    "_enable": false,
-    "_shapeType": 2,
-    "shapeType": 2,
-    "emitFrom": 0,
-    "alignToDirection": false,
-    "randomDirectionAmount": 0,
-    "sphericalDirectionAmount": 0,
-    "randomPositionAmount": 0,
-    "radius": 0.1,
-    "radiusThickness": 1,
-    "arcMode": 0,
-    "arcSpread": 0,
-    "arcSpeed": {
-      "__id__": 53
-    },
-    "length": 5,
-    "boxThickness": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_rotation": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_arc": 6.283185307179586,
-    "_angle": 0.4363323129985824
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 1,
-    "multiplier": 1
-  },
   {
     "__type__": "cc.SizeOvertimeModule",
     "_enable": true,
     "separateAxes": false,
     "size": {
-      "__id__": 55
+      "__id__": 51
     },
     "x": {
-      "__id__": 57
+      "__id__": 53
     },
     "y": {
-      "__id__": 58
+      "__id__": 54
     },
     "z": {
-      "__id__": 59
+      "__id__": 55
     }
   },
   {
     "__type__": "cc.CurveRange",
     "mode": 1,
     "spline": {
-      "__id__": 56
+      "__id__": 52
     },
     "multiplier": 1
   },
@@ -1328,225 +1235,6 @@
     "constant": 0,
     "multiplier": 1
   },
-  {
-    "__type__": "cc.VelocityOvertimeModule",
-    "_enable": false,
-    "x": {
-      "__id__": 61
-    },
-    "y": {
-      "__id__": 62
-    },
-    "z": {
-      "__id__": 63
-    },
-    "speedModifier": {
-      "__id__": 64
-    },
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 1,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.ForceOvertimeModule",
-    "_enable": false,
-    "x": {
-      "__id__": 66
-    },
-    "y": {
-      "__id__": 67
-    },
-    "z": {
-      "__id__": 68
-    },
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.LimitVelocityOvertimeModule",
-    "_enable": false,
-    "limitX": {
-      "__id__": 70
-    },
-    "limitY": {
-      "__id__": 71
-    },
-    "limitZ": {
-      "__id__": 72
-    },
-    "limit": {
-      "__id__": 73
-    },
-    "dampen": 3,
-    "separateAxes": false,
-    "space": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.RotationOvertimeModule",
-    "_enable": false,
-    "_separateAxes": false,
-    "x": {
-      "__id__": 75
-    },
-    "y": {
-      "__id__": 76
-    },
-    "z": {
-      "__id__": 77
-    }
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.TextureAnimationModule",
-    "_enable": false,
-    "_numTilesX": 0,
-    "numTilesX": 0,
-    "_numTilesY": 0,
-    "numTilesY": 0,
-    "_mode": 0,
-    "animation": 0,
-    "frameOverTime": {
-      "__id__": 79
-    },
-    "startFrame": {
-      "__id__": 81
-    },
-    "cycleCount": 0,
-    "_flipU": 0,
-    "_flipV": 0,
-    "_uvChannelMask": -1,
-    "randomRow": false,
-    "rowIndex": 0
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 1,
-    "spline": {
-      "__id__": 80
-    },
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      1
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 2,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 0,
-        "leftTangent": 0,
-        "leftTangentWeight": 0,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 2,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 0,
-        "leftTangent": 0,
-        "leftTangentWeight": 0,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
   {
     "__type__": "cc.NoiseModule",
     "_enable": true,
@@ -1564,66 +1252,6 @@
     "_octaveMultiplier": 0.5,
     "_octaveScale": 2
   },
-  {
-    "__type__": "cc.TrailModule",
-    "_enable": false,
-    "mode": 0,
-    "lifeTime": {
-      "__id__": 84
-    },
-    "_minParticleDistance": 0.1,
-    "existWithParticles": true,
-    "textureMode": 0,
-    "widthFromParticle": true,
-    "widthRatio": {
-      "__id__": 85
-    },
-    "colorFromParticle": false,
-    "colorOverTrail": {
-      "__id__": 86
-    },
-    "colorOvertime": {
-      "__id__": 87
-    },
-    "_space": 0,
-    "_particleSystem": {
-      "__id__": 35
-    }
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0.3,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.CurveRange",
-    "mode": 0,
-    "constant": 0,
-    "multiplier": 1
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.GradientRange",
-    "_mode": 0,
-    "color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    }
-  },
   {
     "__type__": "cc.ParticleSystemRenderer",
     "_renderMode": 0,
@@ -1665,7 +1293,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 60
     },
     "ske": {
       "__id__": 29
@@ -1686,7 +1314,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 62
     },
     "_material": null,
     "_isTrigger": true,

+ 187 - 121
assets/bundle/game/prefab/level.prefab

@@ -20,16 +20,19 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -62,172 +65,227 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Box082",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_prefab": {
+      "__id__": 3
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 2
+    },
+    "asset": {
+      "__uuid__": "c492d598-720d-4e54-9b3e-92c8db012e5e@d4793",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "67qSEErC5ftY09QzIZY+ie",
+    "instance": {
+      "__id__": 4
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "33B3rnfatJxK8h6fR8VzAV",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
       {
-        "__id__": 3
+        "__id__": 8
+      },
+      {
+        "__id__": 9
       }
     ],
-    "_prefab": {
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
       "__id__": 6
     },
-    "_lpos": {
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "bg"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "67qSEErC5ftY09QzIZY+ie"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0.4,
       "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_lrot": {
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
       "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    },
-    "_id": ""
+    }
   },
   {
-    "__type__": "cc.MeshRenderer",
-    "_name": "",
+    "__type__": "cc.Node",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
+    "_parent": {
+      "__id__": 1
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 4
+    "_prefab": {
+      "__id__": 11
     },
-    "_materials": [
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@e6821",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@ac35e",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@47ad3",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@1ef3c",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@f3e98",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@6363a",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@883e3",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@808ae",
-        "__expectedType__": "cc.Material"
-      },
-      {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@c5fbc",
-        "__expectedType__": "cc.Material"
-      },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 10
+    },
+    "asset": {
+      "__uuid__": "39745771-ef67-4bcb-bf21-5e70199dfd6a@87aed",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "00knp1gOxWX7tvjA9HJdYE",
+    "instance": {
+      "__id__": 12
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "477BNlBEpPPq+pqXRcj7lp",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
       {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@c4114",
-        "__expectedType__": "cc.Material"
+        "__id__": 13
       },
       {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@db4d2",
-        "__expectedType__": "cc.Material"
+        "__id__": 15
       },
       {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@d90a4",
-        "__expectedType__": "cc.Material"
+        "__id__": 16
       },
       {
-        "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@5de44",
-        "__expectedType__": "cc.Material"
+        "__id__": 17
       }
     ],
-    "_visFlags": 0,
-    "bakeSettings": {
-      "__id__": 5
-    },
-    "_mesh": {
-      "__uuid__": "8f90d19a-85f5-4649-8444-b4ab32b867c2@44b97",
-      "__expectedType__": "cc.Mesh"
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 14
     },
-    "_shadowCastingMode": 0,
-    "_shadowReceivingMode": 1,
-    "_shadowBias": 0,
-    "_shadowNormalBias": 0,
-    "_reflectionProbeId": -1,
-    "_reflectionProbeBlendId": -1,
-    "_reflectionProbeBlendWeight": 0,
-    "_enabledGlobalStandardSkinObject": false,
-    "_enableMorph": true,
-    "_id": ""
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "house"
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "d235H3TBFVepMCWT+K4OAA"
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "00knp1gOxWX7tvjA9HJdYE"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 14
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0.4,
+      "z": 0
+    }
   },
   {
-    "__type__": "cc.ModelBakeSettings",
-    "texture": null,
-    "uvParam": {
-      "__type__": "cc.Vec4",
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 14
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
-      "w": 0
-    },
-    "_bakeable": false,
-    "_castShadow": false,
-    "_receiveShadow": false,
-    "_recieveShadow": false,
-    "_lightmapSize": 64,
-    "_useLightProbe": false,
-    "_bakeToLightProbe": true,
-    "_reflectionProbeType": 0,
-    "_bakeToReflectionProbe": true
+      "w": 1
+    }
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 14
     },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "e27yORM99aBqOz35XLTWTv",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
   },
   {
     "__type__": "8c27cj0JjNKfqC6bCg/xYaN",
@@ -239,7 +297,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 8
+      "__id__": 19
     },
     "_id": ""
   },
@@ -257,6 +315,14 @@
     },
     "fileId": "67qSEErC5ftY09QzIZY+ie",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 2
+      }
+    ]
   }
 ]

+ 108 - 98
assets/bundle/game/prefab/obstacle.prefab

@@ -25,11 +25,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -62,128 +62,133 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Cylinder002",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      }
-    ],
     "_prefab": {
-      "__id__": 6
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0.1,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.8,
-      "y": 1,
-      "z": 0.8
+      "__id__": 3
     },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
+    "__editorExtras__": {}
   },
   {
-    "__type__": "cc.MeshRenderer",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
+    "__type__": "cc.PrefabInfo",
+    "root": {
       "__id__": 2
     },
-    "_enabled": true,
-    "__prefab": {
+    "asset": {
+      "__uuid__": "3a649517-2486-4e8c-9a4d-422506b467f3@a9070",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "f1DTefCtpZca4LycqCWzdy",
+    "instance": {
       "__id__": 4
     },
-    "_materials": [
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "caKmMmNolOrJt8thKrJL4C",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
       {
-        "__uuid__": "3a649517-2486-4e8c-9a4d-422506b467f3@db4d2",
-        "__expectedType__": "cc.Material"
+        "__id__": 8
       },
       {
-        "__uuid__": "3a649517-2486-4e8c-9a4d-422506b467f3@d90a4",
-        "__expectedType__": "cc.Material"
+        "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
-    "_visFlags": 0,
-    "bakeSettings": {
-      "__id__": 5
-    },
-    "_mesh": {
-      "__uuid__": "3a649517-2486-4e8c-9a4d-422506b467f3@8a6b5",
-      "__expectedType__": "cc.Mesh"
-    },
-    "_shadowCastingMode": 0,
-    "_shadowReceivingMode": 1,
-    "_shadowBias": 0,
-    "_shadowNormalBias": 0,
-    "_reflectionProbeId": -1,
-    "_reflectionProbeBlendId": -1,
-    "_reflectionProbeBlendWeight": 0,
-    "_enabledGlobalStandardSkinObject": false,
-    "_enableMorph": true,
-    "_id": ""
+    "removedComponents": []
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "59oE1H9ahWD7jc3OqH14KW"
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "obstacle"
   },
   {
-    "__type__": "cc.ModelBakeSettings",
-    "texture": null,
-    "uvParam": {
-      "__type__": "cc.Vec4",
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "f1DTefCtpZca4LycqCWzdy"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0.1,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
-      "w": 0
-    },
-    "_bakeable": false,
-    "_castShadow": false,
-    "_receiveShadow": false,
-    "_recieveShadow": false,
-    "_lightmapSize": 64,
-    "_useLightProbe": false,
-    "_bakeToLightProbe": true,
-    "_reflectionProbeType": 0,
-    "_bakeToReflectionProbe": true
+      "w": 1
+    }
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "asset": {
-      "__id__": 0
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "fileId": "beFyGJ9g5bF4uijBxf1VeA",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "propertyPath": [
+      "_lscale"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0.8,
+      "y": 1,
+      "z": 0.8
+    }
   },
   {
     "__type__": "05e6ejYAF9L0pHE/xPEakYH",
@@ -195,7 +200,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 8
+      "__id__": 12
     },
     "_id": ""
   },
@@ -213,6 +218,11 @@
     },
     "fileId": "f1DTefCtpZca4LycqCWzdy",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 2
+      }
+    ]
   }
 ]

+ 226 - 230
assets/bundle/gui/game/game.prefab

@@ -853,22 +853,22 @@
         "__id__": 45
       },
       {
-        "__id__": 53
+        "__id__": 51
       },
       {
-        "__id__": 59
+        "__id__": 57
       },
       {
-        "__id__": 67
+        "__id__": 65
       },
       {
         "__id__": 73
       },
       {
-        "__id__": 79
+        "__id__": 81
       },
       {
-        "__id__": 85
+        "__id__": 87
       },
       {
         "__id__": 93
@@ -1053,7 +1053,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "label_clear",
+    "_name": "text_add_cell",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1067,18 +1067,15 @@
       },
       {
         "__id__": 48
-      },
-      {
-        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 50
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 248.46799999999996,
-      "y": 115.37399999999997,
+      "x": -224.666,
+      "y": 69.745,
       "z": 0
     },
     "_lrot": {
@@ -1090,8 +1087,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -1118,8 +1115,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65.634765625,
-      "height": 50.4
+      "width": 200,
+      "height": 52
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1130,10 +1127,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "81l5WFRT5NLJ64k8E4bU+Q"
+    "fileId": "2aB+iqJqFObo/w89NpKL51"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1154,52 +1151,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "{{0}} / 3",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "c9UvQyVK9JJrQPQVEEZ3cu"
-  },
-  {
-    "__type__": "545c05XsG9GDJispEGWKvYv",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 45
+    "_spriteFrame": {
+      "__uuid__": "39d0c5f2-f8ea-4b05-b85d-bb02b14f3dcd@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 51
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "templateMode": true,
-    "watchPath": "",
-    "labelType": "cc.Label",
-    "watchPathArr": [
-      "CheckpointBase.clearCount"
-    ],
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "68y8SeNhdJkJbsWlfjyPaW"
+    "fileId": "e8KWymTkxHcaYR58xAXjkA"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1209,14 +1182,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "70lCi31CBMcZ3cG7w6si9n",
+    "fileId": "87UaCgq5lLPIngw35cdG/B",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "text_add_cell",
+    "_name": "text_leave",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1226,19 +1199,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 52
       },
       {
-        "__id__": 56
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -224.666,
-      "y": 69.745,
+      "x": -235.68749999999994,
+      "y": -46.960999999999956,
       "z": 0
     },
     "_lrot": {
@@ -1270,15 +1243,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
+      "width": 197,
       "height": 52
     },
     "_anchorPoint": {
@@ -1290,7 +1263,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2aB+iqJqFObo/w89NpKL51"
+    "fileId": "9eDuP+8gBEC4LddTxa7WPe"
   },
   {
     "__type__": "cc.Sprite",
@@ -1298,11 +1271,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 55
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1315,7 +1288,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "39d0c5f2-f8ea-4b05-b85d-bb02b14f3dcd@f9941",
+      "__uuid__": "055dfcda-fc45-43b0-be7b-8684c59007a9@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1335,7 +1308,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e8KWymTkxHcaYR58xAXjkA"
+    "fileId": "19JsjMprxDP6PvkTy2dyrc"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1345,14 +1318,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "87UaCgq5lLPIngw35cdG/B",
+    "fileId": "1eRolpFiFB8Ls4EbGHIt+R",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "label_add",
+    "_name": "label_clear",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1362,21 +1335,21 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 58
       },
       {
-        "__id__": 62
+        "__id__": 60
       },
       {
-        "__id__": 64
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -229.169,
+      "x": 248.46799999999996,
       "y": 115.37399999999997,
       "z": 0
     },
@@ -1409,16 +1382,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65.634765625,
-      "height": 50.4
+      "width": 65.64,
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1429,7 +1402,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "25gErekOFAx5wbB9EUGTlC"
+    "fileId": "81l5WFRT5NLJ64k8E4bU+Q"
   },
   {
     "__type__": "cc.Label",
@@ -1437,11 +1410,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 61
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1469,12 +1442,12 @@
     "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
-    "_cacheMode": 0,
+    "_cacheMode": 2,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "62keZlv0xGwKVlP/C6ILDe"
+    "fileId": "c9UvQyVK9JJrQPQVEEZ3cu"
   },
   {
     "__type__": "545c05XsG9GDJispEGWKvYv",
@@ -1482,23 +1455,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 63
     },
     "templateMode": true,
     "watchPath": "",
     "labelType": "cc.Label",
     "watchPathArr": [
-      "CheckpointBase.addCellCount"
+      "CheckpointBase.clearCount"
     ],
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0mI6Ggp5ED5X//Zajc1Ds"
+    "fileId": "68y8SeNhdJkJbsWlfjyPaW"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1508,14 +1481,12 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "62pyEKbzNEVpF76VYKCgsv",
-    "instance": null,
-    "targetOverrides": null,
+    "fileId": "70lCi31CBMcZ3cG7w6si9n",
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_clear",
+    "_name": "label_add",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1524,6 +1495,9 @@
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 66
+      },
       {
         "__id__": 68
       },
@@ -1536,8 +1510,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 247.981,
-      "y": 0,
+      "x": -229.169,
+      "y": 115.37399999999997,
       "z": 0
     },
     "_lrot": {
@@ -1549,9 +1523,9 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
-      "z": 0.5
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
     "_mobility": 0,
     "_layer": 33554432,
@@ -1569,16 +1543,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 67
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 258,
-      "height": 176
+      "width": 65.64,
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1589,19 +1563,19 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b6Ehx7lrFCrJbg0Eu+Hg/C"
+    "fileId": "25gErekOFAx5wbB9EUGTlC"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 69
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1613,28 +1587,52 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "2df66019-938c-47cb-a46d-bc9bbd0e8aae@f9941",
-      "__expectedType__": "cc.SpriteFrame"
+    "_string": "{{0}} / 3",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "62keZlv0xGwKVlP/C6ILDe"
+  },
+  {
+    "__type__": "545c05XsG9GDJispEGWKvYv",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 65
     },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 71
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "templateMode": true,
+    "watchPath": "",
+    "labelType": "cc.Label",
+    "watchPathArr": [
+      "CheckpointBase.addCellCount"
+    ],
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3aVkKjnLdFsbltRSaqQcz9"
+    "fileId": "a0mI6Ggp5ED5X//Zajc1Ds"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1644,14 +1642,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a2yoStAqhBRJv37PepXBHT",
+    "fileId": "62pyEKbzNEVpF76VYKCgsv",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_add_cell",
+    "_name": "label_leave",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1665,15 +1663,18 @@
       },
       {
         "__id__": 76
+      },
+      {
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -224.598,
-      "y": 0,
+      "x": 7.237000000000023,
+      "y": 115.37399999999997,
       "z": 0
     },
     "_lrot": {
@@ -1685,8 +1686,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1713,8 +1714,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 258,
-      "height": 176
+      "width": 65.64,
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1725,10 +1726,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2d3XDPAm9OF57Z8Lgr9AD6"
+    "fileId": "4cKCatK1xEbLySYOs/K5CW"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1749,28 +1750,52 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "82bfcda4-f535-4c5c-9b4c-103ca855a306@f9941",
-      "__expectedType__": "cc.SpriteFrame"
+    "_string": "{{0}} / 3",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "48HfIrE29L5pvUCvmefgI6"
+  },
+  {
+    "__type__": "545c05XsG9GDJispEGWKvYv",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 73
     },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 79
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "templateMode": true,
+    "watchPath": "1",
+    "labelType": "cc.Label",
+    "watchPathArr": [
+      "CheckpointBase.leaveCount"
+    ],
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3amBCWg19EUJcDTcOhzd/t"
+    "fileId": "d2tl1k0S1MW5B4FPG0I1Tt"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1780,14 +1805,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "6dqcTawFFGpL/yQMiHG/gD",
+    "fileId": "cdbFNINNlHooITnPfYHuzw",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "text_leave",
+    "_name": "btn_clear",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1797,19 +1822,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 82
       },
       {
-        "__id__": 82
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 12.780500000000018,
-      "y": 68.41300000000001,
+      "x": 247.981,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -1823,7 +1848,7 @@
       "__type__": "cc.Vec3",
       "x": 0.5,
       "y": 0.5,
-      "z": 1
+      "z": 0.5
     },
     "_mobility": 0,
     "_layer": 33554432,
@@ -1841,16 +1866,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 81
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 83
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197,
-      "height": 52
+      "width": 258,
+      "height": 176
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1861,7 +1886,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "9eDuP+8gBEC4LddTxa7WPe"
+    "fileId": "b6Ehx7lrFCrJbg0Eu+Hg/C"
   },
   {
     "__type__": "cc.Sprite",
@@ -1869,11 +1894,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 81
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1886,7 +1911,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "055dfcda-fc45-43b0-be7b-8684c59007a9@f9941",
+      "__uuid__": "2df66019-938c-47cb-a46d-bc9bbd0e8aae@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1906,7 +1931,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "19JsjMprxDP6PvkTy2dyrc"
+    "fileId": "3aVkKjnLdFsbltRSaqQcz9"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1916,14 +1941,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "1eRolpFiFB8Ls4EbGHIt+R",
+    "fileId": "a2yoStAqhBRJv37PepXBHT",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "label_leave",
+    "_name": "btn_add_cell",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1932,9 +1957,6 @@
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 86
-      },
       {
         "__id__": 88
       },
@@ -1947,8 +1969,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 7.237000000000023,
-      "y": 115.37399999999997,
+      "x": -224.598,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -1960,8 +1982,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -1980,16 +2002,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 85
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65.634765625,
-      "height": 50.4
+      "width": 258,
+      "height": 176
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2000,19 +2022,19 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "4cKCatK1xEbLySYOs/K5CW"
+    "fileId": "2d3XDPAm9OF57Z8Lgr9AD6"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 85
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2024,52 +2046,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "{{0}} / 3",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "48HfIrE29L5pvUCvmefgI6"
-  },
-  {
-    "__type__": "545c05XsG9GDJispEGWKvYv",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 85
+    "_spriteFrame": {
+      "__uuid__": "82bfcda4-f535-4c5c-9b4c-103ca855a306@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 91
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "templateMode": true,
-    "watchPath": "1",
-    "labelType": "cc.Label",
-    "watchPathArr": [
-      "CheckpointBase.leaveCount"
-    ],
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d2tl1k0S1MW5B4FPG0I1Tt"
+    "fileId": "3amBCWg19EUJcDTcOhzd/t"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2079,7 +2077,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "cdbFNINNlHooITnPfYHuzw",
+    "fileId": "6dqcTawFFGpL/yQMiHG/gD",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2293,8 +2291,6 @@
       "__id__": 0
     },
     "fileId": "d6e6n78A9IIqGM6EkdDTk1",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

+ 3 - 0
assets/bundle/gui/game/texture/auto-atlas.pac

@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}

+ 36 - 0
assets/bundle/gui/game/texture/auto-atlas.pac.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "0bb23776-5872-4179-80c3-ce18eecb944d",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}

+ 162 - 17
assets/main.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 19
+      "__id__": 23
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 20
+      "__id__": 24
     },
     "_id": "ba0b085f-f8d5-40b0-9964-2fd25728d707"
   },
@@ -77,7 +77,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 22
       }
     ],
     "_prefab": null,
@@ -356,18 +356,21 @@
     "_children": [
       {
         "__id__": 10
+      },
+      {
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 16
       },
       {
-        "__id__": 14
+        "__id__": 18
       },
       {
-        "__id__": 16
+        "__id__": 20
       }
     ],
     "_prefab": null,
@@ -491,6 +494,148 @@
     "_trackingType": 0,
     "_id": "91CjdhwCZBXZzNJCpJXp5K"
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "loadingbg",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": null,
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": "beTgroEi1Pk79Rza9xO8Sb"
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 720,
+      "height": 1280
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": "36oRLQyZJClK3qdIE93Ai0"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "ffd3f221-020a-4739-b9c1-3f19945ca159@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": "cdHZjgLslOj7tMvdHRYO90"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 720,
+    "_originalHeight": 1280,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": "f6ap+0E/dJ4L1kxJMfFTiI"
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "Canvas<UITransform>",
@@ -501,7 +646,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 17
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -529,7 +674,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 19
     },
     "_cameraComponent": {
       "__id__": 11
@@ -551,7 +696,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 21
     },
     "_alignFlags": 45,
     "_target": null,
@@ -606,28 +751,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 21
+      "__id__": 25
     },
     "shadows": {
-      "__id__": 22
+      "__id__": 26
     },
     "_skybox": {
-      "__id__": 23
+      "__id__": 27
     },
     "fog": {
-      "__id__": 24
+      "__id__": 28
     },
     "octree": {
-      "__id__": 25
+      "__id__": 29
     },
     "skin": {
-      "__id__": 26
+      "__id__": 30
     },
     "lightProbeInfo": {
-      "__id__": 27
+      "__id__": 31
     },
     "postSettings": {
-      "__id__": 28
+      "__id__": 32
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

+ 2 - 1
assets/script/game/account/bll/AccountInit.ts

@@ -1,4 +1,4 @@
-import { dynamicAtlasManager, macro, v3 } from "cc";
+import { dynamicAtlasManager, macro, v3,game } from "cc";
 import { oops } from "../../../../../extensions/oops-plugin-framework/assets/core/Oops";
 import { ecs } from "../../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
 import { Checkpoint } from "../../checkpoint/Checkpoint";
@@ -41,6 +41,7 @@ export class AccountInitSystem extends ecs.ComblockSystem implements ecs.IEntity
         e.AccountModel.reward = oops.storage.getBoolean("reward",false)
         // macro.CLEANUP_IMAGE_CACHE = false;
         // dynamicAtlasManager.enabled = true;
+        game.setFrameRate(30);
         VibrationManager.getInstance().switchVibration = e.AccountModelSetting.vm.vibrationOn
         this.createLevel(e, data);
         e.remove(AccountInitComp);

+ 1 - 1
assets/script/game/checkpoint/bll/InitCheckpoint.ts

@@ -397,7 +397,7 @@ export class InitCheckpointSystem extends ecs.ComblockSystem implements ecs.IEnt
         const checkpoint_model = e.CheckpointModel
         const availablePositions = Array.from({ length: count }, (_, i) => i)
         checkpoint_model.vehicles = Array(count).fill(null)
-        const start_point = v3(-5, 0, 0)
+        const start_point = v3(-6, 0, 0)
         pcolor?.forEach((v,i)=>{
             const color = colors[pcolor[i] - 1]
             if (copyColorCount[color] > 0) {

+ 3 - 0
assets/script/game/initialize/bll/InitRes.ts

@@ -4,6 +4,7 @@
  * @LastEditors: dgflash
  * @LastEditTime: 2023-07-25 17:53:47
  */
+import { director } from "cc";
 import { oops } from "../../../../../extensions/oops-plugin-framework/assets/core/Oops";
 import { AsyncQueue, NextFunction } from "../../../../../extensions/oops-plugin-framework/assets/libs/collection/AsyncQueue";
 import { ecs } from "../../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
@@ -91,6 +92,8 @@ export class InitResSystem extends ecs.ComblockSystem implements ecs.IEntityEnte
     private onComplete(queue: AsyncQueue, e: Initialize) {
         queue.complete = async () => {
             var node = await oops.gui.openAsync(UIID.Loading);
+            const loadingbg = director.getScene().getChildByPath('root/gui/loadingbg')
+            if(loadingbg)loadingbg.active = false
             if (node) e.add(node.getComponent(LoadingViewComp) as ecs.Comp);
             e.remove(InitResComp);
         };

+ 9 - 0
assets/textrue.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "f03e60a0-ce3f-41da-9933-f33e4e042e9a",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/textrue/loadingbg.png


+ 134 - 0
assets/textrue/loadingbg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "ffd3f221-020a-4739-b9c1-3f19945ca159",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "ffd3f221-020a-4739-b9c1-3f19945ca159@6c48a",
+      "displayName": "loadingbg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "ffd3f221-020a-4739-b9c1-3f19945ca159",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "ffd3f221-020a-4739-b9c1-3f19945ca159@f9941",
+      "displayName": "loadingbg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 720,
+        "height": 1280,
+        "rawWidth": 720,
+        "rawHeight": 1280,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -360,
+            -640,
+            0,
+            360,
+            -640,
+            0,
+            -360,
+            640,
+            0,
+            360,
+            640,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1280,
+            720,
+            1280,
+            0,
+            0,
+            720,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -360,
+            -640,
+            0
+          ],
+          "maxPos": [
+            360,
+            640,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "ffd3f221-020a-4739-b9c1-3f19945ca159@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": false,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "redirect": "ffd3f221-020a-4739-b9c1-3f19945ca159@f9941"
+  }
+}