Răsfoiți Sursa

杯子颜色深浅修改

vene 3 luni în urmă
părinte
comite
95318e8cff
44 a modificat fișierele cu 386 adăugiri și 406 ștergeri
  1. 7 7
      assets/Cup/2color/skeleton.atlas
  2. 1 1
      assets/Cup/2color/skeleton.atlas.meta
  3. 0 0
      assets/Cup/2color/skeleton.json
  4. 1 1
      assets/Cup/2color/skeleton.json.meta
  5. BIN
      assets/Cup/2color/skeleton.png
  6. 20 20
      assets/Cup/2color/skeleton.png.meta
  7. 26 26
      assets/Cup/2goblet/skeleton.atlas
  8. 1 1
      assets/Cup/2goblet/skeleton.atlas.meta
  9. 0 0
      assets/Cup/2goblet/skeleton.json
  10. 1 1
      assets/Cup/2goblet/skeleton.json.meta
  11. BIN
      assets/Cup/2goblet/skeleton.png
  12. 36 36
      assets/Cup/2goblet/skeleton.png.meta
  13. 7 7
      assets/Cup/3color/skeleton.atlas
  14. 1 1
      assets/Cup/3color/skeleton.atlas.meta
  15. 0 0
      assets/Cup/3color/skeleton.json
  16. 1 1
      assets/Cup/3color/skeleton.json.meta
  17. BIN
      assets/Cup/3color/skeleton.png
  18. 20 20
      assets/Cup/3color/skeleton.png.meta
  19. 26 26
      assets/Cup/3goblet/skeleton.atlas
  20. 1 1
      assets/Cup/3goblet/skeleton.atlas.meta
  21. 0 0
      assets/Cup/3goblet/skeleton.json
  22. 1 1
      assets/Cup/3goblet/skeleton.json.meta
  23. BIN
      assets/Cup/3goblet/skeleton.png
  24. 36 36
      assets/Cup/3goblet/skeleton.png.meta
  25. 7 7
      assets/Cup/4color/skeleton.atlas
  26. 1 1
      assets/Cup/4color/skeleton.atlas.meta
  27. 0 0
      assets/Cup/4color/skeleton.json
  28. 1 1
      assets/Cup/4color/skeleton.json.meta
  29. BIN
      assets/Cup/4color/skeleton.png
  30. 20 20
      assets/Cup/4color/skeleton.png.meta
  31. 17 17
      assets/Cup/4goblet/skeleton.atlas
  32. 1 1
      assets/Cup/4goblet/skeleton.atlas.meta
  33. 0 0
      assets/Cup/4goblet/skeleton.json
  34. 1 1
      assets/Cup/4goblet/skeleton.json.meta
  35. BIN
      assets/Cup/4goblet/skeleton.png
  36. 20 20
      assets/Cup/4goblet/skeleton.png.meta
  37. 82 82
      assets/Cup/test.scene
  38. 7 21
      assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailFour.prefab
  39. 6 6
      assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailThree.prefab
  40. 15 15
      assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailTwo.prefab
  41. 9 15
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab
  42. 4 4
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab
  43. 3 3
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalTwo.prefab
  44. 6 6
      settings/v2/packages/information.json

+ 7 - 7
assets/Cup/2color/skeleton.atlas

@@ -1,6 +1,6 @@
 
 skeleton.png
-size: 317,109
+size: 313,109
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
@@ -13,10 +13,10 @@ repeat: none
   index: -1
 lower
   rotate: true
-  xy: 231, 4
-  size: 103, 41
+  xy: 231, 6
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 middle
   rotate: true
@@ -27,8 +27,8 @@ middle
   index: -1
 top
   rotate: true
-  xy: 274, 4
-  size: 103, 41
+  xy: 272, 6
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "940af643-0d2e-492e-8fa0-5670bb6399b9",
+  "uuid": "211f0304-95c4-4ed9-b31f-ca8dfbb618cb",
   "files": [
     ".atlas",
     ".json"

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
assets/Cup/2color/skeleton.json


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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+  "uuid": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
   "files": [
     ".json"
   ],

BIN
assets/Cup/2color/skeleton.png


+ 20 - 20
assets/Cup/2color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa",
+  "uuid": "c37f0118-c759-4fcf-9fd6-53f92a9805c2",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@6c48a",
+      "uuid": "c37f0118-c759-4fcf-9fd6-53f92a9805c2@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa",
+        "imageUuidOrDatabaseUri": "c37f0118-c759-4fcf-9fd6-53f92a9805c2",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@f9941",
+      "uuid": "c37f0118-c759-4fcf-9fd6-53f92a9805c2@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 313,
+        "width": 309,
         "height": 105,
-        "rawWidth": 317,
+        "rawWidth": 313,
         "rawHeight": 109,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -156.5,
+            -154.5,
             -52.5,
             0,
-            156.5,
+            154.5,
             -52.5,
             0,
-            -156.5,
+            -154.5,
             52.5,
             0,
-            156.5,
+            154.5,
             52.5,
             0
           ],
