diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 887c50c..87d4d08 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -17,6 +17,11 @@ jobs: pwd git pull 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/Main/Scripts/main/LayoutAdapter.ts b/assets/Main/Scripts/main/LayoutAdapter.ts index 5f72bad..d40c0e9 100644 --- a/assets/Main/Scripts/main/LayoutAdapter.ts +++ b/assets/Main/Scripts/main/LayoutAdapter.ts @@ -1,6 +1,7 @@ import { _decorator, Node, Component, screen, view, ResolutionPolicy, Sprite, sys, Widget, Label, find } from 'cc'; import { getLanguage } from './comm'; - +import { installLabelAlignmentCenterFix } from 'common_tools'; +installLabelAlignmentCenterFix(); const { ccclass, property } = _decorator; export let SWITCH_PROTRAIT_MODE = { diff --git a/assets/Main/Scripts/main/comm.ts b/assets/Main/Scripts/main/comm.ts index b3e6df9..e58b9f7 100644 --- a/assets/Main/Scripts/main/comm.ts +++ b/assets/Main/Scripts/main/comm.ts @@ -30,7 +30,7 @@ export function getHistoryUrl() { } export function getLanguage() { - // return 'zh'; + // return 'my'; return language; } diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..a5373a9 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,18 @@ +{ + "name": "rp_11009", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "rp_11009", + "dependencies": { + "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git" + } + }, + "node_modules/common_tools": { + "version": "1.0.0", + "resolved": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git#c49bf2990a6f348489505ac4998683c814b58dde", + "license": "MIT" + } + } +} diff --git a/package.json b/package.json index 0758a7d..26faeaa 100755 --- a/package.json +++ b/package.json @@ -3,5 +3,8 @@ "uuid": "212985c9-4fb2-457f-818a-2a374975fc36", "creator": { "version": "3.8.5" + }, + "dependencies": { + "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git" } }