xionglijia/18xchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

Browse Source
This commit is contained in:
chen wei bo
2025-09-22 17:54:52 +08:00
parent d56c2518f5 365bdf7293
commit 4712f853e3
21 changed files with 1259 additions and 1484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scripts/chat18x/ui/panels/PersonalPanel.ts
+9 -4
View File
@@ -154,9 +154,14 @@ export class PersonalPanel extends li_BaseView {
NavigationManager.Instance.openSubPanel("SettingPanel", this.node);
}
private openPurchase() {
NavigationManager.Instance.openSubPanel("PurchasePanel", this.node, null, {
openAnimation: PageTransitionType.SLIDE_LEFT,
closeAnimation: PageTransitionType.SLIDE_RIGHT,
});
NavigationManager.Instance.openSubPanel(
"PurchasePanel",
this.node,
{ base: this.node },
{
openAnimation: PageTransitionType.SLIDE_LEFT,
closeAnimation: PageTransitionType.SLIDE_RIGHT,
}
);
}
}
assets/Scripts/chat18x/ui/panels/PurchasePanel.ts
+13 -15
View File
@@ -47,6 +47,10 @@ export class PurchasePanel extends li_BaseView {
web3BtnSelecting;
web3BtnNotSelect;
base: Node;
openUIDataCT(data: any): void {
this.base = data.base;
}
onLoadCT(): void {
this.node.active = false;
this.scheduleOnce(() => {
@@ -203,23 +207,17 @@ export class PurchasePanel extends li_BaseView {
payType: param.payType,
goodId: param.goodId,
networkType: this.getDefaultNetworkType(),
base: this,
basePanel: this.base,
payPanel: this,
};
if (
NavigationManager.Instance.getCurrentActivePanel() == PanelType.PERSONAL
)
if (this.web3PopPanel == null)
NavigationManager.Instance.openSubPanel(
"Web3PopPanel",
this.node,
data
);
else {
data.networkType = undefined;
this.web3PopPanel.refreshData(data);
this.web3PopPanel.refreshView();
}
if (this.web3PopPanel == null)
NavigationManager.Instance.openSubPanel("Web3PopPanel", this.base, data);
else {
data.networkType = undefined;
this.web3PopPanel.refreshData(data);
this.web3PopPanel.refreshView();
}
}
getPlayerMerData() {
assets/Scripts/chat18x/ui/panels/ThemePanel.ts
+9 -4
View File
@@ -295,10 +295,15 @@ export class ThemePanel extends li_BaseView {
}
enterShop() {
NavigationManager.Instance.openSubPanel("PurchasePanel", this.node, null, {
openAnimation: PageTransitionType.SLIDE_LEFT,
closeAnimation: PageTransitionType.SLIDE_RIGHT,
});
NavigationManager.Instance.openSubPanel(
"PurchasePanel",
this.node,
{ base: this.node },
{
openAnimation: PageTransitionType.SLIDE_LEFT,
closeAnimation: PageTransitionType.SLIDE_RIGHT,
}
);
}
chatWithRec() {
assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts
+54 -25
View File
@@ -12,6 +12,7 @@ import { TipsPanel } from "./TipsPanel";
import { SDKManager } from "../../../Main/Channel/SDKManager";
import LanguageUtils from "../../../Main/Common/LanguageUtils";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
import { PersonalPanel } from "./PersonalPanel";
const { ccclass, property } = _decorator;
@@ -34,14 +35,16 @@ export class Web3PopPanel extends li_BaseView {
private networkType: proto.cs.EnmNetworkType;
private goodId: number;
private base: PurchasePanel;
private basePanel: PersonalPanel;
private payPanel: PurchasePanel;
private countdownTimer: any;
private remainingSeconds: number = 0;
private isCountingDown: boolean = false;
private tips: Label;
openUIDataCT(data: any): void {
this.refreshData(data);
this.base.web3PopPanel = this;
this.payPanel.web3PopPanel = this;
}
onLoadCT(): void {
@@ -54,6 +57,7 @@ export class Web3PopPanel extends li_BaseView {
this.address = this._nodeTab.addressText.getComponent(Label);
this.expireTimeText = this._nodeTab.expireTimeText.getComponent(Label);
this.qrCode = this._nodeTab.qrCode.getComponent(Sprite);
this.tips = this._nodeTab.tips.getComponent(Label);
this.registerListener();
this.selection.setScale(new Vec3(1, 0, 1));
@@ -83,13 +87,7 @@ export class Web3PopPanel extends li_BaseView {
},
this
);
GButton.BandClick(
this._nodeTab.ENT_BEP,
() => {
this.onClickCoinType(proto.cs.EnmNetworkType.ENT_BEP);
},
this
);
GButton.BandClick(
this._nodeTab.ENT_ETH,
() => {
@@ -97,6 +95,13 @@ export class Web3PopPanel extends li_BaseView {
},
this
);
GButton.BandClick(
this._nodeTab.ENT_BEP,
() => {
this.onClickCoinType(proto.cs.EnmNetworkType.ENT_BEP);
},
this
);
}
refreshData(data: any): void {
@@ -105,7 +110,8 @@ export class Web3PopPanel extends li_BaseView {
this.goodId = data.goodId;
this.curType =
data.networkType != undefined ? data.networkType : this.curType;
this.base = data.base;
this.basePanel = data.basePanel;
this.payPanel = data.payPanel;
}
refreshView() {
const OrderData = DataManager.I.getDataById<OrderData>(DataId.Order);
@@ -127,8 +133,8 @@ export class Web3PopPanel extends li_BaseView {
if (expireTime > 0) {
this.startCountdown(expireTime);
} else {
this.expireTimeText.string = "已过期";
this.expireTimeText.color = new Color(128, 128, 128, 255);
this.expireTimeText.string = LanguageUtils.getText("web3panel.expired");
//this.expireTimeText.color = new Color(128, 128, 128, 255);
this.disableButtons();
}
this.amount.string = amount;
@@ -137,30 +143,46 @@ export class Web3PopPanel extends li_BaseView {
case proto.cs.EnmNetworkType.ENT_TRON:
ResManager.I.changeResourceSpriteFrame(
this.coinIcon,
"ui/web3pop/coinIcon/ENT_TRON"
"ui/web3pop/coinIcon/Tron"
);
this.coinText.string = "Tron(TRC20)";
this.tips.string = LanguageUtils.getText("web3panel.tips").replace(
"{Network}",
"Tron"
);
this.coinText.string = "ENT_TRON";
break;
case proto.cs.EnmNetworkType.ENT_TON:
ResManager.I.changeResourceSpriteFrame(
this.coinIcon,
"ui/web3pop/coinIcon/ENT_TON"
"ui/web3pop/coinIcon/TON"
);
this.coinText.string = "TON";
this.tips.string = LanguageUtils.getText("web3panel.tips").replace(
"{Network}",
"TON"
);
this.coinText.string = "ENT_TON";
break;
case proto.cs.EnmNetworkType.ENT_ETH:
ResManager.I.changeResourceSpriteFrame(
this.coinIcon,
"ui/web3pop/coinIcon/ENT_ETH"
"ui/web3pop/coinIcon/ETH"
);
this.coinText.string = "ETH";
this.tips.string = LanguageUtils.getText("web3panel.tips").replace(
"{Network}",
"ETH"
);
this.coinText.string = "ENT_ETH";
break;
case proto.cs.EnmNetworkType.ENT_BEP:
ResManager.I.changeResourceSpriteFrame(
this.coinIcon,
"ui/web3pop/coinIcon/ENT_BEP"
"ui/web3pop/coinIcon/BEP"
);
this.coinText.string = "BEP";
this.tips.string = LanguageUtils.getText("web3panel.tips").replace(
"{Network}",
"BEP"
);
this.coinText.string = "ENT_BEP";
break;
}
@@ -198,7 +220,11 @@ export class Web3PopPanel extends li_BaseView {
case proto.cs.EnmNetworkType.ENT_BEP:
break;
}
this.base.startPayment(this.goodId, proto.cs.EnmPayType.EPT_WEB3_USD, type);
this.payPanel.startPayment(
this.goodId,
proto.cs.EnmPayType.EPT_WEB3_USD,
type
);
this.selection.scale = new Vec3(1, 0, 1);
}
@@ -222,7 +248,7 @@ export class Web3PopPanel extends li_BaseView {
onClickClose() {
this.stopCountdown();
this.base.web3PopPanel = null;
this.payPanel.web3PopPanel = null;
this.close();
}
@@ -279,14 +305,15 @@ export class Web3PopPanel extends li_BaseView {
if (!this.expireTimeText) return;
const timeText = this.formatCountdownTime(this.remainingSeconds);
this.expireTimeText.string = timeText;
this.expireTimeText.string =
LanguageUtils.getText("web3panel.expire") + timeText;
if (this.remainingSeconds <= 30 && this.remainingSeconds > 0) {
this.expireTimeText.color = new Color(255, 0, 0, 255);
} else if (this.remainingSeconds <= 0) {
this.expireTimeText.color = new Color(128, 128, 128, 255);
} else {
this.expireTimeText.color = new Color(255, 255, 255, 255);
this.expireTimeText.color = new Color(255, 135, 247, 255);
}
}
@@ -329,6 +356,8 @@ export class Web3PopPanel extends li_BaseView {
private onCountdownExpired(): void {
logger.log("Web3支付倒计时已过期");
this.disableButtons();
TipsPanel.show("支付时间已过期，请重新发起支付");
this.expireTimeText.string = LanguageUtils.getText("web3panel.expired");
//TipsPanel.show("支付时间已过期，请重新发起支付");
}
}