@@ -85,36 +85,36 @@
           "uv": [
             2,
             107,
-            315,
+            311,
             107,
             2,
             2,
-            315,
+            311,
             2
           ],
           "nuv": [
-            0.006309148264984227,
+            0.006389776357827476,
             0.01834862385321101,
-            0.9936908517350158,
+            0.9936102236421726,
             0.01834862385321101,
-            0.006309148264984227,
+            0.006389776357827476,
             0.981651376146789,
-            0.9936908517350158,
+            0.9936102236421726,
             0.981651376146789
           ],
           "minPos": [
-            -156.5,
+            -154.5,
             -52.5,
             0
           ],
           "maxPos": [
-            156.5,
+            154.5,
             52.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@6c48a",
+        "imageUuidOrDatabaseUri": "c37f0118-c759-4fcf-9fd6-53f92a9805c2@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@f9941"
+    "redirect": "c37f0118-c759-4fcf-9fd6-53f92a9805c2@f9941"
   }
 }

+ 26 - 26
assets/Cup/2goblet/skeleton.atlas

@@ -1,89 +1,89 @@
 
 skeleton.png
-size: 1110,149
+size: 190,859
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 2goblet
-  rotate: true
-  xy: 311, 11
+  rotate: false
+  xy: 2, 340
   size: 136, 208
   orig: 136, 217
   offset: 0, 0
   index: -1
 XiGuan
-  rotate: true
-  xy: 2, 2
+  rotate: false
+  xy: 2, 550
   size: 145, 307
   orig: 145, 307
   offset: 0, 0
   index: -1
 ZhuangShi1
   rotate: false
-  xy: 1013, 52
+  xy: 2, 29
   size: 95, 95
   orig: 95, 95
   offset: 0, 0
   index: -1
 ZhuangShi3
   rotate: true
-  xy: 844, 61
+  xy: 99, 2
   size: 49, 66
   orig: 49, 66
   offset: 0, 0
   index: -1
 botton
   rotate: true
-  xy: 945, 4
+  xy: 132, 53
   size: 106, 55
   orig: 106, 56
   offset: 0, 1
   index: -1
 fallwater
-  rotate: true
-  xy: 735, 112
+  rotate: false
+  xy: 149, 375
   size: 35, 276
   orig: 35, 276
   offset: 0, 0
   index: -1
 lower
-  rotate: false
-  xy: 840, 9
-  size: 103, 41
+  rotate: true
+  xy: 149, 756
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 middle
-  rotate: false
-  xy: 735, 3
+  rotate: true
+  xy: 140, 270
   size: 103, 47
   orig: 103, 47
   offset: 0, 0
   index: -1
 spray_B
-  rotate: true
-  xy: 521, 19
+  rotate: false
+  xy: 2, 126
   size: 128, 110
   orig: 140, 124
   offset: 12, 14
   index: -1
 spray_f
-  rotate: true
-  xy: 633, 13
+  rotate: false
+  xy: 2, 238
   size: 134, 100
   orig: 140, 124
   offset: 0, 0
   index: -1
 top
-  rotate: false
-  xy: 1002, 9
-  size: 103, 41
+  rotate: true
+  xy: 149, 653
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 up
-  rotate: false
-  xy: 735, 60
+  rotate: true
+  xy: 138, 161
   size: 107, 50
   orig: 107, 50
   offset: 0, 0

