原浆区水杯 测试数据生成

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

@@ -22,20 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 8
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 64
       },
       {
-        "__id__": 64
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,10 +82,13 @@
       },
       {
         "__id__": 5
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -189,6 +192,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "41YiQYeKZJJYv4yE453vAx"
   },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_opacity": 100,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "759TBtrAJA9aoGxpeEN3Na"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -212,29 +234,29 @@
     },
     "_children": [
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 21
+        "__id__": 23
       },
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -269,17 +291,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 10
+      "__id__": 12
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 9
+      "__id__": 11
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -287,7 +309,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 11
+      "__id__": 13
     },
     "targetOverrides": null
   },
@@ -300,15 +322,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 12
-      },
       {
         "__id__": 14
       },
-      {
-        "__id__": 15
-      },
       {
         "__id__": 16
       },
@@ -318,8 +334,14 @@
       {
         "__id__": 18
       },
+      {
+        "__id__": 19
+      },
       {
         "__id__": 20
+      },
+      {
+        "__id__": 22
       }
     ],
     "removedComponents": []
@@ -327,7 +349,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_name"
@@ -343,7 +365,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_lpos"
@@ -358,7 +380,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_lrot"
@@ -374,7 +396,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_euler"
@@ -389,7 +411,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_layer"
@@ -399,7 +421,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 19
+      "__id__": 21
     },
     "propertyPath": [
       "_layer"
@@ -415,28 +437,28 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_active"
     ],
-    "value": true
+    "value": false
   },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 21
+      "__id__": 23
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -444,7 +466,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 23
+      "__id__": 25
     },
     "targetOverrides": null
   },
@@ -457,15 +479,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 24
-      },
       {
         "__id__": 26
       },
-      {
-        "__id__": 27
-      },
       {
         "__id__": 28
       },
@@ -475,8 +491,14 @@
       {
         "__id__": 30
       },
+      {
+        "__id__": 31
+      },
       {
         "__id__": 32
+      },
+      {
+        "__id__": 34
       }
     ],
     "removedComponents": []
@@ -484,7 +506,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_name"
@@ -500,7 +522,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_lpos"
@@ -515,7 +537,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_lrot"
@@ -531,7 +553,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_euler"
@@ -546,7 +568,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_layer"
@@ -556,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 31
+      "__id__": 33
     },
     "propertyPath": [
       "_layer"
@@ -572,7 +594,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_active"
@@ -583,17 +605,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 33
+      "__id__": 35
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -601,7 +623,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 35
+      "__id__": 37
     },
     "targetOverrides": null
   },
@@ -614,15 +636,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 36
-      },
       {
         "__id__": 38
       },
-      {
-        "__id__": 39
-      },
       {
         "__id__": 40
       },
@@ -631,6 +647,12 @@
       },
       {
         "__id__": 42
+      },
+      {
+        "__id__": 43
+      },
+      {
+        "__id__": 44
       }
     ],
     "removedComponents": []
@@ -638,7 +660,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 37
+      "__id__": 39
     },
     "propertyPath": [
       "_name"
@@ -654,7 +676,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 37
+      "__id__": 39
     },
     "propertyPath": [
       "_lpos"
@@ -669,7 +691,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 37
+      "__id__": 39
     },
     "propertyPath": [
       "_lrot"
@@ -685,7 +707,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 37
+      "__id__": 39
     },
     "propertyPath": [
       "_euler"
@@ -700,7 +722,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 37
+      "__id__": 39
     },
     "propertyPath": [
       "_layer"
@@ -710,7 +732,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 43
+      "__id__": 45
     },
     "propertyPath": [
       "_layer"
@@ -727,17 +749,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -745,7 +767,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -758,15 +780,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
@@ -776,8 +792,14 @@
       {
         "__id__": 53
       },
+      {
+        "__id__": 54
+      },
       {
         "__id__": 55
+      },
+      {
+        "__id__": 57
       }
     ],
     "removedComponents": []
