Explorar el Código

Cup文件调整

woso_javan hace 3 meses
padre
commit
1b9618cf09
Se han modificado 29 ficheros con 160 adiciones y 154 borrados
  1. 1 1
      assets/Cup/2color/skeleton.atlas.meta
  2. 1 1
      assets/Cup/2color/skeleton.json.meta
  3. 6 6
      assets/Cup/2color/skeleton.png.meta
  4. 1 1
      assets/Cup/2goblet/skeleton.atlas.meta
  5. 1 1
      assets/Cup/2goblet/skeleton.json.meta
  6. 6 6
      assets/Cup/2goblet/skeleton.png.meta
  7. 2 2
      assets/Cup/3color/Black/Black01.png.meta
  8. 2 2
      assets/Cup/3color/Black/Black02.png.meta
  9. 2 2
      assets/Cup/3color/Black/Black03.png.meta
  10. 1 1
      assets/Cup/3color/skeleton.atlas.meta
  11. 1 1
      assets/Cup/3color/skeleton.json.meta
  12. 6 6
      assets/Cup/3color/skeleton.png.meta
  13. 1 1
      assets/Cup/3goblet/skeleton.atlas.meta
  14. 1 1
      assets/Cup/3goblet/skeleton.json.meta
  15. 6 6
      assets/Cup/3goblet/skeleton.png.meta
  16. 1 1
      assets/Cup/4color/skeleton.atlas.meta
  17. 1 1
      assets/Cup/4color/skeleton.json.meta
  18. 6 6
      assets/Cup/4color/skeleton.png.meta
  19. 1 1
      assets/Cup/4goblet/skeleton.atlas.meta
  20. 1 1
      assets/Cup/4goblet/skeleton.json.meta
  21. 6 6
      assets/Cup/4goblet/skeleton.png.meta
  22. 33 33
      assets/Cup/test.scene
  23. 7 7
      assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailFour.prefab
  24. 6 6
      assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailThree.prefab
  25. 15 15
      assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailTwo.prefab
  26. 20 19
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab
  27. 15 10
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab
  28. 9 9
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalTwo.prefab
  29. 1 1
      assets/start/Config/GlobalConfig.ts

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "3ba30971-80e4-40a1-86bd-ba5f9c556d25",
+  "uuid": "c6a1d82e-f6f5-43ac-95a6-d0e0d71ff0c5",
   "files": [
     ".atlas",
     ".json"

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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "714d954c-eee4-4dd8-907f-a8a46e77c7d3",
+  "uuid": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "fef123ec-b667-490d-9c25-a577c4f5ef79",
+  "uuid": "ddc7abea-ff38-4e1d-8f41-bb5a6e17b993",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "fef123ec-b667-490d-9c25-a577c4f5ef79@6c48a",
+      "uuid": "ddc7abea-ff38-4e1d-8f41-bb5a6e17b993@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fef123ec-b667-490d-9c25-a577c4f5ef79",
+        "imageUuidOrDatabaseUri": "ddc7abea-ff38-4e1d-8f41-bb5a6e17b993",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "fef123ec-b667-490d-9c25-a577c4f5ef79@f9941",
+      "uuid": "ddc7abea-ff38-4e1d-8f41-bb5a6e17b993@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "fef123ec-b667-490d-9c25-a577c4f5ef79@6c48a",
+        "imageUuidOrDatabaseUri": "ddc7abea-ff38-4e1d-8f41-bb5a6e17b993@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fef123ec-b667-490d-9c25-a577c4f5ef79@f9941"
+    "redirect": "ddc7abea-ff38-4e1d-8f41-bb5a6e17b993@f9941"
   }
 }

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "3496bda9-8554-4682-b506-f2eeb4c9a235",
+  "uuid": "14b7f6e4-d18f-4136-9e3e-7eaabf8a0dd1",
   "files": [
     ".atlas",
     ".json"

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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "0beae2f5-9c43-4013-b456-594ad6bbc4ec",
+  "uuid": "ed0408c7-2409-435a-9e78-cc2d06b01456",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "018f07fb-5b20-4ec5-9665-de9b2de8eb1d",
+  "uuid": "f7b729aa-0847-41b0-b718-5c988c395820",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "018f07fb-5b20-4ec5-9665-de9b2de8eb1d@6c48a",
+      "uuid": "f7b729aa-0847-41b0-b718-5c988c395820@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "018f07fb-5b20-4ec5-9665-de9b2de8eb1d",
+        "imageUuidOrDatabaseUri": "f7b729aa-0847-41b0-b718-5c988c395820",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "018f07fb-5b20-4ec5-9665-de9b2de8eb1d@f9941",
+      "uuid": "f7b729aa-0847-41b0-b718-5c988c395820@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "018f07fb-5b20-4ec5-9665-de9b2de8eb1d@6c48a",
+        "imageUuidOrDatabaseUri": "f7b729aa-0847-41b0-b718-5c988c395820@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "018f07fb-5b20-4ec5-9665-de9b2de8eb1d@f9941"
+    "redirect": "f7b729aa-0847-41b0-b718-5c988c395820@f9941"
   }
 }

