diff --git a/assets/Game/Scripts/SlotBar.ts b/assets/Game/Scripts/SlotBar.ts index 2d48d16..cd36e1a 100644 --- a/assets/Game/Scripts/SlotBar.ts +++ b/assets/Game/Scripts/SlotBar.ts @@ -487,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; diff --git a/assets/Game/history/scripts/Paytable.ts b/assets/Game/history/scripts/Paytable.ts index a28e057..6a93943 100644 --- a/assets/Game/history/scripts/Paytable.ts +++ b/assets/Game/history/scripts/Paytable.ts @@ -1,6 +1,7 @@ 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; @@ -45,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) { diff --git a/assets/Game/history/scripts/Rules.ts b/assets/Game/history/scripts/Rules.ts index 6588378..f66ae43 100644 --- a/assets/Game/history/scripts/Rules.ts +++ b/assets/Game/history/scripts/Rules.ts @@ -1,6 +1,7 @@ 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') @@ -51,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) { diff --git a/assets/Game/history/scripts/Tools.ts b/assets/Game/history/scripts/Tools.ts index e891af2..5b95dfd 100644 --- a/assets/Game/history/scripts/Tools.ts +++ b/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() } diff --git a/assets/Main/Scripts/managers/UIManager.ts b/assets/Main/Scripts/managers/UIManager.ts index aaa0571..1ba3187 100644 --- a/assets/Main/Scripts/managers/UIManager.ts +++ b/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"), - cancelStr: string= I18nManager.instance.t("AID_MAIN_OPERATE_CLOSE"),) { + 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"),) { 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(); }