woso_javan преди 3 месеца
родител
ревизия
0e8c70bce8

+ 0 - 2
assets/module_take_goblet/Prefabs/UI/Result/UI_BattleResult_Impl.ts

@@ -10,8 +10,6 @@ import { LevelManager } from "../../../Script/Manager/LevelMgr";
 import { TakeGobletAudioMgr } from "../../../Script/Manager/TakeGobletAudioMgr";
 
 export class UI_BattleResult_Impl extends UI_BattleResult {
-    rewardBase: number = 0; //基础奖励
-    rewardAdditional: number = 0; //额外奖励
     timeoutIds: Array<number> = [];
     win: boolean = true;
 

+ 4 - 3
assets/module_take_goblet/Script/LevelAction.ts

@@ -38,7 +38,7 @@ export class LevelAction extends Component {
     }
 
     start() {
-        // this.generateInitialCups();
+        this.generateInitialCups();
         this.registerListener();
     }
 
@@ -412,6 +412,7 @@ export class LevelAction extends Component {
         // 设置初始位置(屏幕左侧)
         const uiTransform = this.node.getComponent(UITransform)!;
         newCup.setPosition(-uiTransform.width / 2, 0, 0);
+        newCup.getComponent(OriginCup)!.cupHeight = height;
         this.goblets.addChild(newCup);
 
         // 记录新杯子的初始位置
@@ -442,8 +443,8 @@ export class LevelAction extends Component {
         const originCup = cupNode.getComponent(OriginCup)!;
         const waters = originCup.waters.children;
 
-        // 暂时写死5层水
-        const waterCount = 5;
+        // console.log(`新创建原浆杯,高度: ${originCup.cupHeight}`);
+        const waterCount = originCup.cupHeight;
         for (let i = 0; i < waterCount; i++) {
             const waterNode = waters[i];
             if (!waterNode) continue;

+ 1 - 0
assets/module_take_goblet/Script/TakeGobletGlobalInstance.ts

@@ -55,6 +55,7 @@ export class TakeGobletGlobalInstance {
                 numStr = 'Four';
             }
 
+            // console.log(`异步加载原浆杯预设: Original${numStr}`);
             resLoader.loadAsync(resLoader.gameBundleName, `Prefabs/Cup/Original/Original${numStr}`, Prefab).then((prefab: Prefab) => {
                 resolve(prefab);
             })