Merge branch 'master' of http://192.168.5.71:3333/WOSO_H5_01Team/_TakeGoblet

assets/module_basic/config/levels_config.json

@@ -1 +1 @@
-{"1":{"level":1,"color":9,"wineglass":[4,10,1],"wineglass_color":[9,7],"measuringcup":[5,95,5],"measuringcup_number":5,"measuringcup_color":7,"query_probability":50,"query_ceiling":2,"ice_probability":10,"ice_ceiling":1,"ice_thelimit":30,"change_ceiling":15,"change_thelimit":4,"random":1},"2":{"level":2,"color":8,"wineglass":[2,8,3],"wineglass_color":[9,7],"measuringcup":[5,65,25],"measuringcup_number":10,"measuringcup_color":7,"query_probability":70,"query_ceiling":4,"ice_probability":10,"ice_ceiling":1,"ice_thelimit":30,"change_ceiling":15,"change_thelimit":4,"random":1}}
+{"1":{"level":1,"color":9,"wineglass":[4,10,1],"wineglass_color":[9,7],"measuringcup":[5,95,5],"measuringcup_number":5,"measuringcup_color":7,"query_probability":50,"query_ceiling":2,"ice_probability":100,"ice_ceiling":1,"ice_thelimit":30,"change_ceiling":15,"change_thelimit":4,"random":1},"2":{"level":2,"color":8,"wineglass":[2,8,3],"wineglass_color":[9,7],"measuringcup":[5,65,25],"measuringcup_number":10,"measuringcup_color":7,"query_probability":70,"query_ceiling":4,"ice_probability":10,"ice_ceiling":1,"ice_thelimit":30,"change_ceiling":15,"change_thelimit":4,"random":1}}

assets/module_take_goblet/Image/BeiJin.jpg.meta → assets/module_take_goblet/Image/ChangShi1.jpg.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "143a267d-60f2-4c04-a4e8-80ef27949f08",
+  "uuid": "b33e47fb-b176-4e25-b8f1-85f1996a19bd",
   "files": [
     ".jpg",
     ".json"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "143a267d-60f2-4c04-a4e8-80ef27949f08@6c48a",
-      "displayName": "BeiJin",
+      "uuid": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@6c48a",
+      "displayName": "ChangShi1",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "143a267d-60f2-4c04-a4e8-80ef27949f08",
+        "imageUuidOrDatabaseUri": "b33e47fb-b176-4e25-b8f1-85f1996a19bd",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "143a267d-60f2-4c04-a4e8-80ef27949f08@f9941",
-      "displayName": "BeiJin",
+      "uuid": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@f9941",
+      "displayName": "ChangShi1",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "143a267d-60f2-4c04-a4e8-80ef27949f08@6c48a",
+        "imageUuidOrDatabaseUri": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "143a267d-60f2-4c04-a4e8-80ef27949f08@f9941"
+    "redirect": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@f9941"
   }
 }

assets/module_take_goblet/Prefabs/Cup/Cocktail/CocktailFour.prefab

@@ -1051,14 +1051,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": [
-      {
-        "__id__": 69
-      },
-      {
-        "__id__": 72
-      }
-    ],
+    "targetOverrides": [],
     "nestedPrefabInstanceRoots": [
       {
         "__id__": 46
@@ -1073,65 +1066,5 @@
         "__id__": 11
       }
     ]
-  },
-  {
-    "__type__": "cc.TargetOverrideInfo",
-    "source": {
-      "__id__": 11
-    },
-    "sourceInfo": {
-      "__id__": 70
-    },
-    "propertyPath": [
-      "sprite"
-    ],
-    "target": {
-      "__id__": 11
-    },
-    "targetInfo": {
-      "__id__": 71
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "35arNdD8JHg5R+J5tJu3LH"
-    ]
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "d1TNjQ6tpHdpBByUekiuDV"
-    ]
-  },
-  {
-    "__type__": "cc.TargetOverrideInfo",
-    "source": {
-      "__id__": 23
-    },
-    "sourceInfo": {
-      "__id__": 73
-    },
-    "propertyPath": [
-      "sprite"
-    ],
-    "target": {
-      "__id__": 23
-    },
-    "targetInfo": {
-      "__id__": 74
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "35arNdD8JHg5R+J5tJu3LH"
-    ]
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "d1TNjQ6tpHdpBByUekiuDV"
-    ]
   }
 ]

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