@@ -785,7 +807,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -801,7 +823,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -816,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -832,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -847,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_layer"
@@ -857,7 +879,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 54
+      "__id__": 56
     },
     "propertyPath": [
       "_layer"
@@ -873,7 +895,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 58
     },
     "propertyPath": [
       "_enabled"
@@ -892,11 +914,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 60
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -920,11 +942,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_resizeMode": 0,
     "_layoutType": 2,
@@ -975,7 +997,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1003,7 +1025,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "sprite": {
       "__id__": 5
@@ -1011,7 +1033,7 @@
     "cupHeight": 2,
     "_cupColor": 5,
     "waters": {
-      "__id__": 8
+      "__id__": 10
     },
     "_id": ""
   },
@@ -1029,20 +1051,54 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
+    "targetOverrides": [
+      {
+        "__id__": 69
+      }
+    ],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 21
+        "__id__": 23
       },
       {
-        "__id__": 9
+        "__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"
+    ]
   }
 ]

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

@@ -22,20 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 8
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 49
       },
       {
-        "__id__": 49
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,10 +82,13 @@
       },
       {
         "__id__": 5
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -189,6 +192,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "41YiQYeKZJJYv4yE453vAx"
   },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_opacity": 100,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c8s8yWpddEnY3MHvPaSV5s"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -212,26 +234,26 @@
     },
     "_children": [
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 44
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -266,17 +288,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 10
+      "__id__": 12
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 9
+      "__id__": 11
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -284,7 +306,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 11
+      "__id__": 13
     },
     "targetOverrides": null
   },
@@ -297,15 +319,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 12
-      },
       {
         "__id__": 14
       },
-      {
-        "__id__": 15
-      },
       {
         "__id__": 16
       },
@@ -314,6 +330,12 @@
       },
       {
         "__id__": 18
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 20
       }
     ],
     "removedComponents": []
@@ -321,7 +343,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_name"
@@ -337,7 +359,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_lpos"
@@ -352,7 +374,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_lrot"
@@ -368,7 +390,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_euler"
@@ -383,7 +405,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_layer"
@@ -393,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 19
+      "__id__": 21
     },
     "propertyPath": [
       "_layer"
@@ -410,17 +432,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 20
+      "__id__": 22
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -428,7 +450,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 22
+      "__id__": 24
     },
     "targetOverrides": null
   },
@@ -441,15 +463,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 23
-      },
       {
         "__id__": 25
       },
-      {
-        "__id__": 26
-      },
       {
         "__id__": 27
       },
@@ -458,6 +474,12 @@
       },
       {
         "__id__": 29
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 31
       }
     ],
     "removedComponents": []
@@ -465,7 +487,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_name"
@@ -481,7 +503,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_lpos"
@@ -496,7 +518,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_lrot"
@@ -512,7 +534,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_euler"
@@ -527,7 +549,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_layer"
@@ -537,7 +559,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 30
+      "__id__": 32
     },
     "propertyPath": [
       "_layer"
@@ -554,17 +576,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 31
+      "__id__": 33
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -572,7 +594,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 33
+      "__id__": 35
     },
     "targetOverrides": null
   },
@@ -585,15 +607,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 34
-      },
       {
         "__id__": 36
       },
-      {
-        "__id__": 37
-      },
       {
         "__id__": 38
       },
@@ -602,6 +618,12 @@
       },
       {
         "__id__": 40
+      },
+      {
+        "__id__": 41
+      },
+      {
+        "__id__": 42
       }
     ],
     "removedComponents": []
@@ -609,7 +631,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 35
+      "__id__": 37
     },
     "propertyPath": [
       "_name"
@@ -625,7 +647,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 35
+      "__id__": 37
     },
     "propertyPath": [
       "_lpos"
@@ -640,7 +662,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 35
+      "__id__": 37
     },
     "propertyPath": [
       "_lrot"
@@ -656,7 +678,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 35
+      "__id__": 37
     },
     "propertyPath": [
       "_euler"
@@ -671,7 +693,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 35
+      "__id__": 37
     },
     "propertyPath": [
       "_layer"
@@ -681,7 +703,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 41
+      "__id__": 43
     },
     "propertyPath": [
       "_layer"
@@ -700,11 +722,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -728,11 +750,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_resizeMode": 0,
     "_layoutType": 2,
@@ -783,7 +805,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -811,15 +833,15 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "sprite": {
       "__id__": 5
     },
     "cupHeight": 2,
-    "_waterColor": 8,
+    "_cupColor": 8,
     "waters": {
-      "__id__": 8
+      "__id__": 10
     },
     "_id": ""
   },
@@ -840,13 +862,13 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 31
+        "__id__": 33
       },
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 9
+        "__id__": 11
       }
     ]
   }

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