+ 2 - 2
assets/Cup/3color/Black/Black01.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "5e9470d5-7d78-4f18-afcf-02fd58142b6f@6c48a",
-      "displayName": "black01",
+      "displayName": "Black01",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "5e9470d5-7d78-4f18-afcf-02fd58142b6f@f9941",
-      "displayName": "black01",
+      "displayName": "Black01",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

+ 2 - 2
assets/Cup/3color/Black/Black02.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "fc3422c3-4bbc-4687-9e39-16d19f6cde5f@6c48a",
-      "displayName": "black02",
+      "displayName": "Black02",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "fc3422c3-4bbc-4687-9e39-16d19f6cde5f@f9941",
-      "displayName": "black02",
+      "displayName": "Black02",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

+ 2 - 2
assets/Cup/3color/Black/Black03.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "4fe8a5d1-95c1-4dba-b16a-4582782c2908@6c48a",
-      "displayName": "black03",
+      "displayName": "Black03",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "4fe8a5d1-95c1-4dba-b16a-4582782c2908@f9941",
-      "displayName": "black03",
+      "displayName": "Black03",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "2141fb20-5297-465a-94ef-d6d0394f2480",
+  "uuid": "000e3521-faf2-4626-9210-3adb69a728cd",
   "files": [
     ".atlas",
     ".json"

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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "a1681263-ba24-4113-b8ff-5679d71e3c28",
+  "uuid": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "4962fcc7-a8bc-47de-bea5-446af740f98f",
+  "uuid": "d6f91348-6ad8-41ea-b9c9-ee6409bbcce9",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4962fcc7-a8bc-47de-bea5-446af740f98f@6c48a",
+      "uuid": "d6f91348-6ad8-41ea-b9c9-ee6409bbcce9@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4962fcc7-a8bc-47de-bea5-446af740f98f",
+        "imageUuidOrDatabaseUri": "d6f91348-6ad8-41ea-b9c9-ee6409bbcce9",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4962fcc7-a8bc-47de-bea5-446af740f98f@f9941",
+      "uuid": "d6f91348-6ad8-41ea-b9c9-ee6409bbcce9@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4962fcc7-a8bc-47de-bea5-446af740f98f@6c48a",
+        "imageUuidOrDatabaseUri": "d6f91348-6ad8-41ea-b9c9-ee6409bbcce9@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4962fcc7-a8bc-47de-bea5-446af740f98f@f9941"
+    "redirect": "d6f91348-6ad8-41ea-b9c9-ee6409bbcce9@f9941"
   }
 }

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "25f96d77-a5d5-48f8-9e6e-2762544a313f",
+  "uuid": "0dba10ba-09b0-4f70-bc95-3712d278a47b",
   "files": [
     ".atlas",
     ".json"

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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+  "uuid": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "e8100f48-2888-47b4-98d9-502b112e01cc",
+  "uuid": "6094473a-74af-4ae1-a01a-d3742b27d431",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "e8100f48-2888-47b4-98d9-502b112e01cc@6c48a",
+      "uuid": "6094473a-74af-4ae1-a01a-d3742b27d431@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e8100f48-2888-47b4-98d9-502b112e01cc",
+        "imageUuidOrDatabaseUri": "6094473a-74af-4ae1-a01a-d3742b27d431",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "e8100f48-2888-47b4-98d9-502b112e01cc@f9941",
+      "uuid": "6094473a-74af-4ae1-a01a-d3742b27d431@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "e8100f48-2888-47b4-98d9-502b112e01cc@6c48a",
+        "imageUuidOrDatabaseUri": "6094473a-74af-4ae1-a01a-d3742b27d431@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e8100f48-2888-47b4-98d9-502b112e01cc@f9941"
+    "redirect": "6094473a-74af-4ae1-a01a-d3742b27d431@f9941"
   }
 }

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "ad5e3834-56a7-4b57-bcf3-2f6e39f14637",
+  "uuid": "4b618b36-9c93-4d6e-ade6-db7041cb97e3",
   "files": [
     ".atlas",
     ".json"

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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "54711dbd-674b-4380-976c-77b872932782",
+  "uuid": "479ad108-b18d-49ab-bafc-1380b1d00f78",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "0e9d6d57-e23d-4a70-af86-d3c3f6f2a963",
+  "uuid": "0142011f-3289-4ef2-a172-3088de806586",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "0e9d6d57-e23d-4a70-af86-d3c3f6f2a963@6c48a",
+      "uuid": "0142011f-3289-4ef2-a172-3088de806586@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "0e9d6d57-e23d-4a70-af86-d3c3f6f2a963",
+        "imageUuidOrDatabaseUri": "0142011f-3289-4ef2-a172-3088de806586",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "0e9d6d57-e23d-4a70-af86-d3c3f6f2a963@f9941",
+      "uuid": "0142011f-3289-4ef2-a172-3088de806586@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "0e9d6d57-e23d-4a70-af86-d3c3f6f2a963@6c48a",
+        "imageUuidOrDatabaseUri": "0142011f-3289-4ef2-a172-3088de806586@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "0e9d6d57-e23d-4a70-af86-d3c3f6f2a963@f9941"
+    "redirect": "0142011f-3289-4ef2-a172-3088de806586@f9941"
   }
 }

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

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "df77dc97-4c34-4935-a893-76f3074c6158",
+  "uuid": "3a87e9d1-c85a-4695-aebf-1b5f416263de",
   "files": [
     ".atlas",
     ".json"

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

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "c989b655-5c9d-431c-879b-a139d21bd93a",
+  "uuid": "e80519df-158d-4829-95b1-a60122d58e07",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "86775850-8b5a-40ff-8867-e7cb94432101",
+  "uuid": "13ccd52b-410e-46df-9c91-3ea0aeae8b41",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "86775850-8b5a-40ff-8867-e7cb94432101@6c48a",
+      "uuid": "13ccd52b-410e-46df-9c91-3ea0aeae8b41@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "86775850-8b5a-40ff-8867-e7cb94432101",
+        "imageUuidOrDatabaseUri": "13ccd52b-410e-46df-9c91-3ea0aeae8b41",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "86775850-8b5a-40ff-8867-e7cb94432101@f9941",
+      "uuid": "13ccd52b-410e-46df-9c91-3ea0aeae8b41@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "86775850-8b5a-40ff-8867-e7cb94432101@6c48a",
+        "imageUuidOrDatabaseUri": "13ccd52b-410e-46df-9c91-3ea0aeae8b41@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "86775850-8b5a-40ff-8867-e7cb94432101@f9941"
+    "redirect": "13ccd52b-410e-46df-9c91-3ea0aeae8b41@f9941"
   }
 }

