UI修改

.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'

assets/Game/Prefab/AutoSpinPanel.prefab

@@ -1240,7 +1240,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 811.1579999999999,
-      "height": 58
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1470,7 +1470,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 674.271,
-      "height": 61.084999999999994
+      "height": 70
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1700,7 +1700,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 320,
-      "height": 32.76
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Game/Prefab/ChooseDiff.prefab

@@ -2032,8 +2032,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0.000500000000000167,
-      "y": 169.184,
+      "x": 0,
+      "y": 140,
       "z": 0
     },
     "_lrot": {
@@ -2073,13 +2073,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197.8125,
-      "height": 50.4
+      "width": 260,
+      "height": 56.7
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_id": ""
   },
@@ -2115,8 +2115,8 @@
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
+    "_lineHeight": 45,
+    "_overflow": 3,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2527,7 +2527,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 131.689453125,
+      "width": 200,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2570,8 +2570,8 @@
     "_fontSize": 30,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": false,
+    "_overflow": 3,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -3026,8 +3026,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0.000500000000000167,
-      "y": 169.184,
+      "x": 0,
+      "y": 140,
       "z": 0
     },
     "_lrot": {
@@ -3067,13 +3067,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197.8125,
-      "height": 50.4
+      "width": 260,
+      "height": 56.7
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_id": ""
   },
@@ -3109,8 +3109,8 @@
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
+    "_lineHeight": 45,
+    "_overflow": 3,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -3521,8 +3521,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 131.689453125,
-      "height": 50.4
+      "width": 200,
+      "height": 90.39999999999999
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3557,15 +3557,15 @@
       "b": 255,
       "a": 255
     },
-    "_string": "Thrill Play",
+    "_string": "စိတ်လှုပ်ရှားဖွယ်ကစားနည်း",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
     "_fontSize": 30,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": false,
+    "_overflow": 3,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -4020,8 +4020,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0.000500000000000167,
-      "y": 169.184,
+      "x": 0,
+      "y": 140,
       "z": 0
     },
     "_lrot": {
@@ -4061,13 +4061,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197.8125,
-      "height": 50.4
+      "width": 260,
+      "height": 56.7
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_id": ""
   },
@@ -4103,8 +4103,8 @@
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
+    "_lineHeight": 45,
+    "_overflow": 3,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -4515,7 +4515,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 131.689453125,
+      "width": 200,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -4558,8 +4558,8 @@
     "_fontSize": 30,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": false,
+    "_overflow": 3,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,

assets/Game/SlotScene.prefab

@@ -18669,8 +18669,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 40.32
+      "width": 172,
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -18711,7 +18711,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -19387,8 +19387,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 40.32
+      "width": 172,
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19429,7 +19429,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -19785,8 +19785,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 104.32
+      "width": 172,
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19821,13 +19821,13 @@
       "b": 187,
       "a": 255
     },
-    "_string": "Tabela de pagamentos",
+    "_string": "Tabela de",
     "_horizontalAlign": 1,
     "_verticalAlign": 0,
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -20228,8 +20228,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 40.32
+      "width": 172,
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20270,7 +20270,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -20671,8 +20671,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 40.32
+      "width": 172,
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20713,7 +20713,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -21114,8 +21114,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 40.32
+      "width": 172,
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -21156,7 +21156,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {

assets/Game/history/prefabs/history_detail.prefab

@@ -12217,7 +12217,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 155.625,
+      "width": 200,
       "height": 75.6
     },
     "_anchorPoint": {
@@ -12254,13 +12254,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,

assets/Game/history/scripts/HistoryDetail.ts

@@ -668,6 +668,7 @@ export class HistoryDetail extends Component {
             if (idx == this.data.panDetails.length - 1) {
                 // console.log("已全部生成完")
                 this.hideLoading()
+                this.item_detail.removeFromParent()
                 this.scrollControl.jumpToPage(0)
             }
 
@@ -676,7 +677,6 @@ export class HistoryDetail extends Component {
 
         })
 
-        this.item_detail.removeFromParent()
         this.scrollControl.vert_scrollView = this.list_detail.content.children[0].getComponent(ScrollView)
         this.list_detail.node.active = true
 

assets/Game/history/scripts/Paytable.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform } from 'cc';
+import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
 import { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
 import { getLanguage } from 'db://assets/Main/Scripts/main/comm';
 
@@ -19,6 +19,7 @@ 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);