@@ -22,20 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 8
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       },
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,10 +82,13 @@
       },
       {
         "__id__": 5
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -189,6 +192,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "41YiQYeKZJJYv4yE453vAx"
   },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_opacity": 100,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d5naCNWVxMmZrwvCfSU71x"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -212,23 +234,23 @@
     },
     "_children": [
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 33
       },
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -263,17 +285,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 10
+      "__id__": 12
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 9
+      "__id__": 11
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -281,7 +303,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 11
+      "__id__": 13
     },
     "targetOverrides": null
   },
@@ -294,15 +316,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 12
-      },
       {
         "__id__": 14
       },
-      {
-        "__id__": 15
-      },
       {
         "__id__": 16
       },
@@ -311,6 +327,12 @@
       },
       {
         "__id__": 18
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 20
       }
     ],
     "removedComponents": []
@@ -318,7 +340,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_name"
@@ -334,7 +356,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_lpos"
@@ -349,7 +371,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_lrot"
@@ -365,7 +387,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_euler"
@@ -380,7 +402,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 13
+      "__id__": 15
     },
     "propertyPath": [
       "_layer"
@@ -390,7 +412,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 19
+      "__id__": 21
     },
     "propertyPath": [
       "_layer"
@@ -407,17 +429,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 10
     },
     "_prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 20
+      "__id__": 22
     },
     "asset": {
       "__uuid__": "b4eb1c00-0285-4fb4-bfb0-c67ff721134e",
@@ -425,7 +447,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 22
+      "__id__": 24
     },
     "targetOverrides": null
   },
@@ -438,15 +460,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 23
-      },
       {
         "__id__": 25
       },
-      {
-        "__id__": 26
-      },
       {
         "__id__": 27
       },
@@ -455,6 +471,12 @@
       },
       {
         "__id__": 29
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 31
       }
     ],
     "removedComponents": []
@@ -462,7 +484,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_name"
@@ -478,7 +500,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_lpos"
@@ -493,7 +515,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_lrot"
@@ -509,7 +531,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_euler"
@@ -524,7 +546,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 24
+      "__id__": 26
     },
     "propertyPath": [
       "_layer"
@@ -534,7 +556,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 30
+      "__id__": 32
     },
     "propertyPath": [
       "_layer"
@@ -553,11 +575,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -581,11 +603,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_resizeMode": 0,
     "_layoutType": 2,
@@ -636,7 +658,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -664,15 +686,15 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "sprite": {
       "__id__": 5
     },
     "cupHeight": 2,
-    "_waterColor": 8,
+    "_cupColor": 8,
     "waters": {
-      "__id__": 8
+      "__id__": 10
     },
     "_id": ""
   },
@@ -693,10 +715,10 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 9
+        "__id__": 11
       }
     ]
   }

assets/module_take_goblet/Prefabs/Levels/lvl_1.prefab

@@ -31,14 +31,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 174
+        "__id__": 176
       },
       {
-        "__id__": 176
+        "__id__": 178
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 180
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1928,32 +1928,32 @@
         "__id__": 111
       },
       {
-        "__id__": 121
+        "__id__": 123
       },
       {
-        "__id__": 131
+        "__id__": 133
       },
       {
-        "__id__": 141
+        "__id__": 143
       },
       {
-        "__id__": 151
+        "__id__": 153
       },
       {
-        "__id__": 161
+        "__id__": 163
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 169
+        "__id__": 171
       },
       {
-        "__id__": 171
+        "__id__": 173
       }
     ],
     "_prefab": {
-      "__id__": 173
+      "__id__": 175
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2033,6 +2033,9 @@
       },
       {
         "__id__": 119
+      },
+      {
+        "__id__": 121
       }
     ],
     "removedComponents": []
@@ -2115,6 +2118,23 @@
       "c5Um6SIiFPpZ2sQvqriRM3"
     ]
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 122
+    },
+    "propertyPath": [
+      "color"
+    ],
+    "value": 8
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "f4I3z8x0dEIpy1Kfsx2EAk",
+      "35arNdD8JHg5R+J5tJu3LH"
+    ]
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -2122,14 +2142,14 @@
       "__id__": 110
     },
     "_prefab": {
-      "__id__": 122
+      "__id__": 124
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 121
+      "__id__": 123
     },
     "asset": {
       "__uuid__": "b7afc854-d4f3-4bf8-a325-7553fc5a4cb6",
@@ -2137,7 +2157,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 123
+      "__id__": 125
     },
     "targetOverrides": null
   },
