修改 冰冻限制上限ice_thelimit

assets/module_take_goblet/Script/Component/OriginCup.ts

@@ -197,6 +197,7 @@ export class OriginCup extends Component {
             tween(this.node)
                 .to(0.2, { position: new Vec3(targetX, this.node.position.y, 0) }, { easing: 'sineIn' })
                 .call(async () => {
+                    LevelManager.instance.levelModel.currentOriginCup++;
                     EventDispatcher.instance.emit(GameEvent.EVENT_ORIGIN_CUP_DESTROYED, id);
                     this.node.destroy();
                     resolve();

assets/module_take_goblet/Script/LevelAction.ts

@@ -170,13 +170,6 @@ export class LevelAction extends Component {
                 }
             }
 
-            // //冰冻水
-            // const freezeInit = TakeGobletGlobalInstance.instance.refreshFreezeWaterInit();
-            // const freezeCount = this.originArea.getComponent(OriginArea)!.getFrozenCupCount();
-            // const freezeOver = TakeGobletGlobalInstance.instance.isOverFreezeWaterCeiling(freezeCount);
-            // const freeze = freezeInit && !freezeOver;
-            // originCup.getComponent(OriginCup)!.freezeActive = freeze;
-
             // 在生成初始原浆杯时记录位置
             const id = originCupNode.uuid; // 使用节点唯一ID
             this.originCupPositions.set(id, originCupNode.position.clone());

assets/module_take_goblet/Script/Model/LevelModel.ts

@@ -23,6 +23,8 @@ export class LevelModel {
     public level: number = 1;
     /** 创建问号水的水量*/
     public createQuestionCount: number = 0;
+    /** 当前创建的原浆杯*/
+    public currentOriginCup: number = 0;
     /** 剩余杯子数量*/
     public remainCupCount: number = 0;
     /** 保存可随机的关卡*/
@@ -89,6 +91,7 @@ export class LevelModel {
         this.levelColors = [];
         this.createQuestionCount = 0;
         this.remainCupCount = 0;
+        this.currentOriginCup = 0;
         this.isWin = false;
         this.isEnd = false;
     }

assets/module_take_goblet/Script/TakeGobletGlobalInstance.ts

@@ -124,18 +124,11 @@ export class TakeGobletGlobalInstance {
         return random <= query_probability;
     }
 
-    //初始化 冰冻水刷新概率
-    refreshFreezeWaterInit(): boolean {
-        //DOTO 修改上限问题
-        const { ice_thelimit } = LevelManager.instance.levelModel.levelConfig;
-        const random = Math.random() * 100;
-        return random <= ice_thelimit;
-    }
-
     //生成单个冰冻水刷新概率
     refreshFreezeWater(freezeCount: number): boolean {
-        const { ice_ceiling, ice_probability } = LevelManager.instance.levelModel.levelConfig;
-        if (freezeCount >= ice_ceiling) {
+        const { currentOriginCup } = LevelManager.instance.levelModel;
+        const { ice_ceiling, ice_probability, ice_thelimit } = LevelManager.instance.levelModel.levelConfig;
+        if (freezeCount >= ice_ceiling || currentOriginCup >= ice_thelimit) {
             return false;
         }