diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index c80bc9d..1a1e50d 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.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' diff --git a/assets/Game/prefabs/History/history_detail.prefab b/assets/Game/prefabs/History/history_detail.prefab index 95be1d8..98a0608 100644 --- 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": 155.625, + "width": 200, "height": 75.6 }, "_anchorPoint": { @@ -12132,13 +12132,13 @@ "a": 255 }, "_string": "Transaction", - "_horizontalAlign": 0, + "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, + "_actualFontSize": 31, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 60, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, diff --git a/assets/Loading/scripts/LayoutAdapter.ts b/assets/Loading/scripts/LayoutAdapter.ts index 96970cd..1863466 100644 --- a/assets/Loading/scripts/LayoutAdapter.ts +++ b/assets/Loading/scripts/LayoutAdapter.ts @@ -1,7 +1,9 @@ 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 = { diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index 0e06ac1..faf466f 100644 --- 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 = "eyJQIjoxMDA5NDksIkUiOjE3ODI0MTk0MzcsIlMiOjEwMDEsIkQiOiJycF8xMTAwMSJ9.vtoxQYfRPLeEqzcOqkCE7UIVn6G8xFejT34eR6pixR8"; +let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI3NTk5MjcsIlMiOjEwMDEsIkQiOiJycF8xMTAwMSJ9.AwA0djJhbyWN-O0SzdWu2bAVoFZXURVJXlLWqzpa0uc"; let language = "en" let currency = "THB" @@ -31,7 +31,7 @@ export function getHistoryUrl() { } export function getLanguage() { - // return 'zh'; + return 'my'; return language; } diff --git a/package-lock.json b/package-lock.json index 5118376..0ccbc9d 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index 5fc20a0..8097bcc 100755 --- a/package.json +++ b/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" } }