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

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/Prefabs/Levels/lvl_1.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_10.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_11.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_12.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_13.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_14.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_15.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_16.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_17.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_18.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_19.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_2.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_20.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_21.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_22.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_23.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_24.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_25.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_26.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_27.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_28.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_29.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_3.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_30.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_31.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_32.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_33.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_34.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_35.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_36.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_37.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_38.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_39.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_4.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_40.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_41.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_42.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_43.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_44.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_45.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_46.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_47.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_48.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_49.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_5.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_50.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_6.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_7.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_8.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Prefabs/Levels/lvl_9.prefab

@@ -1044,7 +1044,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 260,
+      "x": 280,
       "y": -60,
       "z": 0
     },

assets/module_take_goblet/Script/LevelAction.ts

@@ -419,18 +419,19 @@ export class LevelAction extends Component {
 
         await GameUtil.delay(0.2);
 
-        //失败检查:制作区大于5个杯子就失败
-        console.log('制作区水杯数量:', this.outArea.getCups().length);
-        if (this.outArea.getCups().length > 5) {
-            this.loadResultPanel(false);
-        }
-
         // 在添加完成后处理暂存区倒水
         await this.handlePourTempCupToOutArea();
+
         // 胜利条件检测：当两个区域都没有杯子时触发胜利
         if (this.outArea.getCups().length === 0 && this.waitArea.cups.length === 0) {
             this.loadResultPanel(true);
         }
+
+        //失败检查:制作区大于5个杯子就失败
+        console.log('制作区水杯数量:', this.outArea.getCups().length);
+        if (this.outArea.getCups().length > 5) {
+            this.loadResultPanel(false);
+        }
     }
 
     //加载结算面板

assets/module_take_goblet/Textures/JInGao.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "7cb78425-d736-49f4-99b9-0ddc22782360",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "7cb78425-d736-49f4-99b9-0ddc22782360@6c48a",
+      "displayName": "JInGao",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "7cb78425-d736-49f4-99b9-0ddc22782360",
+        "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": "7cb78425-d736-49f4-99b9-0ddc22782360@f9941",
+      "displayName": "JInGao",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 112,
+        "height": 155,
+        "rawWidth": 112,
+        "rawHeight": 155,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -56,
+            -77.5,
+            0,
+            56,
+            -77.5,
+            0,
+            -56,
+            77.5,
+            0,
+            56,
+            77.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            155,
+            112,
+            155,
+            0,
+            0,
+            112,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -56,
+            -77.5,
+            0
+          ],
+          "maxPos": [
+            56,
+            77.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "7cb78425-d736-49f4-99b9-0ddc22782360@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "7cb78425-d736-49f4-99b9-0ddc22782360@f9941"
+  }
+}

assets/module_take_goblet/Textures/MuBan_Hong.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f777713e-357d-4e43-8304-93f55c452d75",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f777713e-357d-4e43-8304-93f55c452d75@6c48a",
+      "displayName": "MuBan_Hong",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "f777713e-357d-4e43-8304-93f55c452d75",
+        "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": "f777713e-357d-4e43-8304-93f55c452d75@f9941",
+      "displayName": "MuBan_Hong",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 920,
+        "height": 135,
+        "rawWidth": 920,
+        "rawHeight": 135,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -460,
+            -67.5,
+            0,
+            460,
+            -67.5,
+            0,
+            -460,
+            67.5,
+            0,
+            460,
+            67.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            135,
+            920,
+            135,
+            0,
+            0,
+            920,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -460,
+            -67.5,
+            0
+          ],
+          "maxPos": [
+            460,
+            67.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f777713e-357d-4e43-8304-93f55c452d75@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "f777713e-357d-4e43-8304-93f55c452d75@f9941"
+  }
+}

assets/module_take_goblet/rooster_takegoblet.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 65
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 66
+      "__id__": 69
     },
     "_id": "be14c61f-22d8-4bb9-b444-ad9f29740469"
   },
@@ -80,22 +80,22 @@
         "__id__": 12
       },
       {
-        "__id__": 59
+        "__id__": 62
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 64
       },
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 63
+        "__id__": 66
       },
       {
-        "__id__": 64
+        "__id__": 67
       }
     ],
     "_prefab": null,
@@ -490,15 +490,18 @@
       },
       {
         "__id__": 51
+      },
+      {
+        "__id__": 57
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 60
       },
       {
-        "__id__": 58
+        "__id__": 61
       }
     ],
     "_prefab": null,
@@ -2288,6 +2291,115 @@
     "_lockFlags": 0,
     "_id": "64I7Jzug9FaY2hVVMXuKJH"
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "TopWarning",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 12
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 59
+      }
+    ],
+    "_prefab": null,
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 320,
+      "y": 240,
+      "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": "1aMCz1v9BEtIYV2iI61EUe"
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 57
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 82,
+      "height": 85
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": "bbxLJPi65J0bn2gia8y0Lt"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 57
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7cb78425-d736-49f4-99b9-0ddc22782360@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": "c4iUgD/ZNKz5eFikFWdy8p"
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -2352,7 +2464,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 63
       }
     ],
     "_prefab": null,
@@ -2391,7 +2503,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": null,
@@ -2493,28 +2605,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 67
+      "__id__": 70
     },
     "shadows": {
-      "__id__": 68
+      "__id__": 71
     },
     "_skybox": {
-      "__id__": 69
+      "__id__": 72
     },
     "fog": {
-      "__id__": 70
+      "__id__": 73
     },
     "octree": {
-      "__id__": 71
+      "__id__": 74
     },
     "skin": {
-      "__id__": 72
+      "__id__": 75
     },
     "lightProbeInfo": {
-      "__id__": 73
+      "__id__": 76
     },
     "postSettings": {
-      "__id__": 74
+      "__id__": 77
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false