1

.gitea/workflows/deploy.yaml

@@ -19,7 +19,9 @@ jobs:
           echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
       - name: npm i
         run: |
+          echo 'npm i'
           npm i
+          echo "✅ npm i done"
       - name: build
         run: |
           echo 'build'

assets/Game/prefabs/WebView/webView.prefab

@@ -1160,7 +1160,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -70,
+      "y": -83.523,
       "z": 0
     },
     "_lrot": {
@@ -1201,7 +1201,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 167.19189453125,
-      "height": 54.18
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1243,7 +1243,7 @@
     "_fontSize": 43,
     "_fontFamily": "Arial",
     "_lineHeight": 43,
-    "_overflow": 0,
+    "_overflow": 2,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,

assets/Game/scripts/SlotBar.ts

@@ -416,25 +416,25 @@ export class SlotBar extends Component {
         if (this.isGetBalance) return
         this.isGetBalance = true;
         try {
-            let balacneData = await callGameBalanceApi({ GameId: getGameId() });
-            this.setBalance(balacneData.Balance)
-            return balacneData.Balance;
+            let balacneData = await this.refreshBalanceFromServer();
+            this.setBalance(balacneData)
+            return balacneData;
         } catch (err) {
             console.log('获取余额失败')
             return null;
         } finally {
             this.scheduleOnce(() => {
                 this.isGetBalance = false;
-            }, 1)
+            }, 0.5)
 
         }
     }
 
     async onConfirmErr2(): Promise<number | null> {
         try {
-            let balacneData = await callGameBalanceApi({ GameId: getGameId() });
-            this.setBalance(balacneData.Balance)
-            return balacneData.Balance;
+            let balacneData = await this.refreshBalanceFromServer();
+            this.setBalance(balacneData)
+            return balacneData;
         } catch (err) {
             console.log('获取余额失败')
             return null;
@@ -809,5 +809,27 @@ export class SlotBar extends Component {
             this.setBet(this.betGrade[this.betIndex], true);
         }
     }
+    // private _refreshingBalance: boolean = false;
+    async refreshBalanceFromServer(): Promise<number | null> {
+        // if (this._refreshingBalance) return this.getBalance();
+        // this._refreshingBalance = true;
+        try {
+            const res = await callGameBalanceApi({});
+            const balance = Number(res.Balance);
+            if (!Number.isFinite(balance)) {
+                console.warn("[SlotBar] invalid balance response:", res);
+                return this.getBalance();
+            }
+            this.setBalance(balance);
+            return balance;
+        } catch (err) {
+            console.error("[SlotBar] refresh balance failed:", err);
+            return this.getBalance();
+        } finally {
+            // this.scheduleOnce(() => {
+            // this._refreshingBalance = false;
+            // }, 1)
 
+        }
+    }
 }

assets/Game/scripts/SlotScene.ts

@@ -239,12 +239,11 @@ export class SlotScene extends Component {
             this.slotBar.setWin(0);
         }
 
-        let curBalanceData = await callGameBalanceApi({ GameId: getGameId() })
-        let curBalance = curBalanceData.Balance
-        if (!curBalance) {
-            curBalance = this.slotBar.getBalance()
+        let curBalanceData = await this.slotBar.refreshBalanceFromServer()
+        if (!curBalanceData) {
+            curBalanceData = this.slotBar.getBalance()
         }
-        if (curBalance < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
+        if (curBalanceData < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
             //余额不足不经过服务器，在客户端拦截
             this.showErrorTip(2, () => { this.slotBar.onConfirmErr2() });
             this.handleErrSpin(true);

assets/Loading/game.scene

@@ -187,7 +187,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 959.9999999999999,
+    "_orthoHeight": 960,
     "_near": 0,
     "_far": 2000,
     "_color": {

assets/Loading/scripts/LayoutAdapter.ts

@@ -1,7 +1,9 @@
 import { _decorator, Node, Component, screen, view, ResolutionPolicy, Sprite, sys, Label, Widget, Vec3, UITransform } from 'cc';
 import { LocalizedLabel } from './i18n/LocalizedLabel';
 import { getLanguage } from './comm';
+import { installLabelAlignmentCenterFix } from 'common_tools';
 
+installLabelAlignmentCenterFix();
 const { ccclass, property } = _decorator;
 export let SWITCH_PROTRAIT_MODE = {
     "da": "Skift venligst til portrættilstand",

assets/Loading/scripts/comm.ts

@@ -9,7 +9,7 @@ const qs = new URLSearchParams(location.search)
 
 // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
 let apiaddr = "";
-let token = "eyJQIjoxMDA5NDksIkUiOjE3ODExODc3NjIsIlMiOjEwMDAsIkQiOiJycF8xMDAxMiJ9.5v087Lt--ozENIV6Rdvga9nZVc2bzxf11iJAbG5x8gM";
+let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI3NjA2MTIsIlMiOjEwMDQsIkQiOiJycF8xMDAxMiJ9.f8r8mMsNIh9XSXq-Ni_h2KRw4EBDu9pTWIfwAQw7O7U";
 let language = "en"
 let currency = "THB"
 let isfrom = null

package-lock.json

@@ -9,9 +9,15 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
         "nosleep.js": "^0.12.0"
       }
     },
+    "node_modules/common_tools": {
+      "version": "1.0.0",
+      "resolved": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git#c49bf2990a6f348489505ac4998683c814b58dde",
+      "license": "MIT"
+    },
     "node_modules/nosleep.js": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz",

package.json

@@ -14,6 +14,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
     "nosleep.js": "^0.12.0"
   }
 }