+ 1 - 1
assets/Cup/2goblet/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "ebc8c9d3-b75b-4f0e-bb88-0d783c2d4620",
+  "uuid": "b949fc56-c182-4e9a-aa88-2b8a8058fb44",
   "files": [
     ".atlas",
     ".json"

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
assets/Cup/2goblet/skeleton.json


+ 1 - 1
assets/Cup/2goblet/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "22e77e7c-66b6-416b-a472-4e3726f68e41",
+  "uuid": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
   "files": [
     ".json"
   ],

BIN
assets/Cup/2goblet/skeleton.png


+ 36 - 36
assets/Cup/2goblet/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "70401912-065c-4a99-b6c2-42a61d13f1d9",
+  "uuid": "47ee8f10-c646-4eb3-91e0-8435cec76ae4",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "70401912-065c-4a99-b6c2-42a61d13f1d9@6c48a",
+      "uuid": "47ee8f10-c646-4eb3-91e0-8435cec76ae4@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "70401912-065c-4a99-b6c2-42a61d13f1d9",
+        "imageUuidOrDatabaseUri": "47ee8f10-c646-4eb3-91e0-8435cec76ae4",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "70401912-065c-4a99-b6c2-42a61d13f1d9@f9941",
+      "uuid": "47ee8f10-c646-4eb3-91e0-8435cec76ae4@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -0.5,
+        "offsetY": 0,
         "trimX": 2,
-        "trimY": 3,
-        "width": 1106,
-        "height": 144,
-        "rawWidth": 1110,
-        "rawHeight": 149,
+        "trimY": 2,
+        "width": 186,
+        "height": 855,
+        "rawWidth": 190,
+        "rawHeight": 859,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -553,
-            -72,
+            -93,
+            -427.5,
             0,
-            553,
-            -72,
+            93,
+            -427.5,
             0,
-            -553,
-            72,
+            -93,
+            427.5,
             0,
-            553,
-            72,
+            93,
+            427.5,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            146,
-            1108,
-            146,
+            857,
+            188,
+            857,
             2,
             2,
-            1108,
+            188,
             2
           ],
           "nuv": [
-            0.0018018018018018018,
-            0.013422818791946308,
-            0.9981981981981982,
-            0.013422818791946308,
-            0.0018018018018018018,
-            0.9798657718120806,
-            0.9981981981981982,
-            0.9798657718120806
+            0.010526315789473684,
+            0.002328288707799767,
+            0.9894736842105263,
+            0.002328288707799767,
+            0.010526315789473684,
+            0.9976717112922002,
+            0.9894736842105263,
+            0.9976717112922002
           ],
           "minPos": [
-            -553,
-            -72,
+            -93,
+            -427.5,
             0
           ],
           "maxPos": [
-            553,
-            72,
+            93,
+            427.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "70401912-065c-4a99-b6c2-42a61d13f1d9@6c48a",
+        "imageUuidOrDatabaseUri": "47ee8f10-c646-4eb3-91e0-8435cec76ae4@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "70401912-065c-4a99-b6c2-42a61d13f1d9@f9941"
+    "redirect": "47ee8f10-c646-4eb3-91e0-8435cec76ae4@f9941"
   }
 }

+ 7 - 7
assets/Cup/3color/skeleton.atlas

@@ -1,6 +1,6 @@
 
 skeleton.png
-size: 612,111
+size: 608,111
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
@@ -20,10 +20,10 @@ cup
   index: -1
 lower
   rotate: true
-  xy: 526, 6
-  size: 103, 41
+  xy: 526, 8
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 middle
   rotate: true
@@ -34,8 +34,8 @@ middle
   index: -1
 top
   rotate: true
-  xy: 569, 6
-  size: 103, 41
+  xy: 567, 8
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "6586013d-e775-4049-b308-ad17228bccb4",
+  "uuid": "d6e59036-eebf-445e-8813-3e94509a6d61",
   "files": [
     ".atlas",
     ".json"

Fișier diff suprimat deoarece este prea mare
+ 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": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+  "uuid": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
   "files": [
     ".json"
   ],

BIN
assets/Cup/3color/skeleton.png


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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "fcc6b30b-7eab-4c56-850e-033979f35b37",
+  "uuid": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "fcc6b30b-7eab-4c56-850e-033979f35b37@6c48a",
+      "uuid": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fcc6b30b-7eab-4c56-850e-033979f35b37",
+        "imageUuidOrDatabaseUri": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "fcc6b30b-7eab-4c56-850e-033979f35b37@f9941",
+      "uuid": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 608,
+        "width": 604,
         "height": 107,
-        "rawWidth": 612,
+        "rawWidth": 608,
         "rawHeight": 111,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -304,
+            -302,
             -53.5,
             0,
-            304,
+            302,
             -53.5,
             0,
-            -304,
+            -302,
             53.5,
             0,
-            304,
+            302,
             53.5,
             0
           ],
@@ -85,36 +85,36 @@
           "uv": [
             2,
             109,
-            610,
+            606,
             109,
             2,
             2,
-            610,
+            606,
             2
           ],
           "nuv": [
-            0.0032679738562091504,
+            0.003289473684210526,
             0.018018018018018018,
-            0.9967320261437909,
+            0.9967105263157895,
             0.018018018018018018,
-            0.0032679738562091504,
+            0.003289473684210526,
             0.9819819819819819,
-            0.9967320261437909,
+            0.9967105263157895,
             0.9819819819819819
           ],
           "minPos": [
-            -304,
+            -302,
             -53.5,
             0
           ],
           "maxPos": [
-            304,
+            302,
             53.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "fcc6b30b-7eab-4c56-850e-033979f35b37@6c48a",
+        "imageUuidOrDatabaseUri": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fcc6b30b-7eab-4c56-850e-033979f35b37@f9941"
+    "redirect": "dd9fb1c2-1cd4-40da-9662-de4d8f59dbe7@f9941"
   }
 }

