14 changed files with 468 additions and 600 deletions
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@ -19,9 +19,7 @@ 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'
--- a/assets/Game/prefabs/History/history.prefab
+++ b/assets/Game/prefabs/History/history.prefab
--- a/assets/Game/prefabs/History/history_detail.prefab
+++ b/assets/Game/prefabs/History/history_detail.prefab
@ -12095,7 +12095,7 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 200,
+      "width": 155.625,
      "height": 75.6
    },
    "_anchorPoint": {
@ -12132,13 +12132,13 @@
      "a": 255
    },
    "_string": "Transaction",
-    "_horizontalAlign": 1,
+    "_horizontalAlign": 0,
    "_verticalAlign": 1,
-    "_actualFontSize": 31,
+    "_actualFontSize": 30,
    "_fontSize": 30,
    "_fontFamily": "Arial",
    "_lineHeight": 60,
-    "_overflow": 2,
+    "_overflow": 0,
    "_enableWrapText": true,
    "_font": null,
    "_isSystemFontUsed": true,
--- a/assets/Game/scripts/SlotBar.ts
+++ b/assets/Game/scripts/SlotBar.ts
@ -120,7 +120,7 @@ export class SlotBar extends Component {
  private btnPositions: Map<string, Vec3> = new Map();
  private isAnimating: boolean = false;
  private readonly DURATION = 0.1;
-  private readonly OFFSET_Y = -300;
+  private readonly OFFSET_Y = -200;

  private hasClickSpin: boolean = false;
  private hasClickManualStop: boolean = false;
@ -427,25 +427,25 @@ export class SlotBar extends Component {
    if (this.isGetBalance) return
    this.isGetBalance = true;
    try {
-      let balacneData = await this.refreshBalanceFromServer();
-      this.setBalance(balacneData)
-      return balacneData;
+      let balacneData = await callGameBalanceApi({ GameId: getGameId() });
+      this.setBalance(balacneData.Balance)
+      return balacneData.Balance;
    } catch (err) {
      console.log('获取余额失败')
      return null;
    } finally {
      this.scheduleOnce(() => {
        this.isGetBalance = false;
-      }, 0.5)
+      }, 1)

    }
  }

  async onConfirmErr2(): Promise<number | null> {
    try {
-      let balacneData = await this.refreshBalanceFromServer();
-      this.setBalance(balacneData)
-      return balacneData;
+      let balacneData = await callGameBalanceApi({ GameId: getGameId() });
+      this.setBalance(balacneData.Balance)
+      return balacneData.Balance;
    } catch (err) {
      console.log('获取余额失败')
      return null;
@ -658,7 +658,7 @@ export class SlotBar extends Component {
    this.setBtnVisible(this.spinBtn, true);
    this.setBtnVisible(this.stopAutoBtn, false);
    this.setBtnEnable(this.spinBtn, false);
-    this.slotGame.showFeatureBuy(this.getBet() * this.gameInfo.BuyMul > this.gameInfo.MaxBuyBet)
+    this.slotGame.showFeatureBuy(false)

  }

@ -834,28 +834,4 @@ 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)
-
-    }
-  }
 }
--- a/assets/Game/scripts/SlotGame.ts
+++ b/assets/Game/scripts/SlotGame.ts
@ -875,8 +875,8 @@ export class SlotGame extends Component {
    }


