woso_javan пре 3 месеци
родитељ
комит
40ac0d7276

+ 5 - 5
assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab

@@ -236,7 +236,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "12ba8153-ea37-4c16-a066-8beea9de4651",
+      "__uuid__": "46b5a5d4-5e20-456b-a064-d84dbb60d9e7",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -393,7 +393,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "12ba8153-ea37-4c16-a066-8beea9de4651",
+      "__uuid__": "46b5a5d4-5e20-456b-a064-d84dbb60d9e7",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -550,7 +550,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "12ba8153-ea37-4c16-a066-8beea9de4651",
+      "__uuid__": "46b5a5d4-5e20-456b-a064-d84dbb60d9e7",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -707,7 +707,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "12ba8153-ea37-4c16-a066-8beea9de4651",
+      "__uuid__": "46b5a5d4-5e20-456b-a064-d84dbb60d9e7",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -2002,7 +2002,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "12ba8153-ea37-4c16-a066-8beea9de4651",
+      "__uuid__": "46b5a5d4-5e20-456b-a064-d84dbb60d9e7",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

+ 5 - 5
assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab

@@ -233,7 +233,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "ba693ea8-98a2-4712-b6d2-c2108f1d7c6a",
+      "__uuid__": "54bc3f0f-341d-42c9-ab3d-6595ef4e04c5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -390,11 +390,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "ba693ea8-98a2-4712-b6d2-c2108f1d7c6a",
+      "__uuid__": "54bc3f0f-341d-42c9-ab3d-6595ef4e04c5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "Idle",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -547,7 +547,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "ba693ea8-98a2-4712-b6d2-c2108f1d7c6a",
+      "__uuid__": "54bc3f0f-341d-42c9-ab3d-6595ef4e04c5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1681,7 +1681,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "ba693ea8-98a2-4712-b6d2-c2108f1d7c6a",
+      "__uuid__": "54bc3f0f-341d-42c9-ab3d-6595ef4e04c5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

+ 3 - 3
assets/module_take_goblet/Prefabs/Cup/Original/OriginalTwo.prefab

@@ -230,7 +230,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "05aa3b06-79a5-49a3-86f1-6be1e07637a3",
+      "__uuid__": "f24c6f81-008b-43a6-94f5-5d02d6e71f38",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -387,7 +387,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "05aa3b06-79a5-49a3-86f1-6be1e07637a3",
+      "__uuid__": "f24c6f81-008b-43a6-94f5-5d02d6e71f38",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1360,7 +1360,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "05aa3b06-79a5-49a3-86f1-6be1e07637a3",
+      "__uuid__": "f24c6f81-008b-43a6-94f5-5d02d6e71f38",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

+ 1 - 1
assets/module_take_goblet/Spines/2color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "6e2345e0-8ed3-4e8a-bc75-0aee46794556",
+  "uuid": "5f63b677-171b-4833-98bd-fa776ae22b41",
   "files": [
     ".atlas",
     ".json"

+ 1 - 1
assets/module_take_goblet/Spines/2color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "05aa3b06-79a5-49a3-86f1-6be1e07637a3",
+  "uuid": "f24c6f81-008b-43a6-94f5-5d02d6e71f38",
   "files": [
     ".json"
   ],

+ 6 - 6
assets/module_take_goblet/Spines/2color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "25384545-8350-457b-84d7-4effe3b95f34",
+  "uuid": "6cdee5a6-db02-4b16-ad94-01cfb3a9653a",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "25384545-8350-457b-84d7-4effe3b95f34@6c48a",
+      "uuid": "6cdee5a6-db02-4b16-ad94-01cfb3a9653a@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "25384545-8350-457b-84d7-4effe3b95f34",
+        "imageUuidOrDatabaseUri": "6cdee5a6-db02-4b16-ad94-01cfb3a9653a",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "25384545-8350-457b-84d7-4effe3b95f34@f9941",
+      "uuid": "6cdee5a6-db02-4b16-ad94-01cfb3a9653a@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "25384545-8350-457b-84d7-4effe3b95f34@6c48a",
+        "imageUuidOrDatabaseUri": "6cdee5a6-db02-4b16-ad94-01cfb3a9653a@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "25384545-8350-457b-84d7-4effe3b95f34@f9941"
+    "redirect": "6cdee5a6-db02-4b16-ad94-01cfb3a9653a@f9941"
   }
 }

+ 1 - 1
assets/module_take_goblet/Spines/3color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "339e9389-4054-4350-99d2-9b9c6a5cb256",
+  "uuid": "a1b1fd19-3118-4441-a05f-0cd66faf4253",
   "files": [
     ".atlas",
     ".json"

+ 1 - 1
assets/module_take_goblet/Spines/3color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "ba693ea8-98a2-4712-b6d2-c2108f1d7c6a",
+  "uuid": "54bc3f0f-341d-42c9-ab3d-6595ef4e04c5",
   "files": [
     ".json"
   ],

+ 6 - 6
assets/module_take_goblet/Spines/3color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "bfe1e2d2-d0d2-4d66-b337-41b418509223",
+  "uuid": "73a6c406-80b2-4b41-b96f-30f6eb95bf4d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "bfe1e2d2-d0d2-4d66-b337-41b418509223@6c48a",
+      "uuid": "73a6c406-80b2-4b41-b96f-30f6eb95bf4d@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bfe1e2d2-d0d2-4d66-b337-41b418509223",
+        "imageUuidOrDatabaseUri": "73a6c406-80b2-4b41-b96f-30f6eb95bf4d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "bfe1e2d2-d0d2-4d66-b337-41b418509223@f9941",
+      "uuid": "73a6c406-80b2-4b41-b96f-30f6eb95bf4d@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "bfe1e2d2-d0d2-4d66-b337-41b418509223@6c48a",
+        "imageUuidOrDatabaseUri": "73a6c406-80b2-4b41-b96f-30f6eb95bf4d@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "bfe1e2d2-d0d2-4d66-b337-41b418509223@f9941"
+    "redirect": "73a6c406-80b2-4b41-b96f-30f6eb95bf4d@f9941"
   }
 }

+ 1 - 1
assets/module_take_goblet/Spines/4color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "ac1e933f-aa05-4246-8d5a-f44c090160db",
+  "uuid": "42d5eed8-a34f-4f08-b1e1-1e548f6b79ea",
   "files": [
     ".atlas",
     ".json"

+ 1 - 1
assets/module_take_goblet/Spines/4color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "12ba8153-ea37-4c16-a066-8beea9de4651",
+  "uuid": "46b5a5d4-5e20-456b-a064-d84dbb60d9e7",
   "files": [
     ".json"
   ],

+ 6 - 6
assets/module_take_goblet/Spines/4color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "4f5f4bd7-40e5-4a07-a182-1820b2506e31",
+  "uuid": "492ff66c-2207-46f6-9d2f-aa225dcbc804",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4f5f4bd7-40e5-4a07-a182-1820b2506e31@6c48a",
+      "uuid": "492ff66c-2207-46f6-9d2f-aa225dcbc804@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4f5f4bd7-40e5-4a07-a182-1820b2506e31",
+        "imageUuidOrDatabaseUri": "492ff66c-2207-46f6-9d2f-aa225dcbc804",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4f5f4bd7-40e5-4a07-a182-1820b2506e31@f9941",
+      "uuid": "492ff66c-2207-46f6-9d2f-aa225dcbc804@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4f5f4bd7-40e5-4a07-a182-1820b2506e31@6c48a",
+        "imageUuidOrDatabaseUri": "492ff66c-2207-46f6-9d2f-aa225dcbc804@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4f5f4bd7-40e5-4a07-a182-1820b2506e31@f9941"
+    "redirect": "492ff66c-2207-46f6-9d2f-aa225dcbc804@f9941"
   }
 }

+ 0 - 34
assets/module_take_goblet/Spines/skeleton.atlas

@@ -1,34 +0,0 @@
-
-skeleton.png
-size: 395,110
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-cup
-  rotate: true
-  xy: 2, 2
-  size: 106, 248
-  orig: 107, 248
-  offset: 0, 0
-  index: -1
-lower
-  rotate: true
-  xy: 301, 5
-  size: 103, 45
-  orig: 103, 45
-  offset: 0, 0
-  index: -1
-middle
-  rotate: true
-  xy: 252, 5
-  size: 103, 47
-  orig: 103, 47
-  offset: 0, 0
-  index: -1
-top
-  rotate: true
-  xy: 348, 5
-  size: 103, 45
-  orig: 103, 45
-  offset: 0, 0
-  index: -1

+ 0 - 12
assets/module_take_goblet/Spines/skeleton.atlas.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.0.1",
-  "importer": "*",
-  "imported": true,
-  "uuid": "336fb099-8c81-46cc-a939-c4ad7d02900e",
-  "files": [
-    ".atlas",
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
assets/module_take_goblet/Spines/skeleton.json


+ 0 - 11
assets/module_take_goblet/Spines/skeleton.json.meta

@@ -1,11 +0,0 @@
-{
-  "ver": "1.2.6",
-  "importer": "spine-data",
-  "imported": true,
-  "uuid": "e535936f-ab43-4afd-8ab4-9722cea41097",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

BIN
assets/module_take_goblet/Spines/skeleton.png


+ 0 - 134
assets/module_take_goblet/Spines/skeleton.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "7877d0ad-0876-447e-be03-1358a659cd1a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "7877d0ad-0876-447e-be03-1358a659cd1a@6c48a",
-      "displayName": "skeleton",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "7877d0ad-0876-447e-be03-1358a659cd1a",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "7877d0ad-0876-447e-be03-1358a659cd1a@f9941",
-      "displayName": "skeleton",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 2,
-        "trimY": 2,
-        "width": 391,
-        "height": 106,
-        "rawWidth": 395,
-        "rawHeight": 110,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -195.5,
-            -53,
-            0,
-            195.5,
-            -53,
-            0,
-            -195.5,
-            53,
-            0,
-            195.5,
-            53,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            2,
-            108,
-            393,
-            108,
-            2,
-            2,
-            393,
-            2
-          ],
-          "nuv": [
-            0.005063291139240506,
-            0.01818181818181818,
-            0.9949367088607595,
-            0.01818181818181818,
-            0.005063291139240506,
-            0.9818181818181818,
-            0.9949367088607595,
-            0.9818181818181818
-          ],
-          "minPos": [
-            -195.5,
-            -53,
-            0
-          ],
-          "maxPos": [
-            195.5,
-            53,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "7877d0ad-0876-447e-be03-1358a659cd1a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "7877d0ad-0876-447e-be03-1358a659cd1a@f9941"
-  }
-}

Неке датотеке нису приказане због велике количине промена