+ 26 - 26
assets/Cup/3goblet/skeleton.atlas

@@ -1,89 +1,89 @@
 
 skeleton.png
-size: 1130,149
+size: 190,859
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 3goblet
-  rotate: true
-  xy: 311, 11
+  rotate: false
+  xy: 2, 320
   size: 136, 228
   orig: 136, 246
   offset: 0, 0
   index: -1
 XiGuan
-  rotate: true
-  xy: 2, 2
+  rotate: false
+  xy: 2, 550
   size: 145, 307
   orig: 145, 307
   offset: 0, 0
   index: -1
 ZhuangShi1
   rotate: false
-  xy: 1033, 52
+  xy: 2, 9
   size: 95, 95
   orig: 95, 95
   offset: 0, 0
   index: -1
 ZhuangShi3
   rotate: true
-  xy: 864, 61
+  xy: 99, 2
   size: 49, 66
   orig: 49, 66
   offset: 0, 0
   index: -1
 botton
   rotate: true
-  xy: 965, 4
+  xy: 132, 53
   size: 106, 55
   orig: 106, 56
   offset: 0, 1
   index: -1
 fallwater
-  rotate: true
-  xy: 755, 112
+  rotate: false
+  xy: 149, 375
   size: 35, 276
   orig: 35, 276
   offset: 0, 0
   index: -1
 lower
-  rotate: false
-  xy: 860, 9
-  size: 103, 41
+  rotate: true
+  xy: 149, 756
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 middle
-  rotate: false
-  xy: 755, 3
+  rotate: true
+  xy: 140, 270
   size: 103, 47
   orig: 103, 47
   offset: 0, 0
   index: -1
 spray_B
-  rotate: true
-  xy: 541, 19
+  rotate: false
+  xy: 2, 106
   size: 128, 110
   orig: 140, 124
   offset: 12, 14
   index: -1
 spray_f
-  rotate: true
-  xy: 653, 13
+  rotate: false
+  xy: 2, 218
   size: 134, 100
   orig: 140, 124
   offset: 0, 0
   index: -1
 top
-  rotate: false
-  xy: 1022, 9
-  size: 103, 41
+  rotate: true
+  xy: 149, 653
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 up
-  rotate: false
-  xy: 755, 60
+  rotate: true
+  xy: 138, 161
   size: 107, 50
   orig: 107, 50
   offset: 0, 0

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "9eeb17b1-0c49-4254-8af7-6b9b57d78dc2",
+  "uuid": "cba830ee-778e-4f2f-8f51-046854f117fe",
   "files": [
     ".atlas",
     ".json"

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
assets/Cup/3goblet/skeleton.json


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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+  "uuid": "d28412a9-decc-48b0-ad2a-646636656d70",
   "files": [
     ".json"
   ],

BIN
assets/Cup/3goblet/skeleton.png


+ 36 - 36
assets/Cup/3goblet/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "09ee1da0-9838-4d1b-872e-967643f10731",
+  "uuid": "748b6024-83d0-4066-959c-b557314625ce",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "09ee1da0-9838-4d1b-872e-967643f10731@6c48a",
+      "uuid": "748b6024-83d0-4066-959c-b557314625ce@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "09ee1da0-9838-4d1b-872e-967643f10731",
+        "imageUuidOrDatabaseUri": "748b6024-83d0-4066-959c-b557314625ce",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "09ee1da0-9838-4d1b-872e-967643f10731@f9941",
+      "uuid": "748b6024-83d0-4066-959c-b557314625ce@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -0.5,
+        "offsetY": 0,
         "trimX": 2,
-        "trimY": 3,
-        "width": 1126,
-        "height": 144,
-        "rawWidth": 1130,
-        "rawHeight": 149,
+        "trimY": 2,
+        "width": 186,
+        "height": 855,
+        "rawWidth": 190,
+        "rawHeight": 859,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -563,
-            -72,
+            -93,
+            -427.5,
             0,
-            563,
-            -72,
+            93,
+            -427.5,
             0,
-            -563,
-            72,
+            -93,
+            427.5,
             0,
-            563,
-            72,
+            93,
+            427.5,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            146,
-            1128,
-            146,
+            857,
+            188,
+            857,
             2,
             2,
-            1128,
+            188,
             2
           ],
           "nuv": [
-            0.0017699115044247787,
-            0.013422818791946308,
-            0.9982300884955753,
-            0.013422818791946308,
-            0.0017699115044247787,
-            0.9798657718120806,
-            0.9982300884955753,
-            0.9798657718120806
+            0.010526315789473684,
+            0.002328288707799767,
+            0.9894736842105263,
+            0.002328288707799767,
+            0.010526315789473684,
+            0.9976717112922002,
+            0.9894736842105263,
+            0.9976717112922002
           ],
           "minPos": [
-            -563,
-            -72,
+            -93,
+            -427.5,
             0
           ],
           "maxPos": [
-            563,
-            72,
+            93,
+            427.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "09ee1da0-9838-4d1b-872e-967643f10731@6c48a",
+        "imageUuidOrDatabaseUri": "748b6024-83d0-4066-959c-b557314625ce@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "09ee1da0-9838-4d1b-872e-967643f10731@f9941"
+    "redirect": "748b6024-83d0-4066-959c-b557314625ce@f9941"
   }
 }

