feat:模型更换

assets/bundle/game/model/man/balloon.FBX.meta

@@ -160,6 +160,111 @@
       ]
     },
     "dumpMaterials": false,
-    "materialDumpDir": "db://assets/bundle/game/model/man/Materials_balloon"
+    "materialDumpDir": "db://assets/bundle/game/model/man/Materials_balloon",
+    "materials": {
+      "7351f5d4-c1f7-4acc-8619-69f52fc733e5@12579": {
+        "__type__": "cc.Material",
+        "_name": "",
+        "_objFlags": 0,
+        "__editorExtras__": {},
+        "_native": "",
+        "_effectAsset": {
+          "__uuid__": "e41c2641-857b-4aa5-a920-09d62b1a5628",
+          "__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": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          }
+        ],
+        "_props": [
+          {},
+          {
+            "mainColor": {
+              "__type__": "cc.Color",
+              "r": 148,
+              "g": 230,
+              "b": 245,
+              "a": 255
+            }
+          },
+          {},
+          {},
+          {},
+          {},
+          {}
+        ]
+      }
+    }
   }
 }

assets/bundle/game/model/man/cane.FBX.meta

@@ -175,6 +175,111 @@
       "scenes": [
         "c2660672-9fe2-4cea-990d-3a0fb3e9d768@19d5f"
       ]
+    },
+    "materials": {
+      "c2660672-9fe2-4cea-990d-3a0fb3e9d768@12579": {
+        "__type__": "cc.Material",
+        "_name": "",
+        "_objFlags": 0,
+        "__editorExtras__": {},
+        "_native": "",
+        "_effectAsset": {
+          "__uuid__": "e41c2641-857b-4aa5-a920-09d62b1a5628",
+          "__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": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          }
+        ],
+        "_props": [
+          {},
+          {
+            "mainColor": {
+              "__type__": "cc.Color",
+              "r": 148,
+              "g": 230,
+              "b": 245,
+              "a": 255
+            }
+          },
+          {},
+          {},
+          {},
+          {},
+          {}
+        ]
+      }
     }
   }
 }

assets/bundle/game/model/man/hat.FBX.meta

@@ -175,6 +175,111 @@
       "scenes": [
         "02917cad-309b-42cd-ac7b-e99ba2611c0e@ca77c"
       ]
+    },
+    "materials": {
+      "02917cad-309b-42cd-ac7b-e99ba2611c0e@12579": {
+        "__type__": "cc.Material",
+        "_name": "",
+        "_objFlags": 0,
+        "__editorExtras__": {},
+        "_native": "",
+        "_effectAsset": {
+          "__uuid__": "e41c2641-857b-4aa5-a920-09d62b1a5628",
+          "__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": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          }
+        ],
+        "_props": [
+          {},
+          {
+            "mainColor": {
+              "__type__": "cc.Color",
+              "r": 148,
+              "g": 230,
+              "b": 245,
+              "a": 255
+            }
+          },
+          {},
+          {},
+          {},
+          {},
+          {}
+        ]
+      }
     }
   }
 }

assets/bundle/game/prefab/airplane.prefab

@@ -29,10 +29,16 @@
     "_components": [
       {
         "__id__": 15
+      },
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -441,15 +447,19 @@
     "__prefab": {
       "__id__": 16
     },
-    "playOnLoad": true,
+    "playOnLoad": false,
     "_clips": [
       {
         "__uuid__": "7f887f8a-c5bf-4080-bef2-8135f59741c5@73b7f",
         "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "7f887f8a-c5bf-4080-bef2-8135f59741c5@e757a",
+        "__expectedType__": "cc.AnimationClip"
       }
     ],
     "_defaultClip": {
-      "__uuid__": "7f887f8a-c5bf-4080-bef2-8135f59741c5@73b7f",
+      "__uuid__": "7f887f8a-c5bf-4080-bef2-8135f59741c5@e757a",
       "__expectedType__": "cc.AnimationClip"
     },
     "_useBakedAnimation": true,
@@ -460,6 +470,49 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "37daoYMMxU1ZDOSTwTrMRD"
   },
