diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index 19a1bffb..1980ac96 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -207,7 +207,8 @@ export class PurchasePanel extends li_BaseView { payType: param.payType, goodId: param.goodId, networkType: this.getDefaultNetworkType(), - base: this.base, + basePanel: this.base, + payPanel: this, }; if (this.web3PopPanel == null) diff --git a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts index e8576ee5..dd87f370 100644 --- a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts @@ -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(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("支付时间已过期,请重新发起支付"); } } diff --git a/assets/bundles/Chat18x/Web3PopPanel.prefab b/assets/bundles/Chat18x/Web3PopPanel.prefab index 4cd7cb3e..1fbce173 100644 --- a/assets/bundles/Chat18x/Web3PopPanel.prefab +++ b/assets/bundles/Chat18x/Web3PopPanel.prefab @@ -22,41 +22,41 @@ "__id__": 2 }, { - "__id__": 30 + "__id__": 32 }, { - "__id__": 44 + "__id__": 48 }, { - "__id__": 76 + "__id__": 80 }, { - "__id__": 82 + "__id__": 86 }, { - "__id__": 88 + "__id__": 92 }, { - "__id__": 208 + "__id__": 212 }, { - "__id__": 244 + "__id__": 248 } ], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 270 }, { - "__id__": 266 + "__id__": 272 }, { - "__id__": 268 + "__id__": 274 } ], "_prefab": { - "__id__": 270 + "__id__": 276 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,14 +106,14 @@ "_active": true, "_components": [ { - "__id__": 25 + "__id__": 27 }, { - "__id__": 27 + "__id__": 29 } ], "_prefab": { - "__id__": 29 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", @@ -548,10 +548,13 @@ }, { "__id__": 22 + }, + { + "__id__": 24 } ], "_prefab": { - "__id__": 24 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -681,6 +684,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "e3rc7PLYJCra06FfdIxfET" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "languageKey": "web3panel.title", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51esHu7thNt6npEve+fVOq" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -704,7 +728,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 28 }, "_contentSize": { "__type__": "cc.Size", @@ -732,7 +756,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 30 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -790,20 +814,23 @@ }, "_children": [ { - "__id__": 31 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 41 }, { - "__id__": 41 + "__id__": 43 + }, + { + "__id__": 45 } ], "_prefab": { - "__id__": 43 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -840,23 +867,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 30 + "__id__": 32 }, "_children": [], "_active": false, "_components": [ - { - "__id__": 32 - }, { "__id__": 34 }, { "__id__": 36 + }, + { + "__id__": 38 } ], "_prefab": { - "__id__": 38 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -893,11 +920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -921,11 +948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -966,11 +993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 39 }, "_alignFlags": 9, "_target": null, @@ -1015,11 +1042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -1043,11 +1070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1105,6 +1132,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1bosF3eUdGNZ66VUTvm+vI" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 46 + }, + "languageKey": "web3panel.warning", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b8exDMa7BAvLkQRxAOaJEn" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1128,23 +1176,23 @@ }, "_children": [ { - "__id__": 45 + "__id__": 49 }, { - "__id__": 57 + "__id__": 61 }, { - "__id__": 65 + "__id__": 69 } ], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 77 } ], "_prefab": { - "__id__": 75 + "__id__": 79 }, "_lpos": { "__type__": "cc.Vec3", @@ -1181,24 +1229,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 48 }, "_children": [ { - "__id__": 46 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 56 }, { - "__id__": 54 + "__id__": 58 } ], "_prefab": { - "__id__": 56 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -1235,20 +1283,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 45 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 51 }, { - "__id__": 49 + "__id__": 53 } ], "_prefab": { - "__id__": 51 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -1285,11 +1333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1313,11 +1361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1371,11 +1419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -1399,11 +1447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1457,23 +1505,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 58 - }, - { - "__id__": 60 - }, { "__id__": 62 + }, + { + "__id__": 64 + }, + { + "__id__": 66 } ], "_prefab": { - "__id__": 64 + "__id__": 68 }, "_lpos": { "__type__": "cc.Vec3", @@ -1510,11 +1558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1538,11 +1586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 65 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1609,11 +1657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 67 }, "languageKey": "web3panel.amount", "defaultText": "", @@ -1643,23 +1691,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 66 - }, - { - "__id__": 68 - }, { "__id__": 70 + }, + { + "__id__": 72 + }, + { + "__id__": 74 } ], "_prefab": { - "__id__": 72 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1696,11 +1744,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1724,11 +1772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1792,11 +1840,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 75 }, "_alignFlags": 0, "_target": null, @@ -1841,11 +1889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 78 }, "_contentSize": { "__type__": "cc.Size", @@ -1888,14 +1936,14 @@ "_active": true, "_components": [ { - "__id__": 77 + "__id__": 81 }, { - "__id__": 79 + "__id__": 83 } ], "_prefab": { - "__id__": 81 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", @@ -1932,11 +1980,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 82 }, "_contentSize": { "__type__": "cc.Size", @@ -1960,11 +2008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 84 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2021,14 +2069,14 @@ "_active": true, "_components": [ { - "__id__": 83 + "__id__": 87 }, { - "__id__": 85 + "__id__": 89 } ], "_prefab": { - "__id__": 87 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -2065,11 +2113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 88 }, "_contentSize": { "__type__": "cc.Size", @@ -2093,11 +2141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2178,26 +2226,26 @@ }, "_children": [ { - "__id__": 89 + "__id__": 93 }, { - "__id__": 97 + "__id__": 101 }, { - "__id__": 111 + "__id__": 115 }, { - "__id__": 123 + "__id__": 127 } ], "_active": true, "_components": [ { - "__id__": 205 + "__id__": 209 } ], "_prefab": { - "__id__": 207 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", @@ -2234,23 +2282,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 92 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 90 - }, - { - "__id__": 92 - }, { "__id__": 94 + }, + { + "__id__": 96 + }, + { + "__id__": 98 } ], "_prefab": { - "__id__": 96 + "__id__": 100 }, "_lpos": { "__type__": "cc.Vec3", @@ -2287,11 +2335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2315,11 +2363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2386,11 +2434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 99 }, "languageKey": "web3panel.network", "defaultText": "", @@ -2420,27 +2468,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 92 }, "_children": [ { - "__id__": 98 + "__id__": 102 } ], "_active": true, "_components": [ - { - "__id__": 104 - }, - { - "__id__": 106 - }, { "__id__": 108 + }, + { + "__id__": 110 + }, + { + "__id__": 112 } ], "_prefab": { - "__id__": 110 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -2477,20 +2525,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 97 + "__id__": 101 }, "_children": [], "_active": true, "_components": [ { - "__id__": 99 + "__id__": 103 }, { - "__id__": 101 + "__id__": 105 } ], "_prefab": { - "__id__": 103 + "__id__": 107 }, "_lpos": { "__type__": "cc.Vec3", @@ -2527,11 +2575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -2555,11 +2603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 106 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2613,11 +2661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -2641,11 +2689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 111 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2686,11 +2734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 113 }, "clickEvents": [], "_interactable": true, @@ -2755,24 +2803,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 92 }, "_children": [ { - "__id__": 112 + "__id__": 116 } ], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 122 }, { - "__id__": 120 + "__id__": 124 } ], "_prefab": { - "__id__": 122 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -2809,20 +2857,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 111 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 117 }, { - "__id__": 115 + "__id__": 119 } ], "_prefab": { - "__id__": 117 + "__id__": 121 }, "_lpos": { "__type__": "cc.Vec3", @@ -2859,11 +2907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -2887,11 +2935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 120 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2903,7 +2951,7 @@ "b": 255, "a": 255 }, - "_string": "TRON Mainnet", + "_string": "Tron(TRC20)", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 37, @@ -2968,16 +3016,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 123 }, "_contentSize": { "__type__": "cc.Size", - "width": 67, - "height": 67 + "width": 63, + "height": 63 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2996,11 +3044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 125 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3013,7 +3061,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49b048c9-5df5-441e-bab1-71e783a89c38@f9941", + "__uuid__": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3054,36 +3102,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 92 }, "_children": [ { - "__id__": 124 + "__id__": 128 }, { - "__id__": 142 + "__id__": 146 }, { - "__id__": 160 + "__id__": 164 }, { - "__id__": 178 + "__id__": 182 } ], "_active": true, "_components": [ - { - "__id__": 198 - }, - { - "__id__": 200 - }, { "__id__": 202 + }, + { + "__id__": 204 + }, + { + "__id__": 206 } ], "_prefab": { - "__id__": 204 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -3120,27 +3168,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 123 + "__id__": 127 }, "_children": [ { - "__id__": 125 + "__id__": 129 }, { - "__id__": 131 + "__id__": 135 } ], "_active": true, "_components": [ { - "__id__": 137 + "__id__": 141 }, { - "__id__": 139 + "__id__": 143 } ], "_prefab": { - "__id__": 141 + "__id__": 145 }, "_lpos": { "__type__": "cc.Vec3", @@ -3177,20 +3225,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 124 + "__id__": 128 }, "_children": [], "_active": true, "_components": [ { - "__id__": 126 + "__id__": 130 }, { - "__id__": 128 + "__id__": 132 } ], "_prefab": { - "__id__": 130 + "__id__": 134 }, "_lpos": { "__type__": "cc.Vec3", @@ -3227,16 +3275,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", - "width": 67, - "height": 67 + "width": 63, + "height": 63 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3255,11 +3303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3272,7 +3320,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49b048c9-5df5-441e-bab1-71e783a89c38@f9941", + "__uuid__": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3313,20 +3361,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 124 + "__id__": 128 }, "_children": [], "_active": true, "_components": [ { - "__id__": 132 + "__id__": 136 }, { - "__id__": 134 + "__id__": 138 } ], "_prefab": { - "__id__": 136 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -3363,15 +3411,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", - "width": 194.009765625, + "width": 210.69140625, "height": 50.4 }, "_anchorPoint": { @@ -3391,11 +3439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3407,7 +3455,7 @@ "b": 255, "a": 255 }, - "_string": "ENT_TRON", + "_string": "Tron(TRC20)", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 36, @@ -3472,11 +3520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 142 }, "_contentSize": { "__type__": "cc.Size", @@ -3500,11 +3548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 144 }, "clickEvents": [], "_interactable": true, @@ -3569,27 +3617,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 123 + "__id__": 127 }, "_children": [ { - "__id__": 143 + "__id__": 147 }, { - "__id__": 149 + "__id__": 153 } ], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 159 }, { - "__id__": 157 + "__id__": 161 } ], "_prefab": { - "__id__": 159 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", @@ -3626,20 +3674,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 146 }, "_children": [], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 148 }, { - "__id__": 146 + "__id__": 150 } ], "_prefab": { - "__id__": 148 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -3676,16 +3724,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", - "width": 64, - "height": 71 + "width": 63, + "height": 63 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3704,11 +3752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 151 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3721,7 +3769,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@f9941", + "__uuid__": "e7365632-f721-473c-b545-7e9d56140774@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3762,20 +3810,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 146 }, "_children": [], "_active": true, "_components": [ { - "__id__": 150 + "__id__": 154 }, { - "__id__": 152 + "__id__": 156 } ], "_prefab": { - "__id__": 154 + "__id__": 158 }, "_lpos": { "__type__": "cc.Vec3", @@ -3812,15 +3860,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", - "width": 167.361328125, + "width": 75.33984375, "height": 50.4 }, "_anchorPoint": { @@ -3840,11 +3888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3856,7 +3904,7 @@ "b": 255, "a": 255 }, - "_string": "ENT_TON", + "_string": "TON", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 36, @@ -3921,11 +3969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 160 }, "_contentSize": { "__type__": "cc.Size", @@ -3949,11 +3997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 162 }, "clickEvents": [], "_interactable": true, @@ -4018,27 +4066,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 123 + "__id__": 127 }, "_children": [ { - "__id__": 161 + "__id__": 165 }, { - "__id__": 167 + "__id__": 171 } ], "_active": true, "_components": [ { - "__id__": 173 + "__id__": 177 }, { - "__id__": 175 + "__id__": 179 } ], "_prefab": { - "__id__": 177 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", @@ -4075,20 +4123,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 166 }, { - "__id__": 164 + "__id__": 168 } ], "_prefab": { - "__id__": 166 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -4125,16 +4173,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", - "width": 70, - "height": 70 + "width": 63, + "height": 63 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4153,11 +4201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 169 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4170,7 +4218,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@f9941", + "__uuid__": "ecc0567a-892a-4356-914b-73c100168288@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4211,20 +4259,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 172 }, { - "__id__": 170 + "__id__": 174 } ], "_prefab": { - "__id__": 172 + "__id__": 176 }, "_lpos": { "__type__": "cc.Vec3", @@ -4261,15 +4309,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", - "width": 164.056640625, + "width": 72, "height": 50.4 }, "_anchorPoint": { @@ -4289,11 +4337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4305,7 +4353,7 @@ "b": 255, "a": 255 }, - "_string": "ENT_BEP", + "_string": "ETH", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 36, @@ -4370,11 +4418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 178 }, "_contentSize": { "__type__": "cc.Size", @@ -4398,11 +4446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 180 }, "clickEvents": [], "_interactable": true, @@ -4467,30 +4515,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 123 + "__id__": 127 }, "_children": [ { - "__id__": 179 + "__id__": 183 }, { - "__id__": 185 + "__id__": 189 } ], "_active": true, "_components": [ - { - "__id__": 191 - }, - { - "__id__": 193 - }, { "__id__": 195 + }, + { + "__id__": 197 + }, + { + "__id__": 199 } ], "_prefab": { - "__id__": 197 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -4527,20 +4575,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 178 + "__id__": 182 }, "_children": [], "_active": true, "_components": [ { - "__id__": 180 + "__id__": 184 }, { - "__id__": 182 + "__id__": 186 } ], "_prefab": { - "__id__": 184 + "__id__": 188 }, "_lpos": { "__type__": "cc.Vec3", @@ -4577,16 +4625,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 179 + "__id__": 183 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 185 }, "_contentSize": { "__type__": "cc.Size", - "width": 67, - "height": 67 + "width": 63, + "height": 63 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4605,11 +4653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 179 + "__id__": 183 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 187 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4622,7 +4670,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@f9941", + "__uuid__": "4ac28fc0-5891-44b4-953c-8940d43379b0@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4663,20 +4711,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 178 + "__id__": 182 }, "_children": [], "_active": true, "_components": [ { - "__id__": 186 + "__id__": 190 }, { - "__id__": 188 + "__id__": 192 } ], "_prefab": { - "__id__": 190 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -4713,15 +4761,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", - "width": 164.021484375, + "width": 72.03515625, "height": 50.4 }, "_anchorPoint": { @@ -4741,11 +4789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 193 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4757,7 +4805,7 @@ "b": 255, "a": 255 }, - "_string": "ENT_ETH", + "_string": "BEP", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 36, @@ -4822,11 +4870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 178 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 196 }, "_contentSize": { "__type__": "cc.Size", @@ -4850,11 +4898,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 178 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4892,11 +4940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 178 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 200 }, "clickEvents": [], "_interactable": true, @@ -4961,11 +5009,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -4989,11 +5037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5034,11 +5082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 207 }, "_resizeMode": 0, "_layoutType": 2, @@ -5085,11 +5133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 210 }, "_contentSize": { "__type__": "cc.Size", @@ -5130,23 +5178,23 @@ }, "_children": [ { - "__id__": 209 + "__id__": 213 }, { - "__id__": 217 + "__id__": 221 }, { - "__id__": 225 + "__id__": 229 } ], "_active": true, "_components": [ { - "__id__": 241 + "__id__": 245 } ], "_prefab": { - "__id__": 243 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -5183,23 +5231,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 212 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 210 - }, - { - "__id__": 212 - }, { "__id__": 214 + }, + { + "__id__": 216 + }, + { + "__id__": 218 } ], "_prefab": { - "__id__": 216 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -5236,11 +5284,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -5264,11 +5312,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5335,11 +5383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 219 }, "languageKey": "", "defaultText": "", @@ -5369,23 +5417,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 212 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 218 - }, - { - "__id__": 220 - }, { "__id__": 222 + }, + { + "__id__": 224 + }, + { + "__id__": 226 } ], "_prefab": { - "__id__": 224 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -5422,11 +5470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -5450,11 +5498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 225 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5518,11 +5566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 227 }, "_alignFlags": 0, "_target": null, @@ -5567,27 +5615,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 212 }, "_children": [ { - "__id__": 226 + "__id__": 230 } ], "_active": true, "_components": [ - { - "__id__": 234 - }, - { - "__id__": 236 - }, { "__id__": 238 + }, + { + "__id__": 240 + }, + { + "__id__": 242 } ], "_prefab": { - "__id__": 240 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -5624,23 +5672,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 225 + "__id__": 229 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 227 - }, - { - "__id__": 229 - }, { "__id__": 231 + }, + { + "__id__": 233 + }, + { + "__id__": 235 } ], "_prefab": { - "__id__": 233 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -5677,11 +5725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 232 }, "_contentSize": { "__type__": "cc.Size", @@ -5705,11 +5753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 234 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5728,7 +5776,7 @@ "_fontSize": 42, "_fontFamily": "Arial", "_lineHeight": 81.5, - "_overflow": 1, + "_overflow": 2, "_enableWrapText": false, "_font": null, "_isSystemFontUsed": true, @@ -5773,13 +5821,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 236 }, - "languageKey": "", + "languageKey": "web3panel.copy", "defaultText": "", "autoUpdate": true, "_id": "" @@ -5807,11 +5855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -5835,11 +5883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5880,11 +5928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 243 }, "clickEvents": [], "_interactable": true, @@ -5936,7 +5984,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 225 + "__id__": 229 }, "_id": "" }, @@ -5963,11 +6011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -6008,27 +6056,27 @@ }, "_children": [ { - "__id__": 245 + "__id__": 249 }, { - "__id__": 253 + "__id__": 257 } ], "_active": true, "_components": [ { - "__id__": 259 + "__id__": 265 }, { - "__id__": 261 + "__id__": 267 } ], "_prefab": { - "__id__": 263 + "__id__": 269 }, "_lpos": { "__type__": "cc.Vec3", - "x": 5.254000000000019, + "x": -146.81400000000002, "y": 336.22800000000007, "z": 0 }, @@ -6061,27 +6109,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 244 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 246 - }, - { - "__id__": 248 - }, { "__id__": 250 + }, + { + "__id__": 252 + }, + { + "__id__": 254 } ], "_prefab": { - "__id__": 252 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", - "x": -231.85000000000002, + "x": -27.36510950000003, "y": -2.8290000000001783, "z": 0 }, @@ -6114,11 +6162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -6142,11 +6190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6187,11 +6235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 255 }, "_alignFlags": 9, "_target": null, @@ -6210,7 +6258,7 @@ "_originalWidth": 34, "_originalHeight": 0, "_alignMode": 2, - "_lockFlags": 0, + "_lockFlags": 8, "_id": "" }, { @@ -6236,24 +6284,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 244 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 254 + "__id__": 258 }, { - "__id__": 256 + "__id__": 260 + }, + { + "__id__": 262 } ], "_prefab": { - "__id__": 258 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", - "x": -4.004000000000019, + "x": 3.5049999999999955, "y": 0, "z": 0 }, @@ -6286,11 +6337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -6314,11 +6365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6330,7 +6381,7 @@ "b": 247, "a": 255 }, - "_string": "label", + "_string": "Expire Time:label", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 37, @@ -6376,6 +6427,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "97qw1pZZpIGYyqINJO7VGr" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 257 + }, + "_enabled": false, + "__prefab": { + "__id__": 263 + }, + "_alignFlags": 8, + "_target": null, + "_left": 207.09351562499995, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 300, + "_originalHeight": 0, + "_alignMode": 1, + "_lockFlags": 8, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a1awmUN2NOoqEpKXO0vQ/5" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -6395,15 +6482,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 266 }, "_contentSize": { "__type__": "cc.Size", - "width": 408.969781, + "width": 0, "height": 50.4 }, "_anchorPoint": { @@ -6423,11 +6510,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 248 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 262 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6446,7 +6533,7 @@ "_fontSize": 36, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 3, + "_overflow": 0, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -6508,7 +6595,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -6536,7 +6623,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 273 }, "_alignFlags": 45, "_target": null, @@ -6572,7 +6659,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 275 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 5d29810c..4f7841c9 100644 Binary files a/assets/bundles/DataTable/tblanguage.bin and b/assets/bundles/DataTable/tblanguage.bin differ diff --git a/assets/resources/ui/web3pop/coinIcon/BEP.png b/assets/resources/ui/web3pop/coinIcon/BEP.png new file mode 100644 index 00000000..5b3be6f3 Binary files /dev/null and b/assets/resources/ui/web3pop/coinIcon/BEP.png differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta b/assets/resources/ui/web3pop/coinIcon/BEP.png.meta similarity index 70% rename from assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta rename to assets/resources/ui/web3pop/coinIcon/BEP.png.meta index 6c98ea38..c7b6ffe0 100644 --- a/assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/BEP.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79", + "uuid": "4ac28fc0-5891-44b4-953c-8940d43379b0", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a", - "displayName": "ENT_TON", + "uuid": "4ac28fc0-5891-44b4-953c-8940d43379b0@6c48a", + "displayName": "BEP", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79", + "imageUuidOrDatabaseUri": "4ac28fc0-5891-44b4-953c-8940d43379b0", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@f9941", - "displayName": "ENT_TON", + "uuid": "4ac28fc0-5891-44b4-953c-8940d43379b0@f9941", + "displayName": "BEP", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 64, - "height": 71, - "rawWidth": 64, - "rawHeight": 71, + "width": 63, + "height": 63, + "rawWidth": 63, + "rawHeight": 63, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -32, - -35.5, + -31.5, + -31.5, 0, - 32, - -35.5, + 31.5, + -31.5, 0, - -32, - 35.5, + -31.5, + 31.5, 0, - 32, - 35.5, + 31.5, + 31.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 71, - 64, - 71, + 63, + 63, + 63, 0, 0, - 64, + 63, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -32, - -35.5, + -31.5, + -31.5, 0 ], "maxPos": [ - 32, - 35.5, + 31.5, + 31.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a", + "imageUuidOrDatabaseUri": "4ac28fc0-5891-44b4-953c-8940d43379b0@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a" + "redirect": "4ac28fc0-5891-44b4-953c-8940d43379b0@6c48a" } } diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png b/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png deleted file mode 100644 index 914179d3..00000000 Binary files a/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png and /dev/null differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png b/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png deleted file mode 100644 index 03a95685..00000000 Binary files a/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png and /dev/null differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_TON.png b/assets/resources/ui/web3pop/coinIcon/ENT_TON.png deleted file mode 100644 index 3bfd5891..00000000 Binary files a/assets/resources/ui/web3pop/coinIcon/ENT_TON.png and /dev/null differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png b/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png deleted file mode 100644 index 117492f4..00000000 Binary files a/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png and /dev/null differ diff --git a/assets/resources/ui/web3pop/coinIcon/ETH.png b/assets/resources/ui/web3pop/coinIcon/ETH.png new file mode 100644 index 00000000..14f0c09b Binary files /dev/null and b/assets/resources/ui/web3pop/coinIcon/ETH.png differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta b/assets/resources/ui/web3pop/coinIcon/ETH.png.meta similarity index 70% rename from assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta rename to assets/resources/ui/web3pop/coinIcon/ETH.png.meta index ee339ea5..80b801de 100644 --- a/assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/ETH.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c", + "uuid": "ecc0567a-892a-4356-914b-73c100168288", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a", - "displayName": "ENT_BEP", + "uuid": "ecc0567a-892a-4356-914b-73c100168288@6c48a", + "displayName": "ETH", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "51d2ab04-4a3e-4872-b41a-c3b752734c3c", + "imageUuidOrDatabaseUri": "ecc0567a-892a-4356-914b-73c100168288", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@f9941", - "displayName": "ENT_BEP", + "uuid": "ecc0567a-892a-4356-914b-73c100168288@f9941", + "displayName": "ETH", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 70, - "height": 70, - "rawWidth": 70, - "rawHeight": 70, + "width": 63, + "height": 63, + "rawWidth": 63, + "rawHeight": 63, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -35, - -35, + -31.5, + -31.5, 0, - 35, - -35, + 31.5, + -31.5, 0, - -35, - 35, + -31.5, + 31.5, 0, - 35, - 35, + 31.5, + 31.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 70, - 70, - 70, + 63, + 63, + 63, 0, 0, - 70, + 63, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -35, - -35, + -31.5, + -31.5, 0 ], "maxPos": [ - 35, - 35, + 31.5, + 31.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a", + "imageUuidOrDatabaseUri": "ecc0567a-892a-4356-914b-73c100168288@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a" + "redirect": "ecc0567a-892a-4356-914b-73c100168288@6c48a" } } diff --git a/assets/resources/ui/web3pop/coinIcon/TON.png b/assets/resources/ui/web3pop/coinIcon/TON.png new file mode 100644 index 00000000..e227ebce Binary files /dev/null and b/assets/resources/ui/web3pop/coinIcon/TON.png differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta b/assets/resources/ui/web3pop/coinIcon/TON.png.meta similarity index 70% rename from assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta rename to assets/resources/ui/web3pop/coinIcon/TON.png.meta index 21a8f84b..b654cbe1 100644 --- a/assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/TON.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf", + "uuid": "e7365632-f721-473c-b545-7e9d56140774", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a", - "displayName": "ENT_ETH", + "uuid": "e7365632-f721-473c-b545-7e9d56140774@6c48a", + "displayName": "TON", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf", + "imageUuidOrDatabaseUri": "e7365632-f721-473c-b545-7e9d56140774", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@f9941", - "displayName": "ENT_ETH", + "uuid": "e7365632-f721-473c-b545-7e9d56140774@f9941", + "displayName": "TON", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 67, - "height": 67, - "rawWidth": 67, - "rawHeight": 67, + "width": 63, + "height": 63, + "rawWidth": 63, + "rawHeight": 63, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -33.5, - -33.5, + -31.5, + -31.5, 0, - 33.5, - -33.5, + 31.5, + -31.5, 0, - -33.5, - 33.5, + -31.5, + 31.5, 0, - 33.5, - 33.5, + 31.5, + 31.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 67, - 67, - 67, + 63, + 63, + 63, 0, 0, - 67, + 63, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -33.5, - -33.5, + -31.5, + -31.5, 0 ], "maxPos": [ - 33.5, - 33.5, + 31.5, + 31.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a", + "imageUuidOrDatabaseUri": "e7365632-f721-473c-b545-7e9d56140774@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a" + "redirect": "e7365632-f721-473c-b545-7e9d56140774@6c48a" } } diff --git a/assets/resources/ui/web3pop/coinIcon/Tron.png b/assets/resources/ui/web3pop/coinIcon/Tron.png new file mode 100644 index 00000000..275dc5d8 Binary files /dev/null and b/assets/resources/ui/web3pop/coinIcon/Tron.png differ diff --git a/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta b/assets/resources/ui/web3pop/coinIcon/Tron.png.meta similarity index 70% rename from assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta rename to assets/resources/ui/web3pop/coinIcon/Tron.png.meta index 53454dd0..217a29f7 100644 --- a/assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta +++ b/assets/resources/ui/web3pop/coinIcon/Tron.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "49b048c9-5df5-441e-bab1-71e783a89c38", + "uuid": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a", - "displayName": "ENT_TRON", + "uuid": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@6c48a", + "displayName": "Tron", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "49b048c9-5df5-441e-bab1-71e783a89c38", + "imageUuidOrDatabaseUri": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "49b048c9-5df5-441e-bab1-71e783a89c38@f9941", - "displayName": "ENT_TRON", + "uuid": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@f9941", + "displayName": "Tron", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 67, - "height": 67, - "rawWidth": 67, - "rawHeight": 67, + "width": 63, + "height": 63, + "rawWidth": 63, + "rawHeight": 63, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -33.5, - -33.5, + -31.5, + -31.5, 0, - 33.5, - -33.5, + 31.5, + -31.5, 0, - -33.5, - 33.5, + -31.5, + 31.5, 0, - 33.5, - 33.5, + 31.5, + 31.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 67, - 67, - 67, + 63, + 63, + 63, 0, 0, - 67, + 63, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -33.5, - -33.5, + -31.5, + -31.5, 0 ], "maxPos": [ - 33.5, - 33.5, + 31.5, + 31.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a", + "imageUuidOrDatabaseUri": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a" + "redirect": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@6c48a" } } diff --git a/xchat_cfg b/xchat_cfg index bf5ae24f..f1c13f8c 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit bf5ae24f0f65daf676a8ed4479d2ff53528b3646 +Subproject commit f1c13f8ca3df2086693d83851f53219348f4dd47