+ 7 - 7
assets/Cup/4color/skeleton.atlas

@@ -1,6 +1,6 @@
 
 skeleton.png
-size: 391,110
+size: 387,110
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
@@ -13,10 +13,10 @@ cup
   index: -1
 lower
   rotate: true
-  xy: 305, 5
-  size: 103, 41
+  xy: 305, 7
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 middle
   rotate: true
@@ -27,8 +27,8 @@ middle
   index: -1
 top
   rotate: true
-  xy: 348, 5
-  size: 103, 41
+  xy: 346, 7
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "c792b0d2-01eb-4bf4-82f6-a669f84c7ff9",
+  "uuid": "16983e99-d801-4709-b7e3-dd4bce6c51e2",
   "files": [
     ".atlas",
     ".json"

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
assets/Cup/4color/skeleton.json


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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+  "uuid": "b30b4f82-1470-4197-b961-c5da51fdec20",
   "files": [
     ".json"
   ],

BIN
assets/Cup/4color/skeleton.png


+ 20 - 20
assets/Cup/4color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "5a709f05-018d-451c-8bf4-6f6b2b76235f",
+  "uuid": "f8013c49-eb5e-4e4e-9713-616dbe5c52aa",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "5a709f05-018d-451c-8bf4-6f6b2b76235f@6c48a",
+      "uuid": "f8013c49-eb5e-4e4e-9713-616dbe5c52aa@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5a709f05-018d-451c-8bf4-6f6b2b76235f",
+        "imageUuidOrDatabaseUri": "f8013c49-eb5e-4e4e-9713-616dbe5c52aa",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "5a709f05-018d-451c-8bf4-6f6b2b76235f@f9941",
+      "uuid": "f8013c49-eb5e-4e4e-9713-616dbe5c52aa@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 387,
+        "width": 383,
         "height": 106,
-        "rawWidth": 391,
+        "rawWidth": 387,
         "rawHeight": 110,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -193.5,
+            -191.5,
             -53,
             0,
-            193.5,
+            191.5,
             -53,
             0,
-            -193.5,
+            -191.5,
             53,
             0,
-            193.5,
+            191.5,
             53,
             0
           ],
@@ -85,36 +85,36 @@
           "uv": [
             2,
             108,
-            389,
+            385,
             108,
             2,
             2,
-            389,
+            385,
             2
           ],
           "nuv": [
-            0.005115089514066497,
+            0.00516795865633075,
             0.01818181818181818,
-            0.9948849104859335,
+            0.9948320413436692,
             0.01818181818181818,
-            0.005115089514066497,
+            0.00516795865633075,
             0.9818181818181818,
-            0.9948849104859335,
+            0.9948320413436692,
             0.9818181818181818
           ],
           "minPos": [
-            -193.5,
+            -191.5,
             -53,
             0
           ],
           "maxPos": [
-            193.5,
+            191.5,
             53,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "5a709f05-018d-451c-8bf4-6f6b2b76235f@6c48a",
+        "imageUuidOrDatabaseUri": "f8013c49-eb5e-4e4e-9713-616dbe5c52aa@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5a709f05-018d-451c-8bf4-6f6b2b76235f@f9941"
+    "redirect": "f8013c49-eb5e-4e4e-9713-616dbe5c52aa@f9941"
   }
 }

+ 17 - 17
assets/Cup/4goblet/skeleton.atlas

@@ -1,89 +1,89 @@
 
 skeleton.png
