assets/Game/fonts/FranklinGothicDemiCond.ttf.meta

@@ -2,10 +2,10 @@
   "ver": "1.0.1",
   "importer": "ttf-font",
   "imported": true,
-  "uuid": "5e31c32e-aa54-4a32-b793-32a4dc06a811",
+  "uuid": "69fbd01d-29d4-4356-b163-4a703a7d45e4",
   "files": [
     ".json",
-    "AvenirNextWorldMedium.ttf"
+    "FranklinGothicDemiCond.ttf"
   ],
   "subMetas": {},
   "userData": {}

assets/Game/fonts/FranklinGothicMedium.ttf.meta

@@ -2,10 +2,10 @@
   "ver": "1.0.1",
   "importer": "ttf-font",
   "imported": true,
-  "uuid": "d9c1c5ff-ffc2-4cd4-a343-39bd8388746d",
+  "uuid": "2e641180-f09b-4b02-b393-585d06441b69",
   "files": [
     ".json",
-    "AvenirNextWorldDemi.ttf"
+    "FranklinGothicMedium.ttf"
   ],
   "subMetas": {},
   "userData": {}

assets/Game/fonts/Pyidaungsu_Bold.ttf.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "ttf-font",
   "imported": true,
-  "uuid": "704ad71c-5bed-458d-b306-9fc5328576b1",
+  "uuid": "67d33629-4ef1-4a23-9167-8543375dadb0",
   "files": [
     ".json",
     "Pyidaungsu_Bold.ttf"

assets/Game/fonts/Pyidaungsu_Regular.ttf.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "ttf-font",
   "imported": true,
-  "uuid": "dfdc09d9-7107-4534-905c-904db5297c61",
+  "uuid": "22db0ca4-1712-4916-a282-b42719196c93",
   "files": [
     ".json",
     "Pyidaungsu_Regular.ttf"

assets/Game/fonts/Roboto Bold.ttf.meta

@@ -2,10 +2,10 @@
   "ver": "1.0.1",
   "importer": "ttf-font",
   "imported": true,
-  "uuid": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+  "uuid": "dee281aa-889b-4381-9619-2373b02ea7e1",
   "files": [
     ".json",
-    "Roboto_Bold.ttf"
+    "Roboto Bold.ttf"
   ],
   "subMetas": {},
   "userData": {}

assets/Game/fonts/Roboto Regular.ttf.meta

@@ -2,10 +2,10 @@
   "ver": "1.0.1",
   "importer": "ttf-font",
   "imported": true,
-  "uuid": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+  "uuid": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
   "files": [
     ".json",
-    "Roboto_Regular.ttf"
+    "Roboto Regular.ttf"
   ],
   "subMetas": {},
   "userData": {}

assets/Game/fonts/font.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "734202fa-7b80-48b5-9ed4-07c715826c06",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

assets/Game/prefabs/AutoSpinPanel/AutoSpinPanel.prefab

@@ -317,7 +317,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -266,
+      "y": -270,
       "z": 0
     },
     "_lrot": {
@@ -858,8 +858,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 334,
+      "x": 349,
-      "y": 3,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -1218,7 +1218,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 197,
+      "y": 200,
       "z": 0
     },
     "_lrot": {
@@ -1258,8 +1258,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 244.78125,
+      "width": 811.1579999999999,
-      "height": 88.2
+      "height": 58
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1300,11 +1300,11 @@
     "_actualFontSize": 56,
     "_fontSize": 56,
     "_fontFamily": "Arial",
-    "_lineHeight": 70,
+    "_lineHeight": 58,
-    "_overflow": 0,
+    "_overflow": 2,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "_isSystemFontUsed": false,
@@ -1376,27 +1376,27 @@
     },
     "isBold": true,
     "fontOther": {
-      "__uuid__": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+      "__uuid__": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
       "__expectedType__": "cc.TTFFont"
     },
     "fontOtherBold": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThVi": {
-      "__uuid__": "5e31c32e-aa54-4a32-b793-32a4dc06a811",
+      "__uuid__": "53564fbb-0c8f-48f6-9f1a-a9bdc54fd297",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThViBold": {
-      "__uuid__": "d9c1c5ff-ffc2-4cd4-a343-39bd8388746d",
+      "__uuid__": "922161d3-e56f-47de-b9ee-b1ffdb27939b",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMy": {
-      "__uuid__": "dfdc09d9-7107-4534-905c-904db5297c61",
+      "__uuid__": "22db0ca4-1712-4916-a282-b42719196c93",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMyBold": {
-      "__uuid__": "704ad71c-5bed-458d-b306-9fc5328576b1",
+      "__uuid__": "67d33629-4ef1-4a23-9167-8543375dadb0",
       "__expectedType__": "cc.TTFFont"
     },
     "_id": ""
