diff --git a/Ps/片头.aep b/Ps/片头.aep index 20b6ecd5..fe9f1810 100644 Binary files a/Ps/片头.aep and b/Ps/片头.aep differ diff --git a/assets/Scripts/chat18x/payment/PaymentService.ts b/assets/Scripts/chat18x/payment/PaymentService.ts index 2d94b0bc..02a474c4 100644 --- a/assets/Scripts/chat18x/payment/PaymentService.ts +++ b/assets/Scripts/chat18x/payment/PaymentService.ts @@ -45,7 +45,7 @@ export class PaymentService { orderData.saveOrderData(create.data); // 发出事件,支付订单创建成功 - Utils.sendInnerMsg(InnerMsgCode.PayOrderCreateSucc, { orderId: orderId, payType: req.payType }); + Utils.sendInnerMsg(InnerMsgCode.PayOrderCreateSucc, { orderId: orderId, payType: req.payType,goodId:req.goodId }); // 分发流程 const flow = this.flowMap[req.payType]; diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index 5ac9e105..de5a09e1 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -12,7 +12,8 @@ import { GirlData } from "../../data/GirlData"; import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService"; import { PaymentService } from "db://assets/Scripts/chat18x/payment/PaymentService"; import proto from "db://assets/Scripts/proto/proto.pb.js"; -import { NavigationManager } from "../../manager/NavigationManager"; +import { NavigationManager, PanelType } from "../../manager/NavigationManager"; +import { Web3PopPanel } from "./Web3PopPanel"; const { ccclass, property } = _decorator; @@ -26,9 +27,15 @@ export class PurchasePanel extends li_BaseView { private vipPrice30: Label; private vipTime30: Label; + private currentPayType: proto.cs.EnmPayType = + proto.cs.EnmPayType.EPT_Cash_INR; + private defaultNetworkType: proto.cs.EnmNetworkType.ENT_TRON; + public web3PopPanel: Web3PopPanel; @property([PurchasePanelItem]) public items: PurchasePanelItem[] = []; - + getDefaultNetworkType(): proto.cs.EnmNetworkType { + return this.defaultNetworkType; + } onLoadCT(): void { Utils.parseNode(this.node, this._nodeTab); this.coinNum = this._nodeTab.coinNum.getComponent(Label); @@ -46,6 +53,9 @@ export class PurchasePanel extends li_BaseView { Utils.addInnerEL(InnerMsgCode.VipExpireChange, this, () => { this.onVipExpireChange(); }); + Utils.addInnerEL(InnerMsgCode.PayOrderCreateSucc, this, () => { + this.createOrRefreshWeb3PayPanel; + }); for (let index = 0; index < this.items.length; index++) { const element = this.items[index]; @@ -119,22 +129,48 @@ export class PurchasePanel extends li_BaseView { const rechargeIds = this.shopData.getRechargeIds(); for (let index = 0; index < this.items.length; index++) { const element = this.items[index]; - element.refresh(rechargeIds[index]); + element.refresh(type, rechargeIds[index]); + } + if (type == 0) { + this.currentPayType = proto.cs.EnmPayType.EPT_Cash_INR; + } else { + this.currentPayType = proto.cs.EnmPayType.EPT_WEB3_USD; } } - setDiamondTag(id: number) { + purchaseGood(id: number, networkType: proto.cs.EnmNetworkType) { const shopData = DataManager.I.getDataById(DataId.Shop); const isRechargeId = shopData.isRechargeId(id); if (isRechargeId) { // 需要外部支付进行购买 - this.startPayment(id, proto.cs.EnmPayType.EPT_Cash_INR, proto.cs.EnmNetworkType.ENT_TRON); - } else { - //是u币充值,打开页面 - NavigationManager.Instance.openSubPanel("Web3PopPanel", this.node); + this.startPayment(id, this.currentPayType, networkType); } } + createOrRefreshWeb3PayPanel(param: any) { + const data = { + orderId: param.orderId, + payType: param.payType, + goodId: param.goodId, + networkType: this.defaultNetworkType, + base: this, + }; + + if ( + NavigationManager.Instance.getCurrentActivePanel() == PanelType.PERSONAL + ) + if (this.web3PopPanel === null) + NavigationManager.Instance.openSubPanel( + "Web3PopPanel", + this.node, + data + ); + else { + this.web3PopPanel.refreshData(data); + this.web3PopPanel.refreshView(); + } + } + getPlayerMerData() { //todo: 获取服务器玩家商业化数据 this.refreshCoinNum(); @@ -217,8 +253,15 @@ export class PurchasePanel extends li_BaseView { } onDestroy() { - Utils.removeInnerEL(InnerMsgCode.BalanceChange, this, () => {}); - Utils.removeInnerEL(InnerMsgCode.VipExpireChange, this, () => {}); + Utils.removeInnerEL(InnerMsgCode.BalanceChange, this, () => { + this.onBalanceChange(); + }); + Utils.removeInnerEL(InnerMsgCode.VipExpireChange, this, () => { + this.onVipExpireChange(); + }); + Utils.addInnerEL(InnerMsgCode.PayOrderCreateSucc, this, () => { + this.createOrRefreshWeb3PayPanel; + }); super.onDestroy(); } } diff --git a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts index 0f2c523b..7405270b 100644 --- a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts @@ -2,26 +2,52 @@ import { _decorator, Component, Label, Node, Sprite, Vec3 } from "cc"; import li_BaseView from "../../../Main/Common/li_BaseView"; import Utils from "../../../Main/Common/Utils"; import { GButton } from "../../../Main/Common/GButton"; +import { DataId, DataManager } from "../../data/DataManager"; +import { OrderData } from "../../data/OrderData"; +import proto from "db://assets/Scripts/proto/proto.pb.js"; +import ResManager from "../../../Main/Manager/ResManager"; +import { PurchasePanel } from "./PurchasePanel"; + const { ccclass, property } = _decorator; @ccclass("Web3PopPanel") export class Web3PopPanel extends li_BaseView { private _nodeTab: any = {}; + private amount: Label; private coinIcon: Sprite; private coinText: Label; + private address: Label; + private expireTimeText: Label; private selection: Node; - private curType: number; + private curType: proto.cs.EnmNetworkType; + + private orderId; + private payType; + private networkType: proto.cs.EnmNetworkType; + private goodId: number; + + private base: PurchasePanel; + openUIDataCT(data: any): void { + this.refreshData(data); + this.base.web3PopPanel = this; + } + onLoadCT(): void { Utils.parseNode(this.node, this._nodeTab); + this.amount = this._nodeTab.chargeAmount.getComponent(Label); this.selection = this._nodeTab.Selection; - this.coinIcon = this._nodeTab.SelectedCoinIcon; - this.coinText = this._nodeTab._SelectedCoinText; + this.coinIcon = this._nodeTab.SelectedCoinIcon.getComponent(Sprite); + this.coinText = this._nodeTab.SelectedCoinText.getComponent(Label); + this.address = this._nodeTab.addressText.getComponent(Label); + this.expireTimeText = this._nodeTab.expireTimeText.getComponent(Label); this.registerListener(); this.selection.setScale(new Vec3(1, 0, 1)); + + this.refreshView(); } registerListener() { GButton.BandClick(this._nodeTab.closeBtn, this.onClickClose, this); @@ -33,23 +59,30 @@ export class Web3PopPanel extends li_BaseView { GButton.BandClick(this._nodeTab.CopyBtn, this.onClickCopy, this); GButton.BandClick( - this._nodeTab.CoinType1, + this._nodeTab.ENT_TRON, () => { - this.onClickCoinType(1); + this.onClickCoinType(proto.cs.EnmNetworkType.ENT_TRON); }, this ); GButton.BandClick( - this._nodeTab.CoinType2, + this._nodeTab.ENT_TON, () => { - this.onClickCoinType(2); + this.onClickCoinType(proto.cs.EnmNetworkType.ENT_TON); }, this ); GButton.BandClick( - this._nodeTab.CoinType3, + this._nodeTab.ENT_BEP, () => { - this.onClickCoinType(3); + this.onClickCoinType(proto.cs.EnmNetworkType.ENT_BEP); + }, + this + ); + GButton.BandClick( + this._nodeTab.ENT_ETH, + () => { + this.onClickCoinType(proto.cs.EnmNetworkType.ENT_ETH); }, this ); @@ -58,8 +91,54 @@ export class Web3PopPanel extends li_BaseView { init() { this.curType = 1; } - refresh() { - //this.coinIcon + refreshData(data: any): void { + this.orderId = data.orderId; + this.payType = data.payType; + this.goodId = data.goodId; + this.networkType = data.networkType; + this.base = data.base; + } + refreshView() { + const OrderData = DataManager.I.getDataById(DataId.Order); + + const amount = OrderData.getAmountById(this.orderId); + const walletUrl = OrderData.getWalletById(this.orderId); + + const expireTime = OrderData.getExpireById(this.orderId); + const retCode = OrderData.getRetCodeById(this.orderId); + + this.amount.string = amount; + this.address.string = walletUrl; + switch (this.networkType) { + case proto.cs.EnmNetworkType.ENT_TRON: + ResManager.I.changeResourceSpriteFrame( + this.coinIcon, + "ui/web3pop/coinIcon/ENT_TRON" + ); + this.coinText.string = "ENT_TRON"; + break; + case proto.cs.EnmNetworkType.ENT_TON: + ResManager.I.changeResourceSpriteFrame( + this.coinIcon, + "ui/web3pop/coinIcon/ENT_TON" + ); + this.coinText.string = "ENT_TON"; + break; + case proto.cs.EnmNetworkType.ENT_ETH: + ResManager.I.changeResourceSpriteFrame( + this.coinIcon, + "ui/web3pop/coinIcon/ENT_ETH" + ); + this.coinText.string = "ENT_ETH"; + break; + case proto.cs.EnmNetworkType.ENT_BEP: + ResManager.I.changeResourceSpriteFrame( + this.coinIcon, + "ui/web3pop/coinIcon/ENT_BEP" + ); + this.coinText.string = "ENT_BEP"; + break; + } } updateSelectNetwork() {} @@ -68,14 +147,21 @@ export class Web3PopPanel extends li_BaseView { this.selection.scale = new Vec3(1, 1, 1); } - onClickCoinType(type: number) { + onClickCoinType(type: proto.cs.EnmNetworkType) { this.curType = type; - if (type == 1) { - } else if (type == 2) { - } else if (type == 3) { - } else { + switch (type) { + case proto.cs.EnmNetworkType.ENT_TRON: + break; + case proto.cs.EnmNetworkType.ENT_TON: + break; + case proto.cs.EnmNetworkType.ENT_ETH: + break; + case proto.cs.EnmNetworkType.ENT_BEP: + break; } + this.base.startPayment(this.goodId, proto.cs.EnmPayType.EPT_WEB3_USD, type); + this.selection.scale = new Vec3(1, 0, 1); } diff --git a/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts b/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts index 01176924..abbdf078 100644 --- a/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts +++ b/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts @@ -26,12 +26,12 @@ export class PurchasePanelItem extends Component { GButton.BandClick(this.node, this.onClickThis, this); } - public refresh(goodId: number) { + public refresh(type: number, goodId: number) { this.goodId = goodId; - this.show(); + this.show(type); } - public show() { + public show(type: number) { const shopData = DataManager.I.getDataById(DataId.Shop); const count = shopData.getCountById(this.goodId); this.count.string = count.toString(); @@ -39,7 +39,7 @@ export class PurchasePanelItem extends Component { this.price.string = price.toString(); let path = ""; - if (this.goodId > 2000) { + if (type == 1) { // web3币 path += "ui/shop/coin/"; } //cash @@ -52,6 +52,6 @@ export class PurchasePanelItem extends Component { } async onClickThis() { - this.baseView.setDiamondTag(this.goodId); + this.baseView.purchaseGood(this.goodId,this.baseView.getDefaultNetworkType()); } } diff --git a/assets/bundles/Chat18x/Web3PopPanel.prefab b/assets/bundles/Chat18x/Web3PopPanel.prefab index a3b48ffc..4e3a7154 100644 --- a/assets/bundles/Chat18x/Web3PopPanel.prefab +++ b/assets/bundles/Chat18x/Web3PopPanel.prefab @@ -38,22 +38,25 @@ }, { "__id__": 184 + }, + { + "__id__": 216 } ], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 236 }, { - "__id__": 218 + "__id__": 238 }, { - "__id__": 220 + "__id__": 240 } ], "_prefab": { - "__id__": 222 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -802,7 +805,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 382.3520000000001, + "y": 410.539, "z": 0 }, "_lrot": { @@ -837,7 +840,7 @@ "__id__": 30 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 32 @@ -1609,7 +1612,7 @@ }, { "__type__": "cc.Node", - "_name": "amount", + "_name": "chargeAmount", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2775,7 +2778,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 167.67600000000004, + "x": 39.653999999999996, "y": 0, "z": 0 }, @@ -2816,12 +2819,12 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 242.0859375, + "width": 275.264453, "height": 50.4 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -2852,14 +2855,14 @@ "b": 255, "a": 255 }, - "_string": "Select Network", - "_horizontalAlign": 1, + "_string": "TRON Mainnet", + "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 36, + "_actualFontSize": 37, "_fontSize": 36, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -2962,7 +2965,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@f9941", + "__uuid__": "49b048c9-5df5-441e-bab1-71e783a89c38@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4793,7 +4796,7 @@ }, { "__type__": "cc.Node", - "_name": "amount", + "_name": "addressText", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -5402,6 +5405,506 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "expireTime", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 217 + }, + { + "__id__": 225 + } + ], + "_active": true, + "_components": [ + { + "__id__": 231 + }, + { + "__id__": 233 + } + ], + "_prefab": { + "__id__": 235 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 13.932999999999993, + "y": 336.22800000000007, + "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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 216 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 218 + }, + { + "__id__": 220 + }, + { + "__id__": 222 + } + ], + "_prefab": { + "__id__": 224 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -231.85000000000002, + "y": -2.8290000000001783, + "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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 217 + }, + "_enabled": true, + "__prefab": { + "__id__": 219 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 34, + "height": 34 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "18rP84qnJMiZlwABZcR2bi" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 217 + }, + "_enabled": true, + "__prefab": { + "__id__": 221 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "a39de313-5d51-4b74-9dfd-ee34e4a68dc7@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ccdrxsbzJE1baMXFfmZvYG" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 217 + }, + "_enabled": true, + "__prefab": { + "__id__": 223 + }, + "_alignFlags": 9, + "_target": null, + "_left": -44.36510950000003, + "_right": 0, + "_top": 11.029000000000178, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 34, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "26vrfTY7ZJlZaozxaoOM5f" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1fhDfRwH1DvrJ1ypnhqmvR", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "expireTimeText", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 216 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 226 + }, + { + "__id__": 228 + } + ], + "_prefab": { + "__id__": 230 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -4.004000000000019, + "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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 225 + }, + "_enabled": true, + "__prefab": { + "__id__": 227 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "78eiLJuahKppvoD+GP0npT" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 225 + }, + "_enabled": true, + "__prefab": { + "__id__": 229 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "label", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 37, + "_fontSize": 36.4, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "97qw1pZZpIGYyqINJO7VGr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e7sSg9KvRIYKLY4QNctc2+", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 216 + }, + "_enabled": true, + "__prefab": { + "__id__": 232 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 408.969781, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "caFB6v34JCiZ5omWsvMGOQ" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 216 + }, + "_enabled": true, + "__prefab": { + "__id__": 234 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 135, + "b": 247, + "a": 255 + }, + "_string": "expireTime:", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 36, + "_fontSize": 36, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 3, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "eehLl7akNETIy0JvO+0zMo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6fB8Gy5QRC2qHC6x3aKXuo", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -5412,7 +5915,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", @@ -5440,7 +5943,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 239 }, "_alignFlags": 45, "_target": null, @@ -5476,7 +5979,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 241 }, "m_rootNode": null, "_id": "" diff --git a/assets/resources/ui/web3pop/coinIcon.meta b/assets/resources/ui/web3pop/coinIcon.meta new file mode 100644 index 00000000..da64ae5a --- /dev/null +++ b/assets/resources/ui/web3pop/coinIcon.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "5a016087-9db9-4683-b272-d19dd09ca6b2", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/ui/web3pop/Solana blockchain platform - Wikipedia.png b/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png similarity index 100% rename from assets/resources/ui/web3pop/Solana blockchain platform - Wikipedia.png rename to assets/resources/ui/web3pop/coinIcon/ENT_BEP.png diff --git a/assets/resources/ui/web3pop/Solana blockchain platform - Wikipedia.png.meta b/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta similarity index 95% rename from assets/resources/ui/web3pop/Solana blockchain platform - Wikipedia.png.meta rename to assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta index 68494694..ee339ea5 100644 --- a/assets/resources/ui/web3pop/Solana blockchain platform - Wikipedia.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a", - "displayName": "Solana blockchain platform - Wikipedia", + "displayName": "ENT_BEP", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@f9941", - "displayName": "Solana blockchain platform - Wikipedia", + "displayName": "ENT_BEP", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/resources/ui/web3pop/图层 933 拷贝.png b/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png similarity index 100% rename from assets/resources/ui/web3pop/图层 933 拷贝.png rename to assets/resources/ui/web3pop/coinIcon/ENT_ETH.png diff --git a/assets/resources/ui/web3pop/图层 933 拷贝.png.meta b/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta similarity index 97% rename from assets/resources/ui/web3pop/图层 933 拷贝.png.meta rename to assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta index fe7d0fbb..21a8f84b 100644 --- a/assets/resources/ui/web3pop/图层 933 拷贝.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a", - "displayName": "图层 933 拷贝", + "displayName": "ENT_ETH", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@f9941", - "displayName": "图层 933 拷贝", + "displayName": "ENT_ETH", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/resources/ui/web3pop/图层 3.png b/assets/resources/ui/web3pop/coinIcon/ENT_TON.png similarity index 100% rename from assets/resources/ui/web3pop/图层 3.png rename to assets/resources/ui/web3pop/coinIcon/ENT_TON.png diff --git a/assets/resources/ui/web3pop/图层 3.png.meta b/assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta similarity index 97% rename from assets/resources/ui/web3pop/图层 3.png.meta rename to assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta index 58aa3083..6c98ea38 100644 --- a/assets/resources/ui/web3pop/图层 3.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a", - "displayName": "图层 3", + "displayName": "ENT_TON", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@f9941", - "displayName": "图层 3", + "displayName": "ENT_TON", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/resources/ui/web3pop/图层 2.png b/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png similarity index 100% rename from assets/resources/ui/web3pop/图层 2.png rename to assets/resources/ui/web3pop/coinIcon/ENT_TRON.png diff --git a/assets/resources/ui/web3pop/图层 2.png.meta b/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta similarity index 97% rename from assets/resources/ui/web3pop/图层 2.png.meta rename to assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta index 95b54839..53454dd0 100644 --- a/assets/resources/ui/web3pop/图层 2.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a", - "displayName": "图层 2", + "displayName": "ENT_TRON", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "49b048c9-5df5-441e-bab1-71e783a89c38@f9941", - "displayName": "图层 2", + "displayName": "ENT_TRON", "id": "f9941", "name": "spriteFrame", "userData": {