帮助赔率历史记录的屏幕适配

assets/Game/scripts/game/History.ts

@@ -1,4 +1,4 @@
-import { _decorator, Button, Color, Component, EventHandler, EventMouse, instantiate, isValid, JsonAsset, Label, math, Node, Prefab, ScrollView, sp, tween, UITransform, Vec3 } from 'cc';
+import { _decorator, Button, Color, Component, EventHandler, EventMouse, instantiate, isValid, JsonAsset, Label, math, Node, Prefab, ScrollView, sp, tween, UIOpacity, UITransform, Vec3 } from 'cc';
 import { getCsymbol, getHistory, getHistoryDetails, getLanguage } from '../../../Loading/scripts/comm';
 import { fixNum, getTimezoneOffsetString, getTranslate, hideAllChildren, hideToBottom, isBrahmic, showAllChildren, updateLang } from './Tools';
 const { ccclass, property } = _decorator;
@@ -405,6 +405,7 @@ export class History extends Component {
         // console.log("clickItem, roundId = ", roundId)
 
         const history_detail = instantiate(this.history_detail)
+        history_detail.getComponent(UIOpacity).opacity = 0
         this.node_detail.addChild(history_detail)
         let data = await getHistoryDetails({
             GameId: "rp_11001",
@@ -415,6 +416,8 @@ export class History extends Component {
 
         const self = this
         history_detail.position = new Vec3(1080, 0)
+        history_detail.getComponent(UIOpacity).opacity = 255
+
         tween(history_detail).to(0.2, { position: new Vec3(0, 0) })
             .call(() => {
                 self.scheduleOnce(() => { comp.entryFinish() })

assets/Game/scripts/game/HistoryDetail.ts

@@ -197,7 +197,7 @@ export class HistoryDetail extends Component {
         node.active = true
 
         let startVec = new Vec3(0, 3000)
-        let endVec = new Vec3(0, 800)
+        let endVec = new Vec3(0, this.list_detail.node.getPosition().y)
 
         node.position = startVec
         tween(node).to(0.2, { position: endVec }).call(() => {
@@ -566,6 +566,7 @@ export class HistoryDetail extends Component {
             await waitNextFrame();
         })
 
+        this.item_detail.removeFromParent()
         this.scrollControl.vert_scrollView = this.list_detail.content.children[0].getComponent(ScrollView)
         this.list_detail.node.active = true
     }
@@ -647,15 +648,16 @@ export class HistoryDetail extends Component {
     showLoading() {
         this.loading.active = true
         let sk = this.loading.getComponent(sp.Skeleton)
-        sk.paused = false
+        // sk.paused = false
-        sk.loop = true
+        // sk.loop = true
+        sk.setAnimation(0, 'loadingLoop')
     }
 
     hideLoading() {
         let sk = this.loading.getComponent(sp.Skeleton)
-        sk.paused = true
+        // sk.paused = true
-        sk.loop = false
+        // sk.loop = false
-
+        sk.clearAnimations()
         this.loading.active = false
 
     }

assets/Loading/game.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 90
+      "__id__": 89
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 91
+      "__id__": 90
     },
     "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767"
   },
@@ -77,11 +77,17 @@
         "__id__": 8
       },
       {
-        "__id__": 70
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 84
+      },
       {
         "__id__": 85
       },
@@ -93,9 +99,6 @@
       },
       {
         "__id__": 88
-      },
-      {
-        "__id__": 89
       }
     ],
     "_prefab": null,
@@ -351,12 +354,6 @@
       },
       {
         "__id__": 67
-      },
-      {
-        "__id__": 68
-      },
-      {
-        "__id__": 69
       }
     ],
     "_prefab": null,
@@ -2345,7 +2342,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2560
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2445,7 +2442,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2560
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2497,7 +2494,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2560
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2520,8 +2517,8 @@
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": -320,
+    "_top": 0,
-    "_bottom": -320,
+    "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": false,
@@ -2536,62 +2533,6 @@
     "_lockFlags": 0,
     "_id": "ffH2CIHMVCZImyoyKJ54AK"
   },