@@ -1448,7 +1448,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -153,
+      "y": -152,
       "z": 0
     },
     "_lrot": {
@@ -1488,8 +1488,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 286.9453125,
+      "width": 674.271,
-      "height": 63
+      "height": 61.084999999999994
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1527,14 +1527,14 @@
     "_string": "Start Auto Spin",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 42,
+    "_actualFontSize": 43,
     "_fontSize": 42,
     "_fontFamily": "Arial",
-    "_lineHeight": 50,
+    "_lineHeight": 46,
-    "_overflow": 0,
+    "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "_isSystemFontUsed": false,
@@ -1606,27 +1606,27 @@
     },
     "isBold": true,
     "fontOther": {
-      "__uuid__": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+      "__uuid__": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
       "__expectedType__": "cc.TTFFont"
     },
     "fontOtherBold": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThVi": {
-      "__uuid__": "5e31c32e-aa54-4a32-b793-32a4dc06a811",
+      "__uuid__": "53564fbb-0c8f-48f6-9f1a-a9bdc54fd297",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThViBold": {
-      "__uuid__": "d9c1c5ff-ffc2-4cd4-a343-39bd8388746d",
+      "__uuid__": "922161d3-e56f-47de-b9ee-b1ffdb27939b",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMy": {
-      "__uuid__": "dfdc09d9-7107-4534-905c-904db5297c61",
+      "__uuid__": "22db0ca4-1712-4916-a282-b42719196c93",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMyBold": {
-      "__uuid__": "704ad71c-5bed-458d-b306-9fc5328576b1",
+      "__uuid__": "67d33629-4ef1-4a23-9167-8543375dadb0",
       "__expectedType__": "cc.TTFFont"
     },
     "_id": ""
@@ -1677,8 +1677,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 334,
+      "x": 366,
-      "y": 75,
+      "y": 79,
       "z": 0
     },
     "_lrot": {
@@ -1718,8 +1718,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 256.2294921875,
+      "width": 320,
-      "height": 44.1
+      "height": 32.76
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1754,17 +1754,17 @@
       "b": 255,
       "a": 255
     },
-    "_string": "Number of Auto Spins",
+    "_string": "Number of Rounds",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 26,
+    "_actualFontSize": 29,
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_fontFamily": "Arial",
-    "_lineHeight": 35,
+    "_lineHeight": 26,
-    "_overflow": 0,
+    "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
-      "__uuid__": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+      "__uuid__": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
       "__expectedType__": "cc.TTFFont"
     },
     "_isSystemFontUsed": false,
@@ -1836,27 +1836,27 @@
     },
     "isBold": false,
     "fontOther": {
-      "__uuid__": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+      "__uuid__": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
       "__expectedType__": "cc.TTFFont"
     },
     "fontOtherBold": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThVi": {
-      "__uuid__": "5e31c32e-aa54-4a32-b793-32a4dc06a811",
+      "__uuid__": "53564fbb-0c8f-48f6-9f1a-a9bdc54fd297",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThViBold": {
-      "__uuid__": "d9c1c5ff-ffc2-4cd4-a343-39bd8388746d",
+      "__uuid__": "922161d3-e56f-47de-b9ee-b1ffdb27939b",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMy": {
-      "__uuid__": "dfdc09d9-7107-4534-905c-904db5297c61",
+      "__uuid__": "22db0ca4-1712-4916-a282-b42719196c93",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMyBold": {
-      "__uuid__": "704ad71c-5bed-458d-b306-9fc5328576b1",
+      "__uuid__": "67d33629-4ef1-4a23-9167-8543375dadb0",
       "__expectedType__": "cc.TTFFont"
     },
     "_id": ""
