帮助赔率界面使用节点池，减少消耗

.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,
+      "x": 0,
-      "y": 169.184,
+      "y": 140,
       "z": 0
     },
     "_lrot": {
@@ -2073,13 +2073,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197.8125,
+      "width": 260,
-      "height": 50.4
+      "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,
+    "_lineHeight": 45,
-    "_overflow": 0,
+    "_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,
+    "_overflow": 3,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -3026,8 +3026,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0.000500000000000167,
+      "x": 0,
-      "y": 169.184,
+      "y": 140,
       "z": 0
     },
     "_lrot": {
@@ -3067,13 +3067,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197.8125,
+      "width": 260,
-      "height": 50.4
+      "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,
+    "_lineHeight": 45,
-    "_overflow": 0,
+    "_overflow": 3,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -3521,8 +3521,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 131.689453125,
+      "width": 200,
-      "height": 50.4
+      "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,
+    "_overflow": 3,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -4020,8 +4020,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0.000500000000000167,
+      "x": 0,
-      "y": 169.184,
+      "y": 140,
       "z": 0
     },
     "_lrot": {
@@ -4061,13 +4061,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197.8125,
+      "width": 260,
-      "height": 50.4
+      "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,
+    "_lineHeight": 45,
-    "_overflow": 0,
+    "_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,
+    "_overflow": 3,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,

assets/Game/Scripts/SlotBar.ts

@@ -1,6 +1,6 @@
 import { _decorator, Animation, Button, Component, Label, Node, sp, Sprite, tween, Tween, UIOpacity, Vec3, } from "cc";
 import { SLOT_BAR_EVENT } from "./Define";
-import { callGameBalanceApi, getGameId, gold2cash } from "../../Main/Scripts/main/comm";
+import { callGameBalanceApi, getFrom, getGameId, gold2cash } from "../../Main/Scripts/main/comm";
 import { AudioManager } from "../../Main/Scripts/managers/AudioManager";
 import { GameDataManager } from "../../Main/Scripts/managers/GameDataManager";
 import { I18nManager } from "../../Main/Scripts/managers/I18nManager";
@@ -42,6 +42,10 @@ export class SlotBar extends Component {
   @property({ type: [BtnConfig] })
   btnTable: BtnConfig[] = [];
 
+  //全局遮罩
+  @property(Node)
+  gray: Node = null
+
   hasClickSpin: boolean = false;
   hasClickManualStop: boolean = false;
   private isFastSpin: boolean = false;
@@ -483,17 +487,17 @@ export class SlotBar extends Component {
 
   onClickRules() {
     AudioManager.instance.playSFX("Click_Menu_menu");
-    UIManager.instance.showPopup("WebView", "history/prefabs/rules", "Game", null);
+    UIManager.instance.showPopup("rules", "history/prefabs/rules", "Game", null);
   }
 
   onClickPaytable() {
     AudioManager.instance.playSFX("Click_Menu_menu");
-    UIManager.instance.showPopup("WebView", "history/prefabs/paytable", "Game", null);
+    UIManager.instance.showPopup("paytable", "history/prefabs/paytable", "Game", null);
   }
 
   onClickHistory() {
     AudioManager.instance.playSFX("Click_Menu_menu");
-    UIManager.instance.showPopup("WebView", "history/prefabs/history", "Game", null);
+    UIManager.instance.showPopup("history", "history/prefabs/history", "Game", null);
   }
 
   isON = true;
@@ -517,7 +521,14 @@ export class SlotBar extends Component {
       false,
       null,
       () => {
-        window.close();
+        let from = getFrom()
+        console.log('from', from)
+        if (!from || from == "") {
+          window.close()
+        } else {
+          this.gray.active = true
+          location.replace(from)
+        }
       },
       I18nManager.instance.t("AID_QUIT_LEFT_BUTTON"),
       I18nManager.instance.t("AID_ERROR_QUIT_BUTTON")

assets/Game/SlotScene.prefab

@@ -25,26 +25,29 @@
         "__id__": 650
       },
       {
-        "__id__": 1160
+        "__id__": 1168
       },
       {
-        "__id__": 1179
+        "__id__": 1187
+      },
+      {
+        "__id__": 1159
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 1194
+        "__id__": 1202
       },
       {
-        "__id__": 1196
+        "__id__": 1204
       },
       {
-        "__id__": 1198
+        "__id__": 1206
       }
     ],
     "_prefab": {
-      "__id__": 1200
+      "__id__": 1208
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13442,7 +13445,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 1159
+      "__id__": 1167
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -18669,8 +18672,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 40.32
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -18711,7 +18714,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -19387,8 +19390,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 40.32
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19429,7 +19432,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -19785,8 +19788,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 104.32
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19821,13 +19824,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 +20231,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 40.32
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20270,7 +20273,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -20671,8 +20674,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 40.32
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20713,7 +20716,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -21114,8 +21117,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 40.32
+      "height": 42.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -21156,7 +21159,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 32,
+    "_lineHeight": 34,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -24658,6 +24661,9 @@
         "__id__": 1158
       }
     ],
+    "gray": {
+      "__id__": 1159
+    },
     "_id": ""
   },
   {
@@ -24762,6 +24768,154 @@
       "__id__": 848
     }
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "gray",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 1160
+      },
+      {
+        "__id__": 1162
+      },
+      {
+        "__id__": 1164
+      }
+    ],
+    "_prefab": {
+      "__id__": 1166
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1159
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 1161
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1080,
+      "height": 1920
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c20f2wemRDoIkJDo7pmASN"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1159
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 1163
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ecL5kURzRGhZgR14QRz3X1"
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1159
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 1165
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "69ZyVNQ8hFApTYUjCcNSBZ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3b6GzPsepH9aODFEhu4pgl",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -24782,14 +24936,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 1161
+      "__id__": 1169
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 1160
+      "__id__": 1168
     },
     "asset": {
       "__uuid__": "29fb0a1e-a12f-4c41-9000-815327a25730",
@@ -24797,7 +24951,7 @@
     },
     "fileId": "c9QEC2alVDUrRXVFfYng3l",
     "instance": {
-      "__id__": 1162
+      "__id__": 1170
     },
     "targetOverrides": null
   },
