调整UI

assets/module_take_goblet/Prefabs/UI/Result/UI_BattleResult_Impl.ts

@@ -88,9 +88,12 @@ export class UI_BattleResult_Impl extends UI_BattleResult {
             const wineglass = LevelManager.instance.levelModel.levelConfig.wineglass;
             const sum = wineglass.reduce((pre, cur) => pre + cur, 0);
             const remainCupCount = LevelManager.instance.levelModel.remainCupCount;
-            const progress = ~~((sum - remainCupCount) / sum * 100) / 100;
-            loseLevProgress.progress = Math.floor(progress * 100) / 100;
-            loseLevProgress.node.getChildByName('Label').getComponent(Label).string = `${progress * 100}%`
+            // const progress = ~~((sum - remainCupCount) / sum * 100) / 100;
+            // loseLevProgress.progress = Math.floor(progress * 100) / 100;
+            // const progressStr = (progress * 100).toFixed(2);
+            const progressStr = ((sum - remainCupCount) / sum * 100).toFixed(2);
+            loseLevProgress.progress = Math.floor(Number(progressStr) * 100) / 100
+            loseLevProgress.node.getChildByName('Label').getComponent(Label).string = `${progressStr}%`
         }
     }
 

assets/module_take_goblet/RoosterTakeGoblet.ts

@@ -66,7 +66,7 @@ export class RoosterTakeGoblet extends Component {
 
     //刷新剩余杯子的数量
     private refreshCupCount() {
-        const lbRemain = find('Canvas/GameUI/TopLeft/Pai/LbRemaining')!.getComponent(Label);
+        const lbRemain = find('Canvas/Scene/Pai/LbRemaining')!.getComponent(Label);
         const lvlAction = find('Canvas/Scene/Levels')!.children[0].getComponent(LevelAction);
 
         const waitLength = lvlAction.waitArea!.getCups().length;

assets/module_take_goblet/Script/Component/CocktailCup.ts

@@ -88,7 +88,6 @@ export class CocktailCup extends Component {
                     if (outArea) {
                         this.node.removeFromParent(); // 先从父节点移除
                         this.node.destroy();
-                        EventDispatcher.instance.emit(GameEvent.EVENT_CHECK_GAME_OVER);
                         await outArea.arrangeCups();   // 等待排列完成
                     }
                     resolve();