掉落时逻辑修改

assets/Game/scripts/SlotGame.ts

@@ -562,19 +562,27 @@ export class SlotGame extends Component {
         this.rollerManager.createNewIconTop(createDatas, CroSymbols);
     }
 
+    // iconFallDown_Pan() {
+    //     this.rollerManager.iconFallDown(this.spinData, true);
+    // }
     // icon掉落的逻辑
-    iconFallDown() {
+    iconFallDown_PanOut() {
+        //pan内的块先掉落
+
         //消除掉落时已有三个scatter，触发延时一会儿，以及心跳声
         if (this.rollerManager.checkNextRollerExpect(6, 3)) {
             AudioManager.instance.playSFX('Appear_Scatter_Sound_elimin', 1, true)
+            this.rollerManager.iconFallDown(this.spinData, true);
             this.scheduleOnce(() => {
                 AudioManager.instance.stopAllSFX()
                 this.setWaysCount(this.spinData.Symbol.WaysNum);
-                this.rollerManager.iconFallDown(this.spinData);
-            }, 2)
+                this.rollerManager.iconFallDown(this.spinData, false);
+            }, 2.5)
         } else {
-            this.setWaysCount(this.spinData.Symbol.WaysNum);
-            this.rollerManager.iconFallDown(this.spinData);
+            this.scheduleOnce(() => {
+                this.setWaysCount(this.spinData.Symbol.WaysNum);
+                this.rollerManager.iconFallDown(this.spinData, false);
+            }, 0.5)
         }
     }
 

assets/Game/scripts/SlotScene.ts

@@ -581,11 +581,15 @@ export class SlotScene extends Component {
       this.slotGame.getNewMulti(this.gameState.isInFreeSpin, this.spinData.WinInfo.MultPos)
 
       // 处理数据
+
       this.spinData = this.spinInfo.Data;
       // 改变图标框和图标
       this.slotGame.changeIconAndFrameType(this.spinData);
+
       // 创建新图标
       this.slotGame.createNewIconTop(this.spinData);
+      // this.slotGame.iconFallDown_Pan();
+
     } catch (error) {
       this.isErr = true
       let errCode = parseInt(error.message.split("#")[0]);
@@ -609,10 +613,7 @@ export class SlotScene extends Component {
 
   onIconsCreated() {
     // let delay = (this.spinData.WinInfo && this.spinData.WinInfo.MultPos) ? 1 : 0
-    this.scheduleOnce(() => {
-      this.slotGame.iconFallDown();
-
-    }, 0.5)
+    this.slotGame.iconFallDown_PanOut();
   }
 
   onIconsFallen() {

assets/Game/scripts/game/BaseRoller.ts

@@ -653,5 +653,5 @@ export abstract class BaseRoller extends Component {
 
     abstract createNewIconTop(createDatas: number[][], CroSymbols: any): void;
 
-    abstract iconFallDown(data: number[], CroSymbols: any): void;
+    abstract iconFallDown(data: number[], CroSymbols: any, inPan: boolean): void;
 }

assets/Game/scripts/game/Roller.ts

@@ -811,7 +811,7 @@ export class Roller extends BaseRoller {
 
 
     /** icon进行掉落移动 */
-    iconFallDown(data: number[], CroSymbols: any) {
+    iconFallDown(data: number[], CroSymbols: any, inPan: boolean) {
         let updates = [];
         let sortNewIconStartPos = this.getNewIconsStartPos(data, CroSymbols);
         let sortIcons = this.getSortIcons();
@@ -819,7 +819,17 @@ export class Roller extends BaseRoller {
             let newStartPos = sortNewIconStartPos[i];
             let oldIcon = sortIcons[i];
             let oldIconStartPos = oldIcon.startPos;
+            if (inPan) {
+                if (oldIconStartPos < 0) {
+                    continue
+                }
 
+            }
+            // else {
+            //     if (oldIconStartPos >= 0) {
+            //         continue
+            //     }
+            // }
 
             if (oldIconStartPos === newStartPos) {
                 continue;
@@ -891,7 +901,10 @@ export class Roller extends BaseRoller {
 
         // 在所有图标都完成掉落后触发事件
         this.scheduleOnce(() => {
-            this.node.emit(ROLLER_EVENT.ICON_FALLEN, this._rollerId);
+            if (!inPan) {
+                this.node.emit(ROLLER_EVENT.ICON_FALLEN, this._rollerId);
+
+            }
         }, totalFallTime + 0.1); // 添加一点额外时间确保所有动画完成
     }
 

assets/Game/scripts/game/RollerManager.ts

@@ -769,7 +769,7 @@ export class RollerManager extends Component {
         })
     }
 
-    iconFallDown(data: GameData) {
+    iconFallDown(data: GameData, inPan: boolean) {
         this._spinData = data;
         this._resultStopData = [];
         this._fallenRollerCount = 0; // 重置计数器
@@ -785,7 +785,7 @@ export class RollerManager extends Component {
             let rollerCroSymbols = processedCroSymbols[index];
             roller.setCroSymbols(rollerCroSymbols);
             this.scheduleOnce(() => {
-                roller.iconFallDown(stopData, rollerCroSymbols)
+                roller.iconFallDown(stopData, rollerCroSymbols,inPan)
             }, 0.03 * index)
         })