2
0

2 Commity f7a6b513ae ... 164e410064

Autor SHA1 Správa Dátum
  vene 164e410064 Merge branch 'master' of http://192.168.5.71:3333/WOSO_H5_01Team/_TakeGoblet 3 mesiacov pred
  vene cdc63404be 水杯修改 3 mesiacov pred

+ 1 - 1
assets/Cup/3color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "d6e59036-eebf-445e-8813-3e94509a6d61",
+  "uuid": "8ed18e18-51f8-4cd8-922b-e438858a517f",
   "files": [
     ".atlas",
     ".json"

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
assets/Cup/3color/skeleton.json


+ 1 - 1
assets/Cup/3color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
+  "uuid": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
   "files": [
     ".json"
   ],

+ 6 - 6
assets/Cup/3color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7",
+  "uuid": "38c2445e-ca4d-4a74-a364-2fe42bdeacd4",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@6c48a",
+      "uuid": "38c2445e-ca4d-4a74-a364-2fe42bdeacd4@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7",
+        "imageUuidOrDatabaseUri": "38c2445e-ca4d-4a74-a364-2fe42bdeacd4",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@f9941",
+      "uuid": "38c2445e-ca4d-4a74-a364-2fe42bdeacd4@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@6c48a",
+        "imageUuidOrDatabaseUri": "38c2445e-ca4d-4a74-a364-2fe42bdeacd4@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@f9941"
+    "redirect": "38c2445e-ca4d-4a74-a364-2fe42bdeacd4@f9941"
   }
 }

+ 8 - 8
assets/Cup/test.scene

@@ -1646,11 +1646,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
+      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
-    "defaultAnimation": "<None>",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1755,11 +1755,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
+      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "<None>",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1864,11 +1864,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
+      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "<None>",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1973,7 +1973,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
+      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2489,7 +2489,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
+      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov