Переглянути джерело

重新排列一次 补丁

woso_javan 3 місяців тому
батько
коміт
5acb41ce3a

+ 2 - 2
assets/module_take_goblet/Script/Component/CocktailCup.ts

@@ -4,6 +4,7 @@ import { Water } from './Water';
 import { EventDispatcher } from 'db://assets/core_tgx/easy_ui_framework/EventDispatcher';
 import { GameEvent } from '../Enum/GameEvent';
 import { OutArea } from './OutArea';
+import { GameUtil } from '../GameUtil';
 const { ccclass, property, executeInEditMode } = _decorator;
 
 /** 调酒杯组件脚本*/
@@ -112,13 +113,12 @@ export class CocktailCup extends Component {
                 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();   // 等待排列完成
                         }
-                        this.node.destroy();               // 最后销毁节点
                         resolve();
                     })
                     .start();

+ 0 - 3
assets/module_take_goblet/Script/Component/OriginCup.ts

@@ -15,9 +15,6 @@ export class OriginCup extends Component {
     @property(Node)
     waters: Node = null!;  //水节点
 
-    @property({ type: CCInteger, tooltip: "水层数量" })
-    waterLayers: number = 5; // 改为可配置项
-
     start() {
         this.node.on(Node.EventType.TOUCH_END, () => {
             EventDispatcher.instance.emit(GameEvent.EVENT_CLICK_ORIGIN_CUP, this);

+ 0 - 1
assets/module_take_goblet/Script/Component/WaitArea.ts

@@ -28,7 +28,6 @@ export class WaitArea extends Component {
         const spacing = -80;
 
         this.cups.forEach((cup, index) => {
-            // 注意这里使用原始子节点顺序排列
             const originalIndex = this.waitNodes.children.indexOf(cup);
             cup.setPosition(startX + originalIndex * spacing, 0, 0);
         });