@@ -26,19 +26,22 @@
       },
       {
         "__id__": 54
+      },
+      {
+        "__id__": 82
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 88
       },
       {
-        "__id__": 62
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 92
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -591,7 +594,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -613,7 +616,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -98.375,
+      "y": -100,
       "z": 0
     },
     "_lrot": {
@@ -653,8 +656,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -665,10 +668,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "63XlIR7NNEToX0jgim7HJb"
+    "fileId": "7ajt4lHqFFyLqA1Oiy8e5L"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -689,51 +692,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 +723,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ddgLMHAKNDDYytyNQLqejA",
+    "fileId": "f2B7SXOcZP2Ll797kirwYN",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -796,7 +776,7 @@
       "r": 49,
       "g": 126,
       "b": 254,
-      "a": 255
+      "a": 155
     },
     "_skeletonData": {
       "__uuid__": "e535936f-ab43-4afd-8ab4-9722cea41097",
@@ -912,7 +892,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "Sprite-001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -974,8 +954,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 20,
+      "height": 32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -986,10 +966,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8cskMsaFA6pBneWogPgOp"
+    "fileId": "d0LF/YiSxO9J2EVdNIyDV8"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1010,51 +990,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 +1021,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "293pjcd6BARrZMoPnQkOFB",
+    "fileId": "ef3l4UOA1F+rg+u9qd5pMO",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1117,7 +1074,7 @@
       "r": 49,
       "g": 126,
       "b": 254,
-      "a": 255
+      "a": 155
     },
     "_skeletonData": {
       "__uuid__": "e535936f-ab43-4afd-8ab4-9722cea41097",
@@ -1217,24 +1174,28 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Cup",
+    "_name": "Freeze",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 55
       },
       {
-        "__id__": 57
+        "__id__": 67
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 81
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1266,90 +1227,108 @@
     "_id": ""
   },
   {
-    "__type__": "cc.UITransform",
-    "_name": "",
+    "__type__": "cc.Node",
+    "_name": "Freeze1",
     "_objFlags": 0,
     "__editorExtras__": {},
-    "node": {
+    "_parent": {
       "__id__": 54
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 56
+    "_children": [
+      {
+        "__id__": 56
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 64
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
     },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 107,
-      "height": 248
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -95,
+      "z": 0
     },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.4953271028037383,
-      "y": 0.5
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
     },
     "_id": ""
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b1hUuayohNKatleGengg1m"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
+    "__type__": "cc.Node",
+    "_name": "Label",
     "_objFlags": 0,
     "__editorExtras__": {},
-    "node": {
-      "__id__": 54
+    "_parent": {
+      "__id__": 55
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 59
+      }
+    ],
+    "_prefab": {
+      "__id__": 61
     },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
     },
-    "_skeletonData": {
-      "__uuid__": "9cb1d3ed-44e3-4907-9073-b4e2a04e7838",
-      "__expectedType__": "sp.SkeletonData"
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
     },
-    "defaultSkin": "cup",
-    "defaultAnimation": "Idle",
-    "_premultipliedAlpha": false,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "2dPff3s75GIYNtRdp5oE+G"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
-    "asset": {
-      "__id__": 0
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
     },
-    "fileId": "64CU6wdeNOjoMwg0hpUSzs",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "_id": ""
   },
   {
     "__type__": "cc.UITransform",
@@ -1357,16 +1336,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 1
+      "__id__": 56
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 58
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
-      "height": 200
+      "width": 40,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1377,30 +1356,704 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e49Vvev7tDZoZDf5tXBmwQ"
+    "fileId": "6fTNZI3mZFrZHlZD4cnlLN"
   },
   {
-    "__type__": "df41eBXO7VGm5nWuifPPYGJ",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 1
+      "__id__": 56
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 60
     },
