调酒杯替换spine

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

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "1b69be7b-925a-4479-9ce0-f132e8feb521",
+  "uuid": "4103c8ba-5120-4bb5-a726-eb4a1a98e25a",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "07012ef0-6be2-40b4-9b49-cf701d8d87f1",
+  "uuid": "78e6c352-981d-47e8-a884-1bdd2e38a86f",
   "files": [
     ".json"
   ],

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

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "0b18f20b-8f62-430f-8908-5b4828ab9181",
+  "uuid": "9dd62ea4-5624-4a53-93a5-d229cbbbcd17",
   "files": [
     ".json"
   ],

assets/module_take_goblet/Prefabs/Levels/lvl_1.prefab

@@ -295,7 +295,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -255,
+      "x": -285,
       "y": 0,
       "z": 0
     },
@@ -520,7 +520,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 62.955,
+      "x": 50,
       "y": -60.595,
       "z": 0
     },
@@ -694,7 +694,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 0,
       "height": 200
     },
     "_anchorPoint": {
@@ -816,7 +816,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 29.512,
+      "x": 20,
       "y": 0,
       "z": 0
     },
@@ -910,7 +910,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 500,
       "height": 200
     },
     "_anchorPoint": {
@@ -1041,7 +1041,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 217.697,
+      "x": 260,
       "y": -60,
       "z": 0
     },
@@ -1174,7 +1174,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -200,
+      "x": -250,
       "y": 0,
       "z": 0
     },