-    showFeatureBuy(isHide: boolean) {
-        this.featureBuyNode.active = !isHide;
+    showFeatureBuy(isShow: boolean) {
+        this.featureBuyNode.active = !isShow;
    }

    setFeatureBuyInteractable(isInteractable: boolean) {
--- a/assets/Game/scripts/SlotScene.ts
+++ b/assets/Game/scripts/SlotScene.ts
@ -127,7 +127,11 @@ export class SlotScene extends Component {
    // this.FreeSpinEnter.show(8)
    // this.FreeSpinAdd.show(5)
    // this.BigWinUI.show(800000, WIN_TYPE.SUPER_MEGA_WIN, 10000)
-
+    if (!this.gameInfo.CloseBuyGame) {
+      this.slotGame.showFeatureBuy(
+        this.slotBar.getBet() * this.gameInfo.BuyMul > this.gameInfo.MaxBuyBet
+      );
+    }
  }

  private async init() {
@ -298,14 +302,15 @@ export class SlotScene extends Component {
    if (!isFreeSpin) {
      this.slotBar.setWin(0);
    }
-    let curBalanceData = await this.slotBar.refreshBalanceFromServer()
-    if (!curBalanceData) {
-      curBalanceData = this.slotBar.getBalance()
+    let curBalanceData = await callGameBalanceApi({ GameId: getGameId() })
+    let curBalance = curBalanceData.Balance
+    if (!curBalance) {
+      curBalance = this.slotBar.getBalance()
    }
-    if (curBalanceData < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
+    if (curBalance < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
      //余额不足不经过服务器，在客户端拦截
      this.showErrorTip(2, () => { this.slotBar.onConfirmErr2() });
-      this.handleErrSpin(true);
+      this.handleErrSpin();
      this.isErr2 = true;
      return
    }
--- a/assets/Game/scripts/game/HistoryDetail.ts
+++ b/assets/Game/scripts/game/HistoryDetail.ts
@ -559,7 +559,6 @@ export class HistoryDetail extends Component {
            if (idx == this.data.panDetails.length - 1) {
                // console.log("已全部生成完")
                this.hideLoading()
-                this.item_detail.removeFromParent()
                this.scrollControl.jumpToPage(0)
            }

@ -567,6 +566,7 @@ export class HistoryDetail extends Component {
            await waitNextFrame();
        })

+        this.item_detail.removeFromParent()
        this.scrollControl.vert_scrollView = this.list_detail.content.children[0].getComponent(ScrollView)
        this.list_detail.node.active = true
    }
--- a/assets/Game/scripts/game/Paytable.ts
+++ b/assets/Game/scripts/game/Paytable.ts
@ -1,4 +1,4 @@
-import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
+import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform } from 'cc';
 import { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
 import { getLanguage } from 'db://assets/Loading/scripts/comm';
 const { ccclass, property } = _decorator;
@ -18,7 +18,6 @@ export class Paytable extends Component {
        this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];

        this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
-        this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment()

        this.scrollView.node.on('scrolling', this.onScrolling, this);
        this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
--- a/assets/Game/scripts/game/Rules.ts
+++ b/assets/Game/scripts/game/Rules.ts
@ -1,4 +1,4 @@
-import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
+import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform } from 'cc';
 import { getAllRichTexts, hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
 import { getCsymbol, getLanguage } from 'db://assets/Loading/scripts/comm';
 const { ccclass, property } = _decorator;
@ -16,7 +16,7 @@ export class Rules extends Component {
    protected onLoad(): void {
        this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
        this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
-        this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment()
+
        this.scrollView.node.on('scrolling', this.onScrolling, this);
        this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
    }
@ -49,7 +49,7 @@ export class Rules extends Component {
        Label_1_3.string = str
    }

-
+    
    clickCloseRules() {
        const destroyFunc = () => { this.node.destroy() }
        hideToBottom(this.node, destroyFunc)
--- a/assets/Loading/game.scene
+++ b/assets/Loading/game.scene
@ -23,7 +23,7 @@
    "_active": true,
    "_components": [],
    "_prefab": {
-      "__id__": 91
+      "__id__": 89
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@ -54,7 +54,7 @@
    },
    "autoReleaseAssets": false,
    "_globals": {
-      "__id__": 92
+      "__id__": 90
    },
    "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767"
  },
@ -77,11 +77,17 @@
        "__id__": 8
      },
      {
-        "__id__": 70
+        "__id__": 68
      }
    ],
    "_active": true,
    "_components": [
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 84
+      },
      {
        "__id__": 85
      },
@ -93,19 +99,13 @@
      },
      {
        "__id__": 88
-      },
-      {
-        "__id__": 89
-      },
-      {
-        "__id__": 90
      }
    ],
    "_prefab": null,
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 540,
-      "y": 960,
+      "y": 959.9999999999999,
      "z": 0
    },
    "_lrot": {
@ -190,7 +190,7 @@
    "_priority": 0,
    "_fov": 45,
    "_fovAxis": 0,
-    "_orthoHeight": 960,
+    "_orthoHeight": 959.9999999999999,
    "_near": 0,
    "_far": 2000,
    "_color": {
@ -354,12 +354,6 @@
      },
      {
        "__id__": 67
-      },
-      {
-        "__id__": 68
-      },
-      {
-        "__id__": 69
      }
    ],
    "_prefab": null,
@ -2348,7 +2342,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@ -2448,7 +2442,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@ -2500,7 +2494,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@ -2509,62 +2503,6 @@
    },
    "_id": "b39r/AfidO+pudz3SN7pqo"
  },