+  {
+    "__type__": "2c84cKc02VIKIsL3JPDuHMT",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 18
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "adGTDsIDdJjLtWOOVoA6sm"
+  },
+  {
+    "__type__": "75e1cJ6FJZFiLkV1ic7vWnm",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 20
+    },
+    "ske": {
+      "__id__": 15
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bbWGXpCClIgYy1ga6so7qd"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -469,6 +522,7 @@
       "__id__": 0
     },
     "fileId": "11SYDqdmNS/6th87D82aGF",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/car1.prefab

@@ -29,10 +29,16 @@
     "_components": [
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 29
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -701,7 +707,7 @@
     "__prefab": {
       "__id__": 24
     },
-    "playOnLoad": true,
+    "playOnLoad": false,
     "_clips": [
       {
         "__uuid__": "9b0033c1-7d64-4faa-b0bd-301da52e6123@73b7f",
@@ -724,6 +730,49 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "87bM+dBvFbk4EAwGIVX7G+"
   },
+  {
+    "__type__": "2c84cKc02VIKIsL3JPDuHMT",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 26
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c6z7zpx+JCYqw3BA8qnPck"
+  },
+  {
+    "__type__": "75e1cJ6FJZFiLkV1ic7vWnm",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 28
+    },
+    "ske": {
+      "__id__": 23
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "03H8WnxMBKpo9xgn2Gy59G"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/bundle/game/prefab/car2.prefab

@@ -32,10 +32,16 @@
     "_components": [
       {
         "__id__": 28
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -812,7 +818,7 @@
     "__prefab": {
       "__id__": 29
     },
-    "playOnLoad": true,
+    "playOnLoad": false,
     "_clips": [
       {
         "__uuid__": "46758aea-eaa1-4d88-8a39-08391ad863bc@73b7f",
@@ -835,6 +841,49 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "15UFcgnh1Q3YDVDIG5Tngh"
   },
+  {
+    "__type__": "2c84cKc02VIKIsL3JPDuHMT",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 31
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "feUO8X1+FAJ5+LZCfseDNs"
+  },
+  {
+    "__type__": "75e1cJ6FJZFiLkV1ic7vWnm",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 33
+    },
+    "ske": {
+      "__id__": 28
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "81jKktJUJFSJK6NAW7X8Z3"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/bundle/game/prefab/grid.prefab

@@ -23,9 +23,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -177,6 +181,24 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "29e1aXWq8RBoqnrA6NHZ7SC",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8f3kba0d5LiL8YrcpUYLCo"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -186,6 +208,7 @@
       "__id__": 0
     },
     "fileId": "a7vLgS6ZVQ/qBe77gOtnCb",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/level.prefab

@@ -23,9 +23,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -225,6 +229,24 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "8c27cj0JjNKfqC6bCg/xYaN",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "70o+W89xlEabSsQn7birE8"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -234,6 +256,7 @@
       "__id__": 0
     },
     "fileId": "67qSEErC5ftY09QzIZY+ie",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/man.prefab

@@ -32,10 +32,19 @@
     "_components": [
       {
         "__id__": 94
+      },
+      {
+        "__id__": 96
+      },
+      {
+        "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2801,6 +2810,78 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "a3fLYf+65RKYBqR3GP+ZF5"
   },
+  {
+    "__type__": "2b35fDPnvZDA6d7i5Y8aa2N",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 97
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c4FeQCW0JDsI4aMvRKt33l"
+  },
+  {
+    "__type__": "89a4fQ+54lH0bCd57qgAA2W",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 99
+    },
+    "ske": {
+      "__id__": 94
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2eP5hBTIlL07OsAeTiUyyZ"
+  },
+  {
+    "__type__": "cc.CapsuleCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_radius": 0.5,
+    "_cylinderHeight": 1,
+    "_direction": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0eob9UXBRMvIHqtAAT5kL4"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/bundle/game/prefab/man_balloon.prefab

@@ -32,10 +32,19 @@
     "_components": [
       {
         "__id__": 94
+      },
+      {
+        "__id__": 96
+      },
+      {
+        "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2801,6 +2810,78 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "a3fLYf+65RKYBqR3GP+ZF5"
   },
+  {
+    "__type__": "2b35fDPnvZDA6d7i5Y8aa2N",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 97
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "69afhKJdNE3I9vpXUCqmnN"
+  },
+  {
+    "__type__": "89a4fQ+54lH0bCd57qgAA2W",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 99
+    },
+    "ske": {
+      "__id__": 94
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d9HOkHyt5It5d/aV3sFljk"
+  },
+  {
+    "__type__": "cc.CapsuleCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_radius": 0.5,
+    "_cylinderHeight": 1,
+    "_direction": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "09GoiErcZGzZCjYbmPIYlO"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -2810,6 +2891,7 @@
       "__id__": 0
     },
     "fileId": "54m2HWkqdewI++hdiHalG6",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/man_cane.prefab

@@ -32,10 +32,19 @@
     "_components": [
       {
         "__id__": 82
+      },
+      {
+        "__id__": 84
+      },
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2442,6 +2451,78 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "5bfG/J0v9eTr3Z987CCS1R"
   },
+  {
+    "__type__": "2b35fDPnvZDA6d7i5Y8aa2N",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 85
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bfC2ioMepOCpr44O7IGa+0"
+  },
+  {
+    "__type__": "89a4fQ+54lH0bCd57qgAA2W",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 87
+    },
+    "ske": {
+      "__id__": 82
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8dr/6vEBZNDr9r7/4kmQho"
+  },
+  {
+    "__type__": "cc.CapsuleCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 89
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_radius": 0.5,
+    "_cylinderHeight": 1,
+    "_direction": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2ef/kYpJBNw54wFyNo93JW"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -2451,6 +2532,7 @@
       "__id__": 0
     },
     "fileId": "b1POKrNN5dfYRfk6ouMpGQ",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/man_hat.prefab

@@ -32,10 +32,19 @@
     "_components": [
       {
         "__id__": 82
+      },
+      {
+        "__id__": 84
+      },
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2442,6 +2451,78 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "5eu77aqXlf6rZktQILGjBI"
   },
+  {
+    "__type__": "2b35fDPnvZDA6d7i5Y8aa2N",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 85
+    },
+    "AssetRawUrl": null,
+    "PlayOnStart": false,
+    "AutoUpdate": false,
+    "duration": 0.3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1akBEHGwBKWa6lz4ruEzNv"
+  },
+  {
+    "__type__": "89a4fQ+54lH0bCd57qgAA2W",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 87
+    },
+    "ske": {
+      "__id__": 82
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "54xzzFzMlPSpi18Z2kaXhk"
+  },
+  {
+    "__type__": "cc.CapsuleCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 89
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_radius": 0.5,
+    "_cylinderHeight": 1,
+    "_direction": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c0QbD70i1KIZjgpEUdcPfx"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -2451,6 +2532,7 @@
       "__id__": 0
     },
     "fileId": "95MFymsaJUyq/ghxVrHrVs",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/obstacle.prefab

@@ -23,9 +23,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -181,6 +185,24 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "05e6ejYAF9L0pHE/xPEakYH",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "84MFp9kdVG5Ytun+PYnsNO"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -190,6 +212,7 @@
       "__id__": 0
     },
     "fileId": "f1DTefCtpZca4LycqCWzdy",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/game/prefab/station.prefab

@@ -23,9 +23,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -177,6 +181,24 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "40facD3UE5LJY2FH/4AUk5+",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a0PPODQctH0rTRW9P0NNUe"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -185,6 +207,8 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "97MJdV5ndZvqwNvB6zVdI2"
+    "fileId": "97MJdV5ndZvqwNvB6zVdI2",
+    "instance": null,
+    "targetOverrides": null
   }
 ]

assets/main.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 45
+      "__id__": 19
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 46
+      "__id__": 20
     },
     "_id": "ba0b085f-f8d5-40b0-9964-2fd25728d707"
   },
@@ -71,13 +71,13 @@
         "__id__": 3
       },
       {
-        "__id__": 35
+        "__id__": 9
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 18
       }
     ],
     "_prefab": null,