@@ -1901,8 +1901,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 335,
+      "x": 348,
-      "y": 5,
+      "y": 3.988,
       "z": 0
     },
     "_lrot": {
@@ -1942,8 +1942,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100.107421875,
+      "width": 92.01,
-      "height": 75.6
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1987,14 +1987,17 @@
     "_lineHeight": 60,
     "_overflow": 0,
     "_enableWrapText": true,
-    "_font": null,
+    "_font": {
-    "_isSystemFontUsed": true,
+      "__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4",
+      "__expectedType__": "cc.TTFFont"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
-    "_cacheMode": 0,
+    "_cacheMode": 2,
     "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
@@ -2070,8 +2073,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -119,
+      "x": -97,
-      "y": 3,
+      "y": 7,
       "z": 0
     },
     "_lrot": {

assets/Game/scripts/AntiSleepManager.ts

@@ -1,63 +0,0 @@
-import { _decorator, Component, Node } from 'cc';
-import NoSleep from 'nosleep.js';
-const { ccclass,property } = _decorator;
-
-@ccclass('AntiSleepManager')
-export class AntiSleepManager extends Component {
-    private noSleep: NoSleep | null = null;
-    private wakeLock: any = null;
-    _enabled: boolean = false;
-
-    onLoad() {
-        this.noSleep = new NoSleep();
-    }
-
-    clickStart(){
-        if(this._enabled) return
-
-        this.enableWakeLock();
-    }
-
-    async enableWakeLock() {
-
-        this._enabled = true
-
-        try {
-            if ('wakeLock' in navigator) {
-                this.wakeLock = await (navigator as any).wakeLock.request('screen');
-                // console.log('✅ 屏幕常亮已启用 (Wake Lock API)');
-
-                // 处理页面切换时丢失锁
-                document.addEventListener('visibilitychange', async () => {
-                    if (document.visibilityState === 'visible') {
-                        this.wakeLock = await (navigator as any).wakeLock.request('screen');
-                    }
-                });
-            } else {
-                this.noSleep?.enable();
-                // console.log('✅ 屏幕常亮已启用 (NoSleep.js)');
-            }
-        } catch (err) {
-            this._enabled = false
-            // console.error('❌ 启用屏幕常亮失败:', err);
-        }
-    }
-
-    disableWakeLock() {
-        if (this.wakeLock) {
-            this.wakeLock.release();
-            this.wakeLock = null;
-            // console.log('🔒 Wake Lock 已关闭');
-        }
-        if (this.noSleep) {
-            this.noSleep.disable();
-            // console.log('🔒 NoSleep 已关闭');
-        }
-    }
-
-    onDestroy() {
-        // this.disableWakeLock();
-    }
-}
-
-

assets/Game/scripts/AntiSleepManager.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "c3c4a468-972c-4ee3-8841-9b917cf5c8b1",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

assets/Game/scripts/SlotBar.ts

@@ -52,6 +52,8 @@ export class SlotBar extends Component {
   @property({ type: Prefab })
   private autoSpinPanel: Prefab = null;
 
+  @property(Node)
+  private tipSmall: Node = null;
   @property(SlotGame)
   private slotGame: SlotGame = null;
 
@@ -64,11 +66,6 @@ export class SlotBar extends Component {
   @property(Prefab)
   pfb_rules: Prefab = null;
 
-  @property(Node)
-  private tipSmall_turbo: Node = null;
-  @property(Node)
-  private tipSmall_bet: Node = null;
-
   @property(Node)
   private manualStopNode: Node = null;
 
@@ -273,14 +270,19 @@ export class SlotBar extends Component {
     });
   }
 
+  allowClickManualStop(bl: boolean) {
+    this.hasClickSpin = bl;
+    this.manualStopNode.active = bl
+  }
 
+  notAllowClickManualStop(bl: boolean) {
+    this.hasClickManualStop = bl;
+  }
 
   onBtnSpin() {
     // 第一次点击 旋转
     if (!this.hasClickSpin && !this.hasClickManualStop) {
       AudioManager.instance.playSFX("Spin_Button_Click");
-      this.hasClickSpin = true;
-      this.manualStopNode.active = true
       this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK);
       this.spinAni.startSpin();
 
@@ -299,8 +301,8 @@ export class SlotBar extends Component {
     // 第一次点击 旋转
     if (!this.hasClickSpin && !this.hasClickManualStop) {
       // AudioManager.instance.playSFX('Spin_Button_Click');
-      this.hasClickSpin = true;
+
-      this.manualStopNode.active = true
+
 
       this.setBtnEnable(this.subBtn, false);
       this.setBtnEnable(this.addBtn, false);
@@ -317,8 +319,7 @@ export class SlotBar extends Component {
   onBtnTestSpin(event, args) {
     // 第一次点击 旋转
     if (!this.hasClickSpin && !this.hasClickManualStop) {
-      this.hasClickSpin = true;
+      // this.hasClickSpin = true;
-      this.manualStopNode.active = true
       this.node.emit(SLOT_BAR_EVENT.ON_TEST_SPIN_CLICK, args);
 
       this.setBtnEnable(this.subBtn, false);
@@ -339,7 +340,7 @@ export class SlotBar extends Component {
   }
 
   manualStop() {
-    this.hasClickManualStop = true;
+    this.notAllowClickManualStop(true)
     this.spinAni.stopSpin();
     this.setBtnEnable(this.spinBtn, false);
   }
@@ -430,63 +431,49 @@ export class SlotBar extends Component {
     // 清理之前的计时器和动画
     this.clearTipTimers();
 
-    let tipNode = null
+    // 设置提示内容
     if (openTurbo != null) {
-      tipNode = this.tipSmall_turbo
+      this.tipSmall.getChildByPath("layout/turbo").active = true
-      this.tipSmall_bet.active = false
+      this.tipSmall.getChildByPath("layout/turbo").getComponent(Sprite).spriteFrame = this.turboFrames[openTurbo ? 0 : 1]
-
-      tipNode.getChildByPath("layout/Turboon").active = openTurbo
-      tipNode.getChildByPath("layout/Turbooff").active = !openTurbo
-
-      // 设置提示内容
-      tipNode.active = true;
-      tipNode.getChildByPath("layout/Label").getComponent(Label).string = str;
-      let label = tipNode.getChildByPath("layout/Label").getComponent(Label);
-      label.updateRenderData(true);
-      tipNode.getChildByPath("layout").getComponent(Layout).updateLayout(true)
-      let tipWidth = tipNode.getChildByPath("layout").getComponent(UITransform).width;
-      let frame = tipNode.getChildByName('Frame_Assets');
-      // 调整框架大小
-      frame.getComponent(UITransform).setContentSize(tipWidth + 140, 125);
     } else {
-      tipNode = this.tipSmall_bet
+      this.tipSmall.getChildByPath("layout/turbo").active = false
-      this.tipSmall_turbo.active = false
 
-      // 设置提示内容
-      tipNode.active = true;
-      tipNode.getChildByPath("Label").getComponent(Label).string = str;
-      let label = tipNode.getChildByPath("Label").getComponent(Label);
-      label.updateRenderData(true);
-      let tipWidth = tipNode.getChildByPath("Label").getComponent(UITransform).width;
-      let frame = tipNode.getChildByName('Frame_Assets');
-      // 调整框架大小
-      frame.getComponent(UITransform).setContentSize(tipWidth + 140, 105);
     }
 
-    tipNode.scale = new Vec3(0, 0, 0);
+    this.tipSmall.getChildByPath("layout/Label").getComponent(Label).string = str;
+    let label = this.tipSmall.getChildByPath("layout/Label").getComponent(Label);
+    label.updateRenderData(true);
+    let tipWidth = this.tipSmall
+      .getChildByPath("layout/Label")
+      .getComponent(UITransform).width;
+    let frame = this.tipSmall.getChildByName("Frame_Assets");
+    frame.getComponent(UITransform).setContentSize(tipWidth + 100, 105);
+    // 调整框架大小
     setTimeout(() => {
+      this.tipSmall.active = true;
       // 显示动画
-      this.currentTipTween = tween(tipNode)
+      this.tipSmall.scale = new Vec3(0, 0, 0);
+      this.currentTipTween = tween(this.tipSmall)
         .to(0.1, { scale: new Vec3(1, 1, 1) })
         .call(() => {
           // 5. 设置隐藏计时器
           this.hideTimer = setTimeout(() => {
-            this.hideTipSmall(tipNode);
+            this.hideTipSmall();
           }, 1000); // 1秒后隐藏
         })
         .start();
     }, 0.1);
   }
 
-  private hideTipSmall(tipNode) {
+  private hideTipSmall() {
-    if (!tipNode.active) return;
+    if (!this.tipSmall.active) return;
 
     this.clearTipTimers(); // 清理可能存在的计时器
 
-    this.currentTipTween = tween(tipNode)
+    this.currentTipTween = tween(this.tipSmall)
       .to(0.1, { scale: new Vec3(0, 0, 0) })
       .call(() => {
-        tipNode.active = false;
+        this.tipSmall.active = false;
         this.currentTipTween = null;
       })
       .start();
@@ -642,9 +629,9 @@ export class SlotBar extends Component {
   }
 
   resetAllState() {
-    this.hasClickSpin = false;
+    this.allowClickManualStop(false)
-    this.manualStopNode.active = false
+    this.notAllowClickManualStop(false)
-    this.hasClickManualStop = false;
+
 
     this.isAuto = false;
     this.setBtnVisible(this.spinBtn, true);

assets/Game/scripts/SlotScene.ts

@@ -286,7 +286,8 @@ export class SlotScene extends Component {
     try {
       this.gameState.isOnReconnect = false;
       this.isReceiveMsg = false;
-      this.isErr = false;
+
+      this.isErr = false
       this.slotGame.spin(this.gameState.isInFreeSpin);
       this.gameState.isOneRoundEnd = false;
       this.slotGame.changeBg(this.gameState.isInFreeSpin);
@@ -302,14 +303,9 @@ export class SlotScene extends Component {
       } else {
         if (!isFreeSpin) {
           if (!isFeatureBuy) {
-            this.slotBar.setBalance(
+            this.slotBar.setBalance(this.slotBar.getBalance() - this.slotBar.getBet());
-              this.slotBar.getBalance() - this.slotBar.getBet()
-            );
           } else {
-            this.slotBar.setBalance(
+            this.slotBar.setBalance(this.slotBar.getBalance() - (this.slotBar.getBet() * this.gameInfo.BuyMul));
-              this.slotBar.getBalance() -
-              this.slotBar.getBet() * this.gameInfo.BuyMul
-            );
           }
         }
       }
@@ -327,7 +323,8 @@ export class SlotScene extends Component {
       }
       if (!this.gameState.isDebug) {
         this.spinInfo = await callGameApi("spin", msg);
-
+        this.slotBar.allowClickManualStop(true)
+        this.slotBar.notAllowClickManualStop(false)
         if (this.spinInfo.Frb.Ongoing) {
           if (!isFreeSpin) {
             let count = this.spinInfo.Frb.Ongoing.Frn;
@@ -363,7 +360,7 @@ export class SlotScene extends Component {
       this.isReceiveMsg = true;
       await this.handleSpinResult();
     } catch (error) {
-      this.isErr = true;
+      this.isErr = true
       let errCode = parseInt(error.message.split("#")[0]);
       if (isNaN(errCode)) {
         this.showErrorTip(4);
@@ -389,16 +386,15 @@ export class SlotScene extends Component {
     if (!this.isReceiveMsg) return;
 
     // 免费游戏不能手动停止
-    if (this.gameState.isInFreeSpin) {
+    // if (this.gameState.isInFreeSpin) {
-      return;
+    //   return;
-    }
+    // }
 
     // 滚轮没有开始旋转的时候不能停止
     if (!this.slotGame.isScroll()) return;
 
     this.slotBar.manualStop();
     this.slotGame.manualStop();
-
   }
 
   private handleErrSpin() {

assets/Game/scripts/game/Roller.ts

@@ -267,18 +267,12 @@ export class Roller extends BaseRoller {
      * @param data 停止时的图标数据
      */
     async manualStopScroll(data: number[]) {
-        if (this._info.isManualStop ||
+        this.resetInfo();
-            this._info.state === ROLLER_STATE.STOP) {
-            return;
-        }
-
-
-        this._info.resetLxInfo();
         this._stopData = data;
         this._info.isManualStop = true;
         Tween.stopAllByTarget(this._info.speedNode);
 
-        // 直接回收所有动态图标
+        // 回收所有动态图标
         while (this._info.icons.length > 0) {
             let icon = this._info.icons.pop();
             this.iconFactory.recycleIcon(icon);
@@ -293,14 +287,8 @@ export class Roller extends BaseRoller {
                 this.iconFactory.recycleIcon(icon);
             }
         }
-        this._allIcons.clear();
-        this._posToIconKey.clear();
 
         this.createInitIcons(data);
-        // 为所有创建的图标播放动画
-        for (let icon of this._allIcons.values()) {
-            icon.getComponent(Icon).playSpawnAni();
-        }
         this.changeState(ROLLER_STATE.STOP);
     }
 

assets/Loading/game.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 90
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 91
+      "__id__": 89
     },
     "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767"
   },
@@ -77,11 +77,14 @@
         "__id__": 8
       },
       {
-        "__id__": 70
+        "__id__": 69
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 84
+      },
       {
         "__id__": 85
       },
@@ -90,12 +93,6 @@
       },
       {
         "__id__": 87
-      },
-      {
-        "__id__": 88
-      },
-      {
-        "__id__": 89
       }
     ],
     "_prefab": null,
@@ -341,11 +338,14 @@
         "__id__": 9
       },
       {
-        "__id__": 63
+        "__id__": 62
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 65
+      },
       {
         "__id__": 66
       },
@@ -354,9 +354,6 @@
       },
       {
         "__id__": 68
-      },
-      {
-        "__id__": 69
       }
     ],
     "_prefab": null,
@@ -429,16 +426,16 @@
         "__id__": 47
       },
       {
-        "__id__": 58
+        "__id__": 57
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 60
       },
       {
-        "__id__": 62
+        "__id__": 61
       }
     ],
     "_prefab": null,
@@ -1578,7 +1575,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60.921875,
+      "width": 82.0556640625,
       "height": 56.4
     },
     "_anchorPoint": {
@@ -1608,7 +1605,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "0%",
+    "_string": "50%",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 38,
@@ -1674,8 +1671,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -4.008,
-      "y": -485,
+      "y": -555.67,
       "z": 0
     },
     "_lrot": {
@@ -1713,8 +1710,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
+      "width": 1021.423828125,
-      "height": 200
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1749,11 +1746,11 @@
     "_actualFontSize": 36,
     "_fontSize": 36,
     "_fontFamily": "Arial",
-    "_lineHeight": 36,
+    "_lineHeight": 40,
-    "_overflow": 2,
+    "_overflow": 3,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "_isSystemFontUsed": false,
@@ -1800,27 +1797,27 @@
     "__prefab": null,
     "isBold": true,
     "fontOther": {
-      "__uuid__": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+      "__uuid__": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
       "__expectedType__": "cc.TTFFont"
     },
     "fontOtherBold": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThVi": {
-      "__uuid__": "5e31c32e-aa54-4a32-b793-32a4dc06a811",
+      "__uuid__": "53564fbb-0c8f-48f6-9f1a-a9bdc54fd297",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThViBold": {
-      "__uuid__": "d9c1c5ff-ffc2-4cd4-a343-39bd8388746d",
+      "__uuid__": "922161d3-e56f-47de-b9ee-b1ffdb27939b",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMy": {
-      "__uuid__": "dfdc09d9-7107-4534-905c-904db5297c61",
+      "__uuid__": "22db0ca4-1712-4916-a282-b42719196c93",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMyBold": {
-      "__uuid__": "704ad71c-5bed-458d-b306-9fc5328576b1",
+      "__uuid__": "67d33629-4ef1-4a23-9167-8543375dadb0",
       "__expectedType__": "cc.TTFFont"
     },
     "_id": "40ROcQDbZGnoCxA1DAS4sf"
@@ -1854,7 +1851,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -524,
+      "y": -525,
       "z": 0
     },
     "_lrot": {
@@ -1908,7 +1905,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 7,
+      "y": 6.263,
       "z": 0
     },
     "_lrot": {
@@ -1946,8 +1943,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 313.4249267578125,
-      "height": 200
+      "height": 56.7
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1983,10 +1980,10 @@
     "_fontSize": 45,
     "_fontFamily": "Arial",
     "_lineHeight": 45,
-    "_overflow": 2,
+    "_overflow": 0,
     "_enableWrapText": false,
     "_font": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "_isSystemFontUsed": false,
@@ -2046,27 +2043,27 @@
     "__prefab": null,
     "isBold": true,
     "fontOther": {
-      "__uuid__": "4b259f80-bc47-4cdc-a6d9-c69a67186770",
+      "__uuid__": "1e8c3f52-ef88-4a93-a301-ed3c1982c5d4",
       "__expectedType__": "cc.TTFFont"
     },
     "fontOtherBold": {
-      "__uuid__": "c34c14ee-808f-4e93-80a2-ea58fb11b3d2",
+      "__uuid__": "dee281aa-889b-4381-9619-2373b02ea7e1",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThVi": {
-      "__uuid__": "5e31c32e-aa54-4a32-b793-32a4dc06a811",
+      "__uuid__": "53564fbb-0c8f-48f6-9f1a-a9bdc54fd297",
       "__expectedType__": "cc.TTFFont"
     },
     "fontThViBold": {
-      "__uuid__": "d9c1c5ff-ffc2-4cd4-a343-39bd8388746d",
+      "__uuid__": "922161d3-e56f-47de-b9ee-b1ffdb27939b",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMy": {
-      "__uuid__": "dfdc09d9-7107-4534-905c-904db5297c61",
+      "__uuid__": "22db0ca4-1712-4916-a282-b42719196c93",
       "__expectedType__": "cc.TTFFont"
     },
     "fontMyBold": {
-      "__uuid__": "704ad71c-5bed-458d-b306-9fc5328576b1",
+      "__uuid__": "67d33629-4ef1-4a23-9167-8543375dadb0",
       "__expectedType__": "cc.TTFFont"
     },
     "_id": "eceQ3zTtBFPIUHk4Vz0lKB"
@@ -2145,13 +2142,10 @@
     "clickEvents": [
       {
         "__id__": 56
-      },
-      {
-        "__id__": 57
       }
     ],
     "_interactable": true,
-    "_transition": 0,
+    "_transition": 2,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 214,
@@ -2213,16 +2207,6 @@
     "handler": "onStartBtnClick",
     "customEventData": ""
   },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 2
-    },
-    "component": "",
-    "_componentId": "c3c4aRolyxO44hBm5F89cix",
-    "handler": "clickStart",
-    "customEventData": ""
-  },
   {
     "__type__": "cc.Node",
     "_name": "Logo",
@@ -2235,10 +2219,10 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 58
       },
       {
-        "__id__": 60
+        "__id__": 59
       }
     ],
     "_prefab": null,
@@ -2277,7 +2261,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": null,
@@ -2299,7 +2283,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": null,
@@ -2396,10 +2380,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 63
       },
       {
-        "__id__": 65
+        "__id__": 64
       }
     ],
     "_prefab": null,
@@ -2438,7 +2422,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": null,
@@ -2460,7 +2444,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": null,
@@ -2602,22 +2586,22 @@
     },
     "_children": [
       {
-        "__id__": 71
+        "__id__": 70
       },
       {
-        "__id__": 75
+        "__id__": 74
       },
       {
-        "__id__": 80
+        "__id__": 79
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 82
       },
       {
-        "__id__": 84
+        "__id__": 83
       }
     ],
     "_prefab": null,
@@ -2656,19 +2640,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 69
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 71
+      },
       {
         "__id__": 72
       },
       {
         "__id__": 73
-      },
-      {
-        "__id__": 74
       }
     ],
     "_prefab": null,