-  {
-    "__type__": "cc.Mask",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_type": 0,
-    "_inverted": false,
-    "_segments": 64,
-    "_alphaThreshold": 0.1,
-    "_id": "1bp0mDHnVBYoa14QZI/k1G"
-  },
-  {
-    "__type__": "cc.Graphics",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_lineWidth": 1,
-    "_strokeColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_lineJoin": 2,
-    "_lineCap": 0,
-    "_fillColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 0
-    },
-    "_miterLimit": 10,
-    "_id": "d38dT/Kz1Kub1b05cwraDN"
-  },
  {
    "__type__": "cc.Widget",
    "_name": "",
@ -2575,7 +2513,7 @@
    },
    "_enabled": true,
    "__prefab": null,
-    "_alignFlags": 5,
+    "_alignFlags": 45,
    "_target": null,
    "_left": 0,
    "_right": 0,
@ -2583,17 +2521,17 @@
    "_bottom": 0,
    "_horizontalCenter": 0,
    "_verticalCenter": 0,
-    "_isAbsLeft": true,
+    "_isAbsLeft": false,
    "_isAbsRight": true,
    "_isAbsTop": true,
    "_isAbsBottom": true,
    "_isAbsHorizontalCenter": true,
    "_isAbsVerticalCenter": true,
    "_originalWidth": 1080,
-    "_originalHeight": 2400,
+    "_originalHeight": 1920,
    "_alignMode": 2,
    "_lockFlags": 0,
-    "_id": "2dAW/VTelFD4EAkT5IAFtx"
+    "_id": "ffH2CIHMVCZImyoyKJ54AK"
  },
  {
    "__type__": "cc.Node",
@ -2605,22 +2543,22 @@
    },
    "_children": [
      {
-        "__id__": 71
+        "__id__": 69
      },
      {
-        "__id__": 75
+        "__id__": 73
      },
      {
-        "__id__": 80
+        "__id__": 78
      }
    ],
    "_active": false,
    "_components": [
      {
-        "__id__": 83
+        "__id__": 81
      },
      {
-        "__id__": 84
+        "__id__": 82
      }
    ],
    "_prefab": null,
@ -2659,19 +2597,19 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 70
+      "__id__": 68
    },
    "_children": [],
    "_active": true,
    "_components": [
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 71
+      },
      {
        "__id__": 72
-      },
-      {
-        "__id__": 73
-      },
-      {
-        "__id__": 74
      }
    ],
    "_prefab": null,
@ -2710,7 +2648,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 71
+      "__id__": 69
    },
    "_enabled": true,
    "__prefab": null,
@ -2732,7 +2670,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 71
+      "__id__": 69
    },
    "_enabled": true,
    "__prefab": null,
@ -2744,7 +2682,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 71
+      "__id__": 69
    },
    "_enabled": true,
    "__prefab": null,
