assets/Game/Prefab/AutoSpinPanel.prefab

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

assets/Game/Prefab/ChooseDiff.prefab

@@ -2032,8 +2032,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 0.000500000000000167,
-      "y": 140,
+      "y": 169.184,
       "z": 0
     },
     "_lrot": {
@@ -2073,13 +2073,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 260,
+      "width": 197.8125,
-      "height": 56.7
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0
+      "y": 0.5
     },
     "_id": ""
   },
@@ -2115,8 +2115,8 @@
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 45,
+    "_lineHeight": 40,
-    "_overflow": 3,
+    "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2527,7 +2527,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
+      "width": 131.689453125,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2570,8 +2570,8 @@
     "_fontSize": 30,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 3,
+    "_overflow": 0,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -3026,8 +3026,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 0.000500000000000167,
-      "y": 140,
+      "y": 169.184,
       "z": 0
     },
     "_lrot": {
@@ -3067,13 +3067,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 260,
+      "width": 197.8125,
-      "height": 56.7
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0
+      "y": 0.5
     },
     "_id": ""
   },
@@ -3109,8 +3109,8 @@
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 45,
+    "_lineHeight": 40,
-    "_overflow": 3,
+    "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -3521,8 +3521,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
+      "width": 131.689453125,
-      "height": 90.39999999999999
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3557,15 +3557,15 @@
       "b": 255,
       "a": 255
     },
-    "_string": "စိတ်လှုပ်ရှားဖွယ်ကစားနည်း",
+    "_string": "Thrill Play",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
     "_fontSize": 30,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 3,
+    "_overflow": 0,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -4020,8 +4020,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 0.000500000000000167,
-      "y": 140,
+      "y": 169.184,
       "z": 0
     },
     "_lrot": {
@@ -4061,13 +4061,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 260,
+      "width": 197.8125,
-      "height": 56.7
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0
+      "y": 0.5
     },
     "_id": ""
   },
@@ -4103,8 +4103,8 @@
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 45,
+    "_lineHeight": 40,
-    "_overflow": 3,
+    "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -4515,7 +4515,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
+      "width": 131.689453125,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -4558,8 +4558,8 @@
     "_fontSize": 30,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 3,
