UI修改

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/SlotScene.prefab

@@ -18669,8 +18669,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
+      "width": 172,
-      "height": 40.32
+      "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,
+      "width": 172,
-      "height": 40.32
+      "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,
+      "width": 172,
-      "height": 104.32
+      "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,
+      "width": 172,
-      "height": 40.32
+      "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,
+      "width": 172,
-      "height": 40.32
+      "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,
+      "width": 172,
-      "height": 40.32
+      "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/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/comm.ts

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

assets/Main/main.scene

@@ -2568,7 +2568,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2400
+      "height": 2360
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",