-    "cupSkeleton": {
-      "__id__": 57
-    },
-    "cupHeight": 2,
-    "waters": {
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "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
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4aDReKQ3ZO5KdXyffw/B12"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1e9UX5W6ZDC5johf4vEkti",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 55
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 63
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 35
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "dbVBIO3lBKzoVBYpyNoIAp"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 55
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 65
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 15,
+      "g": 126,
+      "b": 247,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@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": "bc28Tq6aFFP6IIU7QMpKcT"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1cwprjIjhMmbZw8Vc0ckq9",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Freeze2",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 54
+    },
+    "_children": [
+      {
+        "__id__": 68
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 74
+      },
+      {
+        "__id__": 76
+      }
+    ],
+    "_prefab": {
+      "__id__": 78
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -55,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 67
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 69
+      },
+      {
+        "__id__": 71
+      }
+    ],
+    "_prefab": {
+      "__id__": 73
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "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__": 68
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 70
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "49plZXVGBOspb4SBkol6KB"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 68
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 72
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "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
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0b7+peicVNJJinJPPDt0Jt"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "77TFZvKbRE5K+mNh9EINBu",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 67
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 75
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 35
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "cf/PeHG1pKyZmnzZCVQEZp"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 67
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 77
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 15,
+      "g": 126,
+      "b": 247,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@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": "95bmaWLsdNC4deq0fLzznK"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d8vDZEIKpGQZfF5IOXslPJ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 54
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 80
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "09+uSaNbFEeLIhsDLz4fZX"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c8zFvKltdD+7aR1I+NdcJV",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Cup",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 85
+      }
+    ],
+    "_prefab": {
+      "__id__": 87
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "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__": 82
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 84
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 107,
+      "height": 248
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.4953271028037383,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b1hUuayohNKatleGengg1m"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 82
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 86
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_skeletonData": {
+      "__uuid__": "9cb1d3ed-44e3-4907-9073-b4e2a04e7838",
+      "__expectedType__": "sp.SkeletonData"
+    },
+    "defaultSkin": "cup",
+    "defaultAnimation": "Idle",
+    "_premultipliedAlpha": false,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2dPff3s75GIYNtRdp5oE+G"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "64CU6wdeNOjoMwg0hpUSzs",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 89
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 200
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e49Vvev7tDZoZDf5tXBmwQ"
+  },
+  {
+    "__type__": "df41eBXO7VGm5nWuifPPYGJ",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 91
+    },
+    "cupSkeleton": {
+      "__id__": 85
+    },
+    "cupHeight": 2,
+    "waters": {
       "__id__": 2
     },
     "marks": {
       "__id__": 22
     },
+    "freeze": {
+      "__id__": 54
+    },
     "_id": ""
   },
   {

assets/module_take_goblet/Prefabs/Cup/TempCup.prefab

@@ -25,20 +25,20 @@
         "__id__": 8
       },
       {
-        "__id__": 23
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 23
       },
       {
-        "__id__": 31
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -221,14 +221,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 12
       },
       {
-        "__id__": 20
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -279,7 +279,7 @@
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
       "__expectedType__": "cc.Prefab"
     },
-    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "fileId": "",
     "instance": {
       "__id__": 11
     },
@@ -293,97 +293,9 @@
     },
     "mountedChildren": [],
     "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      },
-      {
-        "__id__": 15
-      },
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 17
-      }
-    ],
+    "propertyOverrides": [],
     "removedComponents": []
   },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "Water"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "c46/YsCPVOJYA4mWEpNYRx"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -394,7 +306,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -422,7 +334,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 21
+      "__id__": 15
     },
     "_resizeMode": 0,
     "_layoutType": 2,
@@ -475,14 +387,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 18
       },
       {
-        "__id__": 26
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -519,11 +431,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 23
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 19
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -547,11 +459,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 23
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 21
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -609,7 +521,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 30
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -637,14 +549,14 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 26
     },
     "cupHeight": 1,
     "waters": {
       "__id__": 8
     },
     "adNode": {
-      "__id__": 23
+      "__id__": 17
     },
     "_id": ""
   },