+    "_overflow": 0,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_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, getFrom, getGameId, gold2cash } from "../../Main/Scripts/main/comm";
+import { callGameBalanceApi, 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,10 +42,6 @@ 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;
@@ -487,17 +483,17 @@ export class SlotBar extends Component {
 
   onClickRules() {
     AudioManager.instance.playSFX("Click_Menu_menu");
-    UIManager.instance.showPopup("rules", "history/prefabs/rules", "Game", null);
+    UIManager.instance.showPopup("WebView", "history/prefabs/rules", "Game", null);
   }
 
   onClickPaytable() {
     AudioManager.instance.playSFX("Click_Menu_menu");
-    UIManager.instance.showPopup("paytable", "history/prefabs/paytable", "Game", null);
+    UIManager.instance.showPopup("WebView", "history/prefabs/paytable", "Game", null);
   }
 
   onClickHistory() {
     AudioManager.instance.playSFX("Click_Menu_menu");
-    UIManager.instance.showPopup("history", "history/prefabs/history", "Game", null);
+    UIManager.instance.showPopup("WebView", "history/prefabs/history", "Game", null);
   }
 
   isON = true;
@@ -521,14 +517,7 @@ export class SlotBar extends Component {
       false,
       null,
       () => {
-        let from = getFrom()
+        window.close();
-        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,29 +25,26 @@
         "__id__": 650
       },
       {
-        "__id__": 1168
+        "__id__": 1160
       },
       {
-        "__id__": 1187
+        "__id__": 1179
-      },
-      {
-        "__id__": 1159
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 1202
+        "__id__": 1194
       },
       {
-        "__id__": 1204
+        "__id__": 1196
       },
       {
-        "__id__": 1206
+        "__id__": 1198
       }
     ],
     "_prefab": {
-      "__id__": 1208
+      "__id__": 1200
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13445,7 +13442,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 1167
+      "__id__": 1159
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -18672,8 +18669,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
+      "width": 150,
-      "height": 42.84
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -18714,7 +18711,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 34,
+    "_lineHeight": 32,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -19390,8 +19387,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
+      "width": 150,
-      "height": 42.84
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19432,7 +19429,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 34,
+    "_lineHeight": 32,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -19788,8 +19785,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
+      "width": 150,
-      "height": 42.84
+      "height": 104.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19824,13 +19821,13 @@
       "b": 187,
       "a": 255
     },
-    "_string": "Tabela de",
+    "_string": "Tabela de pagamentos",
     "_horizontalAlign": 1,
     "_verticalAlign": 0,
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 34,
+    "_lineHeight": 32,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -20231,8 +20228,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
+      "width": 150,
-      "height": 42.84
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20273,7 +20270,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 34,
+    "_lineHeight": 32,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -20674,8 +20671,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
+      "width": 150,
-      "height": 42.84
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20716,7 +20713,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 34,
+    "_lineHeight": 32,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -21117,8 +21114,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
+      "width": 150,
-      "height": 42.84
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -21159,7 +21156,7 @@
     "_actualFontSize": 32,
     "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 34,
+    "_lineHeight": 32,
     "_overflow": 3,
     "_enableWrapText": true,
     "_font": {
@@ -24661,9 +24658,6 @@
         "__id__": 1158
       }
     ],
-    "gray": {
-      "__id__": 1159
-    },
     "_id": ""
   },
   {
@@ -24768,154 +24762,6 @@
       "__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": {
@@ -24936,14 +24782,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 1169
+      "__id__": 1161
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 1168
+      "__id__": 1160
     },
     "asset": {
       "__uuid__": "29fb0a1e-a12f-4c41-9000-815327a25730",
@@ -24951,7 +24797,7 @@
     },
     "fileId": "c9QEC2alVDUrRXVFfYng3l",
     "instance": {
-      "__id__": 1170
+      "__id__": 1162
     },
     "targetOverrides": null
   },
@@ -24964,35 +24810,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": []
@@ -25000,7 +24846,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1172
+      "__id__": 1164
     },
     "propertyPath": [
       "_name"
@@ -25016,7 +24862,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1172
+      "__id__": 1164
     },
     "propertyPath": [
       "_lpos"
@@ -25031,7 +24877,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1172
+      "__id__": 1164
     },
     "propertyPath": [
       "_lrot"
@@ -25047,7 +24893,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1172
+      "__id__": 1164
     },
     "propertyPath": [
       "_euler"
@@ -25062,7 +24908,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1172
+      "__id__": 1164
     },
     "propertyPath": [
       "_active"
@@ -25072,7 +24918,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1178
+      "__id__": 1170
     },
     "propertyPath": [
       "_active"
@@ -25088,7 +24934,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1180
+      "__id__": 1172
     },
     "propertyPath": [
       "_active"
@@ -25104,7 +24950,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1182
+      "__id__": 1174
     },
     "propertyPath": [
       "_active"
@@ -25120,7 +24966,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1184
+      "__id__": 1176
     },
     "propertyPath": [
       "_contentSize"
@@ -25140,7 +24986,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1186
+      "__id__": 1178
     },
     "propertyPath": [
       "_active"
@@ -25160,14 +25006,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 1188
+      "__id__": 1180
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 1187
+      "__id__": 1179
     },
     "asset": {
       "__uuid__": "93f49f19-92c8-468b-a67d-b423f3be55f9",
@@ -25175,7 +25021,7 @@
     },
     "fileId": "0d6YCKuIdEs4y/XDNnFU5x",
     "instance": {
-      "__id__": 1189
+      "__id__": 1181
     },
     "targetOverrides": []
   },