-size: 190,894
+size: 190,880
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 XiGuan
   rotate: false
-  xy: 2, 585
+  xy: 2, 571
   size: 145, 307
   orig: 145, 307
   offset: 0, 0
   index: -1
 ZhuangShi1
   rotate: false
-  xy: 2, 16
+  xy: 2, 2
   size: 95, 95
   orig: 95, 95
   offset: 0, 0
   index: -1
 ZhuangShi3
   rotate: true
-  xy: 99, 2
+  xy: 99, 23
   size: 49, 66
   orig: 49, 66
   offset: 0, 0
   index: -1
 botton
   rotate: true
-  xy: 132, 53
+  xy: 132, 74
   size: 106, 55
   orig: 106, 56
   offset: 0, 1
   index: -1
 fallwater
   rotate: false
-  xy: 149, 616
+  xy: 149, 396
   size: 35, 276
   orig: 35, 276
   offset: 0, 0
   index: -1
 goblet
   rotate: false
-  xy: 2, 327
+  xy: 2, 313
   size: 136, 256
   orig: 136, 275
   offset: 0, 0
   index: -1
 lower
   rotate: true
-  xy: 140, 375
-  size: 103, 41
+  xy: 149, 777
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 middle
   rotate: true
-  xy: 140, 480
+  xy: 140, 291
   size: 103, 47
   orig: 103, 47
   offset: 0, 0
   index: -1
 spray_B
   rotate: false
-  xy: 2, 113
+  xy: 2, 99
   size: 128, 110
   orig: 140, 124
   offset: 12, 14
   index: -1
 spray_f
   rotate: false
-  xy: 2, 225
+  xy: 2, 211
   size: 134, 100
   orig: 140, 124
   offset: 0, 0
   index: -1
 top
   rotate: true
-  xy: 140, 270
-  size: 103, 41
+  xy: 149, 674
+  size: 101, 39
   orig: 103, 41
-  offset: 0, 0
+  offset: 1, 1
   index: -1
 up
   rotate: true
-  xy: 138, 161
+  xy: 138, 182
   size: 107, 50
   orig: 107, 50
   offset: 0, 0

+ 1 - 1
assets/Cup/4goblet/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "90727d22-c638-46d7-a022-31e727f61fe7",
+  "uuid": "6afd9bf0-5cb4-466d-96b3-414d2f87c9f5",
   "files": [
     ".atlas",
     ".json"

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
assets/Cup/4goblet/skeleton.json


+ 1 - 1
assets/Cup/4goblet/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "465898ec-e707-4456-bdea-77827ae403fa",
+  "uuid": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
   "files": [
     ".json"
   ],

BIN
assets/Cup/4goblet/skeleton.png


+ 20 - 20
assets/Cup/4goblet/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "bae2acca-8c21-49e8-b132-04129e67e984",
+  "uuid": "e3e251a0-4d8d-46b3-b5c4-933e27c37655",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "bae2acca-8c21-49e8-b132-04129e67e984@6c48a",
+      "uuid": "e3e251a0-4d8d-46b3-b5c4-933e27c37655@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bae2acca-8c21-49e8-b132-04129e67e984",
+        "imageUuidOrDatabaseUri": "e3e251a0-4d8d-46b3-b5c4-933e27c37655",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "bae2acca-8c21-49e8-b132-04129e67e984@f9941",
+      "uuid": "e3e251a0-4d8d-46b3-b5c4-933e27c37655@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -47,9 +47,9 @@
         "trimX": 2,
         "trimY": 2,
         "width": 186,
-        "height": 890,
+        "height": 876,
         "rawWidth": 190,
-        "rawHeight": 894,
+        "rawHeight": 880,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -93,
-            -445,
+            -438,
             0,
             93,
-            -445,
+            -438,
             0,
             -93,
-            445,
+            438,
             0,
             93,
-            445,
+            438,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             2,
-            892,
+            878,
             188,
-            892,
+            878,
             2,
             2,
             188,
@@ -94,27 +94,27 @@
           ],
           "nuv": [
             0.010526315789473684,
-            0.0022371364653243847,
+            0.0022727272727272726,
             0.9894736842105263,
-            0.0022371364653243847,
+            0.0022727272727272726,
             0.010526315789473684,
-            0.9977628635346756,
+            0.9977272727272727,
             0.9894736842105263,
-            0.9977628635346756
+            0.9977272727272727
           ],
           "minPos": [
             -93,
-            -445,
+            -438,
             0
           ],
           "maxPos": [
             93,
-            445,
+            438,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "bae2acca-8c21-49e8-b132-04129e67e984@6c48a",
+        "imageUuidOrDatabaseUri": "e3e251a0-4d8d-46b3-b5c4-933e27c37655@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "bae2acca-8c21-49e8-b132-04129e67e984@f9941"
+    "redirect": "e3e251a0-4d8d-46b3-b5c4-933e27c37655@f9941"
   }
 }

