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

web3 更新 语言修复

Browse Source
This commit is contained in:
xionglijia
2025-09-22 16:40:56 +08:00
parent 7324ab178d
commit 365bdf7293
17 changed files with 681 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scripts/chat18x/ui/panels/PurchasePanel.ts
+2 -1
View File
@@ -207,7 +207,8 @@ export class PurchasePanel extends li_BaseView {
payType: param.payType, payType: param.payType,
goodId: param.goodId, goodId: param.goodId,
networkType: this.getDefaultNetworkType(), networkType: this.getDefaultNetworkType(),
base: this.base, basePanel: this.base,
payPanel: this,
}; };
if (this.web3PopPanel == null) if (this.web3PopPanel == null)
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 { SDKManager } from "../../../Main/Channel/SDKManager";
import LanguageUtils from "../../../Main/Common/LanguageUtils"; import LanguageUtils from "../../../Main/Common/LanguageUtils";
import { logger } from "db://assets/Scripts/Main/Common/Logger"; import { logger } from "db://assets/Scripts/Main/Common/Logger";
import { PersonalPanel } from "./PersonalPanel";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -34,14 +35,16 @@ export class Web3PopPanel extends li_BaseView {
private networkType: proto.cs.EnmNetworkType; private networkType: proto.cs.EnmNetworkType;
private goodId: number; private goodId: number;
private base: PurchasePanel; private basePanel: PersonalPanel;
private payPanel: PurchasePanel;
private countdownTimer: any; private countdownTimer: any;
private remainingSeconds: number = 0; private remainingSeconds: number = 0;
private isCountingDown: boolean = false; private isCountingDown: boolean = false;
private tips: Label;
openUIDataCT(data: any): void { openUIDataCT(data: any): void {
this.refreshData(data); this.refreshData(data);
this.base.web3PopPanel = this; this.payPanel.web3PopPanel = this;
} }
onLoadCT(): void { onLoadCT(): void {
@@ -54,6 +57,7 @@ export class Web3PopPanel extends li_BaseView {
this.address = this._nodeTab.addressText.getComponent(Label); this.address = this._nodeTab.addressText.getComponent(Label);
this.expireTimeText = this._nodeTab.expireTimeText.getComponent(Label); this.expireTimeText = this._nodeTab.expireTimeText.getComponent(Label);
this.qrCode = this._nodeTab.qrCode.getComponent(Sprite); this.qrCode = this._nodeTab.qrCode.getComponent(Sprite);
this.tips = this._nodeTab.tips.getComponent(Label);
this.registerListener(); this.registerListener();
this.selection.setScale(new Vec3(1, 0, 1)); this.selection.setScale(new Vec3(1, 0, 1));
@@ -83,13 +87,7 @@ export class Web3PopPanel extends li_BaseView {
}, },
this this
); );
GButton.BandClick(
this._nodeTab.ENT_BEP,
() => {
this.onClickCoinType(proto.cs.EnmNetworkType.ENT_BEP);
},
this
);
GButton.BandClick( GButton.BandClick(
this._nodeTab.ENT_ETH, this._nodeTab.ENT_ETH,
() => { () => {
@@ -97,6 +95,13 @@ export class Web3PopPanel extends li_BaseView {
}, },
this this
); );
GButton.BandClick(
this._nodeTab.ENT_BEP,
() => {
this.onClickCoinType(proto.cs.EnmNetworkType.ENT_BEP);
},
this
);
} }
refreshData(data: any): void { refreshData(data: any): void {
@@ -105,7 +110,8 @@ export class Web3PopPanel extends li_BaseView {
this.goodId = data.goodId; this.goodId = data.goodId;
this.curType = this.curType =
data.networkType != undefined ? data.networkType : this.curType; data.networkType != undefined ? data.networkType : this.curType;
this.base = data.base; this.basePanel = data.basePanel;
this.payPanel = data.payPanel;
} }
refreshView() { refreshView() {
const OrderData = DataManager.I.getDataById<OrderData>(DataId.Order); const OrderData = DataManager.I.getDataById<OrderData>(DataId.Order);
@@ -127,8 +133,8 @@ export class Web3PopPanel extends li_BaseView {
if (expireTime > 0) { if (expireTime > 0) {
this.startCountdown(expireTime); this.startCountdown(expireTime);
} else { } else {
this.expireTimeText.string = "已过期"; this.expireTimeText.string = LanguageUtils.getText("web3panel.expired");
this.expireTimeText.color = new Color(128, 128, 128, 255); //this.expireTimeText.color = new Color(128, 128, 128, 255);
this.disableButtons(); this.disableButtons();
} }
this.amount.string = amount; this.amount.string = amount;
@@ -137,30 +143,46 @@ export class Web3PopPanel extends li_BaseView {
case proto.cs.EnmNetworkType.ENT_TRON: case proto.cs.EnmNetworkType.ENT_TRON:
ResManager.I.changeResourceSpriteFrame( ResManager.I.changeResourceSpriteFrame(
this.coinIcon, 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; break;
case proto.cs.EnmNetworkType.ENT_TON: case proto.cs.EnmNetworkType.ENT_TON:
ResManager.I.changeResourceSpriteFrame( ResManager.I.changeResourceSpriteFrame(
this.coinIcon, 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; break;
case proto.cs.EnmNetworkType.ENT_ETH: case proto.cs.EnmNetworkType.ENT_ETH:
ResManager.I.changeResourceSpriteFrame( ResManager.I.changeResourceSpriteFrame(
this.coinIcon, 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; break;
case proto.cs.EnmNetworkType.ENT_BEP: case proto.cs.EnmNetworkType.ENT_BEP:
ResManager.I.changeResourceSpriteFrame( ResManager.I.changeResourceSpriteFrame(
this.coinIcon, 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; break;
} }
@@ -198,7 +220,11 @@ export class Web3PopPanel extends li_BaseView {
case proto.cs.EnmNetworkType.ENT_BEP: case proto.cs.EnmNetworkType.ENT_BEP:
break; 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); this.selection.scale = new Vec3(1, 0, 1);
} }
@@ -222,7 +248,7 @@ export class Web3PopPanel extends li_BaseView {
onClickClose() { onClickClose() {
this.stopCountdown(); this.stopCountdown();
this.base.web3PopPanel = null; this.payPanel.web3PopPanel = null;
this.close(); this.close();
} }
@@ -279,14 +305,15 @@ export class Web3PopPanel extends li_BaseView {
if (!this.expireTimeText) return; if (!this.expireTimeText) return;
const timeText = this.formatCountdownTime(this.remainingSeconds); 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) { if (this.remainingSeconds <= 30 && this.remainingSeconds > 0) {
this.expireTimeText.color = new Color(255, 0, 0, 255); this.expireTimeText.color = new Color(255, 0, 0, 255);
} else if (this.remainingSeconds <= 0) { } else if (this.remainingSeconds <= 0) {
this.expireTimeText.color = new Color(128, 128, 128, 255); this.expireTimeText.color = new Color(128, 128, 128, 255);
} else { } 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 { private onCountdownExpired(): void {
logger.log("Web3支付倒计时已过期"); logger.log("Web3支付倒计时已过期");
this.disableButtons(); this.disableButtons();
TipsPanel.show("支付时间已过期，请重新发起支付"); this.expireTimeText.string = LanguageUtils.getText("web3panel.expired");
//TipsPanel.show("支付时间已过期，请重新发起支付");
} }
} }
assets/bundles/Chat18x/Web3PopPanel.prefab
+512 -425
View File
File diff suppressed because it is too large Load Diff
assets/bundles/DataTable/tblanguage.bin
BIN
View File
Binary file not shown.
assets/resources/ui/web3pop/coinIcon/BEP.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

assets/resources/ui/web3pop/coinIcon/ENT_TON.png.meta → assets/resources/ui/web3pop/coinIcon/BEP.png.meta
+28 -28
View File
@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79", "uuid": "4ac28fc0-5891-44b4-953c-8940d43379b0",
"files": [ "files": [
".json", ".json",
".png" ".png"
@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a", "uuid": "4ac28fc0-5891-44b4-953c-8940d43379b0@6c48a",
"displayName": "ENT_TON", "displayName": "BEP",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79", "imageUuidOrDatabaseUri": "4ac28fc0-5891-44b4-953c-8940d43379b0",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@f9941", "uuid": "4ac28fc0-5891-44b4-953c-8940d43379b0@f9941",
"displayName": "ENT_TON", "displayName": "BEP",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
@@ -46,10 +46,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 64, "width": 63,
"height": 71, "height": 63,
"rawWidth": 64, "rawWidth": 63,
"rawHeight": 71, "rawHeight": 63,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
@@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-32, -31.5,
-35.5, -31.5,
0, 0,
32, 31.5,
-35.5, -31.5,
0, 0,
-32, -31.5,
35.5, 31.5,
0, 0,
32, 31.5,
35.5, 31.5,
0 0
], ],
"indexes": [ "indexes": [
@@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
71, 63,
64, 63,
71, 63,
0, 0,
0, 0,
64, 63,
0 0
], ],
"nuv": [ "nuv": [
@@ -103,18 +103,18 @@
1 1
], ],
"minPos": [ "minPos": [
-32, -31.5,
-35.5, -31.5,
0 0
], ],
"maxPos": [ "maxPos": [
32, 31.5,
35.5, 31.5,
0 0
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a", "imageUuidOrDatabaseUri": "4ac28fc0-5891-44b4-953c-8940d43379b0@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "a27de5e4-1840-40c4-ad05-2bc4b3f36c79@6c48a" "redirect": "4ac28fc0-5891-44b4-953c-8940d43379b0@6c48a"
} }
} }
assets/resources/ui/web3pop/coinIcon/ENT_BEP.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

assets/resources/ui/web3pop/coinIcon/ENT_ETH.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

assets/resources/ui/web3pop/coinIcon/ENT_TON.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

assets/resources/ui/web3pop/coinIcon/ENT_TRON.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

assets/resources/ui/web3pop/coinIcon/ETH.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

assets/resources/ui/web3pop/coinIcon/ENT_BEP.png.meta → assets/resources/ui/web3pop/coinIcon/ETH.png.meta
+28 -28
View File
@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c", "uuid": "ecc0567a-892a-4356-914b-73c100168288",
"files": [ "files": [
".json", ".json",
".png" ".png"
@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a", "uuid": "ecc0567a-892a-4356-914b-73c100168288@6c48a",
"displayName": "ENT_BEP", "displayName": "ETH",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "51d2ab04-4a3e-4872-b41a-c3b752734c3c", "imageUuidOrDatabaseUri": "ecc0567a-892a-4356-914b-73c100168288",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@f9941", "uuid": "ecc0567a-892a-4356-914b-73c100168288@f9941",
"displayName": "ENT_BEP", "displayName": "ETH",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
@@ -46,10 +46,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 70, "width": 63,
"height": 70, "height": 63,
"rawWidth": 70, "rawWidth": 63,
"rawHeight": 70, "rawHeight": 63,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
@@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-35, -31.5,
-35, -31.5,
0, 0,
35, 31.5,
-35, -31.5,
0, 0,
-35, -31.5,
35, 31.5,
0, 0,
35, 31.5,
35, 31.5,
0 0
], ],
"indexes": [ "indexes": [
@@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
70, 63,
70, 63,
70, 63,
0, 0,
0, 0,
70, 63,
0 0
], ],
"nuv": [ "nuv": [
@@ -103,18 +103,18 @@
1 1
], ],
"minPos": [ "minPos": [
-35, -31.5,
-35, -31.5,
0 0
], ],
"maxPos": [ "maxPos": [
35, 31.5,
35, 31.5,
0 0
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a", "imageUuidOrDatabaseUri": "ecc0567a-892a-4356-914b-73c100168288@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "51d2ab04-4a3e-4872-b41a-c3b752734c3c@6c48a" "redirect": "ecc0567a-892a-4356-914b-73c100168288@6c48a"
} }
} }
assets/resources/ui/web3pop/coinIcon/TON.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

assets/resources/ui/web3pop/coinIcon/ENT_ETH.png.meta → assets/resources/ui/web3pop/coinIcon/TON.png.meta
+28 -28
View File
@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf", "uuid": "e7365632-f721-473c-b545-7e9d56140774",
"files": [ "files": [
".json", ".json",
".png" ".png"
@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a", "uuid": "e7365632-f721-473c-b545-7e9d56140774@6c48a",
"displayName": "ENT_ETH", "displayName": "TON",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf", "imageUuidOrDatabaseUri": "e7365632-f721-473c-b545-7e9d56140774",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@f9941", "uuid": "e7365632-f721-473c-b545-7e9d56140774@f9941",
"displayName": "ENT_ETH", "displayName": "TON",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
@@ -46,10 +46,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 67, "width": 63,
"height": 67, "height": 63,
"rawWidth": 67, "rawWidth": 63,
"rawHeight": 67, "rawHeight": 63,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
@@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-33.5, -31.5,
-33.5, -31.5,
0, 0,
33.5, 31.5,
-33.5, -31.5,
0, 0,
-33.5, -31.5,
33.5, 31.5,
0, 0,
33.5, 31.5,
33.5, 31.5,
0 0
], ],
"indexes": [ "indexes": [
@@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
67, 63,
67, 63,
67, 63,
0, 0,
0, 0,
67, 63,
0 0
], ],
"nuv": [ "nuv": [
@@ -103,18 +103,18 @@
1 1
], ],
"minPos": [ "minPos": [
-33.5, -31.5,
-33.5, -31.5,
0 0
], ],
"maxPos": [ "maxPos": [
33.5, 31.5,
33.5, 31.5,
0 0
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a", "imageUuidOrDatabaseUri": "e7365632-f721-473c-b545-7e9d56140774@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "7def72e9-1d54-4c0a-8ddb-3c58c8564acf@6c48a" "redirect": "e7365632-f721-473c-b545-7e9d56140774@6c48a"
} }
} }
assets/resources/ui/web3pop/coinIcon/Tron.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

assets/resources/ui/web3pop/coinIcon/ENT_TRON.png.meta → assets/resources/ui/web3pop/coinIcon/Tron.png.meta
+28 -28
View File
@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "49b048c9-5df5-441e-bab1-71e783a89c38", "uuid": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9",
"files": [ "files": [
".json", ".json",
".png" ".png"
@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a", "uuid": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@6c48a",
"displayName": "ENT_TRON", "displayName": "Tron",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "49b048c9-5df5-441e-bab1-71e783a89c38", "imageUuidOrDatabaseUri": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "49b048c9-5df5-441e-bab1-71e783a89c38@f9941", "uuid": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@f9941",
"displayName": "ENT_TRON", "displayName": "Tron",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
@@ -46,10 +46,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 67, "width": 63,
"height": 67, "height": 63,
"rawWidth": 67, "rawWidth": 63,
"rawHeight": 67, "rawHeight": 63,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
@@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-33.5, -31.5,
-33.5, -31.5,
0, 0,
33.5, 31.5,
-33.5, -31.5,
0, 0,
-33.5, -31.5,
33.5, 31.5,
0, 0,
33.5, 31.5,
33.5, 31.5,
0 0
], ],
"indexes": [ "indexes": [
@@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
67, 63,
67, 63,
67, 63,
0, 0,
0, 0,
67, 63,
0 0
], ],
"nuv": [ "nuv": [
@@ -103,18 +103,18 @@
1 1
], ],
"minPos": [ "minPos": [
-33.5, -31.5,
-33.5, -31.5,
0 0
], ],
"maxPos": [ "maxPos": [
33.5, 31.5,
33.5, 31.5,
0 0
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a", "imageUuidOrDatabaseUri": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "49b048c9-5df5-441e-bab1-71e783a89c38@6c48a" "redirect": "5f727fd9-541b-4ec1-b0af-e8c589ef1fc9@6c48a"
} }
} }
xchat_cfg
+1 -1
Submodule xchat_cfg updated: bf5ae24f0f...f1c13f8ca3