-  {
-    "__type__": "cc.Mask",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_type": 0,
-    "_inverted": false,
-    "_segments": 64,
-    "_alphaThreshold": 0.1,
-    "_id": "31IUj90uNGboMG/ZgAfkg4"
-  },
-  {
-    "__type__": "cc.Graphics",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_lineWidth": 1,
-    "_strokeColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_lineJoin": 2,
-    "_lineCap": 0,
-    "_fillColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 0
-    },
-    "_miterLimit": 10,
-    "_id": "88ENBOYIpCGKFcHVTgSMzZ"
-  },
   {
     "__type__": "cc.Node",
     "_name": "tips",
@@ -2602,22 +2543,22 @@
     },
     "_children": [
       {
-        "__id__": 71
+        "__id__": 69
       },
       {
-        "__id__": 75
+        "__id__": 73
       },
       {
-        "__id__": 80
+        "__id__": 78
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 81
       },
       {
-        "__id__": 84
+        "__id__": 82
       }
     ],
     "_prefab": null,
@@ -2656,19 +2597,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 71
+      },
       {
         "__id__": 72
-      },
-      {
-        "__id__": 73
-      },
-      {
-        "__id__": 74
       }
     ],
     "_prefab": null,
@@ -2707,7 +2648,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": null,
@@ -2729,7 +2670,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": null,
@@ -2741,7 +2682,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": null,
@@ -2780,22 +2721,22 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 74
+      },
+      {
+        "__id__": 75
+      },
       {
         "__id__": 76
       },
       {
         "__id__": 77
-      },
-      {
-        "__id__": 78
-      },
-      {
-        "__id__": 79
       }
     ],
     "_prefab": null,
@@ -2834,7 +2775,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": null,
@@ -2856,7 +2797,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": null,
@@ -2918,7 +2859,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": null,
@@ -2931,7 +2872,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": null,
@@ -2961,16 +2902,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 79
       },
       {
-        "__id__": 82
+        "__id__": 80
       }
     ],
     "_prefab": null,
@@ -3009,7 +2950,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": null,
@@ -3031,7 +2972,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": null,
@@ -3070,7 +3011,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": null,
@@ -3092,7 +3033,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": null,
@@ -3223,7 +3164,7 @@
       "__id__": 58
     },
     "rotateNode": {
-      "__id__": 70
+      "__id__": 68
     },
     "_id": "d8F/UwpTxNpZhwSJjDvnkk"
   },
@@ -3239,6 +3180,36 @@
     "__prefab": null,
     "_id": "46W4D2JoFNZZugl/RX7IG4"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_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": 1080,
+    "_originalHeight": 1920,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": "afR8mXvHhEeIs7Aiv76HNP"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": null,
@@ -3250,28 +3221,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 92
+      "__id__": 91
     },
     "shadows": {
-      "__id__": 93
+      "__id__": 92
     },
     "_skybox": {
-      "__id__": 94
+      "__id__": 93
     },
     "fog": {
-      "__id__": 95
+      "__id__": 94
     },
     "octree": {
-      "__id__": 96
+      "__id__": 95
     },
     "skin": {
-      "__id__": 97
+      "__id__": 96
     },
     "lightProbeInfo": {
-      "__id__": 98
+      "__id__": 97
     },
     "postSettings": {
-      "__id__": 99
+      "__id__": 98
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

assets/Loading/scripts/comm.ts

@@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
 const gameId = "rp_11001";
 // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
 let apiaddr = "";
-let token = "eyJQIjoxMDA5NDksIkUiOjE3NzIwMjYxNzYsIlMiOjEwMDMsIkQiOiJycF8xMTAwMSJ9.3wfZ318ajoHyaEkAcGF9VKAW6qXko5aTVFw1K1rr478";
+let token = "eyJQIjoxMDA5NDksIkUiOjE3Nzk5Nzk1NzUsIlMiOjEwMDEsIkQiOiJycF8xMTAwMSJ9.zFNHlm0quBGtYIxM735w8tij2YjXvkTldJ1_rCP-oqk";
 
 let language = "en"
 let currency = "THB"
@@ -53,7 +53,7 @@ export function getGameId() {
 }
 
 export function initReqAddr() {
-    let partHost = ".rpfafafahkdev.com";
+    let partHost = ".rpenenenhkdev.com";
     if (!PREVIEW) {
         const qs = new URLSearchParams(location.search)
 

assets/Loading/scripts/i18n/LocalizedLabel2.ts

@@ -94,6 +94,5 @@ export class LocalizedLabel2 extends Component {
         }
         this.label.isBold = this.isBold;
         this.label.updateRenderData();
-        console.log(currentLang, 'targetFont', targetFont);
     }
 }