@@ -124,15 +124,6 @@
       },
       {
         "__id__": 6
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 18
-      },
-      {
-        "__id__": 27
       }
     ],
     "_active": true,
@@ -354,365 +345,6 @@
     "_editorOnly": false,
     "_castShadow": false
   },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 3
-    },
-    "_prefab": {
-      "__id__": 10
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 9
-    },
-    "asset": {
-      "__uuid__": "929a10d6-4344-45d9-915b-d70564d8575b",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "95MFymsaJUyq/ghxVrHrVs",
-    "instance": {
-      "__id__": 11
-    },
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "4be/3jrTBAyLJ8x6hD51Qj",
-    "prefabRootNode": null,
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      },
-      {
-        "__id__": 15
-      },
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 17
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "man_hat"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "95MFymsaJUyq/ghxVrHrVs"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 3
-    },
-    "_prefab": {
-      "__id__": 19
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 18
-    },
-    "asset": {
-      "__uuid__": "6837a16a-f982-42cb-9af2-1609e68fb1b4",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "54m2HWkqdewI++hdiHalG6",
-    "instance": {
-      "__id__": 20
-    },
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "1e6CQXqWZC8YXs0fo2nWSq",
-    "prefabRootNode": null,
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 21
-      },
-      {
-        "__id__": 23
-      },
-      {
-        "__id__": 24
-      },
-      {
-        "__id__": 25
-      },
-      {
-        "__id__": 26
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 22
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "man_balloon"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "54m2HWkqdewI++hdiHalG6"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 22
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 22
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 22
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 22
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 3
-    },
-    "_prefab": {
-      "__id__": 28
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 27
-    },
-    "asset": {
-      "__uuid__": "61304fe0-95ec-4698-be12-560d9a699c98",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "b1POKrNN5dfYRfk6ouMpGQ",
-    "instance": {
-      "__id__": 29
-    },
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "a03UCy8WxI/o2412p7d3wr",
-    "prefabRootNode": null,
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 30
-      },
-      {
-        "__id__": 32
-      },
-      {
-        "__id__": 33
-      },
-      {
-        "__id__": 34
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 31
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "man_cane"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "b1POKrNN5dfYRfk6ouMpGQ"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 31
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 31
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 31
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
   {
     "__type__": "cc.Node",
     "_name": "gui",
@@ -723,19 +355,19 @@
     },
     "_children": [
       {
-        "__id__": 36
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 12
       },
       {
-        "__id__": 40
+        "__id__": 14
       },
       {
-        "__id__": 42
+        "__id__": 16
       }
     ],
     "_prefab": null,
@@ -774,13 +406,13 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 35
+      "__id__": 9
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 11
       }
     ],
     "_prefab": null,
@@ -819,7 +451,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": null,
@@ -865,11 +497,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -893,14 +525,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 15
     },
     "_cameraComponent": {
-      "__id__": 37
+      "__id__": 11
     },
     "_alignCanvasWithScreen": true,
     "_id": "7acBC/yU9N05fc6HGd8fZS"
@@ -915,11 +547,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 17
     },
     "_alignFlags": 45,
     "_target": null,
@@ -959,7 +591,7 @@
       "__id__": 3
     },
     "gui": {
-      "__id__": 35
+      "__id__": 9
     },
     "_id": "c5PY2uoV1Fub3p/gK8ZOCH"
   },
@@ -969,44 +601,33 @@
     "asset": null,
     "fileId": "ba0b085f-f8d5-40b0-9964-2fd25728d707",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 18
-      },
-      {
-        "__id__": 27
-      }
-    ]
+    "targetOverrides": null
   },
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 47
+      "__id__": 21
     },
     "shadows": {
-      "__id__": 48
+      "__id__": 22
     },
     "_skybox": {
-      "__id__": 49
+      "__id__": 23
     },
     "fog": {
-      "__id__": 50
+      "__id__": 24
     },
     "octree": {
-      "__id__": 51
+      "__id__": 25
     },
     "skin": {
-      "__id__": 52
+      "__id__": 26
     },
     "lightProbeInfo": {
-      "__id__": 53
+      "__id__": 27
     },
     "postSettings": {
-      "__id__": 54
+      "__id__": 28
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

assets/script/game/puppet/model/PuppetEnum.ts

@@ -6,6 +6,8 @@ export enum PuppetAnimatorType {
     Idle = "idle",
     /** 跑 */
     Run = "run",
+    /** 跑 */
+    Sit = "sit",
 }
 
 

assets/script/game/puppet/model/PuppetModelComp.ts

@@ -12,6 +12,7 @@ export class PuppetModelComp extends ecs.Comp {
 
 
     private _color: string = null
+    private _withColider: boolean = true
 
     /** 颜色 */
     get color(): string {
@@ -40,6 +41,14 @@ export class PuppetModelComp extends ecs.Comp {
     set y(value: number) {
         this._y = value
     }
+
+    set withColider(value: boolean) {
+        this._withColider = value
+    }
+
+    get withColider() {
+        return this._withColider
+    }
     // vmAdd() {
     //     VM.add(this.vm, "Grid");
     // }

assets/script/game/puppet/puppet.ts

@@ -34,33 +34,43 @@ export class Puppet extends ecs.Entity {
     }
 
     /** 加载关卡显示对象（cc.Component在创建后，添加到ECS框架中，使实体上任何一个ECS组件都可以通过 ECS API 获取到视图层对象 */
-    load(parent: Node, color: string, pos: Vec3 = Vec3.ZERO, skinId: number = 1,removeColider = false) {
-        const node = this.getSkinModel(skinId)
+    load(parent: Node, color: string, pos: Vec3 = Vec3.ZERO, skinId: number = 1) {
+        const node = ViewUtil.createPrefabNode(this.getSkinModelPath(skinId))
         var mv = node.getComponent(PuppetViewComp)!;
-        if (removeColider) node.getComponent(CapsuleCollider)?.destroy()
+        if (!this.PuppetModel.withColider) node.getComponent(CapsuleCollider)?.destroy()
         this.add(mv);
         this.PuppetView.changeColor(color)
         node.parent = parent;
         node.setPosition(pos);
     }
 
-    changeSkin(skinId:number){
-        const {position,parent}  = this.PuppetView.node
-        const {curState} = this.PuppetView.animator
+    // loadWithOutColider(parent: Node, color: string, pos: Vec3 = Vec3.ZERO, skinId: number = 1){
+    //     const node = ViewUtil.createPrefabNode(this.getSkinModelPath(skinId))
+    //     var mv = node.getComponent(PuppetViewComp)!;
+    //     node.getComponent(CapsuleCollider)?.destroy()
+    //     this.add(mv);
+    //     this.PuppetView.changeColor(color)
+    //     node.parent = parent;
+    //     node.setPosition(pos);
+    // }
+
+    changeSkin(skinId: number) {
+        const { position, parent } = this.PuppetView.node
+        const { curState } = this.PuppetView.animator
         this.remove(PuppetViewComp)
-        this.load(parent,this.PuppetModel.color,position,skinId)
+        this.load(parent, this.PuppetModel.color, position, skinId)
         this.PuppetView?.animator.playAni(curState)
     }
 
-    getSkinModel(skinId: number) {
+    getSkinModelPath(skinId: number) {
         if (skinId === PuppetSKinEnum.Balloon) {
-            return ViewUtil.createPrefabNode("game/prefab/man_balloon");
+            return "game/prefab/man_balloon";
         } else if (skinId === PuppetSKinEnum.Hat) {
-            return ViewUtil.createPrefabNode("game/prefab/man_hat");
+            return "game/prefab/man_hat";
         } else if (skinId === PuppetSKinEnum.Cane) {
-            return ViewUtil.createPrefabNode("game/prefab/man_cane");
+            return "game/prefab/man_cane";
         }
-        return ViewUtil.createPrefabNode("game/prefab/man");
+        return "game/prefab/man";
     }
 }
 

assets/script/game/puppet/view/PuppetViewAnimator.ts

@@ -78,8 +78,12 @@ export class PuppetViewAnimator extends AnimatorSkeletal {
                 this.puppet.PuppetView.ske.play('run')
                 this.curState = PuppetAnimatorType.Run
                 break;
+            case PuppetAnimatorType.Sit:
+                this.puppet.PuppetView.ske.play('sit')
+                this.curState = PuppetAnimatorType.Sit
+                break;
             default:
-                this.puppet.PuppetView.ske.play('idle')
+                this.puppet.PuppetView.ske.stop()
                 this.curState = PuppetAnimatorType.Idle
                 break;
         }

assets/script/game/vehicle/Vehicle.ts

@@ -4,10 +4,11 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec
 import { VehicleModelComp } from "./model/VehicleModelComp";
 import { VehicleViewComp } from "./view/VehicleViewComp";
 import { VehicleSitSystem } from "./bll/VehicleCheck";
+import { VehicleType } from "./model/VehicleEnum";
 
 /**
- * 关卡实体
- * 1、生成关卡初始话数据
+ * 车辆实体
+ * 1、生成车辆关卡初始数据
  */
 @ecs.register('Vehicle')
 export class Vehicle extends ecs.Entity {
@@ -29,14 +30,27 @@ export class Vehicle extends ecs.Entity {
     }
 
     /** 加载车辆显示对象（cc.Component在创建后，添加到ECS框架中，使实体上任何一个ECS组件都可以通过 ECS API 获取到视图层对象 */
-    load(parent: Node, color: string, pos: Vec3 = Vec3.ZERO) {
-        const node = ViewUtil.createPrefabNode("game/prefab/car");
+    load(parent: Node, color: string, pos: Vec3 = Vec3.ZERO,type=VehicleType.CAR) {
+        const node = ViewUtil.createPrefabNode(this.getVehicleModelPath(type));
         var mv = node.getComponent(VehicleViewComp)!;
         this.add(mv);
         this.VehicleView.changeColor(color)
         node.parent = parent;
         node.setPosition(pos);
     }
+
+    getVehicleModelPath(type:VehicleType){
+        switch (type) {
+            case VehicleType.CAR:
+                return 'game/prefab/car2'
+            case VehicleType.BUS:
+                return 'game/prefab/car1'
+            case VehicleType.AIRPLANT:
+                return 'game/prefab/airplane'
+            default:
+                return 'game/prefab/car1'
+        }
+    }
 }
 
 export class EcsVehicleSystem extends ecs.System {

assets/script/game/vehicle/view/VehicleViewController.ts

@@ -6,6 +6,7 @@ import { ecs } from "../../../../../extensions/oops-plugin-framework/assets/libs
 import { Puppet } from "../../puppet/puppet";
 import { PuppetModelComp } from "../../puppet/model/PuppetModelComp";
 import { smc } from "../../common/SingletonModuleComp";
+import { PuppetAnimatorType } from "../../puppet/model/PuppetEnum";
 
 
 const { ccclass, property } = _decorator;
@@ -27,7 +28,7 @@ export class VehicleViewController extends Component {
         const { otherCollider } = event
         // 确认触发事件的对象是玩家
         if (otherCollider.node.layer === Layers.Enum.PUPPET) {
-            // this.vehicle.VehicleView.animator.playAnimation('opendoor',false); // 播放开门动画
+            this.vehicle.VehicleView.animator.playAnimation('opendoor',false); // 播放开门动画
             // this.vehicle.add(VehicleSitComp)
             // if (this.vehicle.VehicleModel.isFull)
             //     this.vehicle.VehicleModel.ready = true
@@ -40,11 +41,12 @@ export class VehicleViewController extends Component {
         const puppet = ecs.getEntity<Puppet>(Puppet)
         const puppetModel = puppet.get(PuppetModelComp)
         puppetModel.color = v.VehicleModel.color
-        puppet.load(this.node, v.VehicleModel.color, v.VehicleModel.sitPos[v.children.size],account.AccountModel.skin,true);
+        puppetModel.withColider = false
+        puppet.load(this.node, v.VehicleModel.color, v.VehicleModel.sitPos[v.children.size],account.AccountModel.skin);
         this.vehicle.addChild(puppet)
         puppet.PuppetView.animator.toRight()
+        puppet.PuppetView.animator.playAni(PuppetAnimatorType.Sit)
         puppet.PuppetView.animator.onScaleComplete = () => {
-          
             // console.log("结果",!checkpoint.CheckpointModel.puppets.some(val => val.PuppetModel?.color === this.vehicle.VehicleModel.color))
             // console.log(checkpoint.CheckpointModel.puppets)
             if (v.children.size >= v.VehicleModel.capcity||!account.checkpoint.CheckpointModel.puppets.some(val => val.PuppetModel?.color === this.vehicle.VehicleModel.color))