@@ -25188,29 +25034,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": []
@@ -25218,7 +25064,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1191
+      "__id__": 1183
     },
     "propertyPath": [
       "_name"
@@ -25234,7 +25080,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1191
+      "__id__": 1183
     },
     "propertyPath": [
       "_lpos"
@@ -25249,7 +25095,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1191
+      "__id__": 1183
     },
     "propertyPath": [
       "_lrot"
@@ -25265,7 +25111,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1191
+      "__id__": 1183
     },
     "propertyPath": [
       "_euler"
@@ -25280,7 +25126,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1191
+      "__id__": 1183
     },
     "propertyPath": [
       "_active"
@@ -25290,7 +25136,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1197
+      "__id__": 1189
     },
     "propertyPath": [
       "_active"
@@ -25306,7 +25152,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1199
+      "__id__": 1191
     },
     "propertyPath": [
       "_active"
@@ -25322,7 +25168,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 1201
+      "__id__": 1193
     },
     "propertyPath": [
       "_contentSize"
@@ -25349,7 +25195,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1203
+      "__id__": 1195
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -25377,7 +25223,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1205
+      "__id__": 1197
     },
     "_alignFlags": 45,
     "_target": null,
@@ -25413,7 +25259,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1207
+      "__id__": 1199
     },
     "slotGame": {
       "__id__": 647
@@ -25444,21 +25290,21 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 1209
+        "__id__": 1201
       },
       {
-        "__id__": 1211
+        "__id__": 1203
       },
       {
-        "__id__": 1213
+        "__id__": 1205
       }
     ],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 1187
+        "__id__": 1179
       },
       {
-        "__id__": 1168
+        "__id__": 1160
       },
       {
         "__id__": 833
@@ -25566,10 +25412,10 @@
       "sysGift"
     ],
     "target": {
-      "__id__": 1168
+      "__id__": 1160
     },
     "targetInfo": {
-      "__id__": 1210
+      "__id__": 1202
     }
   },
   {
@@ -25581,17 +25427,17 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 1206
+      "__id__": 1198
     },
     "sourceInfo": null,
     "propertyPath": [
       "sysGift"
     ],
     "target": {
-      "__id__": 1168
+      "__id__": 1160
     },
     "targetInfo": {
-      "__id__": 1212
+      "__id__": 1204
     }
   },
   {
@@ -25603,17 +25449,17 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 1206
+      "__id__": 1198
     },
     "sourceInfo": null,
     "propertyPath": [
       "slotRanking"
     ],
     "target": {
-      "__id__": 1187
+      "__id__": 1179
     },
     "targetInfo": {
-      "__id__": 1214
+      "__id__": 1206
     }
   },
   {

assets/Game/history/prefabs/history_detail.prefab

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

assets/Game/history/scripts/HistoryDetail.ts

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

assets/Game/history/scripts/Rules.ts

@@ -1,7 +1,6 @@
-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/Main/Scripts/main/comm';
-import { NodePoolManager } from 'db://assets/Main/Scripts/managers/NodePoolManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('Rules')
@@ -17,7 +16,6 @@ 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);
@@ -52,7 +50,7 @@ export class Rules extends Component {
     }
 
     clickCloseRules() {
-        hideToBottom(this.node, () => { NodePoolManager.instance.putNodeToPool('rules', this.node) })
+        hideToBottom(this.node, () => { this.node.destroy() })
     }
 
     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)
+    node.position = new Vec3(0, -height / 2)
     tween(node).to(0.15, { position: new Vec3() }).start()
 }
 

assets/Main/Scripts/main/comm.ts

@@ -16,7 +16,6 @@ let supportUrl = ""
 let oddsUrl = ""
 let historyUrl = ""
 let isRB7 = false;
-let from = "";
 
 export function getOddsUrl() {
     return oddsUrl;
@@ -41,10 +40,6 @@ export function getIsRB7() {
     return isRB7;
 }
 
-export function getFrom() {
-    return from;
-}
-
 export function getCsymbol() {
     return csymbol;
 }
@@ -91,11 +86,6 @@ 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,7 +2,6 @@ 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')
@@ -36,7 +35,6 @@ export class UIManager {
         }
 
         this.uiLayer.addChild(prefab);
-        showFromBottom(prefab)
 
         let main = prefab.getChildByName('main');
         if (!main) {

assets/Main/TipMessagePanel.prefab

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

assets/Main/main.scene

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