@@ -2151,19 +2171,19 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 124
+        "__id__": 126
       },
       {
-        "__id__": 126
+        "__id__": 128
       },
       {
-        "__id__": 127
+        "__id__": 129
       },
       {
-        "__id__": 128
+        "__id__": 130
       },
       {
-        "__id__": 129
+        "__id__": 131
       }
     ],
     "removedComponents": []
@@ -2171,7 +2191,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 125
+      "__id__": 127
     },
     "propertyPath": [
       "_name"
@@ -2187,7 +2207,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 125
+      "__id__": 127
     },
     "propertyPath": [
       "_lpos"
@@ -2202,7 +2222,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 125
+      "__id__": 127
     },
     "propertyPath": [
       "_lrot"
@@ -2218,7 +2238,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 125
+      "__id__": 127
     },
     "propertyPath": [
       "_euler"
@@ -2233,7 +2253,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 130
+      "__id__": 132
     },
     "propertyPath": [
       "cupHeight"
@@ -2253,14 +2273,14 @@
       "__id__": 110
     },
     "_prefab": {
-      "__id__": 132
+      "__id__": 134
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 131
+      "__id__": 133
     },
     "asset": {
       "__uuid__": "b7afc854-d4f3-4bf8-a325-7553fc5a4cb6",
@@ -2268,7 +2288,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 133
+      "__id__": 135
     },
     "targetOverrides": null
   },
@@ -2282,19 +2302,19 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 134
+        "__id__": 136
       },
       {
-        "__id__": 136
+        "__id__": 138
       },
       {
-        "__id__": 137
+        "__id__": 139
       },
       {
-        "__id__": 138
+        "__id__": 140
       },
       {
-        "__id__": 139
+        "__id__": 141
       }
     ],
     "removedComponents": []
@@ -2302,7 +2322,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 135
+      "__id__": 137
     },
     "propertyPath": [
       "_name"
@@ -2318,7 +2338,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 135
+      "__id__": 137
     },
     "propertyPath": [
       "_lpos"
@@ -2333,7 +2353,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 135
+      "__id__": 137
     },
     "propertyPath": [
       "_lrot"
@@ -2349,7 +2369,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 135
+      "__id__": 137
     },
     "propertyPath": [
       "_euler"
@@ -2364,7 +2384,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 140
+      "__id__": 142
     },
     "propertyPath": [
       "cupHeight"
@@ -2384,14 +2404,14 @@
       "__id__": 110
     },
     "_prefab": {
-      "__id__": 142
+      "__id__": 144
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 141
+      "__id__": 143
     },
     "asset": {
       "__uuid__": "b7afc854-d4f3-4bf8-a325-7553fc5a4cb6",
@@ -2399,7 +2419,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 143
+      "__id__": 145
     },
     "targetOverrides": null
   },
@@ -2413,19 +2433,19 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 144
+        "__id__": 146
       },
       {
-        "__id__": 146
+        "__id__": 148
       },
       {
-        "__id__": 147
+        "__id__": 149
       },
       {
-        "__id__": 148
+        "__id__": 150
       },
       {
-        "__id__": 149
+        "__id__": 151
       }
     ],
     "removedComponents": []
@@ -2433,7 +2453,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 145
+      "__id__": 147
     },
     "propertyPath": [
       "_name"
@@ -2449,7 +2469,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 145
+      "__id__": 147
     },
     "propertyPath": [
       "_lpos"
@@ -2464,7 +2484,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 145
+      "__id__": 147
     },
     "propertyPath": [
       "_lrot"
@@ -2480,7 +2500,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 145
+      "__id__": 147
     },
     "propertyPath": [
       "_euler"
@@ -2495,7 +2515,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 150
+      "__id__": 152
     },
     "propertyPath": [
       "cupHeight"
@@ -2515,14 +2535,14 @@
       "__id__": 110
     },
     "_prefab": {
-      "__id__": 152
+      "__id__": 154
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 151
+      "__id__": 153
     },
     "asset": {
       "__uuid__": "15999642-db8e-4575-b395-bd0eb8b214fa",
@@ -2530,7 +2550,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 153
+      "__id__": 155
     },
     "targetOverrides": null
   },
