优化 替换资源

assets/module_take_goblet/Image/ChangShi1.jpg.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "b33e47fb-b176-4e25-b8f1-85f1996a19bd",
+  "files": [
+    ".jpg",
+    ".json"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@6c48a",
+      "displayName": "ChangShi1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "b33e47fb-b176-4e25-b8f1-85f1996a19bd",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "nearest",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@f9941",
+      "displayName": "ChangShi1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1080,
+        "height": 2389,
+        "rawWidth": 1080,
+        "rawHeight": 2389,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -540,
+            -1194.5,
+            0,
+            540,
+            -1194.5,
+            0,
+            -540,
+            1194.5,
+            0,
+            540,
+            1194.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            2389,
+            1080,
+            2389,
+            0,
+            0,
+            1080,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -540,
+            -1194.5,
+            0
+          ],
+          "maxPos": [
+            540,
+            1194.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": false,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@f9941"
+  }
+}

assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab

@@ -917,7 +917,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -939,7 +939,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -98.375,
+      "y": -100,
       "z": 0
     },
     "_lrot": {
@@ -979,8 +979,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -991,10 +991,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "63XlIR7NNEToX0jgim7HJb"
+    "fileId": "0fJrI7t8xI6LZ6QUly+54C"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1015,51 +1015,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "55i0oZuQZDSoFEG+Jfj1Yr"
+    "fileId": "44ViRrXBdN2IqTMlADRFtX"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1069,7 +1046,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ddgLMHAKNDDYytyNQLqejA",
+    "fileId": "18n1c6a8pHkbKVAem3XPht",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1119,9 +1096,9 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 49,
-      "g": 126,
-      "b": 254,
+      "r": 19,
+      "g": 19,
+      "b": 19,
       "a": 255
     },
     "_skeletonData": {
@@ -1159,7 +1136,6 @@
     "__prefab": {
       "__id__": 51
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -1238,7 +1214,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1300,8 +1276,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1312,10 +1288,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8cskMsaFA6pBneWogPgOp"
+    "fileId": "e3EoRnqI1Pw7IENaVh+1Wr"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1336,51 +1312,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "61CCu29itFcbpYMopK+G7Q"
+    "fileId": "1eTEjukg9DaakvrZp6UeUK"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1390,7 +1343,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "293pjcd6BARrZMoPnQkOFB",
+    "fileId": "21ea/LuCFK7Yzt/BUyRWgG",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1480,7 +1433,6 @@
     "__prefab": {
       "__id__": 65
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -1559,7 +1511,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-002",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1581,7 +1533,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -15.843,
+      "y": -15,
       "z": 0
     },
     "_lrot": {
@@ -1621,8 +1573,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1633,10 +1585,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "87bBCdpKpNYaIDGi2R5qPl"
+    "fileId": "7e0973bO5IL6cas9mBdT4d"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1657,51 +1609,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d057TPJ6JMxpMkmpcDjyvr"
+    "fileId": "ecvZgWhyNJlJdL6QU2yJB1"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1711,7 +1640,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "28dfHQnxZCk7b9YEpyV/wI",
+    "fileId": "80rKsNU/NHcLFoL3KVrDem",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1801,7 +1730,6 @@
     "__prefab": {
       "__id__": 79
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -1880,7 +1808,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-003",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1902,7 +1830,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 32.481,
+      "y": 35,
       "z": 0
     },
     "_lrot": {
@@ -1942,8 +1870,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1954,10 +1882,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "07J39b4apGH7yXm0sO6rxq"
+    "fileId": "a2cQgKnvJLdru5mIPJiwcE"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1978,51 +1906,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ecvd35y1ZFYZ8iQ+N3ExV/"
+    "fileId": "60Hm9x5PJAPpM9UeVKwO01"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2032,7 +1937,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "509MhC1rZHcrDGXcjaRXjs",
+    "fileId": "d4Mb0dTIxJDacYMy2eTuZH",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2122,7 +2027,6 @@
     "__prefab": {
       "__id__": 93
     },
-    "sprite": null,
     "_id": ""
   },
   {

assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab

@@ -754,7 +754,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -776,7 +776,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -98.375,
+      "y": -100,
       "z": 0
     },
     "_lrot": {
@@ -816,8 +816,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -828,10 +828,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "63XlIR7NNEToX0jgim7HJb"
+    "fileId": "46CeqeY0RKbZ2VD2N+4sg2"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -852,51 +852,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "55i0oZuQZDSoFEG+Jfj1Yr"
+    "fileId": "d3UlUNk3pNTaGGkHq0/moV"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -906,7 +883,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ddgLMHAKNDDYytyNQLqejA",
+    "fileId": "e9phVN+ERNuIPuEbG2OPKL",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1075,7 +1052,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1137,8 +1114,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1149,10 +1126,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8cskMsaFA6pBneWogPgOp"
+    "fileId": "b0cY7HAftIO6LpagRr7amJ"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1173,51 +1150,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "61CCu29itFcbpYMopK+G7Q"
+    "fileId": "3cMwparv1EtZbgOHW1AolV"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1227,7 +1181,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "293pjcd6BARrZMoPnQkOFB",
+    "fileId": "ee2aVFjERKt7c7xLZ772PN",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1396,7 +1350,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-002",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1418,7 +1372,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -15.843,
+      "y": -15,
       "z": 0
     },
     "_lrot": {
@@ -1458,8 +1412,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1470,10 +1424,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "87bBCdpKpNYaIDGi2R5qPl"
+    "fileId": "96lZQRqklKIKJnKY7gCw/w"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1494,51 +1448,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d057TPJ6JMxpMkmpcDjyvr"
+    "fileId": "e0KL3gLSlGY7Rrw6MVVzSH"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1548,7 +1479,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "28dfHQnxZCk7b9YEpyV/wI",
+    "fileId": "21emxU28dNnY1x0TBTdwSv",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null

assets/module_take_goblet/Prefabs/Cup/Original/OriginalTwo.prefab

@@ -591,7 +591,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -613,7 +613,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -98.375,
+      "y": -100,
       "z": 0
     },
     "_lrot": {
@@ -653,8 +653,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -665,10 +665,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "63XlIR7NNEToX0jgim7HJb"
+    "fileId": "7ajt4lHqFFyLqA1Oiy8e5L"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -689,51 +689,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "55i0oZuQZDSoFEG+Jfj1Yr"
+    "fileId": "a9H6kXRAFMb7nak+Ek2jvh"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -743,7 +720,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ddgLMHAKNDDYytyNQLqejA",
+    "fileId": "f2B7SXOcZP2Ll797kirwYN",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -796,7 +773,7 @@
       "r": 49,
       "g": 126,
       "b": 254,
-      "a": 255
+      "a": 155
     },
     "_skeletonData": {
       "__uuid__": "e535936f-ab43-4afd-8ab4-9722cea41097",
@@ -912,7 +889,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -974,8 +951,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -986,10 +963,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8cskMsaFA6pBneWogPgOp"
+    "fileId": "d0LF/YiSxO9J2EVdNIyDV8"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1010,51 +987,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "?",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "61CCu29itFcbpYMopK+G7Q"
+    "fileId": "1cKe2st7tPurxX4Atrv68z"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1064,7 +1018,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "293pjcd6BARrZMoPnQkOFB",
+    "fileId": "ef3l4UOA1F+rg+u9qd5pMO",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1117,7 +1071,7 @@
       "r": 49,
       "g": 126,
       "b": 254,
-      "a": 255
+      "a": 155
     },
     "_skeletonData": {
       "__uuid__": "e535936f-ab43-4afd-8ab4-9722cea41097",

assets/module_take_goblet/Prefabs/UI/Result/UI_BattleResult.prefab

@@ -31,20 +31,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 178
+        "__id__": 172
       },
       {
-        "__id__": 180
+        "__id__": 174
       },
       {
-        "__id__": 182
+        "__id__": 176
       },
       {
-        "__id__": 184
+        "__id__": 178
       }
     ],
     "_prefab": {
-      "__id__": 186
+      "__id__": 180
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2477,6 +2477,8 @@
       "__id__": 0
     },
     "fileId": "5cu7e5wpZDpJ0Nywed+2T6",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2902,20 +2904,17 @@
         "__id__": 135
       },
       {
-        "__id__": 141
-      },
-      {
-        "__id__": 161
+        "__id__": 155
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 175
+        "__id__": 169
       }
     ],
     "_prefab": {
-      "__id__": 177
+      "__id__": 171
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3084,7 +3083,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Light",
+    "_name": "Fail",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -3106,7 +3105,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 80,
+      "y": 44.651,
       "z": 0
     },
     "_lrot": {
@@ -3144,142 +3143,6 @@
     "__prefab": {
       "__id__": 131
     },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 760
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0dgkiILlBOp6ap2p9NfaoV"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 129
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 133
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "70371fec-12db-47bb-ad95-540f3c634e14@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "adkkeK/FFOo5wqVQn4ZzwV"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "2c3P7v0nZJH5zcbKSLmaBC",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Fail",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 122
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 136
-      },
-      {
-        "__id__": 138
-      }
-    ],
-    "_prefab": {
-      "__id__": 140
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 44.651,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.7,
-      "y": 0.7,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 135
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 137
-    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 498,
@@ -3302,11 +3165,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 135
+      "__id__": 129
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 139
+      "__id__": 133
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3364,26 +3227,26 @@
     },
     "_children": [
       {
-        "__id__": 142
+        "__id__": 136
       },
       {
-        "__id__": 148
+        "__id__": 142
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 154
+        "__id__": 148
       },
       {
-        "__id__": 156
+        "__id__": 150
       },
       {
-        "__id__": 158
+        "__id__": 152
       }
     ],
     "_prefab": {
-      "__id__": 160
+      "__id__": 154
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3420,20 +3283,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 141
+      "__id__": 135
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 143
+        "__id__": 137
       },
       {
-        "__id__": 145
+        "__id__": 139
       }
     ],
     "_prefab": {
-      "__id__": 147
+      "__id__": 141
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3470,11 +3333,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 142
+      "__id__": 136
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 144
+      "__id__": 138
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3498,11 +3361,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 142
+      "__id__": 136
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 146
+      "__id__": 140
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3556,20 +3419,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 141
+      "__id__": 135
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 149
+        "__id__": 143
       },
       {
-        "__id__": 151
+        "__id__": 145
       }
     ],
     "_prefab": {
-      "__id__": 153
+      "__id__": 147
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3606,11 +3469,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 148
+      "__id__": 142
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 150
+      "__id__": 144
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3634,11 +3497,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 148
+      "__id__": 142
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 152
+      "__id__": 146
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3718,11 +3581,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 141
+      "__id__": 135
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 155
+      "__id__": 149
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3746,11 +3609,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 141
+      "__id__": 135
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 157
+      "__id__": 151
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3791,14 +3654,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 141
+      "__id__": 135
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 159
+      "__id__": 153
     },
     "_barSprite": {
-      "__id__": 145
+      "__id__": 139
     },
     "_mode": 0,
     "_totalLength": 690,