@@ -24810,35 +24964,35 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 1163
-      },
-      {
-        "__id__": 1165
-      },
-      {
-        "__id__": 1166
-      },
-      {
-        "__id__": 1167
-      },
-      {
-        "__id__": 1168
-      },
-      {
-        "__id__": 1169
-      },
       {
         "__id__": 1171
       },
       {
         "__id__": 1173
       },
+      {
+        "__id__": 1174
+      },
       {
         "__id__": 1175
       },
+      {
+        "__id__": 1176
+      },
       {
         "__id__": 1177
+      },
+      {
+        "__id__": 1179
+      },
+      {
+        "__id__": 1181
+      },
+      {
+        "__id__": 1183
+      },
+      {
+        "__id__": 1185
       }
     ],
     "removedComponents": []
@@ -24846,7 +25000,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1164
+      "__id__": 1172
     },
     "propertyPath": [
       "_name"
@@ -24862,7 +25016,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1164
+      "__id__": 1172
     },
     "propertyPath": [
       "_lpos"
@@ -24877,7 +25031,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1164
+      "__id__": 1172
     },
     "propertyPath": [
       "_lrot"
@@ -24893,7 +25047,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1164
+      "__id__": 1172
     },
     "propertyPath": [
       "_euler"
@@ -24908,7 +25062,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1164
+      "__id__": 1172
     },
     "propertyPath": [
       "_active"
@@ -24918,7 +25072,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1170
+      "__id__": 1178
     },
     "propertyPath": [
       "_active"
@@ -24934,7 +25088,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1172
+      "__id__": 1180
     },
     "propertyPath": [
       "_active"
@@ -24950,7 +25104,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1174
+      "__id__": 1182
     },
     "propertyPath": [
       "_active"
@@ -24966,7 +25120,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1176
+      "__id__": 1184
     },
     "propertyPath": [
       "_contentSize"
@@ -24986,7 +25140,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1178
+      "__id__": 1186
     },
     "propertyPath": [
       "_active"
@@ -25006,14 +25160,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 1180
+      "__id__": 1188
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 1179
+      "__id__": 1187
     },
     "asset": {
       "__uuid__": "93f49f19-92c8-468b-a67d-b423f3be55f9",
@@ -25021,7 +25175,7 @@
     },
     "fileId": "0d6YCKuIdEs4y/XDNnFU5x",
     "instance": {
-      "__id__": 1181
+      "__id__": 1189
     },
     "targetOverrides": []
   },