+ 82 - 82
assets/Cup/test.scene

@@ -388,12 +388,12 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 0,
-      "b": 0,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -497,12 +497,12 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 0,
-      "b": 0,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -606,12 +606,12 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 0,
-      "b": 0,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -715,12 +715,12 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 0,
-      "b": 0,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -829,7 +829,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -1457,7 +1457,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -1640,17 +1640,17 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 184,
-      "g": 0,
+      "r": 255,
+      "g": 255,
       "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
-    "defaultAnimation": "",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1749,17 +1749,17 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 194,
+      "r": 255,
+      "g": 255,
       "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1858,17 +1858,17 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
+      "r": 255,
       "g": 255,
-      "b": 20,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1973,7 +1973,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2035,7 +2035,7 @@
         "__id__": 63
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 66
@@ -2489,11 +2489,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
-    "defaultAnimation": "<None>",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -2669,13 +2669,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 194,
+      "r": 255,
+      "g": 255,
       "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -2778,13 +2778,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
+      "r": 255,
       "g": 255,
-      "b": 20,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -2893,7 +2893,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2952,7 +2952,7 @@
         "__id__": 85
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 88
@@ -3297,7 +3297,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -3491,11 +3491,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -3600,11 +3600,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -3709,11 +3709,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -3818,11 +3818,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -3921,17 +3921,17 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 240,
-      "g": 37,
-      "b": 37,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -4036,11 +4036,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -4145,11 +4145,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "465898ec-e707-4456-bdea-77827ae403fa",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",
-    "defaultAnimation": "full",
+    "defaultAnimation": "pour_04",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -4314,7 +4314,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -4423,7 +4423,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -4532,7 +4532,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -4641,7 +4641,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -4750,7 +4750,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -4859,7 +4859,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8d914329-c1dc-4fb0-be81-037f75cefb18",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",
@@ -4994,12 +4994,12 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": "7eyDP+6ctFbYfn8QesD4hU"
@@ -5025,11 +5025,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "22e77e7c-66b6-416b-a472-4e3726f68e41",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "pour_02",
+    "defaultAnimation": "full",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -5103,12 +5103,12 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": "999sPPLK5KjIFdbAWVNKY6"
@@ -5134,11 +5134,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "22e77e7c-66b6-416b-a472-4e3726f68e41",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "pour_02",
+    "defaultAnimation": "full",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -5212,12 +5212,12 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": "dbC9ZqB/RHmpCN6DiTUzFp"
@@ -5243,11 +5243,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "22e77e7c-66b6-416b-a472-4e3726f68e41",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
-    "defaultAnimation": "pour_02",
+    "defaultAnimation": "full",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -5321,12 +5321,12 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": "3c6ZwbBctFSLa6wCuYTQ0i"
@@ -5352,11 +5352,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "22e77e7c-66b6-416b-a472-4e3726f68e41",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
-    "defaultAnimation": "pour_02",
+    "defaultAnimation": "full",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -5430,12 +5430,12 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": "099/0pZ9FEoIetEPoE2nkk"
@@ -5461,11 +5461,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "22e77e7c-66b6-416b-a472-4e3726f68e41",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",
-    "defaultAnimation": "pour_02",
+    "defaultAnimation": "full",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,

+ 7 - 21
assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailFour.prefab

@@ -233,7 +233,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -264,8 +264,6 @@
       "__id__": 0
     },
     "fileId": "fbqPkv+KZHworptRnTdb3Z",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -369,7 +367,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -400,8 +398,6 @@
       "__id__": 0
     },
     "fileId": "f64ICIbO9EmIUokRT/XyhT",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -505,7 +501,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -536,8 +532,6 @@
       "__id__": 0
     },
     "fileId": "a9KpFLZwRCmZHdsUtSHr6M",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -641,7 +635,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -672,8 +666,6 @@
       "__id__": 0
     },
     "fileId": "e3SebDTNBNopQiPOw2LkuK",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -818,7 +810,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -849,8 +841,6 @@
       "__id__": 0
     },
     "fileId": "f5I5euV2RD/J/gK2utzro5",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -954,7 +944,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -985,8 +975,6 @@
       "__id__": 0
     },
     "fileId": "a1x3ceDetCdKDoI0ccidhD",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1090,7 +1078,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",
