From 62cad1ca1592eee1366c2967fc8bef4736b49dbe Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Sat, 20 Sep 2025 13:47:44 +0800 Subject: [PATCH] update --- .../chat18x/ui/panels/PayToTalkSubpanel.ts | 20 +- .../chat18x/ui/panels/PersonalPanel.ts | 11 +- .../Scripts/chat18x/ui/panels/ThemePanel.ts | 1 + assets/bundles/Chat18x/ChatPanel.prefab | 524 ++++++----- assets/bundles/Chat18x/GirlDetailPanel.prefab | 816 +++++++++--------- assets/bundles/Chat18x/NavigationPanel.prefab | 696 +++++++++------ assets/bundles/DataTable/tblanguage.bin | Bin 26845 -> 27118 bytes xchat_cfg | 2 +- 8 files changed, 1179 insertions(+), 891 deletions(-) diff --git a/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts b/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts index 32c96ad1..8841856b 100644 --- a/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts @@ -13,7 +13,10 @@ import { DataManager, DataId } from "../../data/DataManager"; import { WalletData } from "../../data/WalletData"; import { ShopData } from "../../data/ShopData"; import { GirlData } from "../../data/GirlData"; -import proto from 'db://assets/Scripts/proto/proto.pb.js'; +import proto from "db://assets/Scripts/proto/proto.pb.js"; +import { ConfigId, ConfigManager } from "../../manager/ConfigManager"; +import { PurchaseConfig } from "../../config/PurchaseConfig"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; const { ccclass, property } = _decorator; @ccclass("PayToTalkSubpanel") @@ -42,6 +45,13 @@ export class PayToTalkSubpanel extends Component { this.base.opacity = 0; this.categoryId = Number(categoryId); this.girlId = girlId; + + const cfg = ConfigManager.I.getDataById(ConfigId.Purchase); + const count = cfg.getCountById(cfg.getChatIds()[0]); + + this.timeBtnLabel.string = + count + LanguageUtils.getText("chatpanel.buy10times"); + tween(this.base).to(0.3, { opacity: 255 }).start(); } @@ -93,12 +103,16 @@ export class PayToTalkSubpanel extends Component { const resData = res.data; // 保存数据 const girlData = DataManager.I.getDataById(DataId.Girl); - girlData.setChatRemainCount(this.categoryId.toString(), girlId, resData.chatRemainCount); + girlData.setChatRemainCount( + this.categoryId.toString(), + girlId, + resData.chatRemainCount + ); const walletData = DataManager.I.getDataById(DataId.Wallet); walletData.balance = Number(resData.balance); walletData.vipExpire = Number(resData.vipExpire); // 刷新界面 this.hide(); } - } + } } diff --git a/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts b/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts index bf44fd12..dbea7279 100644 --- a/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts @@ -124,7 +124,7 @@ export class PersonalPanel extends li_BaseView { private updateBalance(): void { if (this.balanceLabel && this.walletData) { const balance = this.walletData.getOriginalBalance(); - this.balanceLabel.string = `余额: ${balance}`; + this.balanceLabel.string = `${balance}`; } } @@ -133,9 +133,14 @@ export class PersonalPanel extends li_BaseView { const vipExpire = this.walletData.vipExpire; if (vipExpire && vipExpire > Date.now()) { const expireDate = new Date(vipExpire); - this.vipStatusLabel.string = `VIP至: ${expireDate.toLocaleDateString()}`; + + this.vipStatusLabel.string = `${LanguageUtils.getText( + "purchasepanel.vip_left" + )} ${expireDate.toLocaleDateString()}`; } else { - this.vipStatusLabel.string = "普通用户"; + this.vipStatusLabel.string = LanguageUtils.getText( + "purchasepanel.notvip" + ); } } } diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index b3e1e529..ecbc7230 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -471,6 +471,7 @@ export class ThemePanel extends li_BaseView { // 事件回调函数（避免匿名函数导致的内存泄漏） private onLanguageChange = () => { this.recName.string = LanguageUtils.getText(this.rectNameKey); + this.refreshVipExpire(); }; private onBalanceChange = () => { diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index f1a1e583..7590a385 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -22,7 +22,7 @@ "__id__": 2 }, { - "__id__": 263 + "__id__": 265 }, { "__id__": 74 @@ -31,23 +31,23 @@ "__id__": 114 }, { - "__id__": 347 + "__id__": 351 } ], "_active": true, "_components": [ - { - "__id__": 377 - }, - { - "__id__": 379 - }, { "__id__": 381 + }, + { + "__id__": 383 + }, + { + "__id__": 385 } ], "_prefab": { - "__id__": 383 + "__id__": 387 }, "_lpos": { "__type__": "cc.Vec3", @@ -108,18 +108,18 @@ ], "_active": true, "_components": [ - { - "__id__": 256 - }, { "__id__": 258 }, { "__id__": 260 + }, + { + "__id__": 262 } ], "_prefab": { - "__id__": 262 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", @@ -4164,18 +4164,18 @@ ], "_active": true, "_components": [ - { - "__id__": 249 - }, { "__id__": 251 }, { "__id__": 253 + }, + { + "__id__": 255 } ], "_prefab": { - "__id__": 255 + "__id__": 257 }, "_lpos": { "__type__": "cc.Vec3", @@ -4225,23 +4225,23 @@ "__id__": 221 }, { - "__id__": 236 + "__id__": 238 } ], "_active": true, "_components": [ - { - "__id__": 242 - }, { "__id__": 244 }, { "__id__": 246 + }, + { + "__id__": 248 } ], "_prefab": { - "__id__": 248 + "__id__": 250 }, "_lpos": { "__type__": "cc.Vec3", @@ -5035,18 +5035,18 @@ ], "_active": true, "_components": [ - { - "__id__": 228 - }, { "__id__": 230 }, { "__id__": 232 + }, + { + "__id__": 234 } ], "_prefab": { - "__id__": 235 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -5093,10 +5093,13 @@ }, { "__id__": 225 + }, + { + "__id__": 227 } ], "_prefab": { - "__id__": 227 + "__id__": 229 }, "_lpos": { "__type__": "cc.Vec3", @@ -5226,6 +5229,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "413y1uTi1AxIIqBZe+Sc9g" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 222 + }, + "_enabled": true, + "__prefab": { + "__id__": 228 + }, + "languageKey": "chatpanel.send", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0du7D8xtJKtq49/90KG7ic" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -5249,7 +5273,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -5277,7 +5301,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5322,11 +5346,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 235 }, "clickEvents": [ { - "__id__": 234 + "__id__": 236 } ], "_interactable": true, @@ -5409,14 +5433,14 @@ "_active": true, "_components": [ { - "__id__": 237 + "__id__": 239 }, { - "__id__": 239 + "__id__": 241 } ], "_prefab": { - "__id__": 241 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -5453,11 +5477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 240 }, "_contentSize": { "__type__": "cc.Size", @@ -5481,11 +5505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 242 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5543,7 +5567,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 245 }, "_contentSize": { "__type__": "cc.Size", @@ -5571,7 +5595,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 247 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5616,7 +5640,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 249 }, "_alignFlags": 40, "_target": null, @@ -5665,7 +5689,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", @@ -5693,7 +5717,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 252 + "__id__": 254 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5738,7 +5762,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 256 }, "_alignFlags": 44, "_target": null, @@ -5787,7 +5811,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -5815,7 +5839,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 259 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5857,7 +5881,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 263 }, "_alignFlags": 45, "_target": null, @@ -5906,35 +5930,35 @@ }, "_children": [ { - "__id__": 264 + "__id__": 266 }, { - "__id__": 272 + "__id__": 274 }, { - "__id__": 280 + "__id__": 282 }, { - "__id__": 309 + "__id__": 311 } ], "_active": true, "_components": [ - { - "__id__": 338 - }, - { - "__id__": 340 - }, { "__id__": 342 }, { "__id__": 344 + }, + { + "__id__": 346 + }, + { + "__id__": 348 } ], "_prefab": { - "__id__": 346 + "__id__": 350 }, "_lpos": { "__type__": "cc.Vec3", @@ -5971,23 +5995,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 265 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 265 - }, { "__id__": 267 }, { "__id__": 269 + }, + { + "__id__": 271 } ], "_prefab": { - "__id__": 271 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -6024,11 +6048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -6052,11 +6076,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 270 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6097,11 +6121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_alignFlags": 45, "_target": null, @@ -6146,23 +6170,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 265 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 273 - }, { "__id__": 275 }, { "__id__": 277 + }, + { + "__id__": 279 } ], "_prefab": { - "__id__": 279 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -6199,11 +6223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 276 }, "_contentSize": { "__type__": "cc.Size", @@ -6227,11 +6251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6295,11 +6319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 280 }, "languageKey": "chatpanel.paytotalk.desc", "defaultText": "", @@ -6329,24 +6353,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 265 }, "_children": [ { - "__id__": 281 + "__id__": 283 }, { - "__id__": 287 + "__id__": 289 }, { - "__id__": 293 + "__id__": 295 } ], "_active": true, "_components": [ - { - "__id__": 299 - }, { "__id__": 301 }, @@ -6354,11 +6375,14 @@ "__id__": 303 }, { - "__id__": 306 + "__id__": 305 + }, + { + "__id__": 308 } ], "_prefab": { - "__id__": 308 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -6395,20 +6419,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 280 + "__id__": 282 }, "_children": [], "_active": true, "_components": [ { - "__id__": 282 + "__id__": 284 }, { - "__id__": 284 + "__id__": 286 } ], "_prefab": { - "__id__": 286 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -6445,11 +6469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 285 }, "_contentSize": { "__type__": "cc.Size", @@ -6473,11 +6497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 287 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6557,20 +6581,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 280 + "__id__": 282 }, "_children": [], "_active": true, "_components": [ { - "__id__": 288 + "__id__": 290 }, { - "__id__": 290 + "__id__": 292 } ], "_prefab": { - "__id__": 292 + "__id__": 294 }, "_lpos": { "__type__": "cc.Vec3", @@ -6607,11 +6631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 287 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", @@ -6635,11 +6659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 287 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6689,24 +6713,24 @@ }, { "__type__": "cc.Node", - "_name": "Label-001", + "_name": "butTimeText", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 280 + "__id__": 282 }, "_children": [], "_active": true, "_components": [ { - "__id__": 294 + "__id__": 296 }, { - "__id__": 296 + "__id__": 298 } ], "_prefab": { - "__id__": 298 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -6743,11 +6767,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 297 }, "_contentSize": { "__type__": "cc.Size", @@ -6771,11 +6795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 299 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6855,11 +6879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -6883,11 +6907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6928,15 +6952,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 306 }, "clickEvents": [ { - "__id__": 305 + "__id__": 307 } ], "_interactable": true, @@ -6976,7 +7000,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 280 + "__id__": 282 }, "_id": "" }, @@ -6987,7 +7011,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 263 + "__id__": 265 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -7000,11 +7024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 309 }, "_alignFlags": 16, "_target": null, @@ -7049,36 +7073,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 265 }, "_children": [ { - "__id__": 310 + "__id__": 312 }, { - "__id__": 316 + "__id__": 318 }, { - "__id__": 322 + "__id__": 324 } ], "_active": true, "_components": [ - { - "__id__": 328 - }, - { - "__id__": 330 - }, { "__id__": 332 }, { - "__id__": 335 + "__id__": 334 + }, + { + "__id__": 336 + }, + { + "__id__": 339 } ], "_prefab": { - "__id__": 337 + "__id__": 341 }, "_lpos": { "__type__": "cc.Vec3", @@ -7115,20 +7139,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 309 + "__id__": 311 }, "_children": [], "_active": true, "_components": [ { - "__id__": 311 + "__id__": 313 }, { - "__id__": 313 + "__id__": 315 } ], "_prefab": { - "__id__": 315 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -7165,11 +7189,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 310 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -7193,11 +7217,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 310 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 316 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7277,20 +7301,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 309 + "__id__": 311 }, "_children": [], "_active": true, "_components": [ { - "__id__": 317 + "__id__": 319 }, { - "__id__": 319 + "__id__": 321 } ], "_prefab": { - "__id__": 321 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -7327,11 +7351,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 316 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 320 }, "_contentSize": { "__type__": "cc.Size", @@ -7355,11 +7379,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 316 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 322 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7413,20 +7437,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 309 + "__id__": 311 }, "_children": [], "_active": true, "_components": [ { - "__id__": 323 + "__id__": 325 }, { - "__id__": 325 + "__id__": 327 + }, + { + "__id__": 329 } ], "_prefab": { - "__id__": 327 + "__id__": 331 }, "_lpos": { "__type__": "cc.Vec3", @@ -7463,11 +7490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -7491,11 +7518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 328 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7556,6 +7583,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "b4ce7QlXxKRaNk+0xkASHv" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 324 + }, + "_enabled": true, + "__prefab": { + "__id__": 330 + }, + "languageKey": "chatpanel.buyvip", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7VR4eXUlKHLUH023bV5ar" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -7575,11 +7623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -7603,11 +7651,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 335 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7648,15 +7696,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 337 }, "clickEvents": [ { - "__id__": 334 + "__id__": 338 } ], "_interactable": true, @@ -7696,7 +7744,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 309 + "__id__": 311 }, "_id": "" }, @@ -7707,7 +7755,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 263 + "__id__": 265 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -7720,11 +7768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 340 }, "_alignFlags": 16, "_target": null, @@ -7769,11 +7817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 343 }, "_contentSize": { "__type__": "cc.Size", @@ -7797,11 +7845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 345 }, "_alignFlags": 40, "_target": null, @@ -7833,23 +7881,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 347 }, "timeLabel": { - "__id__": 284 + "__id__": 286 }, "timeBtnLabel": { - "__id__": 296 + "__id__": 298 }, "vipLabel": { - "__id__": 313 + "__id__": 315 }, "vipBtnLabel": { - "__id__": 325 + "__id__": 327 }, "_id": "" }, @@ -7863,11 +7911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 349 }, "_opacity": 255, "_id": "" @@ -7899,20 +7947,20 @@ }, "_children": [ { - "__id__": 348 + "__id__": 352 } ], "_active": true, "_components": [ { - "__id__": 372 + "__id__": 376 }, { - "__id__": 374 + "__id__": 378 } ], "_prefab": { - "__id__": 376 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -7949,24 +7997,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 347 + "__id__": 351 }, "_children": [ { - "__id__": 349 + "__id__": 353 } ], "_active": true, "_components": [ { - "__id__": 367 + "__id__": 371 }, { - "__id__": 369 + "__id__": 373 } ], "_prefab": { - "__id__": 371 + "__id__": 375 }, "_lpos": { "__type__": "cc.Vec3", @@ -8003,27 +8051,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 352 }, "_children": [ { - "__id__": 350 + "__id__": 354 } ], "_active": true, "_components": [ - { - "__id__": 360 - }, - { - "__id__": 362 - }, { "__id__": 364 + }, + { + "__id__": 366 + }, + { + "__id__": 368 } ], "_prefab": { - "__id__": 366 + "__id__": 370 }, "_lpos": { "__type__": "cc.Vec3", @@ -8060,26 +8108,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 353 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 351 - }, - { - "__id__": 353 - }, { "__id__": 355 }, { "__id__": 357 + }, + { + "__id__": 359 + }, + { + "__id__": 361 } ], "_prefab": { - "__id__": 359 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", @@ -8116,11 +8164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -8144,11 +8192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 358 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8186,11 +8234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 360 }, "_alignFlags": 12, "_target": null, @@ -8222,11 +8270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 362 }, "clickEvents": [], "_interactable": true, @@ -8291,11 +8339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -8319,11 +8367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 367 }, "_type": 3, "_inverted": false, @@ -8341,11 +8389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 369 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8399,11 +8447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 372 }, "_contentSize": { "__type__": "cc.Size", @@ -8427,11 +8475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 374 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8485,11 +8533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 347 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 377 }, "_contentSize": { "__type__": "cc.Size", @@ -8513,14 +8561,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 347 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 379 }, "image": { - "__id__": 353 + "__id__": 357 }, "_id": "" }, @@ -8551,7 +8599,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 382 }, "_contentSize": { "__type__": "cc.Size", @@ -8579,7 +8627,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 384 }, "_alignFlags": 45, "_target": null, @@ -8615,11 +8663,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 386 }, "m_rootNode": null, "payToTalkPanel": { - "__id__": 342 + "__id__": 346 }, "editBox": { "__id__": 215 @@ -8634,7 +8682,7 @@ "__id__": 71 }, "popUpImage": { - "__id__": 374 + "__id__": 378 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 7777fab1..95bec026 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -24,9 +24,6 @@ ], "_active": true, "_components": [ - { - "__id__": 382 - }, { "__id__": 384 }, @@ -35,10 +32,13 @@ }, { "__id__": 388 + }, + { + "__id__": 390 } ], "_prefab": { - "__id__": 390 + "__id__": 392 }, "_lpos": { "__type__": "cc.Vec3", @@ -88,23 +88,23 @@ "__id__": 17 }, { - "__id__": 364 + "__id__": 366 } ], "_active": true, "_components": [ - { - "__id__": 375 - }, { "__id__": 377 }, { "__id__": 379 + }, + { + "__id__": 381 } ], "_prefab": { - "__id__": 381 + "__id__": 383 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,23 +462,23 @@ "__id__": 24 }, { - "__id__": 283 + "__id__": 285 } ], "_active": true, "_components": [ - { - "__id__": 357 - }, { "__id__": 359 }, { "__id__": 361 + }, + { + "__id__": 363 } ], "_prefab": { - "__id__": 363 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -651,9 +651,6 @@ ], "_active": true, "_components": [ - { - "__id__": 274 - }, { "__id__": 276 }, @@ -662,10 +659,13 @@ }, { "__id__": 280 + }, + { + "__id__": 282 } ], "_prefab": { - "__id__": 282 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -711,9 +711,6 @@ ], "_active": true, "_components": [ - { - "__id__": 265 - }, { "__id__": 267 }, @@ -722,10 +719,13 @@ }, { "__id__": 271 + }, + { + "__id__": 273 } ], "_prefab": { - "__id__": 273 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -772,29 +772,29 @@ "__id__": 41 }, { - "__id__": 144 + "__id__": 146 }, { - "__id__": 168 + "__id__": 170 }, { - "__id__": 250 + "__id__": 252 } ], "_active": true, "_components": [ - { - "__id__": 258 - }, { "__id__": 260 }, { "__id__": 262 + }, + { + "__id__": 264 } ], "_prefab": { - "__id__": 264 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -1153,26 +1153,26 @@ "__id__": 96 }, { - "__id__": 121 + "__id__": 123 }, { - "__id__": 129 + "__id__": 131 } ], "_active": true, "_components": [ - { - "__id__": 137 - }, { "__id__": 139 }, { "__id__": 141 + }, + { + "__id__": 143 } ], "_prefab": { - "__id__": 143 + "__id__": 145 }, "_lpos": { "__type__": "cc.Vec3", @@ -2458,9 +2458,6 @@ ], "_active": true, "_components": [ - { - "__id__": 111 - }, { "__id__": 113 }, @@ -2468,11 +2465,14 @@ "__id__": 115 }, { - "__id__": 118 + "__id__": 117 + }, + { + "__id__": 120 } ], "_prefab": { - "__id__": 120 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2694,10 +2694,13 @@ }, { "__id__": 108 + }, + { + "__id__": 110 } ], "_prefab": { - "__id__": 110 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -2827,6 +2830,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "6dv7LTj8VEw761XsL5ZLd1" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 105 + }, + "_enabled": true, + "__prefab": { + "__id__": 111 + }, + "languageKey": "girldetailpanel.chatbtn", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9buKYIsGdL4rzTKYt4XpvY" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2850,7 +2874,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -2878,7 +2902,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2923,11 +2947,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 118 }, "clickEvents": [ { - "__id__": 117 + "__id__": 119 } ], "_interactable": true, @@ -2995,7 +3019,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 121 }, "_alignFlags": 42, "_target": null, @@ -3045,18 +3069,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 122 - }, { "__id__": 124 }, { "__id__": 126 + }, + { + "__id__": 128 } ], "_prefab": { - "__id__": 128 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -3093,11 +3117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -3121,11 +3145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3189,11 +3213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 129 }, "_alignFlags": 9, "_target": null, @@ -3243,18 +3267,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 130 - }, { "__id__": 132 }, { "__id__": 134 + }, + { + "__id__": 136 } ], "_prefab": { - "__id__": 136 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -3291,11 +3315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -3319,11 +3343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3387,11 +3411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 137 }, "_alignFlags": 33, "_target": null, @@ -3440,7 +3464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 140 }, "_contentSize": { "__type__": "cc.Size", @@ -3468,7 +3492,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 140 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3513,7 +3537,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 144 }, "_alignFlags": 41, "_target": null, @@ -3562,26 +3586,26 @@ }, "_children": [ { - "__id__": 145 + "__id__": 147 }, { - "__id__": 153 + "__id__": 155 } ], "_active": true, "_components": [ - { - "__id__": 161 - }, { "__id__": 163 }, { "__id__": 165 + }, + { + "__id__": 167 } ], "_prefab": { - "__id__": 167 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", @@ -3618,23 +3642,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 144 + "__id__": 146 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 146 - }, { "__id__": 148 }, { "__id__": 150 + }, + { + "__id__": 152 } ], "_prefab": { - "__id__": 152 + "__id__": 154 }, "_lpos": { "__type__": "cc.Vec3", @@ -3671,11 +3695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -3699,11 +3723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 151 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3744,11 +3768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 153 }, "_alignFlags": 45, "_target": null, @@ -3793,23 +3817,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 144 + "__id__": 146 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 154 - }, { "__id__": 156 }, { "__id__": 158 + }, + { + "__id__": 160 } ], "_prefab": { - "__id__": 160 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3846,11 +3870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 157 }, "_contentSize": { "__type__": "cc.Size", @@ -3874,11 +3898,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 159 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3945,11 +3969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 161 }, "_alignFlags": 45, "_target": null, @@ -3994,11 +4018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 164 }, "_contentSize": { "__type__": "cc.Size", @@ -4022,11 +4046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 146 }, "_enabled": false, "__prefab": { - "__id__": 164 + "__id__": 166 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4067,11 +4091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 168 }, "_alignFlags": 41, "_target": null, @@ -4120,29 +4144,29 @@ }, "_children": [ { - "__id__": 169 + "__id__": 171 }, { - "__id__": 175 + "__id__": 177 }, { - "__id__": 209 + "__id__": 211 } ], "_active": true, "_components": [ - { - "__id__": 243 - }, { "__id__": 245 }, { "__id__": 247 + }, + { + "__id__": 249 } ], "_prefab": { - "__id__": 249 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -4179,20 +4203,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 168 + "__id__": 170 }, "_children": [], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 172 }, { - "__id__": 172 + "__id__": 174 } ], "_prefab": { - "__id__": 174 + "__id__": 176 }, "_lpos": { "__type__": "cc.Vec3", @@ -4229,11 +4253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -4257,11 +4281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4315,21 +4339,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 168 + "__id__": 170 }, "_children": [ { - "__id__": 176 + "__id__": 178 }, { - "__id__": 188 + "__id__": 190 } ], "_active": true, "_components": [ - { - "__id__": 200 - }, { "__id__": 202 }, @@ -4338,10 +4359,13 @@ }, { "__id__": 206 + }, + { + "__id__": 208 } ], "_prefab": { - "__id__": 208 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -4378,24 +4402,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 175 + "__id__": 177 }, "_children": [ { - "__id__": 177 + "__id__": 179 } ], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 185 }, { - "__id__": 185 + "__id__": 187 } ], "_prefab": { - "__id__": 187 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -4432,20 +4456,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 176 + "__id__": 178 }, "_children": [], "_active": true, "_components": [ { - "__id__": 178 + "__id__": 180 }, { - "__id__": 180 + "__id__": 182 } ], "_prefab": { - "__id__": 182 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", @@ -4482,11 +4506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 181 }, "_contentSize": { "__type__": "cc.Size", @@ -4510,11 +4534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 183 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4568,11 +4592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 186 }, "_contentSize": { "__type__": "cc.Size", @@ -4596,11 +4620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 188 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4654,24 +4678,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 175 + "__id__": 177 }, "_children": [ { - "__id__": 189 + "__id__": 191 } ], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 197 }, { - "__id__": 197 + "__id__": 199 } ], "_prefab": { - "__id__": 199 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -4708,20 +4732,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 188 + "__id__": 190 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 192 }, { - "__id__": 192 + "__id__": 194 } ], "_prefab": { - "__id__": 194 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -4758,11 +4782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -4786,11 +4810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4844,11 +4868,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -4872,11 +4896,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 200 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4930,11 +4954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -4958,11 +4982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 205 }, "_alignFlags": 5, "_target": null, @@ -4994,17 +5018,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 207 }, "selectedSprite": { - "__id__": 197 + "__id__": 199 }, "unSelectedSprite": { - "__id__": 185 + "__id__": 187 }, "_id": "" }, @@ -5018,11 +5042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 209 }, "clickEvents": [], "_interactable": true, @@ -5087,21 +5111,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 168 + "__id__": 170 }, "_children": [ { - "__id__": 210 + "__id__": 212 }, { - "__id__": 222 + "__id__": 224 } ], "_active": true, "_components": [ - { - "__id__": 234 - }, { "__id__": 236 }, @@ -5110,10 +5131,13 @@ }, { "__id__": 240 + }, + { + "__id__": 242 } ], "_prefab": { - "__id__": 242 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -5150,24 +5174,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 209 + "__id__": 211 }, "_children": [ { - "__id__": 211 + "__id__": 213 } ], "_active": true, "_components": [ { - "__id__": 217 + "__id__": 219 }, { - "__id__": 219 + "__id__": 221 } ], "_prefab": { - "__id__": 221 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", @@ -5204,20 +5228,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 210 + "__id__": 212 }, "_children": [], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 214 }, { - "__id__": 214 + "__id__": 216 } ], "_prefab": { - "__id__": 216 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -5254,11 +5278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -5282,11 +5306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5340,11 +5364,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", @@ -5368,11 +5392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 222 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5426,24 +5450,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 209 + "__id__": 211 }, "_children": [ { - "__id__": 223 + "__id__": 225 } ], "_active": false, "_components": [ { - "__id__": 229 + "__id__": 231 }, { - "__id__": 231 + "__id__": 233 } ], "_prefab": { - "__id__": 233 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -5480,20 +5504,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 222 + "__id__": 224 }, "_children": [], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 226 }, { - "__id__": 226 + "__id__": 228 } ], "_prefab": { - "__id__": 228 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -5530,11 +5554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -5558,11 +5582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 229 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5616,11 +5640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 232 }, "_contentSize": { "__type__": "cc.Size", @@ -5644,11 +5668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 234 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5702,11 +5726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", @@ -5730,11 +5754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 239 }, "_alignFlags": 5, "_target": null, @@ -5766,17 +5790,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 241 }, "selectedSprite": { - "__id__": 231 + "__id__": 233 }, "unSelectedSprite": { - "__id__": 219 + "__id__": 221 }, "_id": "" }, @@ -5790,11 +5814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 243 }, "clickEvents": [], "_interactable": true, @@ -5859,11 +5883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -5887,11 +5911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 248 }, "_alignFlags": 40, "_target": null, @@ -5923,11 +5947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 250 }, "_id": "" }, @@ -5959,18 +5983,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 251 - }, { "__id__": 253 }, { "__id__": 255 + }, + { + "__id__": 257 } ], "_prefab": { - "__id__": 257 + "__id__": 259 }, "_lpos": { "__type__": "cc.Vec3", @@ -6007,11 +6031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 254 }, "_contentSize": { "__type__": "cc.Size", @@ -6035,11 +6059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 256 }, "_resizeMode": 1, "_layoutType": 3, @@ -6073,11 +6097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 258 }, "_alignFlags": 40, "_target": null, @@ -6126,7 +6150,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6154,7 +6178,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 263 }, "_alignFlags": 41, "_target": null, @@ -6190,7 +6214,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 265 }, "_resizeMode": 1, "_layoutType": 2, @@ -6227,6 +6251,8 @@ "__id__": 0 }, "fileId": "a8jgwzPNtJVpWPRJw66C37", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6239,7 +6265,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -6267,7 +6293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 270 }, "_type": 0, "_inverted": false, @@ -6289,7 +6315,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6335,7 +6361,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 274 }, "_alignFlags": 45, "_target": null, @@ -6384,7 +6410,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 277 }, "_contentSize": { "__type__": "cc.Size", @@ -6412,7 +6438,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 277 + "__id__": 279 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6457,7 +6483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 281 }, "bounceDuration": 0.23, "brake": 0.75, @@ -6488,7 +6514,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 283 }, "_alignFlags": 45, "_target": null, @@ -6537,26 +6563,23 @@ }, "_children": [ { - "__id__": 284 + "__id__": 286 }, { - "__id__": 290 + "__id__": 292 }, { - "__id__": 314 + "__id__": 316 }, { - "__id__": 320 + "__id__": 322 }, { - "__id__": 326 + "__id__": 328 } ], "_active": true, "_components": [ - { - "__id__": 346 - }, { "__id__": 348 }, @@ -6568,10 +6591,13 @@ }, { "__id__": 354 + }, + { + "__id__": 356 } ], "_prefab": { - "__id__": 356 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -6608,20 +6634,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 285 }, "_children": [], "_active": true, "_components": [ { - "__id__": 285 + "__id__": 287 }, { - "__id__": 287 + "__id__": 289 } ], "_prefab": { - "__id__": 289 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -6658,11 +6684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 288 }, "_contentSize": { "__type__": "cc.Size", @@ -6686,11 +6712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 290 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6744,30 +6770,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 285 }, "_children": [ { - "__id__": 291 + "__id__": 293 }, { - "__id__": 299 + "__id__": 301 } ], "_active": true, "_components": [ - { - "__id__": 307 - }, { "__id__": 309 }, { "__id__": 311 + }, + { + "__id__": 313 } ], "_prefab": { - "__id__": 313 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -6804,23 +6830,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 292 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 292 - }, { "__id__": 294 }, { "__id__": 296 + }, + { + "__id__": 298 } ], "_prefab": { - "__id__": 298 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -6857,11 +6883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -6885,11 +6911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 297 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6930,11 +6956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 299 }, "_alignFlags": 45, "_target": null, @@ -6979,23 +7005,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 292 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 300 - }, { "__id__": 302 }, { "__id__": 304 + }, + { + "__id__": 306 } ], "_prefab": { - "__id__": 306 + "__id__": 308 }, "_lpos": { "__type__": "cc.Vec3", @@ -7032,11 +7058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 303 }, "_contentSize": { "__type__": "cc.Size", @@ -7060,11 +7086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 305 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7105,11 +7131,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 307 }, "playOnLoad": true, "_clips": [ @@ -7147,11 +7173,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 310 }, "_contentSize": { "__type__": "cc.Size", @@ -7175,11 +7201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 312 }, "_alignFlags": 45, "_target": null, @@ -7211,14 +7237,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 314 }, "animation": { - "__id__": 304 + "__id__": 306 }, "_id": "" }, @@ -7245,20 +7271,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 285 }, "_children": [], "_active": true, "_components": [ { - "__id__": 315 + "__id__": 317 }, { - "__id__": 317 + "__id__": 319 } ], "_prefab": { - "__id__": 319 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -7295,11 +7321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7323,11 +7349,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7381,20 +7407,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 285 }, "_children": [], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 323 }, { - "__id__": 323 + "__id__": 325 } ], "_prefab": { - "__id__": 325 + "__id__": 327 }, "_lpos": { "__type__": "cc.Vec3", @@ -7431,11 +7457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 324 }, "_contentSize": { "__type__": "cc.Size", @@ -7459,11 +7485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 326 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7517,30 +7543,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 285 }, "_children": [ { - "__id__": 327 + "__id__": 329 }, { - "__id__": 333 + "__id__": 335 } ], "_active": true, "_components": [ - { - "__id__": 339 - }, { "__id__": 341 }, { "__id__": 343 + }, + { + "__id__": 345 } ], "_prefab": { - "__id__": 345 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -7577,20 +7603,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 326 + "__id__": 328 }, "_children": [], "_active": true, "_components": [ { - "__id__": 328 + "__id__": 330 }, { - "__id__": 330 + "__id__": 332 } ], "_prefab": { - "__id__": 332 + "__id__": 334 }, "_lpos": { "__type__": "cc.Vec3", @@ -7627,11 +7653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -7655,11 +7681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 333 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7736,20 +7762,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 326 + "__id__": 328 }, "_children": [], "_active": true, "_components": [ { - "__id__": 334 + "__id__": 336 }, { - "__id__": 336 + "__id__": 338 } ], "_prefab": { - "__id__": 338 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -7786,11 +7812,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -7814,11 +7840,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 339 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7872,11 +7898,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -7900,11 +7926,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 344 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7945,11 +7971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 346 }, "_alignFlags": 9, "_target": null, @@ -7994,11 +8020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 349 }, "_contentSize": { "__type__": "cc.Size", @@ -8022,11 +8048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 351 }, "clickEvents": [], "_interactable": true, @@ -8066,7 +8092,7 @@ "_duration": 0.1, "_zoomScale": 0.95, "_target": { - "__id__": 283 + "__id__": 285 }, "_id": "" }, @@ -8080,29 +8106,29 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 353 }, "img": { - "__id__": 287 + "__id__": 289 }, "question": { - "__id__": 314 + "__id__": 316 }, "video": { - "__id__": 323 + "__id__": 325 }, "priceFrame": { - "__id__": 326 + "__id__": 328 }, "videoPrice": { - "__id__": 330 + "__id__": 332 }, "loading": { - "__id__": 290 + "__id__": 292 }, "_id": "" }, @@ -8116,11 +8142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 355 }, "_type": 0, "_inverted": false, @@ -8138,11 +8164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8201,7 +8227,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 360 }, "_contentSize": { "__type__": "cc.Size", @@ -8229,7 +8255,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 360 + "__id__": 362 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8274,7 +8300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 364 }, "_alignFlags": 45, "_target": null, @@ -8309,6 +8335,8 @@ "__id__": 0 }, "fileId": "47GAgASDxMgr95ufaUc9Za", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8322,9 +8350,6 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 365 - }, { "__id__": 367 }, @@ -8332,11 +8357,14 @@ "__id__": 369 }, { - "__id__": 372 + "__id__": 371 + }, + { + "__id__": 374 } ], "_prefab": { - "__id__": 374 + "__id__": 376 }, "_lpos": { "__type__": "cc.Vec3", @@ -8373,11 +8401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 368 }, "_contentSize": { "__type__": "cc.Size", @@ -8401,11 +8429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 370 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8446,15 +8474,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 372 }, "clickEvents": [ { - "__id__": 371 + "__id__": 373 } ], "_interactable": true, @@ -8494,7 +8522,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 364 + "__id__": 366 }, "_id": "" }, @@ -8518,11 +8546,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 375 }, "_alignFlags": 9, "_target": null, @@ -8571,7 +8599,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 378 }, "_contentSize": { "__type__": "cc.Size", @@ -8599,7 +8627,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 378 + "__id__": 380 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8641,7 +8669,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 382 }, "_alignFlags": 45, "_target": null, @@ -8690,7 +8718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 385 }, "_contentSize": { "__type__": "cc.Size", @@ -8718,7 +8746,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 387 }, "_alignFlags": 45, "_target": null, @@ -8754,7 +8782,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 389 }, "_id": "" }, @@ -8772,7 +8800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 391 }, "m_rootNode": null, "videoArea": { @@ -8782,22 +8810,22 @@ "__id__": 53 }, "imgToggle": { - "__id__": 204 + "__id__": 206 }, "videoToggle": { - "__id__": 238 + "__id__": 240 }, "starParent": { "__id__": 58 }, "tags": { - "__id__": 124 + "__id__": 126 }, "descAge": { - "__id__": 132 + "__id__": 134 }, "desc": { - "__id__": 156 + "__id__": 158 }, "chatBtn": { "__id__": 96 @@ -8806,10 +8834,10 @@ "__id__": 17 }, "imgItemInst": { - "__id__": 350 + "__id__": 352 }, "imgsLayout": { - "__id__": 250 + "__id__": 252 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/NavigationPanel.prefab b/assets/bundles/Chat18x/NavigationPanel.prefab index 83f4cf8c..f727a318 100644 --- a/assets/bundles/Chat18x/NavigationPanel.prefab +++ b/assets/bundles/Chat18x/NavigationPanel.prefab @@ -25,26 +25,26 @@ "__id__": 32 }, { - "__id__": 186 + "__id__": 202 }, { - "__id__": 192 + "__id__": 208 } ], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 224 }, { - "__id__": 210 + "__id__": 226 }, { - "__id__": 212 + "__id__": 228 } ], "_prefab": { - "__id__": 214 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -720,32 +720,32 @@ "__id__": 33 }, { - "__id__": 69 + "__id__": 73 }, { - "__id__": 105 + "__id__": 113 }, { - "__id__": 141 + "__id__": 153 } ], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 193 }, { - "__id__": 179 + "__id__": 195 }, { - "__id__": 181 + "__id__": 197 }, { - "__id__": 183 + "__id__": 199 } ], "_prefab": { - "__id__": 185 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -789,17 +789,11 @@ "__id__": 34 }, { - "__id__": 46 + "__id__": 48 } ], "_active": true, "_components": [ - { - "__id__": 58 - }, - { - "__id__": 60 - }, { "__id__": 62 }, @@ -808,10 +802,16 @@ }, { "__id__": 66 + }, + { + "__id__": 68 + }, + { + "__id__": 70 } ], "_prefab": { - "__id__": 68 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -858,14 +858,14 @@ "_active": true, "_components": [ { - "__id__": 41 + "__id__": 43 }, { - "__id__": 43 + "__id__": 45 } ], "_prefab": { - "__id__": 45 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -912,10 +912,13 @@ }, { "__id__": 38 + }, + { + "__id__": 40 } ], "_prefab": { - "__id__": 40 + "__id__": 42 }, "_lpos": { "__type__": "cc.Vec3", @@ -1042,6 +1045,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5b8XafpKNHCqq6M7uMfQdW" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 41 + }, + "languageKey": "navigation.home", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "95JE+VIfpML4USBAP/8+Fc" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1065,7 +1089,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -1093,7 +1117,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 46 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1151,20 +1175,20 @@ }, "_children": [ { - "__id__": 47 + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 57 }, { - "__id__": 55 + "__id__": 59 } ], "_prefab": { - "__id__": 57 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -1201,20 +1225,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 46 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 50 }, { - "__id__": 50 + "__id__": 52 + }, + { + "__id__": 54 } ], "_prefab": { - "__id__": 52 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -1251,11 +1278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -1279,11 +1306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1341,6 +1368,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a4FOQU3VNNm6AV6QDkk4+a" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 49 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "languageKey": "navigation.home", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0+S5WKmdI0ro4BLfWqfgW" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1360,11 +1408,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -1388,11 +1436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1450,7 +1498,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1478,7 +1526,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 65 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1520,7 +1568,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 67 }, "clickEvents": [], "_interactable": true, @@ -1578,7 +1626,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 69 }, "_alignFlags": 1, "_target": null, @@ -1614,7 +1662,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 71 }, "_id": "" }, @@ -1645,32 +1693,32 @@ }, "_children": [ { - "__id__": 70 + "__id__": 74 }, { - "__id__": 82 + "__id__": 88 } ], "_active": true, "_components": [ - { - "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, { "__id__": 102 + }, + { + "__id__": 104 + }, + { + "__id__": 106 + }, + { + "__id__": 108 + }, + { + "__id__": 110 } ], "_prefab": { - "__id__": 104 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -1707,24 +1755,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 69 + "__id__": 73 }, "_children": [ { - "__id__": 71 + "__id__": 75 } ], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 83 }, { - "__id__": 79 + "__id__": 85 } ], "_prefab": { - "__id__": 81 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", @@ -1761,20 +1809,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 74 }, "_children": [], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 76 }, { - "__id__": 74 + "__id__": 78 + }, + { + "__id__": 80 } ], "_prefab": { - "__id__": 76 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -1811,11 +1862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -1839,11 +1890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1901,6 +1952,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a8Q6thqdtGX6TZWeYYmK9s" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 75 + }, + "_enabled": true, + "__prefab": { + "__id__": 81 + }, + "languageKey": "navigation.profile", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "89d9c6eiJKk71f/RcRY7yr" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1920,11 +1992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1948,11 +2020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2006,24 +2078,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 69 + "__id__": 73 }, "_children": [ { - "__id__": 83 + "__id__": 89 } ], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 97 }, { - "__id__": 91 + "__id__": 99 } ], "_prefab": { - "__id__": 93 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -2060,20 +2132,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 88 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 90 }, { - "__id__": 86 + "__id__": 92 + }, + { + "__id__": 94 } ], "_prefab": { - "__id__": 88 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -2110,11 +2185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", @@ -2138,11 +2213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 93 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2200,6 +2275,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "6brtdgarxAs6MgCk0I89bs" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 89 + }, + "_enabled": true, + "__prefab": { + "__id__": 95 + }, + "languageKey": "navigation.profile", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "38f7wbcs1JpaH2452wOgna" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2219,11 +2315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -2247,11 +2343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2305,11 +2401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -2333,11 +2429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 105 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2375,11 +2471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 107 }, "clickEvents": [], "_interactable": true, @@ -2419,7 +2515,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 69 + "__id__": 73 }, "_id": "" }, @@ -2433,11 +2529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 109 }, "_alignFlags": 1, "_target": null, @@ -2469,11 +2565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 111 }, "_id": "" }, @@ -2504,32 +2600,32 @@ }, "_children": [ { - "__id__": 106 + "__id__": 114 }, { - "__id__": 118 + "__id__": 128 } ], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 142 }, { - "__id__": 132 + "__id__": 144 }, { - "__id__": 134 + "__id__": 146 }, { - "__id__": 136 + "__id__": 148 }, { - "__id__": 138 + "__id__": 150 } ], "_prefab": { - "__id__": 140 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -2566,24 +2662,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 113 }, "_children": [ { - "__id__": 107 + "__id__": 115 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 123 }, { - "__id__": 115 + "__id__": 125 } ], "_prefab": { - "__id__": 117 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -2620,20 +2716,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 106 + "__id__": 114 }, "_children": [], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 116 }, { - "__id__": 110 + "__id__": 118 + }, + { + "__id__": 120 } ], "_prefab": { - "__id__": 112 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2670,11 +2769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -2698,11 +2797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 119 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2760,6 +2859,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "cdYxCf2ZxM/49Z1REQn4sp" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 115 + }, + "_enabled": true, + "__prefab": { + "__id__": 121 + }, + "languageKey": "navigation.chat", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "69WxtpLvVIh68d7BCUvJTt" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2779,11 +2899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -2807,11 +2927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2865,24 +2985,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 113 }, "_children": [ { - "__id__": 119 + "__id__": 129 } ], "_active": true, "_components": [ { - "__id__": 125 + "__id__": 137 }, { - "__id__": 127 + "__id__": 139 } ], "_prefab": { - "__id__": 129 + "__id__": 141 }, "_lpos": { "__type__": "cc.Vec3", @@ -2919,20 +3039,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 118 + "__id__": 128 }, "_children": [], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 130 }, { - "__id__": 122 + "__id__": 132 + }, + { + "__id__": 134 } ], "_prefab": { - "__id__": 124 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2969,11 +3092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2997,11 +3120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3059,6 +3182,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "78LqF7A5tM8pmX1uIkgKWs" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 129 + }, + "_enabled": true, + "__prefab": { + "__id__": 135 + }, + "languageKey": "navigation.chat", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "db4B55iVNDnpur5odn4zgA" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3078,11 +3222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 138 }, "_contentSize": { "__type__": "cc.Size", @@ -3106,11 +3250,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 140 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3164,11 +3308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -3192,11 +3336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3234,11 +3378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 147 }, "clickEvents": [], "_interactable": true, @@ -3278,7 +3422,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 105 + "__id__": 113 }, "_id": "" }, @@ -3292,11 +3436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 149 }, "_alignFlags": 1, "_target": null, @@ -3328,11 +3472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 151 }, "_id": "" }, @@ -3363,32 +3507,32 @@ }, "_children": [ { - "__id__": 142 + "__id__": 154 }, { - "__id__": 154 + "__id__": 168 } ], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 182 }, { - "__id__": 168 + "__id__": 184 }, { - "__id__": 170 + "__id__": 186 }, { - "__id__": 172 + "__id__": 188 }, { - "__id__": 174 + "__id__": 190 } ], "_prefab": { - "__id__": 176 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -3425,24 +3569,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 141 + "__id__": 153 }, "_children": [ { - "__id__": 143 + "__id__": 155 } ], "_active": true, "_components": [ { - "__id__": 149 + "__id__": 163 }, { - "__id__": 151 + "__id__": 165 } ], "_prefab": { - "__id__": 153 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", @@ -3479,20 +3623,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 156 }, { - "__id__": 146 + "__id__": 158 + }, + { + "__id__": 160 } ], "_prefab": { - "__id__": 148 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3529,11 +3676,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 157 }, "_contentSize": { "__type__": "cc.Size", @@ -3557,11 +3704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 159 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3619,6 +3766,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "2aymafsbRF8YDZ2y8bWsAN" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 155 + }, + "_enabled": true, + "__prefab": { + "__id__": 161 + }, + "languageKey": "navigation.me", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "66gvnR70RPVJ8mrzNaXt/b" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3638,11 +3806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 164 }, "_contentSize": { "__type__": "cc.Size", @@ -3666,11 +3834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 166 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3724,24 +3892,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 141 + "__id__": 153 }, "_children": [ { - "__id__": 155 + "__id__": 169 } ], "_active": true, "_components": [ { - "__id__": 161 + "__id__": 177 }, { - "__id__": 163 + "__id__": 179 } ], "_prefab": { - "__id__": 165 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", @@ -3778,20 +3946,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 154 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 156 + "__id__": 170 }, { - "__id__": 158 + "__id__": 172 + }, + { + "__id__": 174 } ], "_prefab": { - "__id__": 160 + "__id__": 176 }, "_lpos": { "__type__": "cc.Vec3", @@ -3828,11 +3999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 155 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -3856,11 +4027,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 155 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3918,6 +4089,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5by226NBFHF4EujAV06jU3" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 169 + }, + "_enabled": true, + "__prefab": { + "__id__": 175 + }, + "languageKey": "navigation.me", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dAzXrxp1BBotaUMkjV+Gw" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3937,11 +4129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 178 }, "_contentSize": { "__type__": "cc.Size", @@ -3965,11 +4157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 180 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4023,11 +4215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4051,11 +4243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4093,11 +4285,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 187 }, "clickEvents": [], "_interactable": true, @@ -4137,7 +4329,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 141 + "__id__": 153 }, "_id": "" }, @@ -4151,11 +4343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 189 }, "_alignFlags": 1, "_target": null, @@ -4187,11 +4379,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 191 }, "_id": "" }, @@ -4222,7 +4414,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 194 }, "_contentSize": { "__type__": "cc.Size", @@ -4250,7 +4442,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 196 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4295,7 +4487,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 198 }, "_alignFlags": 44, "_target": null, @@ -4331,7 +4523,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 200 }, "_resizeMode": 0, "_layoutType": 1, @@ -4384,14 +4576,14 @@ "_active": false, "_components": [ { - "__id__": 187 + "__id__": 203 }, { - "__id__": 189 + "__id__": 205 } ], "_prefab": { - "__id__": 191 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -4428,11 +4620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -4456,11 +4648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 206 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4541,26 +4733,26 @@ }, "_children": [ { - "__id__": 193 + "__id__": 209 } ], "_active": false, "_components": [ { - "__id__": 199 + "__id__": 215 }, { - "__id__": 201 + "__id__": 217 }, { - "__id__": 203 + "__id__": 219 }, { - "__id__": 205 + "__id__": 221 } ], "_prefab": { - "__id__": 207 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", @@ -4597,20 +4789,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 192 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 210 }, { - "__id__": 196 + "__id__": 212 } ], "_prefab": { - "__id__": 198 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", @@ -4647,11 +4839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 211 }, "_contentSize": { "__type__": "cc.Size", @@ -4675,11 +4867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4756,11 +4948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 216 }, "_contentSize": { "__type__": "cc.Size", @@ -4784,11 +4976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4829,11 +5021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 220 }, "clickEvents": [], "_interactable": true, @@ -4885,7 +5077,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 192 + "__id__": 208 }, "_id": "" }, @@ -4899,11 +5091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 222 }, "_alignFlags": 12, "_target": null, @@ -4952,7 +5144,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -4980,7 +5172,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 227 }, "_alignFlags": 45, "_target": null, @@ -5016,7 +5208,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 229 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 516cdea9a26d8b5f8fbf68515e12a5c9e21bc081..6e367e01fb5a85fa1603b63aa9b731f771bd6c37 100644 GIT binary patch delta 338 zcmcb6k@4MSMy7_v8=1bbhVWFEWag&UDuBph&Ie1@JXo^t!IBLK76XGoaz-m%w&pNgnK3KBu!P3SDOIANvvgg6l z-UmyT0FCZ^uw>PPCF>t7?S8Oi`hz7?!8U>9fX-xK;DA}d00Lq#9@xUoO1!(HQ$;{- zk54Ts$}fsf&QD2=H#9IX6!yzk$jvWGRRBpAE99i6mFO{8JXo^h!IHH=e*mqW^=|%{m}wC(s>03h0my2oI>JiGcwC7xYK~q~X=Pbv0Z?qS4;wT4<^#MZqXD%$ B5Ssu1 diff --git a/xchat_cfg b/xchat_cfg index 1d45805b..00cd4d80 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 1d45805baa4626f2c19eb915fb9fe0e2316798af +Subproject commit 00cd4d805c2cf30a9fc7d376a2ad83c31e8b30c3