@@ -25034,29 +25188,29 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 1182
-      },
-      {
-        "__id__": 1184
-      },
-      {
-        "__id__": 1185
-      },
-      {
-        "__id__": 1186
-      },
-      {
-        "__id__": 1187
-      },
-      {
-        "__id__": 1188
-      },
       {
         "__id__": 1190
       },
       {
         "__id__": 1192
+      },
+      {
+        "__id__": 1193
+      },
+      {
+        "__id__": 1194
+      },
+      {
+        "__id__": 1195
+      },
+      {
+        "__id__": 1196
+      },
+      {
+        "__id__": 1198
+      },
+      {
+        "__id__": 1200
       }
     ],
     "removedComponents": []
@@ -25064,7 +25218,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1183
+      "__id__": 1191
     },
     "propertyPath": [
       "_name"
@@ -25080,7 +25234,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1183
+      "__id__": 1191
     },
     "propertyPath": [
       "_lpos"
@@ -25095,7 +25249,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1183
+      "__id__": 1191
     },
     "propertyPath": [
       "_lrot"
@@ -25111,7 +25265,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1183
+      "__id__": 1191
     },
     "propertyPath": [
       "_euler"
@@ -25126,7 +25280,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1183
+      "__id__": 1191
     },
     "propertyPath": [
       "_active"
@@ -25136,7 +25290,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1189
+      "__id__": 1197
     },
     "propertyPath": [
       "_active"
@@ -25152,7 +25306,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1191
+      "__id__": 1199
     },
     "propertyPath": [
       "_active"
@@ -25168,7 +25322,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1193
+      "__id__": 1201
     },
     "propertyPath": [
       "_contentSize"
@@ -25195,7 +25349,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1195
+      "__id__": 1203
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -25223,7 +25377,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1197
+      "__id__": 1205
     },
     "_alignFlags": 45,
     "_target": null,
@@ -25259,7 +25413,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1199
+      "__id__": 1207
     },
     "slotGame": {
       "__id__": 647
@@ -25290,21 +25444,21 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 1201
+        "__id__": 1209
       },
       {
-        "__id__": 1203
+        "__id__": 1211
       },
       {
-        "__id__": 1205
+        "__id__": 1213
       }
     ],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 1179
+        "__id__": 1187
       },
       {
-        "__id__": 1160
+        "__id__": 1168
       },
       {
         "__id__": 833
@@ -25412,10 +25566,10 @@
       "sysGift"
     ],
     "target": {
-      "__id__": 1160
+      "__id__": 1168
     },
     "targetInfo": {
-      "__id__": 1202
+      "__id__": 1210
     }
   },
   {
@@ -25427,17 +25581,17 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 1198
+      "__id__": 1206
     },
     "sourceInfo": null,
     "propertyPath": [
       "sysGift"
     ],
     "target": {
-      "__id__": 1160
+      "__id__": 1168
     },
     "targetInfo": {
-      "__id__": 1204
+      "__id__": 1212
     }
   },
   {
@@ -25449,17 +25603,17 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 1198
+      "__id__": 1206
     },
     "sourceInfo": null,
     "propertyPath": [
       "slotRanking"
     ],
     "target": {
-      "__id__": 1179
+      "__id__": 1187
     },
     "targetInfo": {
-      "__id__": 1206
+      "__id__": 1214
     }
   },
   {

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,6 +1,7 @@
-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';
+import { NodePoolManager } from 'db://assets/Main/Scripts/managers/NodePoolManager';
 
 const { ccclass, property } = _decorator;
 
@@ -19,6 +20,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);
@@ -44,7 +46,7 @@ export class Paytable extends Component {
     }
 
     clickClosePaytable() {
-        hideToBottom(this.node, () => { this.node.destroy() })
+        hideToBottom(this.node, () => { NodePoolManager.instance.putNodeToPool('paytable', this.node) })
     }
 
     // onScrollEnded(scrollView: ScrollView) {