@@ -3833,23 +3696,23 @@
     },
     "_children": [
       {
-        "__id__": 162
+        "__id__": 156
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 168
+        "__id__": 162
       },
       {
-        "__id__": 170
+        "__id__": 164
       },
       {
-        "__id__": 172
+        "__id__": 166
       }
     ],
     "_prefab": {
-      "__id__": 174
+      "__id__": 168
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3886,20 +3749,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 161
+      "__id__": 155
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 163
+        "__id__": 157
       },
       {
-        "__id__": 165
+        "__id__": 159
       }
     ],
     "_prefab": {
-      "__id__": 167
+      "__id__": 161
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3936,11 +3799,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 162
+      "__id__": 156
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 164
+      "__id__": 158
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3964,11 +3827,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 162
+      "__id__": 156
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 166
+      "__id__": 160
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4048,11 +3911,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 161
+      "__id__": 155
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 169
+      "__id__": 163
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4076,11 +3939,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 161
+      "__id__": 155
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 171
+      "__id__": 165
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4121,11 +3984,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 161
+      "__id__": 155
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 173
+      "__id__": 167
     },
     "clickEvents": [],
     "_interactable": true,
@@ -4165,7 +4028,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.8,
     "_target": {
-      "__id__": 161
+      "__id__": 155
     },
     "_id": ""
   },