@@ -2707,7 +2691,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 70
     },
     "_enabled": true,
     "__prefab": null,
@@ -2729,7 +2713,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 70
     },
     "_enabled": true,
     "__prefab": null,
@@ -2741,7 +2725,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 70
     },
     "_enabled": true,
     "__prefab": null,
@@ -2780,11 +2764,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 69
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 75
+      },
       {
         "__id__": 76
       },
@@ -2793,9 +2780,6 @@
       },
       {
         "__id__": 78
-      },
-      {
-        "__id__": 79
       }
     ],
     "_prefab": null,
@@ -2834,7 +2818,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": null,
@@ -2856,7 +2840,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": null,
@@ -2918,7 +2902,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": null,
@@ -2931,7 +2915,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": null,
@@ -2961,16 +2945,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 69
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 80
       },
       {
-        "__id__": 82
+        "__id__": 81
       }
     ],
     "_prefab": null,
@@ -3009,7 +2993,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": null,
@@ -3031,7 +3015,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": null,
@@ -3070,7 +3054,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": null,
@@ -3092,7 +3076,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": null,
@@ -3189,7 +3173,7 @@
       "__id__": 9
     },
     "rb7Logo": {
-      "__id__": 58
+      "__id__": 57
     },
     "languageJson": {
       "__uuid__": "65d2a408-9396-47e4-99de-73423a590b7f",
@@ -3220,25 +3204,13 @@
       "__id__": 5
     },
     "Logo": {
-      "__id__": 58
+      "__id__": 57
     },
     "rotateNode": {
-      "__id__": 70
+      "__id__": 69
     },
     "_id": "d8F/UwpTxNpZhwSJjDvnkk"
   },