+ 33 - 33
assets/Cup/test.scene

@@ -393,7 +393,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "54711dbd-674b-4380-976c-77b872932782",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -502,7 +502,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "54711dbd-674b-4380-976c-77b872932782",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -611,7 +611,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "54711dbd-674b-4380-976c-77b872932782",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -720,7 +720,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "54711dbd-674b-4380-976c-77b872932782",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -829,7 +829,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "54711dbd-674b-4380-976c-77b872932782",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -1457,7 +1457,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "54711dbd-674b-4380-976c-77b872932782",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -1646,7 +1646,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a1681263-ba24-4113-b8ff-5679d71e3c28",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -1755,7 +1755,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a1681263-ba24-4113-b8ff-5679d71e3c28",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -1864,7 +1864,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a1681263-ba24-4113-b8ff-5679d71e3c28",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1973,7 +1973,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a1681263-ba24-4113-b8ff-5679d71e3c28",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2489,7 +2489,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a1681263-ba24-4113-b8ff-5679d71e3c28",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2675,7 +2675,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "714d954c-eee4-4dd8-907f-a8a46e77c7d3",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -2784,7 +2784,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "714d954c-eee4-4dd8-907f-a8a46e77c7d3",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -2893,7 +2893,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "714d954c-eee4-4dd8-907f-a8a46e77c7d3",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -3297,7 +3297,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "714d954c-eee4-4dd8-907f-a8a46e77c7d3",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -3491,7 +3491,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -3600,7 +3600,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -3709,7 +3709,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -3818,7 +3818,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -3927,7 +3927,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -4036,7 +4036,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -4145,7 +4145,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "c989b655-5c9d-431c-879b-a139d21bd93a",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",
@@ -4314,7 +4314,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -4423,7 +4423,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -4532,7 +4532,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -4641,7 +4641,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -4750,7 +4750,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -4859,7 +4859,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "20bbd875-b357-4413-a8bb-f021e3ec6adc",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",
@@ -5025,7 +5025,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "0beae2f5-9c43-4013-b456-594ad6bbc4ec",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -5134,7 +5134,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "0beae2f5-9c43-4013-b456-594ad6bbc4ec",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -5243,7 +5243,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "0beae2f5-9c43-4013-b456-594ad6bbc4ec",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -5352,7 +5352,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "0beae2f5-9c43-4013-b456-594ad6bbc4ec",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -5461,7 +5461,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "0beae2f5-9c43-4013-b456-594ad6bbc4ec",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",

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