@@ -1215,7 +1215,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 500,
       "height": 200
     },
     "_anchorPoint": {
@@ -1256,7 +1256,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 500,
       "height": 200
     },
     "_anchorPoint": {

assets/module_take_goblet/Script/Component/CocktailCup.ts

@@ -1,4 +1,4 @@
-import { _decorator, Color, Component, Enum, Node, Sprite, tween, Vec3, UITransform, view } from 'cc';
+import { _decorator, Color, Component, Enum, Node, Sprite, tween, Vec3, UITransform, view, sp, Game } from 'cc';
 import { CupHeight, WaterColorHex, WaterColors } from '../TakeGobletGlobalInstance';
 import { Water } from './Water';
 import { EventDispatcher } from 'db://assets/core_tgx/easy_ui_framework/EventDispatcher';
@@ -7,13 +7,24 @@ import { OutArea } from './OutArea';
 import { GameUtil } from '../GameUtil';
 const { ccclass, property, executeInEditMode } = _decorator;
 
+//调酒杯状态 默认 接水
+export enum CocktailCupState {
+    Default,
+    GetWater,
+    Move,
+    Full
+}
+
 /** 调酒杯组件脚本*/
 @ccclass('CocktailCup')
 @executeInEditMode
 export class CocktailCup extends Component {
 
-    @property(Sprite)
-    sprite: Sprite = null!
+    @property(Node)
+    waters: Node = null!  //水流节点
+
+    @property(sp.Skeleton)
+    colorB: sp.Skeleton = null!  //水流颜色骨骼
 
     @property({ type: Enum(CupHeight), displayName: '杯高度' })
     cupHeight: CupHeight = CupHeight.Two
@@ -30,56 +41,32 @@ export class CocktailCup extends Component {
         this.changeColor()
     }
 
-    @property(Node)
-    waters: Node = null!;  //水节点
-
     currentLayers: number = 0;
 
     onLoad() {
-        // 初始化时隐藏所有水层
-        this.waters.children.forEach(water => water.active = false);
+        this.playAnimationByState(CocktailCupState.Default);
     }
 
     changeColor() {
-        if (!this.sprite) return
-        this.sprite.color = new Color(WaterColorHex[this._cupColor])
+        const color = new Color(WaterColorHex[this.cupColor]);
+        this.waters.children.forEach((water, index) => {
+            water.getComponent(sp.Skeleton)!.color = color;
+        })
+        this.colorB.color = color;
     }
 
-    // 添加水层
-    async addLayer(color: WaterColors) {
-        const nextIndex = this.waters.children.filter(n => n.active).length;
-        const waterNode = this.waters.children[nextIndex];
-        if (waterNode) {
-            const water = waterNode.getComponent(Water)!;
-            water.color = color;
-            waterNode.active = true;
-
-            // 添加后检查是否满杯
-            await this.checkAndDestroy(); // 等待销毁流程完成
-        }
+    // 添加水层 倒水时调用
+    async addLayer() {
+        this.currentLayers++;
+        this.playAnimationByState(CocktailCupState.GetWater);
+        await GameUtil.delay(0.5);
+        await this.checkAndDestroy();
     }
 
     //补满水
     public async fillUp() {
-        const currentActive = this.waters.children.filter(n => n.active).length;
-        const layersToAdd = this.cupHeight - currentActive;
-
-        for (let i = 0; i < layersToAdd; i++) {
-            const waterIndex = currentActive + i;
-            const waterNode = this.waters.children[waterIndex];
-            const water = waterNode.getComponent(Water)!;
-
-            water.color = this.cupColor;
-            waterNode.active = true;
-            waterNode.scale = Vec3.ZERO;
-
-            await new Promise<void>(resolve => {
-                tween(waterNode)
-                    .to(0.5 / layersToAdd, { scale: Vec3.ONE }, { easing: 'sineOut' })
-                    .call(() => resolve())
-                    .start();
-            });
-        }
+        this.playAnimationByState(CocktailCupState.Full);
+        await GameUtil.delay(0.5);
 
         // 补满后执行移动销毁动画
         const uiTransform = this.node.getComponent(UITransform)!;
@@ -89,40 +76,54 @@ export class CocktailCup extends Component {
         await new Promise<void>(resolve => {
             tween(this.node)
                 .to(0.5, { position: new Vec3(targetX, 0, 0) }, { easing: 'sineIn' })
-                .call(() => {
-                    this.node.destroy();
+                .call(async () => {
+                    const outArea = this.node.parent?.parent?.getComponent(OutArea);
+                    if (outArea) {
+                        this.node.removeFromParent(); // 先从父节点移除
+                        this.node.destroy();
+                        await outArea.arrangeCups();   // 等待排列完成
+                    }
                     resolve();
                 })
                 .start();
         });
     }
 
+    //播放动画
+    playAnimationByState(state: CocktailCupState) {
+        const waters = this.waters.children;
+        const siblingNodes = this.node.children.filter(child => child.name !== 'waters');
+        const allNodes = [...waters, ...siblingNodes];
+
+        switch (state) {
+            case CocktailCupState.GetWater:
+                allNodes.forEach(child => child.getComponent(sp.Skeleton)!.setAnimation(0, `pour_0${this.currentLayers}`, false));
+                break;
+            case CocktailCupState.Move:
+                allNodes.forEach(child => child.getComponent(sp.Skeleton)!.setAnimation(0, 'move', false));
+                break;
+            case CocktailCupState.Full:
+                allNodes.forEach(child => child.getComponent(sp.Skeleton)!.setAnimation(0, 'full', false));
+                break;
+
+            default:
+                allNodes.forEach(child => child.getComponent(sp.Skeleton)!.setAnimation(0, 'idle', false));
+                break;
+        }
+    }
+
     // 清空水层（消除时调用）
     reset() {
-        this.waters.children.forEach(water => water.active = false);
         this.currentLayers = 0;
     }
 
     get isFull(): boolean {
-        return this.waters.children.every(node => node.active);
+        return this.currentLayers >= this.cupHeight;
     }
 
     private async checkAndDestroy() {
         if (this.isFull) {
-            await new Promise<void>(resolve => {
-                tween(this.node)
-                    .to(0.3, { scale: Vec3.ZERO })
-                    .call(async () => {
-                        const outArea = this.node.parent?.parent?.getComponent(OutArea);
-                        if (outArea) {
-                            this.node.removeFromParent(); // 先从父节点移除
-                            this.node.destroy();
-                            await outArea.arrangeCups();   // 等待排列完成
-                        }
-                        resolve();
-                    })
-                    .start();
-            });
+            await this.fillUp();
         }
     }
 
@@ -131,7 +132,7 @@ export class CocktailCup extends Component {
     }
 
     public get remainingCapacity(): number {
-        return this.cupHeight - this.waters.children.filter(n => n.active).length;
+        return this.cupHeight - this.currentLayers;
     }
 }
 

assets/module_take_goblet/Script/Component/OutArea.ts

@@ -56,10 +56,10 @@ export class OutArea extends Component {
 
     }
 
-    // 修改排列方法为异步
+    // 排列方法为异步
     async arrangeCups() {
-        const startX = 40;
-        const spacing = 80;
+        const startX = 50;
+        const spacing = 100;
 
         // 过滤掉已销毁的节点
         const validCups = this.cups.filter(cup => cup.isValid);

assets/module_take_goblet/Script/Component/TempCup.ts

@@ -81,15 +81,7 @@ export class TempCup extends Component {
     }
 
     public getColors(): WaterColors[] {
-        return this.waters.children
-            .filter(node => node.active)
-            .map(node => node.getComponent(Water)!.color);
-    }
-
-    public getActiveWaters(): Water[] {
-        return this.waters.children
-            .filter(node => node.active)
-            .map(node => node.getComponent(Water)!);
+        return [this.currentColor];
     }
 
     public isEmpty(): boolean {

assets/module_take_goblet/Script/Component/WaitArea.ts

@@ -24,8 +24,8 @@ export class WaitArea extends Component {
 
     // 从右向左排列
     arrangeCups() {
-        const startX = -40;
-        const spacing = -80;
+        const startX = -50;
+        const spacing = -110;
 
         this.cups.forEach((cup, index) => {
             const originalIndex = this.waitNodes.children.indexOf(cup);

assets/module_take_goblet/Script/LevelAction.ts

@@ -253,14 +253,13 @@ export class LevelAction extends Component {
                 );
 
                 await this.hideCurrentWaterLayer(originCup);
-
                 // 更新目标杯
                 if (targetIsTemp) {
                     const tempCupComp = targetNode.getComponent(TempCup)!;
                     tempCupComp.fill(color);
                 } else {
                     const cocktailCup = targetNode.getComponent(CocktailCup)!;
-                    await cocktailCup.addLayer(color); // 等待添加水层流程完成
+                    await cocktailCup.addLayer(); // 等待添加水层流程完成
                 }
             }
 
@@ -311,7 +310,7 @@ export class LevelAction extends Component {
                     );
 
                     const cocktailCup = targetCup.comp;
-                    await cocktailCup.addLayer(color);
+                    await cocktailCup.addLayer();
                     hasProcessed = true; // 标记已处理
                 }
                 // 仅当有处理过颜色时才重置暂存杯
@@ -330,7 +329,7 @@ export class LevelAction extends Component {
         const waitCups = this.waitArea.cups;
         const outCups = this.outArea.getCups();
         const needAddCount = outCups.length === 0 ? 2 : 1;
-        const byX = outCups.length === 0 ? 160 : 80;
+        const byX = outCups.length === 0 ? 220 : 110;
 
         const movingCups: Node[] = [];
         for (let i = 0; i < needAddCount; i++) {
@@ -349,8 +348,8 @@ export class LevelAction extends Component {
             newComp.reset();
 
             const targetX = outCups.length === 0 ?
-                (newCups.length === 0 ? -120 : -40) :
-                -40;
+                (newCups.length === 0 ? -160 : -50) :
+                -50;
             newCup.setPosition(new Vec3(targetX, 0, 0));
 
             newCups.push(newCup);
@@ -430,7 +429,7 @@ export class LevelAction extends Component {
         const topIndex = originCup.waters.children.length - activeWaters.length;
         if (activeWaters.length >= 0) {
             originCup.getComponent(OriginCup)?.playAnimation(OriginCupState.PourWater, topIndex + 1);
-            await GameUtil.delay(0.5);
+            await GameUtil.delay(0.2);
             activeWaters[activeWaters.length - 1].active = false;
         }
     }

assets/module_take_goblet/Spines/2color/2goblet.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "8e7eec2c-b149-4fd3-aa2f-be77a0a088b1",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/2color/2goblet/skeleton.atlas

@@ -0,0 +1,90 @@
+
+skeleton.png
+size: 1110,149
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+2goblet
+  rotate: true
+  xy: 311, 11
+  size: 136, 208
+  orig: 136, 217
+  offset: 0, 0
+  index: -1
+XiGuan
+  rotate: true
+  xy: 2, 2
+  size: 145, 307
+  orig: 145, 307
+  offset: 0, 0
+  index: -1
+ZhuangShi1
+  rotate: false
+  xy: 1013, 52
+  size: 95, 95
+  orig: 95, 95
+  offset: 0, 0
+  index: -1
+ZhuangShi3
+  rotate: true
+  xy: 844, 61
+  size: 49, 66
+  orig: 49, 66
+  offset: 0, 0
+  index: -1
+botton
+  rotate: true
+  xy: 945, 4
+  size: 106, 55
+  orig: 106, 56
+  offset: 0, 1
+  index: -1
+fallwater
+  rotate: true
+  xy: 735, 112
+  size: 35, 276
+  orig: 35, 276
+  offset: 0, 0
+  index: -1
+lower
+  rotate: false
+  xy: 840, 9
+  size: 103, 41
+  orig: 103, 41
+  offset: 0, 0
+  index: -1
+middle
+  rotate: false
+  xy: 735, 3
+  size: 103, 47
+  orig: 103, 47
+  offset: 0, 0
+  index: -1
+spray_B
+  rotate: true
+  xy: 521, 19
+  size: 128, 110
+  orig: 140, 124
+  offset: 12, 14
+  index: -1
+spray_f
+  rotate: true
+  xy: 633, 13
+  size: 134, 100
+  orig: 140, 124
+  offset: 0, 0
+  index: -1
+top
+  rotate: false
+  xy: 1002, 9
+  size: 103, 41
+  orig: 103, 41
+  offset: 0, 0
+  index: -1
+up
+  rotate: false
+  xy: 735, 60
+  size: 107, 50
+  orig: 107, 50
+  offset: 0, 0
+  index: -1

assets/module_take_goblet/Spines/2color/2goblet/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "3f85f11f-67b6-4c2c-880e-9912ea03a50f",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/2color/2goblet/skeleton.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "b8f1d0bf-eb6d-4675-9565-baad96904177",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/2color/2goblet/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "825d5058-6fbd-4306-a98c-9e8b8318b6ef",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "825d5058-6fbd-4306-a98c-9e8b8318b6ef@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "825d5058-6fbd-4306-a98c-9e8b8318b6ef",
+        "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": "825d5058-6fbd-4306-a98c-9e8b8318b6ef@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": -0.5,
+        "trimX": 2,
+        "trimY": 3,
+        "width": 1106,
+        "height": 144,
+        "rawWidth": 1110,
+        "rawHeight": 149,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -553,
+            -72,
+            0,
+            553,
+            -72,
+            0,
+            -553,
+            72,
+            0,
+            553,
+            72,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            146,
+            1108,
+            146,
+            2,
+            2,
+            1108,
+            2
+          ],
+          "nuv": [
+            0.0018018018018018018,
+            0.013422818791946308,
+            0.9981981981981982,
+            0.013422818791946308,
+            0.0018018018018018018,
+            0.9798657718120806,
+            0.9981981981981982,
+            0.9798657718120806
+          ],
+          "minPos": [
+            -553,
+            -72,
+            0
+          ],
+          "maxPos": [
+            553,
+            72,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "825d5058-6fbd-4306-a98c-9e8b8318b6ef@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "825d5058-6fbd-4306-a98c-9e8b8318b6ef@f9941"
+  }
+}

assets/module_take_goblet/Spines/3color/3goblet.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "caf788eb-516d-4584-be19-164fa53d7256",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/3color/3goblet/skeleton.atlas

@@ -0,0 +1,90 @@
+
+skeleton.png
+size: 1130,149
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+3goblet
+  rotate: true
+  xy: 311, 11
+  size: 136, 228
+  orig: 136, 246
+  offset: 0, 0
+  index: -1
+XiGuan
+  rotate: true
+  xy: 2, 2
+  size: 145, 307
+  orig: 145, 307
+  offset: 0, 0
+  index: -1
+ZhuangShi1
+  rotate: false
+  xy: 1033, 52
+  size: 95, 95
+  orig: 95, 95
+  offset: 0, 0
+  index: -1
+ZhuangShi3
+  rotate: true
+  xy: 864, 61
+  size: 49, 66
+  orig: 49, 66
+  offset: 0, 0
+  index: -1
+botton
+  rotate: true
+  xy: 965, 4
+  size: 106, 55
+  orig: 106, 56
+  offset: 0, 1
+  index: -1
+fallwater
+  rotate: true
+  xy: 755, 112
+  size: 35, 276
+  orig: 35, 276
+  offset: 0, 0
+  index: -1
+lower
+  rotate: false
+  xy: 860, 9
+  size: 103, 41
+  orig: 103, 41
+  offset: 0, 0
+  index: -1
+middle
+  rotate: false
+  xy: 755, 3
+  size: 103, 47
+  orig: 103, 47
+  offset: 0, 0
+  index: -1
+spray_B
+  rotate: true
+  xy: 541, 19
+  size: 128, 110
+  orig: 140, 124
+  offset: 12, 14
+  index: -1
+spray_f
+  rotate: true
+  xy: 653, 13
+  size: 134, 100
+  orig: 140, 124
+  offset: 0, 0
+  index: -1
+top
+  rotate: false
+  xy: 1022, 9
+  size: 103, 41
+  orig: 103, 41
+  offset: 0, 0
+  index: -1
+up
+  rotate: false
+  xy: 755, 60
+  size: 107, 50
+  orig: 107, 50
+  offset: 0, 0
+  index: -1

assets/module_take_goblet/Spines/3color/3goblet/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "822be560-381e-4ef8-89e9-2d68b748b172",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/3color/3goblet/skeleton.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "f55ee69a-9bac-4fa5-a382-3343cfc7462d",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/3color/3goblet/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "eb6c60a3-26c4-4118-bf5f-b4b3bef373a5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "eb6c60a3-26c4-4118-bf5f-b4b3bef373a5@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "eb6c60a3-26c4-4118-bf5f-b4b3bef373a5",
+        "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": "eb6c60a3-26c4-4118-bf5f-b4b3bef373a5@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": -0.5,
+        "trimX": 2,
+        "trimY": 3,
+        "width": 1126,
+        "height": 144,
+        "rawWidth": 1130,
+        "rawHeight": 149,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -563,
+            -72,
+            0,
+            563,
+            -72,
+            0,
+            -563,
+            72,
+            0,
+            563,
+            72,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            146,
+            1128,
+            146,
+            2,
+            2,
+            1128,
+            2
+          ],
+          "nuv": [
+            0.0017699115044247787,
+            0.013422818791946308,
+            0.9982300884955753,
+            0.013422818791946308,
+            0.0017699115044247787,
+            0.9798657718120806,
+            0.9982300884955753,
+            0.9798657718120806
+          ],
+          "minPos": [
+            -563,
+            -72,
+            0
+          ],
+          "maxPos": [
+            563,
+            72,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "eb6c60a3-26c4-4118-bf5f-b4b3bef373a5@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "eb6c60a3-26c4-4118-bf5f-b4b3bef373a5@f9941"
+  }
+}

assets/module_take_goblet/Spines/4color/4goblet.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "8bbbe1a7-c097-4ec5-9508-c420572455de",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/4color/4goblet/skeleton.atlas

@@ -0,0 +1,90 @@
+
+skeleton.png
+size: 190,894
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+XiGuan
+  rotate: false
+  xy: 2, 585
+  size: 145, 307
+  orig: 145, 307
+  offset: 0, 0
+  index: -1
+ZhuangShi1
+  rotate: false
+  xy: 2, 16
+  size: 95, 95
+  orig: 95, 95
+  offset: 0, 0
+  index: -1
+ZhuangShi3
+  rotate: true
+  xy: 99, 2
+  size: 49, 66
+  orig: 49, 66
+  offset: 0, 0
+  index: -1
+botton
+  rotate: true
+  xy: 132, 53
+  size: 106, 55
+  orig: 106, 56
+  offset: 0, 1
+  index: -1
+fallwater
+  rotate: false
+  xy: 149, 616
+  size: 35, 276
+  orig: 35, 276
+  offset: 0, 0
+  index: -1
+goblet
+  rotate: false
+  xy: 2, 327
+  size: 136, 256
+  orig: 136, 275
+  offset: 0, 0
+  index: -1
+lower
+  rotate: true
+  xy: 140, 375
+  size: 103, 41
+  orig: 103, 41
+  offset: 0, 0
+  index: -1
+middle
+  rotate: true
+  xy: 140, 480
+  size: 103, 47
+  orig: 103, 47
+  offset: 0, 0
+  index: -1
+spray_B
+  rotate: false
+  xy: 2, 113
+  size: 128, 110
+  orig: 140, 124
+  offset: 12, 14
+  index: -1
+spray_f
+  rotate: false
+  xy: 2, 225
+  size: 134, 100
+  orig: 140, 124
+  offset: 0, 0
+  index: -1
+top
+  rotate: true
+  xy: 140, 270
+  size: 103, 41
+  orig: 103, 41
+  offset: 0, 0
+  index: -1
+up
+  rotate: true
+  xy: 138, 161
+  size: 107, 50
+  orig: 107, 50
+  offset: 0, 0
+  index: -1

assets/module_take_goblet/Spines/4color/4goblet/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "295e0ab8-1e72-4b53-bd79-31216132f0f0",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/4color/4goblet/skeleton.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "5256a7c5-52f6-447b-a980-615b4f30e94f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/module_take_goblet/Spines/4color/4goblet/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "2cee0669-ef19-4842-b2a9-d042dda9f514",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "2cee0669-ef19-4842-b2a9-d042dda9f514@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "2cee0669-ef19-4842-b2a9-d042dda9f514",
+        "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": "2cee0669-ef19-4842-b2a9-d042dda9f514@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 2,
+        "width": 186,
+        "height": 890,
+        "rawWidth": 190,
+        "rawHeight": 894,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -93,
+            -445,
+            0,
+            93,
+            -445,
+            0,
+            -93,
+            445,
+            0,
+            93,
+            445,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            892,
+            188,
+            892,
+            2,
+            2,
+            188,
+            2
+          ],
+          "nuv": [
+            0.010526315789473684,
+            0.0022371364653243847,
+            0.9894736842105263,
+            0.0022371364653243847,
+            0.010526315789473684,
+            0.9977628635346756,
+            0.9894736842105263,
+            0.9977628635346756
+          ],
+          "minPos": [
+            -93,
+            -445,
+            0
+          ],
+          "maxPos": [
+            93,
+            445,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "2cee0669-ef19-4842-b2a9-d042dda9f514@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "2cee0669-ef19-4842-b2a9-d042dda9f514@f9941"
+  }
+}

settings/v2/packages/information.json

@@ -4,19 +4,19 @@
     "customSplash": {
       "id": "customSplash",
       "label": "customSplash",
-      "enable": false,
+      "enable": true,
       "customSplash": {
-        "complete": false,
-        "form": "https://creator-api.cocos.com/api/form/show?"
+        "complete": true,
+        "form": "https://creator-api.cocos.com/api/form/show?sid=441f33883f4cc43ae3cef841ef990d52"
       }
     },
     "removeSplash": {
       "id": "removeSplash",
       "label": "removeSplash",
-      "enable": false,
+      "enable": true,
       "removeSplash": {
-        "complete": false,
-        "form": "https://creator-api.cocos.com/api/form/show?"
+        "complete": true,
+        "form": "https://creator-api.cocos.com/api/form/show?sid=441f33883f4cc43ae3cef841ef990d52"
       }
     }
   }