@@ -1121,8 +1109,6 @@
       "__id__": 0
     },
     "fileId": "d3H28lWhhDuotQTa6EQyeE",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

+ 6 - 6
assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailThree.prefab

@@ -226,7 +226,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -362,7 +362,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -498,7 +498,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -647,7 +647,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -783,7 +783,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -919,7 +919,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",

+ 15 - 15
assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailTwo.prefab

@@ -186,12 +186,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": ""
@@ -223,7 +223,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b8f1d0bf-eb6d-4675-9565-baad96904177",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -322,12 +322,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": ""
@@ -359,7 +359,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b8f1d0bf-eb6d-4675-9565-baad96904177",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -471,12 +471,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": ""
@@ -508,7 +508,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b8f1d0bf-eb6d-4675-9565-baad96904177",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -607,12 +607,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": ""
@@ -644,7 +644,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b8f1d0bf-eb6d-4675-9565-baad96904177",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -743,12 +743,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128.2100067138672,
+      "width": 136,
       "height": 218.38999938964844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5050307823827346,
+      "x": 0.5,
       "y": 0.6322176276848471
     },
     "_id": ""
@@ -780,7 +780,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b8f1d0bf-eb6d-4675-9565-baad96904177",
+      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",

+ 9 - 15
assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab

@@ -236,7 +236,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3a03007e-2d91-4d5a-90a9-26cce99ac28e",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -270,6 +270,7 @@
     "__prefab": {
       "__id__": 9
     },
+    "sprite": null,
     "_id": ""
   },
   {
@@ -285,8 +286,6 @@
       "__id__": 0
     },
     "fileId": "3dM9R9OXFGg5ZeZ2KIp3d+",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -393,7 +392,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3a03007e-2d91-4d5a-90a9-26cce99ac28e",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -427,6 +426,7 @@
     "__prefab": {
       "__id__": 17
     },
+    "sprite": null,
     "_id": ""
   },
   {
@@ -442,8 +442,6 @@
       "__id__": 0
     },
     "fileId": "777/KtNQ9DS6d87A9F0+5l",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -550,7 +548,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3a03007e-2d91-4d5a-90a9-26cce99ac28e",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -584,6 +582,7 @@
     "__prefab": {
       "__id__": 25
     },
+    "sprite": null,
     "_id": ""
   },
   {
@@ -599,8 +598,6 @@
       "__id__": 0
     },
     "fileId": "feDMH9HyNJLKFtbHKOh2gk",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -707,7 +704,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3a03007e-2d91-4d5a-90a9-26cce99ac28e",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -741,6 +738,7 @@
     "__prefab": {
       "__id__": 33
     },
+    "sprite": null,
     "_id": ""
   },
   {
@@ -756,8 +754,6 @@
       "__id__": 0
     },
     "fileId": "a2ipEVdztCqoxoCkxsaAWU",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2002,7 +1998,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3a03007e-2d91-4d5a-90a9-26cce99ac28e",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2033,8 +2029,6 @@
       "__id__": 0
     },
     "fileId": "64CU6wdeNOjoMwg0hpUSzs",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

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

@@ -233,7 +233,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "17ed8c5c-c806-4d58-90b9-413d771a2313",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -390,7 +390,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "17ed8c5c-c806-4d58-90b9-413d771a2313",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -547,7 +547,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "17ed8c5c-c806-4d58-90b9-413d771a2313",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1681,7 +1681,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "17ed8c5c-c806-4d58-90b9-413d771a2313",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

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

@@ -230,7 +230,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8185b511-cd6d-4604-a915-a3b691178db2",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -387,7 +387,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8185b511-cd6d-4604-a915-a3b691178db2",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1360,7 +1360,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8185b511-cd6d-4604-a915-a3b691178db2",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

+ 6 - 6
settings/v2/packages/information.json

@@ -4,19 +4,19 @@
     "customSplash": {
       "id": "customSplash",
       "label": "customSplash",
-      "enable": true,
+      "enable": false,
       "customSplash": {
-        "complete": true,
-        "form": "https://creator-api.cocos.com/api/form/show?sid=441f33883f4cc43ae3cef841ef990d52"
+        "complete": false,
+        "form": "https://creator-api.cocos.com/api/form/show?"
       }
     },
     "removeSplash": {
       "id": "removeSplash",
       "label": "removeSplash",
-      "enable": true,
+      "enable": false,
       "removeSplash": {
-        "complete": true,
-        "form": "https://creator-api.cocos.com/api/form/show?sid=441f33883f4cc43ae3cef841ef990d52"
+        "complete": false,
+        "form": "https://creator-api.cocos.com/api/form/show?"
       }
     }
   }

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff