4 Комити 35680e7122 ... c3d5c95a6a

Аутор SHA1 Порука Датум
  vene c3d5c95a6a Merge branch 'master' of http://192.168.5.71:3333/WOSO_H5_01Team/_StormSunder пре 2 месеци
  vene c708bc6df5 修改牛羊预制体 пре 2 месеци
  vene 4709c2fe03 添加牛羊修改 пре 2 месеци
  vene 636466f6d6 添加牛yang пре 2 месеци

BIN
assets/model_scene/Model/animal/cow.fbx


+ 177 - 0
assets/model_scene/Model/animal/cow.fbx.meta

@@ -0,0 +1,177 @@
+{
+  "ver": "2.3.12",
+  "importer": "fbx",
+  "imported": true,
+  "uuid": "5027a7d8-1f72-4507-9c51-58aec590001a",
+  "files": [
+    "__original-animation-0.cconb",
+    "__original-animation-1.cconb"
+  ],
+  "subMetas": {
+    "85142": {
+      "importer": "gltf-animation",
+      "uuid": "5027a7d8-1f72-4507-9c51-58aec590001a@85142",
+      "displayName": "",
+      "id": "85142",
+      "name": "run.001.animation",
+      "userData": {
+        "gltfIndex": 1,
+        "wrapMode": 2,
+        "sample": 30,
+        "span": {
+          "from": 0,
+          "to": 1.25
+        },
+        "events": []
+      },
+      "ver": "1.0.17",
+      "imported": true,
+      "files": [
+        ".cconb"
+      ],
+      "subMetas": {}
+    },
+    "69dc9": {
+      "importer": "gltf-mesh",
+      "uuid": "5027a7d8-1f72-4507-9c51-58aec590001a@69dc9",
+      "displayName": "",
+      "id": "69dc9",
+      "name": "立方体.015.mesh",
+      "userData": {
+        "gltfIndex": 0,
+        "triangleCount": 184
+      },
+      "ver": "1.1.1",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "1f586": {
+      "importer": "gltf-animation",
+      "uuid": "5027a7d8-1f72-4507-9c51-58aec590001a@1f586",
+      "displayName": "",
+      "id": "1f586",
+      "name": "idle.animation",
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 2,
+        "sample": 30,
+        "span": {
+          "from": 0,
+          "to": 2.0833332538604736
+        },
+        "events": []
+      },
+      "ver": "1.0.17",
+      "imported": true,
+      "files": [
+        ".cconb"
+      ],
+      "subMetas": {}
+    },
+    "438fe": {
+      "importer": "gltf-skeleton",
+      "uuid": "5027a7d8-1f72-4507-9c51-58aec590001a@438fe",
+      "displayName": "",
+      "id": "438fe",
+      "name": "UnnamedSkeleton.skeleton",
+      "userData": {
+        "gltfIndex": 0,
+        "jointsLength": 5
+      },
+      "ver": "1.0.1",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "712d1": {
+      "importer": "gltf-scene",
+      "uuid": "5027a7d8-1f72-4507-9c51-58aec590001a@712d1",
+      "displayName": "",
+      "id": "712d1",
+      "name": "cow.prefab",
+      "userData": {
+        "gltfIndex": 0
+      },
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "imageMetas": [],
+    "fbx": {
+      "smartMaterialEnabled": true
+    },
+    "animationImportSettings": [
+      {
+        "name": "idle",
+        "duration": 2.0833332538604736,
+        "fps": 30,
+        "splits": [
+          {
+            "name": "idle",
+            "from": 0,
+            "to": 2.0833332538604736,
+            "wrapMode": 2,
+            "previousId": "1f586"
+          }
+        ]
+      },
+      {
+        "name": "run.001",
+        "duration": 1.25,
+        "fps": 30,
+        "splits": [
+          {
+            "name": "run.001",
+            "from": 0,
+            "to": 1.25,
+            "wrapMode": 2,
+            "previousId": "85142"
+          }
+        ]
+      }
+    ],
+    "redirect": "5027a7d8-1f72-4507-9c51-58aec590001a@712d1",
+    "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": [
+        "5027a7d8-1f72-4507-9c51-58aec590001a@69dc9"
+      ],
+      "skeletons": [
+        "5027a7d8-1f72-4507-9c51-58aec590001a@438fe"
+      ],
+      "textures": [],
+      "materials": [],
+      "scenes": [
+        "5027a7d8-1f72-4507-9c51-58aec590001a@712d1"
+      ]
+    }
+  }
+}

BIN
assets/model_scene/Model/animal/sheep.fbx


+ 177 - 0
assets/model_scene/Model/animal/sheep.fbx.meta

@@ -0,0 +1,177 @@
+{
+  "ver": "2.3.12",
+  "importer": "fbx",
+  "imported": true,
+  "uuid": "e226a23b-769d-49b2-b4d0-797004482d28",
+  "files": [
+    "__original-animation-0.cconb",
+    "__original-animation-1.cconb"
+  ],
+  "subMetas": {
+    "30075": {
+      "importer": "gltf-scene",
+      "uuid": "e226a23b-769d-49b2-b4d0-797004482d28@30075",
+      "displayName": "",
+      "id": "30075",
+      "name": "sheep.prefab",
+      "userData": {
+        "gltfIndex": 0
+      },
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "fa0d6": {
+      "importer": "gltf-mesh",
+      "uuid": "e226a23b-769d-49b2-b4d0-797004482d28@fa0d6",
+      "displayName": "",
+      "id": "fa0d6",
+      "name": "立方体.003.mesh",
+      "userData": {
+        "gltfIndex": 0,
+        "triangleCount": 184
+      },
+      "ver": "1.1.1",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "cf5ee": {
+      "importer": "gltf-animation",
+      "uuid": "e226a23b-769d-49b2-b4d0-797004482d28@cf5ee",
+      "displayName": "",
+      "id": "cf5ee",
+      "name": "run.animation",
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 2,
+        "sample": 30,
+        "span": {
+          "from": 0,
+          "to": 2.0833332538604736
+        },
+        "events": []
+      },
+      "ver": "1.0.17",
+      "imported": true,
+      "files": [
+        ".cconb"
+      ],
+      "subMetas": {}
+    },
+    "1f586": {
+      "importer": "gltf-animation",
+      "uuid": "e226a23b-769d-49b2-b4d0-797004482d28@1f586",
+      "displayName": "",
+      "id": "1f586",
+      "name": "idle.animation",
+      "userData": {
+        "gltfIndex": 1,
+        "wrapMode": 2,
+        "sample": 30,
+        "span": {
+          "from": 0,
+          "to": 2.0833332538604736
+        },
+        "events": []
+      },
+      "ver": "1.0.17",
+      "imported": true,
+      "files": [
+        ".cconb"
+      ],
+      "subMetas": {}
+    },
+    "438fe": {
+      "importer": "gltf-skeleton",
+      "uuid": "e226a23b-769d-49b2-b4d0-797004482d28@438fe",
+      "displayName": "",
+      "id": "438fe",
+      "name": "UnnamedSkeleton.skeleton",
+      "userData": {
+        "gltfIndex": 0,
+        "jointsLength": 5
+      },
+      "ver": "1.0.1",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "imageMetas": [],
+    "fbx": {
+      "smartMaterialEnabled": true
+    },
+    "animationImportSettings": [
+      {
+        "name": "run",
+        "duration": 2.0833332538604736,
+        "fps": 30,
+        "splits": [
+          {
+            "name": "run",
+            "from": 0,
+            "to": 2.0833332538604736,
+            "wrapMode": 2,
+            "previousId": "cf5ee"
+          }
+        ]
+      },
+      {
+        "name": "idle",
+        "duration": 2.0833332538604736,
+        "fps": 30,
+        "splits": [
+          {
+            "name": "idle",
+            "from": 0,
+            "to": 2.0833332538604736,
+            "wrapMode": 2,
+            "previousId": "1f586"
+          }
+        ]
+      }
+    ],
+    "redirect": "e226a23b-769d-49b2-b4d0-797004482d28@30075",
+    "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": [
+        "e226a23b-769d-49b2-b4d0-797004482d28@fa0d6"
+      ],
+      "skeletons": [
+        "e226a23b-769d-49b2-b4d0-797004482d28@438fe"
+      ],
+      "textures": [],
+      "materials": [],
+      "scenes": [
+        "e226a23b-769d-49b2-b4d0-797004482d28@30075"
+      ]
+    }
+  }
+}

+ 8 - 8
assets/model_scene/scene.scene

@@ -2672,7 +2672,7 @@
       "__id__": 180
     },
     "asset": {
-      "__uuid__": "a9dee002-0de2-4410-9d99-31ec0dd65951",
+      "__uuid__": "8fbb2db1-1869-4464-8b0a-2eca2a8a84a7",
       "__expectedType__": "cc.Prefab"
     },
     "fileId": "bdaQ4BCqZXFLSla+tH53Xv",
@@ -2684,7 +2684,7 @@
   },
   {
     "__type__": "cc.PrefabInstance",
-    "fileId": "37+vxGeZNGFJKnNonbcLM5",
+    "fileId": "acDRb6VaZJzKzXeCzrKTGk",
     "prefabRootNode": null,
     "mountedChildren": [],
     "mountedComponents": [],
@@ -2731,8 +2731,8 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 1.091,
-      "z": 4.693
+      "y": 1.011,
+      "z": 7.109
     }
   },
   {
@@ -2783,7 +2783,7 @@
       "__id__": 188
     },
     "asset": {
-      "__uuid__": "52119b1b-abe4-4304-9c3e-bf116ebe3728",
+      "__uuid__": "43db299d-12c8-48fd-98d8-9840f96d4a86",
       "__expectedType__": "cc.Prefab"
     },
     "fileId": "bbTTyDvJ5ZiKtJxZQRuYHP",
@@ -2795,7 +2795,7 @@
   },
   {
     "__type__": "cc.PrefabInstance",
-    "fileId": "61uXJQCCJKqJJgKrrTi7Ol",
+    "fileId": "1558VmEqVMiKdPITNyS/p1",
     "prefabRootNode": null,
     "mountedChildren": [],
     "mountedComponents": [],
@@ -2842,8 +2842,8 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0.962,
-      "z": 6.822
+      "y": 1.068,
+      "z": 4.85
     }
   },
   {