@@ -2544,19 +2564,19 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 154
+        "__id__": 156
       },
       {
-        "__id__": 156
+        "__id__": 158
       },
       {
-        "__id__": 157
+        "__id__": 159
       },
       {
-        "__id__": 158
+        "__id__": 160
       },
       {
-        "__id__": 159
+        "__id__": 161
       }
     ],
     "removedComponents": []
@@ -2564,7 +2584,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 155
+      "__id__": 157
     },
     "propertyPath": [
       "_name"
@@ -2580,7 +2600,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 155
+      "__id__": 157
     },
     "propertyPath": [
       "_lpos"
@@ -2595,7 +2615,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 155
+      "__id__": 157
     },
     "propertyPath": [
       "_lrot"
@@ -2611,7 +2631,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 155
+      "__id__": 157
     },
     "propertyPath": [
       "_euler"
@@ -2626,7 +2646,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 160
+      "__id__": 162
     },
     "propertyPath": [
       "cupHeight"
@@ -2646,14 +2666,14 @@
       "__id__": 110
     },
     "_prefab": {
-      "__id__": 162
+      "__id__": 164
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 161
+      "__id__": 163
     },
     "asset": {
       "__uuid__": "eab0a0d9-1a1b-4c20-aaad-3edda02b0f53",
@@ -2661,7 +2681,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 163
+      "__id__": 165
     },
     "targetOverrides": null
   },
@@ -2675,16 +2695,16 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 164
+        "__id__": 166
       },
       {
-        "__id__": 166
+        "__id__": 168
       },
       {
-        "__id__": 167
+        "__id__": 169
       },
       {
-        "__id__": 168
+        "__id__": 170
       }
     ],
     "removedComponents": []
@@ -2692,7 +2712,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 165
+      "__id__": 167
     },
     "propertyPath": [
       "_name"
@@ -2708,7 +2728,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 165
+      "__id__": 167
     },
     "propertyPath": [
       "_lpos"
@@ -2723,7 +2743,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 165
+      "__id__": 167
     },
     "propertyPath": [
       "_lrot"
@@ -2739,7 +2759,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 165
+      "__id__": 167
     },
     "propertyPath": [
       "_euler"
@@ -2761,7 +2781,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 170
+      "__id__": 172
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2789,7 +2809,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 172
+      "__id__": 174
     },
     "_id": ""
   },
@@ -2820,7 +2840,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 175
+      "__id__": 177
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2848,7 +2868,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 177
+      "__id__": 179
     },
     "outArea": {
       "__id__": 18
@@ -2880,54 +2900,57 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 179
+        "__id__": 181
+      },
+      {
+        "__id__": 184
       },
       {
-        "__id__": 182
+        "__id__": 187
       },
       {
-        "__id__": 185
+        "__id__": 190
       },
       {
-        "__id__": 188
+        "__id__": 193
       },
       {
-        "__id__": 191
+        "__id__": 196
       },
       {
-        "__id__": 194
+        "__id__": 199
       },
       {
-        "__id__": 197
+        "__id__": 202
       },
       {
-        "__id__": 200
+        "__id__": 205
       },
       {
-        "__id__": 203
+        "__id__": 208
       },
       {
-        "__id__": 206
+        "__id__": 211
       },
       {
-        "__id__": 209
+        "__id__": 214
       }
     ],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 161
