diff --git a/assets/Scripts/Main/Manager/ViewManager.ts b/assets/Scripts/Main/Manager/ViewManager.ts index 7c03663e..9ef0285b 100644 --- a/assets/Scripts/Main/Manager/ViewManager.ts +++ b/assets/Scripts/Main/Manager/ViewManager.ts @@ -101,7 +101,11 @@ export class ViewManager extends Component { // t_node.sType = "top" GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_top); } else if (type == "tips") { - GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_tips); + GameRootUI.I.AddUIToLayer( + t_node, + CommonConfig.UILayerGroup.Layer_tips, + -1 + ); } } diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index c46933fd..b5a65a63 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -96,7 +96,7 @@ export class PreloadUI extends Component { this.desc = this._nodeTab.Desc.getComponent(Label); // 设置视频为静音,提高移动端自动播放成功率 - this.VideoPlayer.muted = true; + this.VideoPlayer.mute = true; this.VideoPlayer.loop = true; this.VideoPlayer.stayOnBottom = true; @@ -205,16 +205,25 @@ export class PreloadUI extends Component { // 尝试播放视频 try { this.VideoPlayer.play(); - logger.log(`PreloadUI: Video play attempted (retry: ${this.videoPlayRetryCount}/${this.maxVideoPlayRetry})`); + logger.log( + `PreloadUI: Video play attempted (retry: ${this.videoPlayRetryCount}/${this.maxVideoPlayRetry})` + ); // 延迟检查播放状态,如果失败则重试 this.scheduleOnce(() => { - if (!this.VideoPlayer.isPlaying && this.videoPlayRetryCount < this.maxVideoPlayRetry) { + if ( + !this.VideoPlayer.isPlaying && + this.videoPlayRetryCount < this.maxVideoPlayRetry + ) { this.videoPlayRetryCount++; - logger.warn(`PreloadUI: Video play failed, retrying... (${this.videoPlayRetryCount}/${this.maxVideoPlayRetry})`); + logger.warn( + `PreloadUI: Video play failed, retrying... (${this.videoPlayRetryCount}/${this.maxVideoPlayRetry})` + ); this.tryPlayVideo(); } else if (!this.VideoPlayer.isPlaying) { - logger.warn("PreloadUI: Video autoplay failed after max retries. Will retry on user interaction."); + logger.warn( + "PreloadUI: Video autoplay failed after max retries. Will retry on user interaction." + ); } }, 0.5); } catch (error) { diff --git a/assets/Scripts/chat18x/ui/panels/ChargePopPanel.ts b/assets/Scripts/chat18x/ui/panels/ChargePopPanel.ts index e89ebf65..e4f02681 100644 --- a/assets/Scripts/chat18x/ui/panels/ChargePopPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChargePopPanel.ts @@ -20,15 +20,7 @@ export class ChargePopPanel extends li_BaseView { } gotoCharge() { - NavigationManager.Instance.openSubPanel( - "PurchasePanel", - NavigationManager.Instance.getCurrentActivePanelNode(), - { base: NavigationManager.Instance.getCurrentActivePanelNode() }, - { - openAnimation: PageTransitionType.SLIDE_LEFT, - closeAnimation: PageTransitionType.SLIDE_RIGHT, - } - ); + NavigationManager.Instance.openPopupPanel("PurchasePanel"); this.close(); } diff --git a/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts b/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts index 2c17d086..5eac4139 100644 --- a/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts @@ -155,18 +155,10 @@ export class PersonalPanel extends li_BaseView { private openSettings(): void { // TODO: 打开设置面板 - NavigationManager.Instance.openSubPanel("SettingPanel", this.node); + NavigationManager.Instance.openPopupPanel("SettingPanel", this.node); } private openPurchase() { - NavigationManager.Instance.openSubPanel( - "PurchasePanel", - this.node, - { base: this.node }, - { - openAnimation: PageTransitionType.SLIDE_LEFT, - closeAnimation: PageTransitionType.SLIDE_RIGHT, - } - ); + NavigationManager.Instance.openPopupPanel("PurchasePanel"); } private openFavorites() { diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index e228f412..bc982c02 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -44,10 +44,7 @@ export class PurchasePanel extends li_BaseView { cashBtnSelecting; web3BtnSelecting; - base: Node; - openUIDataCT(data: any): void { - this.base = data.base; - } + openUIDataCT(data: any): void {} onLoadCT(): void { this.node.active = false; this.scheduleOnce(() => { @@ -208,12 +205,11 @@ export class PurchasePanel extends li_BaseView { payType: param.payType, goodId: param.goodId, networkType: this.getDefaultNetworkType(), - basePanel: this.base, payPanel: this, }; if (this.web3PopPanel == null) - NavigationManager.Instance.openSubPanel("Web3PopPanel", this.base, data); + NavigationManager.Instance.openPopupPanel("Web3PopPanel", data); else { data.networkType = undefined; this.web3PopPanel.refreshData(data); diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index bb90c103..9d6f2904 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -470,15 +470,7 @@ export class ThemePanel extends li_BaseView { } enterShop() { - NavigationManager.Instance.openSubPanel( - "PurchasePanel", - this.node, - { base: this.node }, - { - openAnimation: PageTransitionType.SLIDE_LEFT, - closeAnimation: PageTransitionType.SLIDE_RIGHT, - } - ); + NavigationManager.Instance.openPopupPanel("PurchasePanel"); } openRecomandList() { diff --git a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts index d50ef412..f14a10bb 100644 --- a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts @@ -36,7 +36,6 @@ export class Web3PopPanel extends li_BaseView { private networkType: proto.cs.EnmNetworkType; private goodId: number; - private basePanel: PersonalPanel; private payPanel: PurchasePanel; private countdownTimer: any; @@ -112,7 +111,6 @@ export class Web3PopPanel extends li_BaseView { this.goodId = data.goodId; this.curType = data.networkType != undefined ? data.networkType : this.curType; - this.basePanel = data.basePanel; this.payPanel = data.payPanel; } refreshView() { diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index 4a039bc1..31c7afae 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -612,6 +612,8 @@ "__id__": 0 }, "fileId": "eaz1XV32NMAYZ1f8eNu4bc", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -717,13 +719,13 @@ "b": 108, "a": 255 }, - "_string": "已过期", + "_string": "Expired", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, + "_actualFontSize": 17, "_fontSize": 25.6, "_fontFamily": "Arial", - "_lineHeight": 32.4, + "_lineHeight": 48.6, "_overflow": 2, "_enableWrapText": true, "_font": {