数据调整

assets/Game/scripts/SlotGame.ts

@@ -270,8 +270,7 @@ export class SlotGame extends Component {
     deleteIconNode() {
         let deleteMsg = [];
         let bottomData = this.spinData.WinPosition.BottomNormal.map(pos => pos + 4);
-        let topData = this.spinData.WinPosition.TopNormal || [];
+        deleteMsg = [ ...bottomData];
-        deleteMsg = [...topData, ...bottomData];
 
         let specialIcons = [...this.spinData.WinPosition.BottomSilver, ...this.spinData.WinPosition.BottomGold];
         let aniData = specialIcons.map(pos => pos + 4) || [];
@@ -553,7 +552,7 @@ export class SlotGame extends Component {
         let spine = this.readyHand.getChildByName('readyHand').getComponent(sp.Skeleton);
         spine.setAnimation(0, 'readyHand_01', true);
 
-        let posX = this.rollerManager.getRollerPosition(rollerId - 1).x;
+        let posX = this.rollerManager.getRollerPosition(rollerId).x;
         this.readyHand.setPosition(posX, 270, 0);
         this.grayNode.active = true;
         this.grayNode.children.forEach((child, index) => {

assets/Game/scripts/game/Define.ts

@@ -108,7 +108,7 @@ export enum SLOT_BAR_EVENT {
     ON_EXIT_CLICK = 'ON_EXIT_CLICK',            // 退出游戏
 }
 
-export enum SYS_GIFT{
+export enum SYS_GIFT {
     CLICK_CONTINUE = 'CLICK_CONTINUE',
     SETTLE_CONTINUE = 'SETTLE_CONTINUE',
 }
@@ -190,16 +190,21 @@ export interface GameData {
     // 是否结束
     IsEnd: boolean;
     // 图标中奖信息
-    SymbolWinInfos: any;
+    WinInfo: {
+        Score: number;
+        Multi: number;
+        MultiValue: any;
+        Desc: any;
+    };
     // 中奖位置
     WinPosition: any;
     // 盘面信息
     Symbol: {
-        ScNum:number;
+        ScNum: number;
-        winMulti:number;
+        winMulti: number;
-        WaysNum:number;
+        WaysNum: number;
-        ReelNum:number[];
+        ReelNum: number[];
-        MultiValue:number[];
+        MultiValue: number[];
         Middle: number[];
     };
     // 盘面变化
@@ -487,18 +492,14 @@ export let winData: any = {
             }
         },
         "WinPosition": {//赢分位置
-            "BottomNormal": [//赢分底部只占单个位置的符号的位置
+            "BottomNormal": [//没有变百搭的赢分符号的位置
                 0,
                 5
             ],
-            "BottomSpecial": [//赢分底部占多个位置的crossSymbol符号的位置
+            "BottomSilver": [//变为百搭的赢分符号的位置
                 13,
                 14
             ],
-            "TopNormal": [//赢分顶部的位置
-                2,
-                3
-            ]
         },
         "PanColor": {//盘面
             "Top": [//盘面顶部

assets/Game/scripts/game/HistoryDetail.ts

@@ -222,7 +222,7 @@ export class HistoryDetail extends Component {
         const info = item.getChildByName("info");
         info.getChildByName("txt_transaction").getComponent(Label).string = this.data.roundId;
 
-        let bet = idx == 0 ? fixNum(pan.AllBet) : fixNum(0)
+        let bet = idx == 0 ? fixNum(pan.Bet) : fixNum(0)
         info.getChildByName("txt_bet").getComponent(Label).string = bet;
 
         info.getChildByName("Label_Bet").getComponent(Label).string = getTranslate(this.dict, "Bet") + `(${currencySymbol})`;
@@ -416,7 +416,7 @@ export class HistoryDetail extends Component {
             node_scatter.destroy()
         }
 
-        const symbolWinInfosKeys = Object.keys(pan.SymbolWinInfos)
+        const symbolWinInfosKeys = Object.keys(pan.WinInfo.Desc)
 
         // 赢分符号统计
         if (symbolWinInfosKeys.length > 0) {
@@ -425,7 +425,7 @@ export class HistoryDetail extends Component {
             symbolWinInfosKeys.forEach((v) => {
                 // console.log("symbol:", v, " = ", pan.SymbolWinInfos[v])
 
-                const symbolWinInfo = pan.SymbolWinInfos[v]
+                const symbolWinInfo = pan.pan.WinInfo.Desc[v]
                 const item_win_kind = instantiate(this.item_win_kind)
 
                 item_win_kind.name = `item_win_kind_${v}`

assets/Game/scripts/game/Paytable.ts

@@ -1,6 +1,5 @@
 import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform } from 'cc';
 import { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
-import { Data } from './Data';
 import { getLanguage } from 'db://assets/Loading/scripts/comm';
 const { ccclass, property } = _decorator;
 

assets/Game/scripts/game/RollerManager.ts

@@ -23,9 +23,6 @@ export class RollerManager extends Component {
     @property({ type: IconFactory, tooltip: '图标工厂' })
     iconFactory: IconFactory = null;
 
-    @property(SpriteFrame)
-    hMaskSpriteFrame: SpriteFrame = null;
-
     @property(SpriteFrame)
     vMaskSpriteFrame: SpriteFrame = null;
 
@@ -38,8 +35,6 @@ export class RollerManager extends Component {
         { row: 5, col: 1, isHorizontal: false },
         { row: 5, col: 1, isHorizontal: false },
     ];
-    // 横向滚轮数组
-    hRollers: HRoller[] = [];
     // 竖向滚轮数组
     vRollers: Roller[] = [];
     // 滚轮数组
@@ -59,7 +54,6 @@ export class RollerManager extends Component {
     // 处理过的不规则icon信息
     _processedCroSymbols: any = null;
 
-    private hMaskNode: Node = null;
     private vMaskNode: Node = null;
 
 
@@ -79,13 +73,10 @@ export class RollerManager extends Component {
         this._format = a;
         this.node.removeAllChildren();
         this.allRollers = [];
-        this.hRollers = [];
         this.vRollers = [];
 
-        this.hMaskNode = this.createMaskNode('HMask', this.hMaskSpriteFrame);
         this.vMaskNode = this.createMaskNode('VMask', this.vMaskSpriteFrame);
 
-        this.node.addChild(this.hMaskNode);
         this.node.addChild(this.vMaskNode);
 
         let rollerLength = this.rollerMsg.length;

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 = "eyJQIjoxMDA5NDksIkUiOjE3NjI2MjYyMDksIlMiOjEwMDQsIkQiOiJycF8xMTAwMSJ9.u2ip42WvBwIyNGboDgZW4nAZfLRHDNO3Ioa_kX_KBA8";
+let token = "eyJQIjoxMDIyNDksIkUiOjE3NjM1Nzk2NTIsIlMiOjk5OSwiRCI6InJwXzExMDAxIn0.7Z8z7XOUvp3XU795wRfy4CrgXZBD38w1mAYErFufAWw";
 
 
 let language = "en"