+        "__id__": 163
       },
       {
-        "__id__": 151
+        "__id__": 153
       },
       {
-        "__id__": 141
+        "__id__": 143
       },
       {
-        "__id__": 131
+        "__id__": 133
       },
       {
-        "__id__": 121
+        "__id__": 123
       },
       {
         "__id__": 111
@@ -2958,7 +2981,7 @@
       "__id__": 44
     },
     "sourceInfo": {
-      "__id__": 180
+      "__id__": 182
     },
     "propertyPath": [
       "waters"
@@ -2967,7 +2990,7 @@
       "__id__": 44
     },
     "targetInfo": {
-      "__id__": 181
+      "__id__": 183
     }
   },
   {
@@ -2988,7 +3011,7 @@
       "__id__": 54
     },
     "sourceInfo": {
-      "__id__": 183
+      "__id__": 185
     },
     "propertyPath": [
       "waters"
@@ -2997,7 +3020,7 @@
       "__id__": 54
     },
     "targetInfo": {
-      "__id__": 184
+      "__id__": 186
     }
   },
   {
@@ -3018,7 +3041,7 @@
       "__id__": 64
     },
     "sourceInfo": {
-      "__id__": 186
+      "__id__": 188
     },
     "propertyPath": [
       "waters"
@@ -3027,7 +3050,7 @@
       "__id__": 64
     },
     "targetInfo": {
-      "__id__": 187
+      "__id__": 189
     }
   },
   {
@@ -3048,7 +3071,7 @@
       "__id__": 74
     },
     "sourceInfo": {
-      "__id__": 189
+      "__id__": 191
     },
     "propertyPath": [
       "waters"
@@ -3057,7 +3080,7 @@
       "__id__": 84
     },
     "targetInfo": {
-      "__id__": 190
+      "__id__": 192
     }
   },
   {
@@ -3078,7 +3101,7 @@
       "__id__": 84
     },
     "sourceInfo": {
-      "__id__": 192
+      "__id__": 194
     },
     "propertyPath": [
       "waters"
@@ -3087,7 +3110,7 @@
       "__id__": 84
     },
     "targetInfo": {
-      "__id__": 193
+      "__id__": 195
     }
   },
   {
@@ -3108,7 +3131,7 @@
       "__id__": 94
     },
     "sourceInfo": {
-      "__id__": 195
+      "__id__": 197
     },
     "propertyPath": [
       "waters"
@@ -3117,7 +3140,7 @@
       "__id__": 94
     },
     "targetInfo": {
-      "__id__": 196
+      "__id__": 198
     }
   },
   {
@@ -3138,7 +3161,7 @@
       "__id__": 111
     },
     "sourceInfo": {
-      "__id__": 198
+      "__id__": 200
     },
     "propertyPath": [
       "waters"
@@ -3147,7 +3170,7 @@
       "__id__": 111
     },
     "targetInfo": {
-      "__id__": 199
+      "__id__": 201
     }
   },
   {
@@ -3165,19 +3188,19 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 121
+      "__id__": 123
     },
     "sourceInfo": {
-      "__id__": 201
+      "__id__": 203
     },
     "propertyPath": [
       "waters"
     ],
     "target": {
-      "__id__": 121
+      "__id__": 123
     },
     "targetInfo": {
-      "__id__": 202
+      "__id__": 204
     }
   },
   {
@@ -3195,19 +3218,19 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 141
+      "__id__": 143
     },
     "sourceInfo": {
-      "__id__": 204
+      "__id__": 206
     },
     "propertyPath": [
       "waters"
     ],
     "target": {
-      "__id__": 141
+      "__id__": 143
     },
     "targetInfo": {
-      "__id__": 205
+      "__id__": 207
     }
   },
   {
@@ -3225,19 +3248,19 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 131
+      "__id__": 133
     },
     "sourceInfo": {
-      "__id__": 207
+      "__id__": 209
     },
     "propertyPath": [
       "waters"
     ],
     "target": {
-      "__id__": 131
+      "__id__": 133
     },
     "targetInfo": {
-      "__id__": 208
+      "__id__": 210
     }
   },
   {
@@ -3255,19 +3278,19 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 151
+      "__id__": 153
     },
     "sourceInfo": {
-      "__id__": 210
+      "__id__": 212
     },
     "propertyPath": [
       "waters"
     ],
     "target": {
-      "__id__": 151
+      "__id__": 153
     },
     "targetInfo": {
-      "__id__": 211
+      "__id__": 213
     }
   },
   {
@@ -3281,5 +3304,37 @@
     "localID": [
       "0bo9EqQYFK2Zyq7BeIp/KB"
     ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 111
+    },
+    "sourceInfo": {
+      "__id__": 215
+    },
+    "propertyPath": [
+      "sprite"
+    ],
+    "target": {
+      "__id__": 111
+    },
+    "targetInfo": {
+      "__id__": 216
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "f4I3z8x0dEIpy1Kfsx2EAk",
+      "35arNdD8JHg5R+J5tJu3LH"
+    ]
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "f4I3z8x0dEIpy1Kfsx2EAk",
+      "d1TNjQ6tpHdpBByUekiuDV"
+    ]
   }
 ]

assets/module_take_goblet/RoosterTakeGoblet.ts

