cailianda il y a 4 ans
Parent
commit
1d6f3f8d4c

+ 48 - 48
assets/d3d/gunFire/GunFire.fbx.meta

@@ -21,54 +21,6 @@
         "gltfIndex": 0
       }
     },
-    "8b989": {
-      "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@8b989",
-      "displayName": "",
-      "id": "8b989",
-      "name": "GunFire3.animation",
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".bin",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0,
-        "wrapMode": 1,
-        "sample": 30,
-        "span": {
-          "from": 0.8333333333333334,
-          "to": 1.5333333333333334
-        },
-        "events": []
-      }
-    },
-    "ba033": {
-      "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@ba033",
-      "displayName": "",
-      "id": "ba033",
-      "name": "GunFire4.animation",
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".bin",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0,
-        "wrapMode": 1,
-        "sample": 30,
-        "span": {
-          "from": 1.5333333333333334,
-          "to": 2.125
-        },
-        "events": []
-      }
-    },
     "b3672": {
       "importer": "gltf-mesh",
       "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@b3672",
@@ -158,6 +110,54 @@
         "events": []
       }
     },
+    "8b989": {
+      "importer": "gltf-animation",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@8b989",
+      "displayName": "",
+      "id": "8b989",
+      "name": "GunFire3.animation",
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 1,
+        "sample": 30,
+        "span": {
+          "from": 0.8333333333333334,
+          "to": 1.5333333333333334
+        },
+        "events": []
+      }
+    },
+    "ba033": {
+      "importer": "gltf-animation",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@ba033",
+      "displayName": "",
+      "id": "ba033",
+      "name": "GunFire4.animation",
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 1,
+        "sample": 30,
+        "span": {
+          "from": 1.5333333333333334,
+          "to": 2.125
+        },
+        "events": []
+      }
+    },
     "43c71": {
       "importer": "gltf-embeded-image",
       "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@43c71",

+ 7 - 24
assets/d3d/gunFire/zhuodan.fbx.meta

@@ -5,23 +5,6 @@
   "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc",
   "files": [],
   "subMetas": {
-    "a55e7": {
-      "importer": "gltf-embeded-image",
-      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7",
-      "displayName": "",
-      "id": "a55e7",
-      "name": "5555.png.image",
-      "ver": "1.0.2",
-      "imported": true,
-      "files": [
-        ".png",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0
-      }
-    },
     "e22fe": {
       "importer": "gltf-mesh",
       "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@e22fe",
@@ -97,12 +80,12 @@
         "events": []
       }
     },
-    "adacb": {
+    "a55e7": {
       "importer": "gltf-embeded-image",
-      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb",
+      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7",
       "displayName": "",
-      "id": "adacb",
-      "name": "file2.image",
+      "id": "a55e7",
+      "name": "5555.png.image",
       "ver": "1.0.2",
       "imported": true,
       "files": [
@@ -135,7 +118,7 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
+        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
       }
     },
     "826f3": {
@@ -158,8 +141,8 @@
   "userData": {
     "imageMetas": [
       {
-        "name": "file2",
-        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
+        "name": "5555.png",
+        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
       }
     ],
     "animationImportSettings": [

+ 48 - 48
assets/d3d/hands/Hand.fbx.meta

@@ -5,54 +5,6 @@
   "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6",
   "files": [],
   "subMetas": {
-    "67bb3": {
-      "importer": "gltf-animation",
-      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@67bb3",
-      "displayName": "",
-      "id": "67bb3",
-      "name": "SniperGunFire.animation",
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".bin",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0,
-        "wrapMode": 1,
-        "sample": 30,
-        "span": {
-          "from": 4.066666666666666,
-          "to": 4.666666666666667
-        },
-        "events": []
-      }
-    },
-    "8c0dc": {
-      "importer": "gltf-animation",
-      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc",
-      "displayName": "",
-      "id": "8c0dc",
-      "name": "GatlingFire.animation",
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".bin",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0,
-        "wrapMode": 1,
-        "sample": 30,
-        "span": {
-          "from": 4.666666666666667,
-          "to": 4.833333492279053
-        },
-        "events": []
-      }
-    },
     "01a55": {
       "importer": "gltf-mesh",
       "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@01a55",
@@ -224,6 +176,54 @@
         "events": []
       }
     },
+    "67bb3": {
+      "importer": "gltf-animation",
+      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@67bb3",
+      "displayName": "",
+      "id": "67bb3",
+      "name": "SniperGunFire.animation",
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 1,
+        "sample": 30,
+        "span": {
+          "from": 4.066666666666666,
+          "to": 4.666666666666667
+        },
+        "events": []
+      }
+    },
+    "8c0dc": {
+      "importer": "gltf-animation",
+      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc",
+      "displayName": "",
+      "id": "8c0dc",
+      "name": "GatlingFire.animation",
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 1,
+        "sample": 30,
+        "span": {
+          "from": 4.666666666666667,
+          "to": 4.833333492279053
+        },
+        "events": []
+      }
+    },
     "43c71": {
       "importer": "gltf-embeded-image",
       "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@43c71",

Fichier diff supprimé car celui-ci est trop grand
+ 380 - 112
assets/resources/ui/PrepareUI.prefab


BIN
assets/ui/img_enter/img_enter_05.png


+ 2 - 2
assets/ui/img_enter/img_enter_05.png.meta

@@ -52,9 +52,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 63,
+        "width": 75,
         "height": 76,
-        "rawWidth": 63,
+        "rawWidth": 75,
         "rawHeight": 76,
         "borderTop": 0,
         "borderBottom": 0,

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff