进度条初始显示为0%

assets/Game/fonts/font.meta

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

assets/Game/fonts/font/AvenirNextWorldDemi.ttf.meta

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

assets/Game/fonts/font/AvenirNextWorldMedium.ttf.meta

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

assets/Game/fonts/font/Pyidaungsu_Bold.ttf.meta

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

assets/Game/fonts/font/Pyidaungsu_Regular.ttf.meta

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

assets/Game/fonts/font/Roboto_Bold.ttf.meta

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

assets/Game/fonts/font/Roboto_Regular.ttf.meta

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

assets/Game/prefabs/AutoSpinPanel/AutoSpinPanel.prefab

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

assets/Game/scripts/AntiSleepManager.ts

@@ -0,0 +1,63 @@
+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

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

assets/Game/scripts/SlotBar.ts

@@ -52,8 +52,6 @@ export class SlotBar extends Component {
   @property({ type: Prefab })
   private autoSpinPanel: Prefab = null;
 
-  @property(Node)
-  private tipSmall: Node = null;
   @property(SlotGame)
   private slotGame: SlotGame = null;
 
@@ -66,6 +64,11 @@ 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;
 
@@ -270,19 +273,14 @@ 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();
 
@@ -301,8 +299,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);
@@ -319,7 +317,8 @@ 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);
@@ -340,7 +339,7 @@ export class SlotBar extends Component {
   }
 
   manualStop() {
-    this.notAllowClickManualStop(true)
+    this.hasClickManualStop = true;
     this.spinAni.stopSpin();
     this.setBtnEnable(this.spinBtn, false);
   }
@@ -431,49 +430,63 @@ export class SlotBar extends Component {
     // 清理之前的计时器和动画
     this.clearTipTimers();
 
-    // 设置提示内容
+    let tipNode = null
     if (openTurbo != null) {
-      this.tipSmall.getChildByPath("layout/turbo").active = true
-      this.tipSmall.getChildByPath("layout/turbo").getComponent(Sprite).spriteFrame = this.turboFrames[openTurbo ? 0 : 1]
-    } else {
-      this.tipSmall.getChildByPath("layout/turbo").active = false
+      tipNode = this.tipSmall_turbo
+      this.tipSmall_bet.active = false
 
+      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_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);
     }
 
-    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);
-    // 调整框架大小
+    tipNode.scale = new Vec3(0, 0, 0);
     setTimeout(() => {
-      this.tipSmall.active = true;
       // 显示动画
-      this.tipSmall.scale = new Vec3(0, 0, 0);
-      this.currentTipTween = tween(this.tipSmall)
+      this.currentTipTween = tween(tipNode)
         .to(0.1, { scale: new Vec3(1, 1, 1) })
         .call(() => {
           // 5. 设置隐藏计时器
           this.hideTimer = setTimeout(() => {
-            this.hideTipSmall();
+            this.hideTipSmall(tipNode);
           }, 1000); // 1秒后隐藏
         })
         .start();
     }, 0.1);
   }
 
-  private hideTipSmall() {
-    if (!this.tipSmall.active) return;
+  private hideTipSmall(tipNode) {
+    if (!tipNode.active) return;
 
     this.clearTipTimers(); // 清理可能存在的计时器
 
-    this.currentTipTween = tween(this.tipSmall)
+    this.currentTipTween = tween(tipNode)
       .to(0.1, { scale: new Vec3(0, 0, 0) })
       .call(() => {
-        this.tipSmall.active = false;
+        tipNode.active = false;
         this.currentTipTween = null;
       })
       .start();
@@ -629,9 +642,9 @@ export class SlotBar extends Component {
   }
 
   resetAllState() {
-    this.allowClickManualStop(false)
-    this.notAllowClickManualStop(false)
-
+    this.hasClickSpin = false;
+    this.manualStopNode.active = false
+    this.hasClickManualStop = false;
 
     this.isAuto = false;
     this.setBtnVisible(this.spinBtn, true);

assets/Game/scripts/SlotScene.ts

@@ -286,8 +286,7 @@ 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);
@@ -303,9 +302,14 @@ export class SlotScene extends Component {
       } else {
         if (!isFreeSpin) {
           if (!isFeatureBuy) {
-            this.slotBar.setBalance(this.slotBar.getBalance() - this.slotBar.getBet());
+            this.slotBar.setBalance(
+              this.slotBar.getBalance() - this.slotBar.getBet()
+            );
           } else {
-            this.slotBar.setBalance(this.slotBar.getBalance() - (this.slotBar.getBet() * this.gameInfo.BuyMul));
+            this.slotBar.setBalance(
+              this.slotBar.getBalance() -
+              this.slotBar.getBet() * this.gameInfo.BuyMul
+            );
           }
         }
       }
@@ -323,8 +327,7 @@ 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;
@@ -360,7 +363,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);
@@ -386,15 +389,16 @@ export class SlotScene extends Component {
     if (!this.isReceiveMsg) return;
 
     // 免费游戏不能手动停止
-    // if (this.gameState.isInFreeSpin) {
-    //   return;
-    // }
+    if (this.gameState.isInFreeSpin) {
+      return;
+    }
 
     // 滚轮没有开始旋转的时候不能停止
     if (!this.slotGame.isScroll()) return;
 
     this.slotBar.manualStop();
     this.slotGame.manualStop();
+
   }
 
   private handleErrSpin() {

assets/Game/scripts/game/Roller.ts

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

assets/Loading/scripts/loading.ts

@@ -177,6 +177,7 @@ 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;
@@ -206,7 +207,8 @@ export class Loading extends Component {
                 }
             }
         );
-
+        await GameDataManager.instance.preloadFrameTypeCache();
+        await GameDataManager.instance.preloadSymbolCache();
         // 资源加载完成，进度条到90%
         this.updateProgress(this.PROGRESS_RESOURCE);