assets/module_take_goblet/Prefabs/Levels/lvl_1.prefab

@@ -81,7 +81,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3
@@ -173,7 +173,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "143a267d-60f2-4c04-a4e8-80ef27949f08@f9941",
+      "__uuid__": "b33e47fb-b176-4e25-b8f1-85f1996a19bd@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -236,7 +236,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 300,
+      "y": 350,
       "z": 0
     },
     "_lrot": {

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/OriginArea.ts

@@ -1,19 +1,29 @@
 import { _decorator, Component, Node } from 'cc';
 import { OriginCup } from './OriginCup';
 import { Water } from './Water';
+import { EventDispatcher } from 'db://assets/core_tgx/easy_ui_framework/EventDispatcher';
+import { GameEvent } from '../Enum/GameEvent';
 const { ccclass, property } = _decorator;
 
 @ccclass('OriginArea')
 export class OriginArea extends Component {
     start() {
+        this.registerListener();
+    }
 
+    registerListener() {
+        EventDispatcher.instance.on(GameEvent.EVENT_ORIGIN_CUP_DESTROYED, this.unfreezeCup, this);
     }
 
-    update(deltaTime: number) {
+    protected onDestroy(): void {
+        this.unregisterListener();
+    }
 
+    unregisterListener() {
+        EventDispatcher.instance.off(GameEvent.EVENT_ORIGIN_CUP_DESTROYED, this.unfreezeCup, this);
     }
 
-    //获取所有原浆杯水节点的mark数量
+    /** 获取所有原浆杯水节点的mark数量*/
     public getTotalMarkCount(): number {
         let count = 0;
         this.node.children.forEach(originCupNode => {
@@ -28,6 +38,32 @@ export class OriginArea extends Component {
         });
         return count;
     }
+
+    /** 获取冰冻杯数量*/
+    public getFrozenCupCount(): number {
+        let count = 0;
+        this.node.children.forEach(originCupNode => {
+            const originCup = originCupNode.getComponent(OriginCup);
+            if (originCup) {
+                if (originCup.freezeActive) {
+                    count++;
+                }
+            }
+        });
+        return count;
+    }
+
+    //解冻冰冻水杯
+    private unfreezeCup() {
+        this.node.children.forEach(originCupNode => {
+            const originCup = originCupNode.getComponent(OriginCup);
+            if (originCup) {
+                if (originCup.freezeActive) {
+                    originCup.unFreeze();
+                }
+            }
+        });
+    }
 }
 
 

assets/module_take_goblet/Script/Component/OriginCup.ts

@@ -1,9 +1,12 @@
-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';
+import { tgxUITips } from 'db://assets/core_tgx/tgx';
 const { ccclass, property, executeInEditMode } = _decorator;
 
 //原浆杯状态 默认 抬起 倒水
@@ -29,14 +32,105 @@ export class OriginCup extends Component {
     @property(Node)
     marks: Node = null!;  //mark节点
 
+    @property(Node)
+    freeze: Node = null!;  //冰冻节点
+
+    get freezeActive() {
+        return this.freeze.active;
+    }
+
+    set freezeActive(value: boolean) {
+        this.freeze.active = value;
+    }
+
     start() {
         this.cupSkeleton = this.node.getChildByName('Cup')?.getComponent(sp.Skeleton)!;
 
         this.node.on(Node.EventType.TOUCH_END, () => {
+            if (this.freezeActive) {
+                tgxUITips.show('冰冻中，无法操作!');
+                return;
+            }
             EventDispatcher.instance.emit(GameEvent.EVENT_CLICK_ORIGIN_CUP, this);
         });
     }
 
+    async spawnNewOriginCup(height: CupHeight, targetPos: Vec3, colors: WaterColors[]): Promise<void> {
+        return new Promise((resolve) => {
+            if (!this.node) return;
+            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);
+            this.setupFrozen();
+
+            // 记录新杯子的初始位置
+            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;
+            }
+        }
+    }
+
+    // 设置原浆冰冻
+    private setupFrozen() {
+        const levelAction = this.node.parent?.parent?.getComponent(LevelAction)!;
+        const freezeCount = levelAction.originArea.getComponent(OriginArea)?.getFrozenCupCount();
+        const freeze = TakeGobletGlobalInstance.instance.refreshFreezeWater(freezeCount);
+        this.freezeActive = freeze;
+    }
+
+    //解除冰冻
+    unFreeze() {
+        const nextIndex = this.freeze.children.filter(n => n.active).length - 1;
+        console.log(`解冻的索引:${nextIndex}`);
+        const freezeNode = this.freeze.children[nextIndex];
+        freezeNode.active = false;
+
+        const freezeCount = this.freeze.children.filter(n => n.active).length;
+        if (freezeCount == 0) {
+            this.freezeActive = false;
+        }
+    }
+
     //播放动画根据状态
     playAnimation(state: OriginCupState, index?: number) {
         switch (state) {

assets/module_take_goblet/Script/Component/Water.ts

@@ -9,7 +9,7 @@ export class Water extends Component {
     private _color: WaterColors = WaterColors.Blue;
     skeleton: sp.Skeleton = null!;
 
-    @property({ type: Sprite })
+    @property(Sprite)
     sprite: Sprite = null!;
 
     @property({ type: Enum(WaterColors) })
@@ -23,18 +23,16 @@ 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;
         }
     }
 
     start() {
         this.skeleton = this.node.getComponent(sp.Skeleton)!;
-        this.sprite = this.node.getChildByName('sprite')?.getComponent(Sprite)!;
+        this.sprite = this.node.getChildByName('Sprite')?.getComponent(Sprite)!;
         this.updateColor();
     }
 
@@ -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,8 +12,8 @@ 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';
+import { OriginArea } from './Component/OriginArea';
 const { ccclass, property } = _decorator;
 
 @ccclass('LevelAction')
@@ -31,7 +31,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; // 添加静态实例
 
@@ -151,6 +151,13 @@ export class LevelAction extends Component {
                 }
             }
 
+            //冰冻水
+            const freezeInit = TakeGobletGlobalInstance.instance.refreshFreezeWaterInit();
+            const freezeCount = this.originArea.getComponent(OriginArea)!.getFrozenCupCount();
+            const freezeOver = TakeGobletGlobalInstance.instance.isOverFreezeWaterCeiling(freezeCount);
+            const freeze = freezeInit && !freezeOver;
+            originCup.getComponent(OriginCup)!.freezeActive = freeze;
+
             // 在生成初始原浆杯时记录位置
             const id = originCupNode.uuid; // 使用节点唯一ID
             this.originCupPositions.set(id, originCupNode.position.clone());
@@ -423,25 +430,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)?.spawnNewOriginCup(height, targetPos, colors);
     }
 
     // 获取可用颜色
@@ -456,30 +446,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

@@ -123,6 +123,30 @@ export class TakeGobletGlobalInstance {
         }
         return random <= query_probability;
     }
+
+    //初始化 冰冻水刷新概率
+    refreshFreezeWaterInit(): boolean {
+        const { ice_thelimit } = LevelManager.instance.levelModel.levelConfig;
+        const random = Math.random() * 100;
+        return random <= ice_thelimit;
+    }
+
+    //生成单个冰冻水刷新概率
+    refreshFreezeWater(freezeCount: number): boolean {
+        const { ice_ceiling, ice_probability } = LevelManager.instance.levelModel.levelConfig;
+        if (freezeCount >= ice_ceiling) {
+            return false;
+        }
+
+        const random = Math.random() * 100;
+        return random <= ice_probability;
+    }
+
+    //是否超过冰冻水上限
+    isOverFreezeWaterCeiling(currrentFreezeCount: number): boolean {
+        const { ice_ceiling } = LevelManager.instance.levelModel.levelConfig;
+        return currrentFreezeCount >= ice_ceiling;
+    }
 }
 
 /**道具类型
@@ -160,7 +184,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,