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",
@@ -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/scripts/Paytable.ts

@@ -1,7 +1,6 @@
 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;
 
@@ -46,7 +45,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 { 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')
@@ -52,7 +51,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) {