@@ -236,7 +236,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -372,7 +372,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -508,7 +508,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -644,7 +644,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -821,7 +821,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -957,7 +957,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -1093,7 +1093,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "2a4e7ceb-a3e0-45e1-a84c-a946da02803c",
+      "__uuid__": "e80519df-158d-4829-95b1-a60122d58e07",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",

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

@@ -229,7 +229,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -365,7 +365,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -501,7 +501,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -650,7 +650,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -786,7 +786,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -922,7 +922,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "d28412a9-decc-48b0-ad2a-646636656d70",
+      "__uuid__": "b15ed284-5a00-48cc-a3f2-00c315d398bc",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",

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

@@ -190,12 +190,12 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 136,
-      "height": 218.38999938964844
+      "height": 218.02000427246094
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.6322176276848471
+      "y": 0.633290544989036
     },
     "_id": ""
   },
@@ -226,7 +226,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -326,12 +326,12 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 136,
-      "height": 218.38999938964844
+      "height": 218.02000427246094
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.6322176276848471
+      "y": 0.633290544989036
     },
     "_id": ""
   },
@@ -362,7 +362,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -475,12 +475,12 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 136,
-      "height": 218.38999938964844
+      "height": 218.02000427246094
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.6322176276848471
+      "y": 0.633290544989036
     },
     "_id": ""
   },
@@ -511,7 +511,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "colorB",
@@ -611,12 +611,12 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 136,
-      "height": 218.38999938964844
+      "height": 218.02000427246094
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.6322176276848471
+      "y": 0.633290544989036
     },
     "_id": ""
   },
@@ -647,7 +647,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "goblet",
@@ -747,12 +747,12 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 136,
-      "height": 218.38999938964844
+      "height": 218.02000427246094
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.6322176276848471
+      "y": 0.633290544989036
     },
     "_id": ""
   },
@@ -783,7 +783,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "da9ada31-0015-408d-aeb1-a7eb446c8ea8",
+      "__uuid__": "ed0408c7-2409-435a-9e78-cc2d06b01456",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "other",

+ 20 - 19
assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab

@@ -230,13 +230,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 1,
+      "g": 96,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -387,13 +387,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 1,
+      "g": 96,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -544,13 +544,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 1,
+      "g": 96,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -584,7 +584,6 @@
     "__prefab": {
       "__id__": 25
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -600,6 +599,8 @@
       "__id__": 0
     },
     "fileId": "feDMH9HyNJLKFtbHKOh2gk",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -700,13 +701,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 1,
+      "g": 96,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -2001,11 +2002,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
+      "__uuid__": "479ad108-b18d-49ab-bafc-1380b1d00f78",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,

+ 15 - 10
assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab

@@ -233,7 +233,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -267,7 +267,6 @@
     "__prefab": {
       "__id__": 9
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -283,6 +282,8 @@
       "__id__": 0
     },
     "fileId": "777/KtNQ9DS6d87A9F0+5l",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -383,13 +384,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 1,
-      "g": 96,
-      "b": 255,
+      "r": 255,
+      "g": 11,
+      "b": 1,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -423,7 +424,6 @@
     "__prefab": {
       "__id__": 17
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -439,6 +439,8 @@
       "__id__": 0
     },
     "fileId": "feDMH9HyNJLKFtbHKOh2gk",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -545,7 +547,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -579,7 +581,6 @@
     "__prefab": {
       "__id__": 25
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -595,6 +596,8 @@
       "__id__": 0
     },
     "fileId": "a2ipEVdztCqoxoCkxsaAWU",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1678,7 +1681,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "50dded05-df4c-44db-85a4-a5b3a31bf7f5",
+      "__uuid__": "062d12d4-900c-4b57-b30f-8fda21fc9f81",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -1709,6 +1712,8 @@
       "__id__": 0
     },
     "fileId": "64CU6wdeNOjoMwg0hpUSzs",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

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

@@ -224,13 +224,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 1,
+      "g": 96,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -381,13 +381,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 1,
+      "g": 96,
+      "b": 255,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1360,7 +1360,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
+      "__uuid__": "ec05f48d-cabb-4d1d-952b-f9860aca15d5",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

+ 1 - 1
assets/start/Config/GlobalConfig.ts

@@ -1,5 +1,5 @@
 export const GlobalConfig = {
-    isDebug: false,
+    isDebug: true,
     initilizeLevel: 1,//初始关卡
     levelTotal: 50,   //最大关卡等级
 }