-  {
-    "__type__": "c3c4aRolyxO44hBm5F89cix",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_id": "46W4D2JoFNZZugl/RX7IG4"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": null,
@@ -3250,28 +3222,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 92
+      "__id__": 90
     },
     "shadows": {
-      "__id__": 93
+      "__id__": 91
     },
     "_skybox": {
-      "__id__": 94
+      "__id__": 92
     },
     "fog": {
-      "__id__": 95
+      "__id__": 93
     },
     "octree": {
-      "__id__": 96
+      "__id__": 94
     },
     "skin": {
-      "__id__": 97
+      "__id__": 95
     },
     "lightProbeInfo": {
-      "__id__": 98
+      "__id__": 96
     },
     "postSettings": {
-      "__id__": 99
+      "__id__": 97
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

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 = "eyJQIjoxMDA5NDksIkUiOjE3NzIwMjYxNzYsIlMiOjEwMDMsIkQiOiJycF8xMTAwMSJ9.3wfZ318ajoHyaEkAcGF9VKAW6qXko5aTVFw1K1rr478";
+let token = "eyJQIjoxMDA5NDksIkUiOjE3NzAxNTA3OTgsIlMiOjk5NywiRCI6InJwXzExMDAxIn0.FERDo2kkrNmbh_bdo-pEavL81qFzMay0yTVqZRiXpuM";
 
 let language = "en"
 let currency = "THB"

assets/Loading/scripts/loading.ts

@@ -177,7 +177,6 @@ export class Loading extends Component {
         } else {
             // 显示重试按钮
             this.tipLabel.string = I18nManager.instance.t("AID_LOADING");
-            this.tipLabel.node.active = false;
             this.startBtn.node.active = true;
             this.progressBar.node.active = false;
             this.progressLabel.node.active = false;
@@ -207,8 +206,7 @@ export class Loading extends Component {
                 }
             }
         );
-        await GameDataManager.instance.preloadFrameTypeCache();
+
-        await GameDataManager.instance.preloadSymbolCache();
         // 资源加载完成，进度条到90%
         this.updateProgress(this.PROGRESS_RESOURCE);