@@ -4196,7 +4059,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 176
+      "__id__": 170
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4237,7 +4100,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 179
+      "__id__": 173
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4265,13 +4128,13 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 181
+      "__id__": 175
     },
     "btNext": {
       "__id__": 116
     },
     "btRestart": {
-      "__id__": 172
+      "__id__": 166
     },
     "light": {
       "__id__": 27
@@ -4301,7 +4164,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 183
+      "__id__": 177
     },
     "_id": ""
   },
@@ -4319,7 +4182,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 185
+      "__id__": 179
     },
     "_id": ""
   },

assets/module_take_goblet/Script/Component/OriginCup.ts

@@ -1,9 +1,11 @@
-import { _decorator, CCInteger, Component, Enum, Node, sp, tween, Vec3 } from 'cc';
-import { CupHeight } from '../TakeGobletGlobalInstance';
+import { _decorator, CCInteger, Component, Enum, find, Node, sp, tween, UITransform, Vec3 } from 'cc';
+import { CupHeight, TakeGobletGlobalInstance, WaterColors } from '../TakeGobletGlobalInstance';
 import { LevelAction } from '../LevelAction';
 import { EventDispatcher } from 'db://assets/core_tgx/easy_ui_framework/EventDispatcher';
 import { GameEvent } from '../Enum/GameEvent';
 import { Water } from './Water';