@ -2783,22 +2721,22 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 70
+      "__id__": 68
    },
    "_children": [],
    "_active": true,
    "_components": [
+      {
+        "__id__": 74
+      },
+      {
+        "__id__": 75
+      },
      {
        "__id__": 76
      },
      {
        "__id__": 77
-      },
-      {
-        "__id__": 78
-      },
-      {
-        "__id__": 79
      }
    ],
    "_prefab": null,
@ -2837,7 +2775,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 75
+      "__id__": 73
    },
    "_enabled": true,
    "__prefab": null,
@ -2859,7 +2797,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 75
+      "__id__": 73
    },
    "_enabled": true,
    "__prefab": null,
@ -2921,7 +2859,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 75
+      "__id__": 73
    },
    "_enabled": true,
    "__prefab": null,
@ -2934,7 +2872,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 75
+      "__id__": 73
    },
    "_enabled": true,
    "__prefab": null,
@ -2964,16 +2902,16 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 70
+      "__id__": 68
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 81
+        "__id__": 79
      },
      {
-        "__id__": 82
+        "__id__": 80
      }
    ],
    "_prefab": null,
@ -3012,7 +2950,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 78
    },
    "_enabled": true,
    "__prefab": null,
@ -3034,7 +2972,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 78
    },
    "_enabled": true,
    "__prefab": null,
@ -3073,7 +3011,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 70
+      "__id__": 68
    },
    "_enabled": true,
    "__prefab": null,
@ -3095,7 +3033,7 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 70
+      "__id__": 68
    },
    "_enabled": true,
    "__prefab": null,
@ -3132,7 +3070,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@ -3226,7 +3164,7 @@
      "__id__": 58
    },
    "rotateNode": {
-      "__id__": 70
+      "__id__": 68
    },
    "_id": "d8F/UwpTxNpZhwSJjDvnkk"
  },
@ -3283,28 +3221,28 @@
  {
    "__type__": "cc.SceneGlobals",
    "ambient": {
-      "__id__": 93
+      "__id__": 91
    },
    "shadows": {
-      "__id__": 94
+      "__id__": 92
    },
    "_skybox": {
-      "__id__": 95
+      "__id__": 93
    },
    "fog": {
-      "__id__": 96
+      "__id__": 94
    },
    "octree": {
-      "__id__": 97
+      "__id__": 95
    },
    "skin": {
-      "__id__": 98
+      "__id__": 96
    },
    "lightProbeInfo": {
-      "__id__": 99
+      "__id__": 97
    },
    "postSettings": {
-      "__id__": 100
+      "__id__": 98
    },
    "bakedWithStationaryMainLight": false,
    "bakedWithHighpLightmap": false
--- a/assets/Loading/scripts/LayoutAdapter.ts
+++ b/assets/Loading/scripts/LayoutAdapter.ts
@ -1,9 +1,7 @@
 import { _decorator, Node, Component, screen, view, ResolutionPolicy, Sprite, sys, UITransform, Label, find } 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 = {
--- 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 = "eyJQIjoxMDA5NDksIkUiOjE3ODI5MzA5ODEsIlMiOjEwMDAsIkQiOiJycF8xMTAwMSJ9.432SLYXxigvcnlARfSesXWhDOJ06QHzN3OvU791lMiw";
+let token = "eyJQIjoxMDA5NDksIkUiOjE3ODExODU1MzgsIlMiOjEwMDIsIkQiOiJycF8xMTAwMSJ9.MEuOw7xQRgnH1-0hQFXTspVZbXMEsvPBF2BbUFq3wBg";

 let language = "en"
 let currency = "THB"
@ -31,7 +31,7 @@ export function getHistoryUrl() {
 }

 export function getLanguage() {
-    // return 'th';
+    // return 'zh';
    return language;
 }

--- a/package-lock.json
+++ b/package-lock.json
@ -9,15 +9,9 @@
      "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",
--- a/package.json
+++ b/package.json
@ -14,7 +14,6 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
    "nosleep.js": "^0.12.0"
  }
 }