assets/Game/history/scripts/Rules.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform } from 'cc';
+import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
 import { getAllRichTexts, hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
 import { getCsymbol, getLanguage } from 'db://assets/Main/Scripts/main/comm';
 const { ccclass, property } = _decorator;
@@ -16,6 +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);

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 = {

assets/Main/Scripts/main/comm.ts

@@ -30,7 +30,7 @@ export function getHistoryUrl() {
 }
 
 export function getLanguage() {
-    // return 'zh';
+    // return 'my';
     return language;
 }
 

assets/Main/TipMessagePanel.prefab

@@ -27,18 +27,18 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 94
-      },
       {
         "__id__": 96
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -287,26 +287,26 @@
         "__id__": 33
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 73
+        "__id__": 75
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 91
       },
       {
-        "__id__": 91
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -718,7 +718,7 @@
     "_actualFontSize": 57,
     "_fontSize": 56,
     "_fontFamily": "Arial",
-    "_lineHeight": 56,
+    "_lineHeight": 57,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -836,10 +836,13 @@
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -920,13 +923,13 @@
       "b": 255,
       "a": 255
     },
-    "_string": "label",
+    "_string": "လက်ကျန်ငွေ မလုံလောက်ပါ။ အရောင်းပမာဏကို ပြောင်းလဲကြည့်ရှုပါ။",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 43,
     "_fontSize": 42,
     "_fontFamily": "Arial",
-    "_lineHeight": 42,
+    "_lineHeight": 57,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -1012,6 +1015,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "7bvpzJamlOlquyMqNzwm5Q"
   },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 33
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9b/qfHIkVPwZouLlXmPvo4"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1021,8 +1043,6 @@
       "__id__": 0
     },
     "fileId": "d0C7b4KtxF3Z5olPuBCkBH",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1035,20 +1055,20 @@
     },
     "_children": [
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 54
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1085,14 +1105,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 43
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 43
-      },
       {
         "__id__": 45
       },
@@ -1101,10 +1118,13 @@
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1141,11 +1161,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1169,11 +1189,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1240,11 +1260,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "key": "Confirm",
     "_id": ""
@@ -1259,11 +1279,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "isBold": true,
     "fontOther": {
@@ -1315,11 +1335,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1343,11 +1363,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1405,20 +1425,20 @@
     },
     "_children": [
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 70
       },
       {
-        "__id__": 70
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1455,14 +1475,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 57
+      "__id__": 59
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 59
-      },
       {
         "__id__": 61
       },
@@ -1471,10 +1488,13 @@
       },
       {
         "__id__": 65
+      },
+      {
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1511,11 +1531,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1539,11 +1559,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1610,11 +1630,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 66
     },
     "key": "Confirm",
     "_id": ""
@@ -1629,11 +1649,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "isBold": true,
     "fontOther": {
@@ -1685,11 +1705,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1713,11 +1733,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1775,20 +1795,20 @@
     },
     "_children": [
       {
-        "__id__": 74
+        "__id__": 76
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 86
       },
       {
-        "__id__": 86
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1825,14 +1845,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 73
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 75
-      },
       {
         "__id__": 77
       },
@@ -1841,10 +1858,13 @@
       },
       {
         "__id__": 81
+      },
+      {
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1881,11 +1901,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1909,11 +1929,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1980,11 +2000,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "key": "Close",
     "_id": ""
@@ -1999,11 +2019,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "isBold": true,
     "fontOther": {
@@ -2055,11 +2075,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2083,11 +2103,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2145,7 +2165,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2173,7 +2193,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2222,7 +2242,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 97
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2250,7 +2270,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2286,7 +2306,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_id": ""
   },

assets/Main/main.scene

@@ -1960,7 +1960,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 326.66748046875,
-      "height": 56.7
+      "height": 69.3
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1995,7 +1995,7 @@
     "_actualFontSize": 45,
     "_fontSize": 45,
     "_fontFamily": "Arial",
-    "_lineHeight": 45,
+    "_lineHeight": 55,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -2568,7 +2568,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2400
+      "height": 2360
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3240,7 +3240,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 580,
-      "height": 60
+      "height": 62
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3275,7 +3275,7 @@
     "_actualFontSize": 58,
     "_fontSize": 58,
     "_fontFamily": "Arial",
-    "_lineHeight": 60,
+    "_lineHeight": 62,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -3522,7 +3522,7 @@
     "_actualFontSize": 44,
     "_fontSize": 43,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 62,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {

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"
+    }
+  }
+}

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"
   }
 }