+import { OriginArea } from './OriginArea';
+import { LevelManager } from '../Manager/LevelMgr';
 const { ccclass, property, executeInEditMode } = _decorator;
 
 //原浆杯状态 默认 抬起 倒水
@@ -37,6 +39,61 @@ export class OriginCup extends Component {
         });
     }
 
+    async moveToTargetPos(height: CupHeight, targetPos: Vec3, colors: WaterColors[]): Promise<void> {
+        return new Promise((resolve) => {
+            if (!this.node) return;
+            console.log(`this.node.parent:${this.node.parent.name}`);
+            const levelAction = this.node.parent?.parent?.getComponent(LevelAction)!;
+
+            // 设置初始位置（屏幕左侧）
+            const uiTransform = levelAction.node.getComponent(UITransform)!;
+            this.node.setPosition(-uiTransform.width / 2, 0, 0);
+            this.node.getComponent(OriginCup)!.cupHeight = height;
+            levelAction.originArea?.addChild(this.node);
+            // console.log(`spawnNewOriginCup 设置初始位置:${this.node.position}`);
+            this.setupOriginCupColors(this.node, colors);
+
+            // 记录新杯子的初始位置
+            levelAction.originCupPositions.set(this.node.uuid, targetPos);
+
+            // 移动动画到原位置
+            tween(this.node)
+                .to(0.5, { position: targetPos })
+                .call(() => {
+                    const markCount = levelAction.originArea?.getComponent(OriginArea)?.getTotalMarkCount();
+                    console.log(`mark总数:${markCount}`);
+                    LevelManager.instance.levelModel.createQuestionCount = markCount;
+                    resolve();
+                })
+                .start();
+        });
+    }
+
+    // 设置原浆杯颜色
+    private setupOriginCupColors(cupNode: Node, colors: WaterColors[]) {
+        const levelAction = this.node.parent?.parent?.getComponent(LevelAction)!;
+        const originCup = cupNode.getComponent(OriginCup)!;
+        const marks = cupNode.getChildByName('Marks')!;
+        const waters = originCup.waters.children;
+        // console.log(`新创建原浆杯，高度: ${originCup.cupHeight}`);
+        const markCount = levelAction.originArea.getComponent(OriginArea)?.getTotalMarkCount();
+        const waterCount = originCup.cupHeight;
+        for (let i = 0; i < waterCount; i++) {
+            const waterNode = waters[i];
+            if (!waterNode) continue;
+
+            const water = waterNode.getComponent(Water)!;
+            const mark = TakeGobletGlobalInstance.instance.refreshQuestionWater(markCount);
+            water.color = colors[Math.floor(Math.random() * colors.length)];
+            waterNode.active = true;
+            console.log(`i:${i} --  marks.children[i].name:${marks.children[i].name}`);
+            if (mark) {
+                marks.children[i].active = true;
+                marks.children[i].getComponent(Water)!.color = WaterColors.Black;
+            }
+        }
+    }
+
     //播放动画根据状态
     playAnimation(state: OriginCupState, index?: number) {
         switch (state) {

assets/module_take_goblet/Script/Component/Water.ts

@@ -23,12 +23,10 @@ export class Water extends Component {
     }
 
     private updateColor() {
-        if (this.skeleton) {
-            this.skeleton.color = new Color(WaterColorHex[this.color]);
-        } else {
-            if (this.sprite) {
-                this.sprite.color = new Color(WaterColorHex[this.color]);
-            }
+        let color = new Color(WaterColorHex[this.color]);
+        const target = this.skeleton ?? this.sprite;
+        if (target) {
+            target.color = color;
         }
     }
 
@@ -43,10 +41,6 @@ export class Water extends Component {
         this.updateColor();
     }
 
-    setMark(mark: boolean) {
-        // this.mark.active = mark;
-    }
-
     //播放动画根据状态
     playAnimation(state: OriginCupState, index?: number) {
         switch (state) {

assets/module_take_goblet/Script/LevelAction.ts

@@ -12,7 +12,6 @@ import { TempCups } from './Component/TempCups';
 import { tgxUIMgr, tgxUITips } from '../../core_tgx/tgx';
 import { LevelManager } from './Manager/LevelMgr';
 import { UI_BattleResult } from '../../scripts/UIDef';
-import { OriginArea } from './Component/OriginArea';
 import { GameUtil } from './GameUtil';
 const { ccclass, property } = _decorator;
 
@@ -31,7 +30,7 @@ export class LevelAction extends Component {
     @property(Node)
     originArea: Node = null!;  //原浆区
 
-    private originCupPositions = new Map<string, Vec3>(); // 改用唯一ID记录
+    originCupPositions = new Map<string, Vec3>(); // 改用唯一ID记录
     private isProcessing = false; // 添加状态锁
     static instance: LevelAction; // 添加静态实例
 
@@ -423,25 +422,8 @@ export class LevelAction extends Component {
         const height = TakeGobletGlobalInstance.instance.generateOriginCupHeight();
         const prefab = await TakeGobletGlobalInstance.instance.loadAsyncOriginCup(height);
         const newCup = instantiate(prefab);
-
-        // 设置初始位置（屏幕左侧）
-        const uiTransform = this.node.getComponent(UITransform)!;
-        newCup.setPosition(-uiTransform.width / 2, 0, 0);
-        newCup.getComponent(OriginCup)!.cupHeight = height;
         this.originArea.addChild(newCup);
-        this.setupOriginCupColors(newCup, colors);
-
-        // 记录新杯子的初始位置
-        this.originCupPositions.set(newCup.uuid, targetPos);
-
-        // 移动动画到原位置
-        tween(newCup)
-            .to(0.5, { position: targetPos })
-            .start();
-
-        const markCount = this.originArea.getComponent(OriginArea)?.getTotalMarkCount();
-        console.log(`mark总数:${markCount}`);
-        LevelManager.instance.levelModel.createQuestionCount = markCount;
+        await newCup.getComponent(OriginCup)?.moveToTargetPos(height, targetPos, colors);
     }
 
     // 获取可用颜色
@@ -456,30 +438,6 @@ export class LevelAction extends Component {
         });
     }
 
-    // 设置原浆杯颜色
-    private setupOriginCupColors(cupNode: Node, colors: WaterColors[]) {
-        const originCup = cupNode.getComponent(OriginCup)!;
-        const marks = cupNode.getChildByName('Marks')!;
-        const waters = originCup.waters.children;
-        // console.log(`新创建原浆杯，高度: ${originCup.cupHeight}`);
-        const markCount = this.originArea.getComponent(OriginArea)?.getTotalMarkCount();
-        const waterCount = originCup.cupHeight;
-        for (let i = 0; i < waterCount; i++) {
-            const waterNode = waters[i];
-            if (!waterNode) continue;
-
-            const water = waterNode.getComponent(Water)!;
-            const mark = TakeGobletGlobalInstance.instance.refreshQuestionWater(markCount);
-            water.color = colors[Math.floor(Math.random() * colors.length)];
-            waterNode.active = true;
-            console.log(`i:${i} --  marks.children[i].name:${marks.children[i].name}`);
-            if (mark) {
-                marks.children[i].active = true;
-                marks.children[i].getComponent(Water)!.color = WaterColors.Black;
-            }
-        }
-    }
-
     private handleCupDestroyed(destroyedCup: Node) {
         // 从outArea移除被销毁的杯子
         this.outArea.removeCup(destroyedCup);

assets/module_take_goblet/Script/TakeGobletGlobalInstance.ts

@@ -160,7 +160,7 @@ export const WaterColorHex: Record<WaterColors, string> = {
     [WaterColors.Purple]: "#D62F9C",
     [WaterColors.Magenta]: "#EE60FE",
     [WaterColors.DarkBlue]: "#3052A1",
-    [WaterColors.Black]: "#111111",
+    [WaterColors.Black]: "#131313",
 };
 
 export const WaterColorLog: Record<WaterColors, string> = {

assets/module_take_goblet/Textures/WenHao.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1c3ce48a-d3bb-4364-bbbe-ea050374cede",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@6c48a",
+      "displayName": "WenHao",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1c3ce48a-d3bb-4364-bbbe-ea050374cede",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "nearest",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941",
+      "displayName": "WenHao",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 20,
+        "height": 32,
+        "rawWidth": 20,
+        "rawHeight": 32,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -10,
+            -16,
+            0,
+            10,
+            -16,
+            0,
+            -10,
+            16,
+            0,
+            10,
+            16,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            32,
+            20,
+            32,
+            0,
+            0,
+            20,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -10,
+            -16,
+            0
+          ],
+          "maxPos": [
+            10,
+            16,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1c3ce48a-d3bb-4364-bbbe-ea050374cede@f9941"
+  }
+}

assets/module_take_goblet/rooster_takegoblet.scene

@@ -313,7 +313,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "143a267d-60f2-4c04-a4e8-80ef27949f08@f9941",
+      "__uuid__": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,