ffff

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

@@ -267,6 +267,8 @@
       "__id__": 0
     },
     "fileId": "fbqPkv+KZHworptRnTdb3Z",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -401,6 +403,8 @@
       "__id__": 0
     },
     "fileId": "f64ICIbO9EmIUokRT/XyhT",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -535,6 +539,8 @@
       "__id__": 0
     },
     "fileId": "a9KpFLZwRCmZHdsUtSHr6M",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -669,6 +675,8 @@
       "__id__": 0
     },
     "fileId": "e3SebDTNBNopQiPOw2LkuK",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -844,6 +852,8 @@
       "__id__": 0
     },
     "fileId": "f5I5euV2RD/J/gK2utzro5",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -978,6 +988,8 @@
       "__id__": 0
     },
     "fileId": "a1x3ceDetCdKDoI0ccidhD",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1112,6 +1124,8 @@
       "__id__": 0
     },
     "fileId": "d3H28lWhhDuotQTa6EQyeE",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

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

@@ -236,11 +236,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -393,11 +393,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -427,7 +427,6 @@
     "__prefab": {
       "__id__": 17
     },
-    "sprite": null,
     "_id": ""
   },
   {
@@ -443,6 +442,8 @@
       "__id__": 0
     },
     "fileId": "777/KtNQ9DS6d87A9F0+5l",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -549,11 +550,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -705,11 +706,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -2000,11 +2001,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3a03007e-2d91-4d5a-90a9-26cce99ac28e",
+      "__uuid__": "b30b4f82-1470-4197-b961-c5da51fdec20",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
-    "defaultAnimation": "Idle",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,

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

@@ -233,11 +233,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -390,11 +390,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -547,11 +547,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1681,7 +1681,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "17ed8c5c-c806-4d58-90b9-413d771a2313",
+      "__uuid__": "da0ef0ee-0ac0-4cf3-b9b1-b327848a543a",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

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

@@ -230,11 +230,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -387,11 +387,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
-    "defaultAnimation": "",
+    "defaultAnimation": "Idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1360,7 +1360,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8185b511-cd6d-4604-a915-a3b691178db2",
+      "__uuid__": "f53e31cb-ea10-4571-b31e-82ff26c8d895",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

assets/module_take_goblet/Script/LevelAction.ts

@@ -418,8 +418,10 @@ export class LevelAction extends Component {
         }
 
         await GameUtil.delay(0.2);
+
         // 在添加完成后处理暂存区倒水
         await this.handlePourTempCupToOutArea();
+
         // 胜利条件检测：当两个区域都没有杯子时触发胜利
         if (this.outArea.getCups().length === 0 && this.waitArea.cups.length === 0) {
             this.loadResultPanel(true);

assets/module_take_goblet/rooster_takegoblet.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 70
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 71
+      "__id__": 69
     },
     "_id": "be14c61f-22d8-4bb9-b444-ad9f29740469"
   },
@@ -80,22 +80,22 @@
         "__id__": 12
       },
       {
-        "__id__": 64
+        "__id__": 62
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 64
       },
       {
-        "__id__": 67
+        "__id__": 65
       },
       {
-        "__id__": 68
+        "__id__": 66
       },
       {
-        "__id__": 69
+        "__id__": 67
       }
     ],
     "_prefab": null,
@@ -498,10 +498,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 60
       },
       {
-        "__id__": 63
+        "__id__": 61
       }
     ],
     "_prefab": null,
@@ -2291,71 +2291,22 @@
     "_lockFlags": 0,
     "_id": "64I7Jzug9FaY2hVVMXuKJH"
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "Warnings",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [
-      {
-        "__id__": 58
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 61
-      }
-    ],
-    "_prefab": null,
-    "_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": "b9bDidQLlNNpidCfGrNzl9"
-  },
   {
     "__type__": "cc.Node",
     "_name": "TopWarning",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 57
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 58
       },
       {
-        "__id__": 60
+        "__id__": 59
       }
     ],
     "_prefab": null,
@@ -2394,7 +2345,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": null,
@@ -2416,7 +2367,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": null,
@@ -2449,28 +2400,6 @@
     "_atlas": null,
     "_id": "c4iUgD/ZNKz5eFikFWdy8p"
   },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 57
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": "e8f36xWotP7YZQrbD/R3Ji"
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -2535,7 +2464,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 63
       }
     ],
     "_prefab": null,
@@ -2574,7 +2503,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": null,
@@ -2676,28 +2605,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 72
+      "__id__": 70
     },
     "shadows": {
-      "__id__": 73
+      "__id__": 71
     },
     "_skybox": {
-      "__id__": 74
+      "__id__": 72
     },
     "fog": {
-      "__id__": 75
+      "__id__": 73
     },
     "octree": {
-      "__id__": 76
+      "__id__": 74
     },
     "skin": {
-      "__id__": 77
+      "__id__": 75
     },
     "lightProbeInfo": {
-      "__id__": 78
+      "__id__": 76
     },
     "postSettings": {
-      "__id__": 79
+      "__id__": 77
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false