@@ -16,7 +16,7 @@ export class RoosterTakeGoblet extends Component {
 
     onLoad() {
         TakeGobletAudioMgr.initilize();
-        TakeGobletAudioMgr.play(TakeGobletAudioMgr.getMusicIdName(2), 1.0);
+        // TakeGobletAudioMgr.play(TakeGobletAudioMgr.getMusicIdName(2), 1.0);
 
         LevelManager.instance.initilizeModel();
         TakeGobletGlobalInstance.instance.levels = find('Canvas/Scene/Levels')!;

assets/module_take_goblet/Script/Component/WaitArea.ts

@@ -9,7 +9,7 @@ export class WaitArea extends Component {
     waitNodes: Node = null!;  // 实际存放杯子的节点
 
     // 直接使用waitNodes的子节点管理
-    get cups() {
+    get cups(): Node[] {
         return this.waitNodes.children;
     }
 
@@ -45,6 +45,11 @@ export class WaitArea extends Component {
         this.arrangeCups();
         return cup;
     }
+
+    // 添加明确的返回类型
+    getCups(): Node[] {
+        return this.waitNodes.children;
+    }
 }
 
 

assets/module_take_goblet/Script/Component/Water.ts

@@ -5,39 +5,28 @@ const { ccclass, property, executeInEditMode } = _decorator;
 @ccclass('Water')
 @executeInEditMode
 export class Water extends Component {
-    @property({ type: Enum(WaterColors) })
     private _color: WaterColors = WaterColors.Blue;
 
-    @property(Sprite)
-    sprite: Sprite = null!
-
+    @property({ type: Enum(WaterColors) })
     get color() {
         return this._color;
     }
-
     set color(value: WaterColors) {
         this._color = value;
         this.updateColor();
     }
 
-    start() {
-        this.updateColor();
-    }
-
-    onLoad() {
-        this.updateColor();
-    }
+    @property(Sprite)
+    private sprite: Sprite = null!;
 
     private updateColor() {
-        const sprite = this.getComponent(Sprite);
-        if (sprite) {
-            sprite.color = new Color(WaterColorHex[this._color]);
+        if (this.sprite) {
+            this.sprite.color = new Color(WaterColorHex[this._color]);
         }
     }
 
-    // 外部调用设置颜色
-    public setColor(color: WaterColors) {
-        this.color = color;
+    start() {
+        this.updateColor();
     }
 }
 

assets/module_take_goblet/Script/LevelAction.ts

@@ -4,6 +4,8 @@ import { CupHeight, TakeGobletGlobalInstance, WaterColors } from './TakeGobletGl
 import { OutArea } from './Component/OutArea';
 import { WaitArea } from './Component/WaitArea';
 import { CocktailCup } from './Component/CocktailCup';
+import { OriginCup } from './Component/OriginCup';
+import { Water } from './Component/Water';
 const { ccclass, property } = _decorator;
 
 @ccclass('LevelAction')
@@ -51,6 +53,9 @@ export class LevelAction extends Component {
         // 分配初始位置
         allCups.slice(0, 2).forEach(cup => this.outArea.addCup(cup));
         allCups.slice(2).forEach(cup => this.waitArea.addCup(cup));
+
+        // 在分配完调酒杯后添加
+        this.generateOriginCups();
     }
 
     // 当调酒区杯子被消除时调用
@@ -62,5 +67,30 @@ export class LevelAction extends Component {
             }
         }
     }
+
+    private generateOriginCups() {
+        const outCups = this.outArea.getCups() as Node[];
+        const waitCups = this.waitArea.getCups() as Node[];
+
+        const allCups = [...outCups, ...waitCups].slice(0, 7);
+        const colors = allCups.map(cup => {
+            const comp = cup.getComponent(CocktailCup);
+            return comp ? comp.cupColor : WaterColors.Blue;
+        });
+
+        this.goblets.children.forEach(originCupNode => {
+            const originCup = originCupNode.getComponent(OriginCup)!;
+            const waters = originCup.waters.children;
+
+            for (let i = 0; i < originCup.cupHeight; i++) {
+                const waterNode = waters[i];
+                const water = waterNode.getComponent(Water);
+                if (water) {
+                    water.color = colors[Math.floor(Math.random() * colors.length)];
+                    waterNode.active = true;
+                }
+            }
+        });
+    }
 }