assets/Game/history/scripts/Rules.ts

@@ -1,6 +1,7 @@
-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';
+import { NodePoolManager } from 'db://assets/Main/Scripts/managers/NodePoolManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('Rules')
@@ -16,6 +17,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);
@@ -50,7 +52,7 @@ export class Rules extends Component {
     }
 
     clickCloseRules() {
-        hideToBottom(this.node, () => { this.node.destroy() })
+        hideToBottom(this.node, () => { NodePoolManager.instance.putNodeToPool('rules', this.node) })
     }
 
     onScrolling(scrollView: ScrollView) {

assets/Game/history/scripts/Tools.ts

@@ -425,7 +425,7 @@ export function showFromBottom(node: Node) {
         height = 1920;
     }
 
-    node.position = new Vec3(0, -height / 2)
+    node.position = new Vec3(0, -height)
     tween(node).to(0.15, { position: new Vec3() }).start()
 }
 

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

@@ -16,6 +16,7 @@ let supportUrl = ""
 let oddsUrl = ""
 let historyUrl = ""
 let isRB7 = false;
+let from = "";
 
 export function getOddsUrl() {
     return oddsUrl;
@@ -30,7 +31,7 @@ export function getHistoryUrl() {
 }
 
 export function getLanguage() {
-    // return 'zh';
+    // return 'my';
     return language;
 }
 
@@ -40,6 +41,10 @@ export function getIsRB7() {
     return isRB7;
 }
 
+export function getFrom() {
+    return from;
+}
+
 export function getCsymbol() {
     return csymbol;
 }
@@ -86,6 +91,11 @@ export function initReqAddr() {
             currency = c
         }
 
+        const fr = qs.get("from");
+        if (fr) {
+            from = fr
+        }
+
         const brand = qs.get("brand")
         if (brand == 'rb7') {
             isRB7 = brand == 'rb7';

assets/Main/Scripts/managers/UIManager.ts

@@ -2,12 +2,13 @@ import { _decorator, director, find, Node, Tween, tween, v3, Vec3 } from 'cc';
 import { NodePoolManager } from './NodePoolManager';
 import { TipMessagePanel } from '../main/TipMessagePanel';
 import { I18nManager } from './I18nManager';
+import { showFromBottom } from 'db://assets/Game/history/scripts/Tools';
 const { ccclass, property } = _decorator;
 
 @ccclass('UIManager')
 export class UIManager {
     private static _instance: UIManager = null;
- 
+
     static get instance() {
         if (this._instance) {
             return this._instance;
@@ -35,6 +36,7 @@ export class UIManager {
         }
 
         this.uiLayer.addChild(prefab);
+        showFromBottom(prefab)
 
         let main = prefab.getChildByName('main');
         if (!main) {
@@ -158,8 +160,8 @@ export class UIManager {
         return controller;
     }
 
-    showTipMessagePanel(title: string, msg: string, isCenter: boolean, confirmCb: () => void, closeCb: () => void, confirmStr: string= I18nManager.instance.t("AID_QUIT_LEFT_BUTTON"),
+    showTipMessagePanel(title: string, msg: string, isCenter: boolean, confirmCb: () => void, closeCb: () => void, confirmStr: string = I18nManager.instance.t("AID_QUIT_LEFT_BUTTON"),
-    cancelStr: string= I18nManager.instance.t("AID_MAIN_OPERATE_CLOSE"),) {
+        cancelStr: string = I18nManager.instance.t("AID_MAIN_OPERATE_CLOSE"),) {
         let scene = director.getScene();
         if (!scene?.isValid) return;
 
@@ -171,7 +173,7 @@ export class UIManager {
         tipMessagePanelComp.setIsCenter(isCenter);
         tipMessagePanelComp.setConfirmCallBack(confirmCb);
         tipMessagePanelComp.setCloseCallBack(closeCb);
-         tipMessagePanelComp.setBtnLabel(isCenter,confirmStr,cancelStr)
+        tipMessagePanelComp.setBtnLabel(isCenter, confirmStr, cancelStr)
         tipMessagePanelComp.show();
     }
 

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