From 8cf24a1cab85b0ac3d68e8291e489186732837f6 Mon Sep 17 00:00:00 2001
From: TJH <TJH@qq.com>
Date: Mon, 24 Nov 2025 10:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E4=B8=8A=E6=96=B9=E6=8E=89=E8=90=BD?=
 =?UTF-8?q?=E4=B8=8B=E6=9D=A5=E7=9A=84=E5=9D=97=E5=8F=AF=E4=BB=A5=E6=98=AF?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Game/scripts/SlotGame.ts           | 8 +++++---
 assets/Game/scripts/game/BaseRoller.ts    | 2 +-
 assets/Game/scripts/game/Roller.ts        | 9 +++++----
 assets/Game/scripts/game/RollerManager.ts | 6 +++---
 assets/Loading/scripts/comm.ts            | 2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/assets/Game/scripts/SlotGame.ts b/assets/Game/scripts/SlotGame.ts
index e9265f9..8d1a986 100644
--- a/assets/Game/scripts/SlotGame.ts
+++ b/assets/Game/scripts/SlotGame.ts
@@ -282,7 +282,6 @@ export class SlotGame extends Component {
         }
 
         deleteMsg = deleteMsg.filter(item => specialIcons.indexOf(item) === -1);
-        console.log('deleteMsg', deleteMsg)
         this.rollerManager.handleWinIcons(this.winLayer, deleteMsg, specialIcons || []);
     }
 
@@ -306,14 +305,17 @@ export class SlotGame extends Component {
 
         // 遍历CrossSymbolColorChange获取颜色变化信息
         for (let key in this.spinData.Change.Details) {
+            if (!this.spinData.Change.Details[key].Symbol) {
+                return
+            }
             // let colorChange = this.spinData.PanChanges.CrossSymbolColorChange[key];
-            let newIndex = 0;
+            let newIndex = this.spinData.Change.Details[key].Symbol.New;
             let oldStartPos;
             let frameType;
             let height;
 
             // 先在CrossSymbolPosChange中查找位置变化
-            if (this.spinData.Change.Details[key]) {
+            if (this.spinData.Change.Details[key].Pos) {
                 oldStartPos = this.spinData.Change.Details[key].Pos.Old[0];
             }
             // 如果没找到则在CroSymbols中查找
diff --git a/assets/Game/scripts/game/BaseRoller.ts b/assets/Game/scripts/game/BaseRoller.ts
index 1284293..7150540 100644
--- a/assets/Game/scripts/game/BaseRoller.ts
+++ b/assets/Game/scripts/game/BaseRoller.ts
@@ -647,7 +647,7 @@ export abstract class BaseRoller extends Component {
 
     abstract chanegeIconAndFrameType(data: any[]): void;
 
-    abstract createNewIconTop(createDatas: number[]): void;
+    abstract createNewIconTop(createDatas: number[][]): void;
 
     abstract iconFallDown(data: number[], CroSymbols: any): void;
 }
\ No newline at end of file
diff --git a/assets/Game/scripts/game/Roller.ts b/assets/Game/scripts/game/Roller.ts
index 3666df8..eba9249 100644
--- a/assets/Game/scripts/game/Roller.ts
+++ b/assets/Game/scripts/game/Roller.ts
@@ -763,15 +763,16 @@ export class Roller extends BaseRoller {
      * 创建新icon
      * @param createMsg 信息
      */
-    createNewIconTop(createDatas: number[]) {
+    createNewIconTop(createDatas: number[][]) {
         // 获取所有图标        
         let topY = this.getIconPosition(0, 1);
         for (let i = 0; i < createDatas.length; i++) {
             let pos = i - createDatas.length;
-            let iconIndex = createDatas[i];
-            let iconKey = this.generateIconKey(pos, 1, pos);
+            let iconIndex = createDatas[i][0];
+            let iconHeight = createDatas[i].length
+            let iconKey = this.generateIconKey(pos, iconHeight, pos);
             let icon = this.iconFactory.icfactoryCreateIcon(iconIndex);
-            icon.getComponent(Icon).initIcon(iconIndex, 1, iconKey, 0, this._rollerId);
+            icon.getComponent(Icon).initIcon(iconIndex, iconHeight, iconKey, 0, this._rollerId);
 
             let y = topY.y + (createDatas.length - i) * this.iconHeight;
             icon.setPosition(0, y, 0); this._content.addChild(icon);
diff --git a/assets/Game/scripts/game/RollerManager.ts b/assets/Game/scripts/game/RollerManager.ts
index 3238b83..d3153b7 100644
--- a/assets/Game/scripts/game/RollerManager.ts
+++ b/assets/Game/scripts/game/RollerManager.ts
@@ -790,10 +790,10 @@ export class RollerManager extends Component {
     }
 
 
-    createNewIconTop(createDatas: number[][]) {
+    createNewIconTop(createDatas: number[][][]) {
         this.allRollers.forEach((roller, index) => {
-            let createData = createDatas[index];
-            roller.createNewIconTop(createData);
+            let rollerData = createDatas[index];
+            roller.createNewIconTop(rollerData);
         })
     }
 
diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts
index a10695c..e426bff 100644
--- a/assets/Loading/scripts/comm.ts
+++ b/assets/Loading/scripts/comm.ts
@@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
 const gameId = "rp_11001";
 // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
 let apiaddr = "";
-let token = "eyJQIjoxMDA5NDksIkUiOjE3NjM2NzAzMDAsIlMiOjEwMDMsIkQiOiJycF8xMTAwMSJ9.3flLZnTD1xphdF3e2rjCdDlc6BXLpAXOP7_I2kusTVY";
+let token = "eyJQIjoxMDA5NDksIkUiOjE3NjM5OTA4NDAsIlMiOjEwMDUsIkQiOiJycF8xMTAwMSJ9.lNl-ezMadQU_1B7s0Y5UqxjtTvzimGgYai_r_TLonyA";
 
 
 let language = "en"