diff --git a/DataTables/Datas/#demo.item.xlsx b/DataTables/Datas/#demo.item.xlsx deleted file mode 100644 index 974ed8bd..00000000 Binary files a/DataTables/Datas/#demo.item.xlsx and /dev/null differ diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index 5d686637..aadeed6a 100644 Binary files a/DataTables/Datas/__tables__.xlsx and b/DataTables/Datas/__tables__.xlsx differ diff --git a/DataTables/Datas/girls.xlsx b/DataTables/Datas/girls.xlsx index 40538ec5..ae70547f 100644 Binary files a/DataTables/Datas/girls.xlsx and b/DataTables/Datas/girls.xlsx differ diff --git a/DataTables/Datas/l10n/Demo.xlsx b/DataTables/Datas/l10n/Demo.xlsx deleted file mode 100644 index c9032390..00000000 Binary files a/DataTables/Datas/l10n/Demo.xlsx and /dev/null differ diff --git a/DataTables/Datas/l10n/Patch.xlsx b/DataTables/Datas/l10n/Patch.xlsx deleted file mode 100644 index 77428df8..00000000 Binary files a/DataTables/Datas/l10n/Patch.xlsx and /dev/null differ diff --git a/DataTables/Datas/l10n/texts.json b/DataTables/Datas/l10n/texts.json deleted file mode 100644 index 0b59e3fa..00000000 --- a/DataTables/Datas/l10n/texts.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - {"key":"/apple", "en":"apple", "zh":"苹果"}, - {"key":"/abc", "en":"apple", "zh":"苹果"}, - {"key":"/def", "en":"apple", "zh":"苹果"}, - {"key":"key_name", "en":"apple", "zh":"苹果"}, - {"key":"test/a", "en":"apple", "zh":"苹果"}, - {"key":"name", "en":"apple", "zh":"苹果"}, - {"key":"/banana", "en":"banana", "zh":"香蕉"} -] \ No newline at end of file diff --git a/DataTables/Datas/language.xlsx b/DataTables/Datas/language.xlsx new file mode 100644 index 00000000..6c50ac0e Binary files /dev/null and b/DataTables/Datas/language.xlsx differ diff --git a/DataTables/Datas/texts.json b/DataTables/Datas/texts.json new file mode 100644 index 00000000..1c2c6ee2 --- /dev/null +++ b/DataTables/Datas/texts.json @@ -0,0 +1,4 @@ +[ + { "key": "/apple", "en": "apple", "zh": "苹果" }, + { "key": "/abc", "en": "apple", "zh": "苹果" } +] diff --git a/DataTables/Datas/themes.xlsx b/DataTables/Datas/themes.xlsx index 824f2ae2..500330d0 100644 Binary files a/DataTables/Datas/themes.xlsx and b/DataTables/Datas/themes.xlsx differ diff --git a/DataTables/Datas/~$__tables__.xlsx b/DataTables/Datas/~$__tables__.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/DataTables/Datas/~$__tables__.xlsx differ diff --git a/DataTables/Datas/~$girls.xlsx b/DataTables/Datas/~$girls.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/DataTables/Datas/~$girls.xlsx differ diff --git a/DataTables/Datas/~$language.xlsx b/DataTables/Datas/~$language.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/DataTables/Datas/~$language.xlsx differ diff --git a/DataTables/Datas/~$themes.xlsx b/DataTables/Datas/~$themes.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/DataTables/Datas/~$themes.xlsx differ diff --git a/DataTables/gen.bat b/DataTables/gen.bat index 3eef6241..8956b88c 100644 --- a/DataTables/gen.bat +++ b/DataTables/gen.bat @@ -6,6 +6,8 @@ dotnet %LUBAN_DLL% ^ -t all ^ -d json ^ --conf %CONF_ROOT%\luban.conf ^ - -x outputDataDir=output + -x outputDataDir=output + + pause \ No newline at end of file diff --git a/DataTables/output/demo_tbitem.json b/DataTables/output/demo_tbitem.json deleted file mode 100644 index 06e888f8..00000000 --- a/DataTables/output/demo_tbitem.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "id": 1001, - "name": "道具1", - "desc": "描述1", - "count": 10 - }, - { - "id": 1002, - "name": "道具2", - "desc": "描述2", - "count": 100 - } -] \ No newline at end of file diff --git a/DataTables/output/demo_tbreward.json b/DataTables/output/demo_tbreward.json deleted file mode 100644 index 329a3ca7..00000000 --- a/DataTables/output/demo_tbreward.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "id": 1001, - "name": "道具1", - "desc": "碎片", - "count": 10 - }, - { - "id": 1002, - "name": "道具2", - "desc": "金币", - "count": 100 - } -] \ No newline at end of file diff --git a/DataTables/output/tbgirls.json b/DataTables/output/tbgirls.json index c8dc8ba1..fbad0a8b 100644 --- a/DataTables/output/tbgirls.json +++ b/DataTables/output/tbgirls.json @@ -1,36 +1,30 @@ [ { "id": 10001, - "name": "Anaya Kapoor", + "nameKey": "girl_10001_name", "age": "29", "category": 0, - "tag": [ - "Hot,Horny" - ], + "tagKey": "girl_10001_tag", "priceType": 0, "avatarPath": "Image/Girls/10001/Avatar/10001_avatar", "starCount": 5 }, { "id": 10002, - "name": "Meher Joshi", + "nameKey": "girl_10002_name", "age": "26", "category": 0, - "tag": [ - "Earth-tone linens,handcrafted jewelry" - ], + "tagKey": "girl_10002_tag", "priceType": 1, "avatarPath": "Image/Girls/10002/Avatar/10002_avatar", "starCount": 4 }, { "id": 10003, - "name": "Sana Reddy", + "nameKey": "girl_10003_name", "age": "25", "category": 0, - "tag": [ - "Singer-Songwriter,Dancer" - ], + "tagKey": "girl_10003_tag", "priceType": 2, "avatarPath": "Image/Girls/10003/Avatar/10003_avatar", "starCount": 3 diff --git a/DataTables/output/tblanguage.json b/DataTables/output/tblanguage.json new file mode 100644 index 00000000..143d481c --- /dev/null +++ b/DataTables/output/tblanguage.json @@ -0,0 +1,162 @@ +[ + { + "key": "themepanel.title", + "language_en": "Girls Online", + "language_cn": "在线选妃", + "language_hi": "ऑनलाइन लड़कियाँ", + "language_fr": "Filles en ligne", + "language_de": "Mädchen Online" + }, + { + "key": "themepanel.recomandtext", + "language_en": "Daily Recomand", + "language_cn": "每日推荐", + "language_hi": "दैनिक सिफारिश", + "language_fr": "Recommandation quotidienne", + "language_de": "Tägliche Empfehlung" + }, + { + "key": "girllistpanel.title", + "language_en": "Girl List", + "language_cn": "技师列表", + "language_hi": "लड़कियों की सूची", + "language_fr": "Liste des filles", + "language_de": "Mädchenliste" + }, + { + "key": "girldetailpanel.chatbtn", + "language_en": "Send Msgs!", + "language_cn": "发送消息", + "language_hi": "संदेश भेजें", + "language_fr": "Envoyer un message", + "language_de": "Nachricht senden" + }, + { + "key": "girldetailpanel.name", + "language_en": "Name:", + "language_cn": "名字:", + "language_hi": "नाम:", + "language_fr": "Nom :", + "language_de": "Name:" + }, + { + "key": "girldetailpanel.age", + "language_en": "Age:", + "language_cn": "年龄:", + "language_hi": "उम्र:", + "language_fr": "Âge :", + "language_de": "Alter:" + }, + { + "key": "girldetailpanel.desc", + "language_en": "Description:", + "language_cn": "自我介绍:", + "language_hi": "विवरण:", + "language_fr": "Description :", + "language_de": "Beschreibung:" + }, + { + "key": "chatpanel.inputplaceholder", + "language_en": "Messages!", + "language_cn": "请输入：", + "language_hi": "संदेश लिखें", + "language_fr": "Écrivez ici...", + "language_de": "Nachricht eingeben" + }, + { + "key": "category_1001", + "language_en": "mature_lady", + "language_cn": "熟女", + "language_hi": "परिपक्व महिला", + "language_fr": "Femme mature", + "language_de": "Reife Dame" + }, + { + "key": "category_1002", + "language_en": "eighteen", + "language_cn": "18岁", + "language_hi": "अठारह वर्ष", + "language_fr": "Dix-huit ans", + "language_de": "Achtzehn" + }, + { + "key": "category_1003", + "language_en": "hot_mommy", + "language_cn": "辣妈", + "language_hi": "सेक्सी माँ", + "language_fr": "Maman sexy", + "language_de": "Heiße Mama" + }, + { + "key": "category_1004", + "language_en": "binding", + "language_cn": "捆绑", + "language_hi": "बंधन", + "language_fr": "Bondage", + "language_de": "Fesseln" + }, + { + "key": "category_1005", + "language_en": "public_fight", + "language_cn": "公众野战", + "language_hi": "सार्वजनिक संभोग", + "language_fr": "Sexe public", + "language_de": "Öffentlicher Sex" + }, + { + "key": "category_1006", + "language_en": "cartoon", + "language_cn": "卡通", + "language_hi": "कार्टून", + "language_fr": "Dessin animé", + "language_de": "Zeichentrick" + }, + { + "key": "girl_10001_name", + "language_en": "Anaya Kapoor", + "language_cn": "阿纳雅", + "language_hi": "आन्या कपूर", + "language_fr": "Anaya Kapoor", + "language_de": "Anaya Kapoor" + }, + { + "key": "girl_10002_name", + "language_en": "Meher Joshi", + "language_cn": "梅尔", + "language_hi": "मेहर जोशी", + "language_fr": "Meher Joshi", + "language_de": "Meher Joshi" + }, + { + "key": "girl_10003_name", + "language_en": "Sana Reddy", + "language_cn": "萨娜", + "language_hi": "साना रेड्डी", + "language_fr": "Sana Reddy", + "language_de": "Sana Reddy" + }, + { + "key": "girl_10001_tag", + "language_en": "Hot|Horny", + "language_cn": "火辣|饥渴", + "language_hi": "सेक्सी|कामुक", + "language_fr": "Chaude|Excitée", + "language_de": "Heiß|Geil" + }, + { + "key": "girl_10002_tag", + "language_en": "Earth-tone linens,handcrafted jewelry", + "language_cn": "土色亚麻制品|手工珠宝", + "language_hi": "भूरे रंग के लिनन|हस्तनिर्मित गहने", + "language_fr": "Linge terreux,Bijoux artisanaux", + "language_de": "Erdfarbene Leinen,Handgemachter Schmuck" + }, + { + "key": "girl_10003_tag", + "language_en": "Singer-Songwriter,Dancer", + "language_cn": "舞者|歌手", + "language_hi": "गायक-गीतकार|नर्तकी", + "language_fr": "Chanteuse-compositrice,Danseuse", + "language_de": "Sängerin-Songwriterin,Tänzerin" + } +] \ No newline at end of file diff --git a/DataTables/output/tbthemes.json b/DataTables/output/tbthemes.json index 76d44918..68e22324 100644 --- a/DataTables/output/tbthemes.json +++ b/DataTables/output/tbthemes.json @@ -1,6 +1,7 @@ [ { "id": 1001, + "key": "category_1001", "name": "mature_lady", "category": 0, "isRelease": true, @@ -8,6 +9,7 @@ }, { "id": 1002, + "key": "category_1002", "name": "eighteen", "category": 1, "isRelease": false, @@ -15,6 +17,7 @@ }, { "id": 1003, + "key": "category_1003", "name": "hot_mommy", "category": 2, "isRelease": false, @@ -22,6 +25,7 @@ }, { "id": 1004, + "key": "category_1004", "name": "binding", "category": 3, "isRelease": false, @@ -29,6 +33,7 @@ }, { "id": 1005, + "key": "category_1005", "name": "public_fight", "category": 4, "isRelease": false, @@ -36,6 +41,7 @@ }, { "id": 1006, + "key": "category_1006", "name": "cartoon", "category": 5, "isRelease": false, diff --git a/assets/Scripts/Main/Common/LanguageLabel.ts b/assets/Scripts/Main/Common/LanguageLabel.ts new file mode 100644 index 00000000..28295364 --- /dev/null +++ b/assets/Scripts/Main/Common/LanguageLabel.ts @@ -0,0 +1,134 @@ +import { _decorator, Component, Label, Node } from "cc"; +import LanguageUtils, { LanguageType } from "./LanguageUtils"; + +const { ccclass, property, requireComponent } = _decorator; + +@ccclass("LanguageLabel") +@requireComponent(Label) +export class LanguageLabel extends Component { + @property({ + displayName: "Language Key", + tooltip: "多语言配置表中的key值", + }) + private languageKey: string = ""; + + @property({ + displayName: "Default Text", + tooltip: "如果找不到对应的翻译时显示的默认文本", + }) + private defaultText: string = ""; + + @property({ + displayName: "Auto Update", + tooltip: "是否自动监听语言变化并更新", + }) + private autoUpdate: boolean = true; + + private label: Label = null; + private params: { [key: string]: any } = null; + + onLoad() { + this.label = this.getComponent(Label); + if (!this.label) { + console.error("LanguageLabel: Label component not found!"); + return; + } + + this.updateText(); + + if (this.autoUpdate) { + LanguageUtils.onLanguageChanged(this.onLanguageChanged, this); + } + } + + onDestroy() { + if (this.autoUpdate) { + LanguageUtils.offLanguageChanged(this.onLanguageChanged, this); + } + } + + onEnable() { + this.updateText(); + } + + private onLanguageChanged(language: LanguageType) { + this.updateText(); + } + + private updateText() { + if (!this.label || !this.languageKey) { + return; + } + + let text: string; + if (this.params && Object.keys(this.params).length > 0) { + text = LanguageUtils.getTextWithParams( + this.languageKey, + this.params, + this.defaultText + ); + } else { + text = LanguageUtils.getText(this.languageKey, this.defaultText); + } + + this.label.string = text; + } + + /** + * 设置语言key + */ + public setLanguageKey(key: string) { + this.languageKey = key; + this.updateText(); + } + + /** + * 设置文本参数（用于替换文本中的占位符） + * @param params 参数对象，如 {name: "玩家", score: 100} + */ + public setParams(params: { [key: string]: any }) { + this.params = params; + this.updateText(); + } + + /** + * 添加或更新单个参数 + */ + public setParam(key: string, value: any) { + if (!this.params) { + this.params = {}; + } + this.params[key] = value; + this.updateText(); + } + + /** + * 清除所有参数 + */ + public clearParams() { + this.params = null; + this.updateText(); + } + + /** + * 手动刷新文本 + */ + public refresh() { + this.updateText(); + } + + /** + * 获取当前的语言key + */ + public getLanguageKey(): string { + return this.languageKey; + } + + /** + * 设置默认文本 + */ + public setDefaultText(text: string) { + this.defaultText = text; + this.updateText(); + } +} diff --git a/assets/Scripts/Main/Common/LanguageLabel.ts.meta b/assets/Scripts/Main/Common/LanguageLabel.ts.meta new file mode 100644 index 00000000..fa450cc4 --- /dev/null +++ b/assets/Scripts/Main/Common/LanguageLabel.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "d7e4f3a2-8b9c-4d2e-a1f6-3c5e9d7b8a4f", + "files": [], + "subMetas": {}, + "userData": {} +} \ No newline at end of file diff --git a/assets/Scripts/Main/Common/LanguageUtils.ts b/assets/Scripts/Main/Common/LanguageUtils.ts new file mode 100644 index 00000000..37db2f6a --- /dev/null +++ b/assets/Scripts/Main/Common/LanguageUtils.ts @@ -0,0 +1,201 @@ +import { _decorator, sys } from "cc"; +import { Language } from "../../schema/schema"; +import ConfigManager from "../../chat18x/manager/ConfigManager"; +import { CommonConfig } from "../Config/CommonConfig"; +import li_EventManager from "./li_EventManager"; +import Utils from "./Utils"; +import { InnerMsgCode } from "../Config/InnerMsgCode"; + +const { ccclass } = _decorator; + +export enum LanguageType { + EN = "en", // 英文 + CN = "cn", // 中文 + HI = "hi", // 印地语 + FR = "fr", // 法语 + DE = "de", //德语 +} + +export enum LanguageEvent { + LANGUAGE_CHANGED = "LANGUAGE_CHANGED", +} + +@ccclass("LanguageUtils") +export default class LanguageUtils { + private static currentLanguage: LanguageType = LanguageType.EN; + private static languageCache: Map = new Map(); + private static isInitialized: boolean = false; + + public static get CurrentLanguage(): LanguageType { + if (!this.isInitialized) { + this.init(); + } + return this.currentLanguage; + } + + private static init() { + if (this.isInitialized) return; + this.isInitialized = true; + this.loadLanguageSetting(); + } + + private static loadLanguageSetting() { + const savedLanguage = sys.localStorage.getItem( + CommonConfig.StorageConfig.LANGUAGE_SETTING + ); + if ( + savedLanguage && + Object.values(LanguageType).includes(savedLanguage as LanguageType) + ) { + this.currentLanguage = savedLanguage as LanguageType; + } else { + this.detectSystemLanguage(); + } + console.log( + "LanguageUtils initialized with language:", + this.currentLanguage + ); + } + + private static detectSystemLanguage() { + const systemLanguage = sys.language; + if (systemLanguage.startsWith("zh")) { + this.currentLanguage = LanguageType.CN; + } else if (systemLanguage.startsWith("hi")) { + this.currentLanguage = LanguageType.HI; + } else if (systemLanguage.startsWith("fr")) { + this.currentLanguage = LanguageType.FR; + } else if (systemLanguage.startsWith("de")) { + this.currentLanguage = LanguageType.DE; + } else { + this.currentLanguage = LanguageType.EN; + } + } + + public static setLanguage(language: LanguageType): void { + if (!this.isInitialized) { + this.init(); + } + + if (this.currentLanguage === language) { + return; + } + + this.currentLanguage = language; + this.languageCache.clear(); + sys.localStorage.setItem( + CommonConfig.StorageConfig.LANGUAGE_SETTING, + language + ); + + Utils.sendInnerMsg(InnerMsgCode.LanguageChange, language); + console.log("Language changed to:", language); + } + + public static getText(key: string, defaultText: string = ""): string { + if (!this.isInitialized) { + this.init(); + } + + if (!key) { + return defaultText; + } + + if (this.languageCache.has(key)) { + return this.languageCache.get(key); + } + + if (!ConfigManager.tables || !ConfigManager.tables.TbLanguage) { + console.warn("Language table not loaded yet"); + return defaultText || key; + } + + const languageData = ConfigManager.tables.TbLanguage.get(key); + if (!languageData) { + console.warn(`Language key not found: ${key}`); + return defaultText || key; + } + + let text: string = ""; + switch (this.currentLanguage) { + case LanguageType.EN: + text = languageData.languageEn; + break; + case LanguageType.CN: + text = languageData.languageCn; + break; + case LanguageType.HI: + text = languageData.languageHi; + break; + case LanguageType.FR: + text = languageData.languageFr; + break; + case LanguageType.DE: + text = languageData.languageDe; + break; + default: + text = languageData.languageEn; + } + + if (!text || text.length === 0) { + text = languageData.languageEn || defaultText || key; + } + + this.languageCache.set(key, text); + return text; + } + + public static getTextWithParams( + key: string, + params: { [key: string]: any }, + defaultText: string = "" + ): string { + let text = this.getText(key, defaultText); + + for (let paramKey in params) { + const regex = new RegExp(`{${paramKey}}`, "g"); + text = text.replace(regex, params[paramKey].toString()); + } + + return text; + } + + public static getAvailableLanguages(): LanguageType[] { + return Object.values(LanguageType); + } + + public static getLanguageDisplayName(language: LanguageType): string { + switch (language) { + case LanguageType.EN: + return "English"; + case LanguageType.CN: + return "中文"; + case LanguageType.HI: + return "हिंदी"; + case LanguageType.FR: + return "Français"; + case LanguageType.DE: + return "Deutsch"; + default: + return language; + } + } + + public static clearCache(): void { + this.languageCache.clear(); + } + + public static onLanguageChanged( + callback: (language: LanguageType) => void, + target: any + ): void { + Utils.addInnerEL(InnerMsgCode.LanguageChange, target, callback); + } + + public static offLanguageChanged( + callback: (language: LanguageType) => void, + target: any + ): void { + Utils.removeInnerEL(InnerMsgCode.LanguageChange, target, callback); + } +} diff --git a/assets/Scripts/Main/Common/LanguageUtils.ts.meta b/assets/Scripts/Main/Common/LanguageUtils.ts.meta new file mode 100644 index 00000000..1b0c6dc9 --- /dev/null +++ b/assets/Scripts/Main/Common/LanguageUtils.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "c8b5e7a2-4f3d-4e8b-9c2a-1d6f5e8a7b9c", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/Main/Config/CommonConfig.ts b/assets/Scripts/Main/Config/CommonConfig.ts index 45dca886..4e889154 100644 --- a/assets/Scripts/Main/Config/CommonConfig.ts +++ b/assets/Scripts/Main/Config/CommonConfig.ts @@ -30,6 +30,7 @@ export namespace CommonConfig { DD_LEVELOPER = StorageConfigUtil.BaseData + 16, //进入关卡且首次进度>0时（或第一次操作） GUIDE_MAIN = StorageConfigUtil.BaseData + 17, //主界面引导是否完成 GUIDE_TALK = StorageConfigUtil.BaseData + 18, //聊天界面引导是否完成 + LANGUAGE_SETTING = StorageConfigUtil.BaseData + 19, //语言设置 DOUYIN_SIDEBAR = StorageConfigUtil.Channel + 1, //抖音渠道侧边栏奖励是否领取 } diff --git a/assets/Scripts/Main/Config/InnerMsgCode.ts b/assets/Scripts/Main/Config/InnerMsgCode.ts index 73cae02d..001e28e3 100644 --- a/assets/Scripts/Main/Config/InnerMsgCode.ts +++ b/assets/Scripts/Main/Config/InnerMsgCode.ts @@ -26,4 +26,5 @@ export enum InnerMsgCode { Chat_DialogRefresh, SimplePlayVide, + LanguageChange, } \ No newline at end of file diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index 7b6ce894..e2e356d5 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -1,213 +1,240 @@ -import { _decorator, AssetManager, AudioClip, Button, Component, ImageAsset, JsonAsset, Label, Material, Node, Prefab, ProgressBar, Sprite, SpriteFrame } from 'cc'; -import { GButton } from '../../Main/Common/GButton'; -import ResManager from '../../Main/Manager/ResManager'; -import Resource from '../../Main/Config/Resource'; -import { SDKManager } from '../../Main/Channel/SDKManager'; -import HttpUnit from '../../Main/Common/HttpUnit'; -import GlobalValue from '../../Main/Common/GlobalValue'; -import Utils from '../../Main/Common/Utils'; -import { InnerMsgCode } from '../../Main/Config/InnerMsgCode'; -import { promptItem } from '../Item/promptItem'; +import { + _decorator, + AssetManager, + AudioClip, + Button, + Component, + ImageAsset, + JsonAsset, + Label, + Material, + Node, + Prefab, + ProgressBar, + Sprite, + SpriteFrame, +} from "cc"; +import { GButton } from "../../Main/Common/GButton"; +import ResManager from "../../Main/Manager/ResManager"; +import Resource from "../../Main/Config/Resource"; +import { SDKManager } from "../../Main/Channel/SDKManager"; +import HttpUnit from "../../Main/Common/HttpUnit"; +import GlobalValue from "../../Main/Common/GlobalValue"; +import Utils from "../../Main/Common/Utils"; +import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; +import { promptItem } from "../Item/promptItem"; +import LanguageUtils, { LanguageType } from "../../Main/Common/LanguageUtils"; const { ccclass, property } = _decorator; -@ccclass('PreloadUI') +@ccclass("PreloadUI") export class PreloadUI extends Component { + private checkFinish = true; //检查完成 + private preloadFinish = false; //资源加载完成 + private loginFinish = false; //登录完成 - private checkFinish = true; //检查完成 - private preloadFinish = false; //资源加载完成 - private loginFinish = false; //登录完成 + private jinduBar: Node = null; + private jinduFilled: Sprite = null; + private LabProgress: Label = null; + //private btnLogin: Sprite = null; //登录按钮 - private jinduBar: Node = null; - private jinduFilled: Sprite = null; - private LabProgress: Label = null; - //private btnLogin: Sprite = null; //登录按钮 + start() { + //Utils.addInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt) - start() { - //Utils.addInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt) - - this.jinduBar = this.node.getChildByName("jinduBar"); - this.jinduFilled = this.jinduBar.getChildByName("jinduFilled").getComponent(Sprite); - this.LabProgress = this.node.getChildByName("LabProgress").getComponent(Label); - //this.btnLogin = this.node.getChildByName("btnLogin").getComponent(Sprite); - - //适配背景图 - let BG = this.node.getChildByName("BG"); - Utils.adjustBgPixelRatio(BG, 1) + this.jinduBar = this.node.getChildByName("jinduBar"); + this.jinduFilled = this.jinduBar + .getChildByName("jinduFilled") + .getComponent(Sprite); + this.LabProgress = this.node + .getChildByName("LabProgress") + .getComponent(Label); + //this.btnLogin = this.node.getChildByName("btnLogin").getComponent(Sprite); - this.jinduFilled.fillRange = 0; - //this.btnLogin.node.active = false; + //适配背景图 + let BG = this.node.getChildByName("BG"); + Utils.adjustBgPixelRatio(BG, 1); - this.preloadFiles() + this.jinduFilled.fillRange = 0; + //this.btnLogin.node.active = false; + + this.preloadFiles(); + + LanguageUtils.setLanguage(LanguageType.CN); + } + + protected onDestroy(): void { + Utils.removeInnerEL( + InnerMsgCode.UI_ShowPrompt, + this, + this.resiveShowPrompt + ); + } + + update(deltaTime: number) { + if (this.checkFinish) { + if (this.preloadFinish && this.loginFinish) { + this.checkFinish = false; + this.enterGame(); + } } + } - protected onDestroy(): void { - Utils.removeInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt) - } + /**收到飘字消息 */ + resiveShowPrompt(data: any) { + let msg = data.text; + let self = this; + ResManager.I.loadSubpackagePrefab("item/promptItem", (n_node: Node) => { + self.node.addChild(n_node); + let pItem = n_node.getComponent(promptItem); + pItem.setLabel(msg); + }); + } - update(deltaTime: number) { - if (this.checkFinish) { - if (this.preloadFinish && this.loginFinish) { - this.checkFinish = false - this.enterGame() - } + //预加载文件 + preloadFiles() { + let preloadTab = [ + { path: "ChatPanel", bundleName: "Chat18x", ftype: Prefab }, + { path: "GirlDetailPanel", bundleName: "Chat18x", ftype: Prefab }, + { path: "GirlListPanel", bundleName: "Chat18x", ftype: Prefab }, + // {path:"Music/music_interface", bundleName: "Audio", ftype: AudioClip}, + // {path:"bg/mengli_stage_bg", bundleName: "Raw", ftype: ImageAsset}, + // {path:"cg0/mengli_0_cg", bundleName: "Raw", ftype: ImageAsset}, + // {path:"cg1/mengli_1_cg", bundleName: "Raw", ftype: ImageAsset}, + // {path:"cg2/mengli_2_cg", bundleName: "Raw", ftype: ImageAsset}, + // {path:"cg3/mengli_3_cg", bundleName: "Raw", ftype: ImageAsset}, + // {path:"emo_1/mengli_shy", bundleName: "Raw", ftype: ImageAsset}, + // {path:"emo_2/mengli_laugh", bundleName: "Raw", ftype: ImageAsset}, + // {path:"emo_3/mengli_disgust", bundleName: "Raw", ftype: ImageAsset}, + // {path:"role/mengli_default", bundleName: "Raw", ftype: ImageAsset}, + // {path:"Zjm/raw1", bundleName: "Raw", ftype: ImageAsset}, + // {path:"touming", bundleName: "common", ftype: ImageAsset}, + // // {path:"chanpin_1_0", bundleName: "daoju", ftype: ImageAsset}, //有合图加载失败 + // {path:"zjm_1", bundleName: "Zhujiemian", ftype: ImageAsset}, + // {path:"zjm_19", bundleName: "Zhujiemian", ftype: ImageAsset}, + // {path:"zjm_30", bundleName: "Zhujiemian", ftype: ImageAsset}, + // {path:"mohu", bundleName: "Materials", ftype: Material}, + // {path:"UI/Cross/Cross_UI", bundleName: "PB", ftype: Prefab}, + // {path:"UI/StartUI/Start_UI", bundleName: "PB", ftype: Prefab}, + // {path:"commonGlobal", bundleName: "DataTable", ftype: JsonAsset}, + ]; + let num_prefab = 0; //已加载数量 + let num_succeed = 0; //加载成功数量 + let preloadFunc = () => { + if (num_prefab < preloadTab.length) { + let cfg = preloadTab[num_prefab]; + ResManager.I.preLoadSubpackageFile( + cfg.path, + cfg.bundleName, + cfg.ftype, + (ret) => { + num_prefab++; + num_succeed++; + let percent = 0.45 * (num_prefab / preloadTab.length); + this.showLoadProgress(0.55 + percent); + console.log("加载成功：", cfg.path); + preloadFunc(); + }, + (err) => { + num_prefab++; + console.log("加载失败：", err); + } + ); + } else { + if (num_succeed >= num_prefab) { + this.loadDataTable(); } - } + } + }; + preloadFunc(); + } - /**收到飘字消息 */ - resiveShowPrompt(data: any) { - let msg = data.text - let self = this - ResManager.I.loadSubpackagePrefab("item/promptItem", (n_node: Node)=>{ - self.node.addChild(n_node) - let pItem = n_node.getComponent(promptItem) - pItem.setLabel(msg) - }) - } + //加载配置表 + loadDataTable() { + let dataArr = [ + //"commonGlobal", + // "levelHole", + //"Music", + //"Sound", + ]; + //配置表使用方法： let cfgs = Resource.getConfig("Sound") + let num_prefab = 0; + let preloadFunc = () => { + if (num_prefab < dataArr.length) { + let cfgname = dataArr[num_prefab]; + ResManager.I.loadSubpackageDataTable(cfgname, (ret: JsonAsset) => { + num_prefab++; + Resource.addSubJsonConfig(cfgname, ret.json); + preloadFunc(); + }); + } else { + this.preloadFinish = true; + this.onLogin(); + } + }; + preloadFunc(); + } - //预加载文件 - preloadFiles() { - let preloadTab = [ - {path:"ChatPanel", bundleName: "Chat18x", ftype: Prefab}, - {path:"GirlDetailPanel", bundleName: "Chat18x", ftype: Prefab}, - {path:"GirlListPanel", bundleName: "Chat18x", ftype: Prefab}, - // {path:"Music/music_interface", bundleName: "Audio", ftype: AudioClip}, - // {path:"bg/mengli_stage_bg", bundleName: "Raw", ftype: ImageAsset}, - // {path:"cg0/mengli_0_cg", bundleName: "Raw", ftype: ImageAsset}, - // {path:"cg1/mengli_1_cg", bundleName: "Raw", ftype: ImageAsset}, - // {path:"cg2/mengli_2_cg", bundleName: "Raw", ftype: ImageAsset}, - // {path:"cg3/mengli_3_cg", bundleName: "Raw", ftype: ImageAsset}, - // {path:"emo_1/mengli_shy", bundleName: "Raw", ftype: ImageAsset}, - // {path:"emo_2/mengli_laugh", bundleName: "Raw", ftype: ImageAsset}, - // {path:"emo_3/mengli_disgust", bundleName: "Raw", ftype: ImageAsset}, - // {path:"role/mengli_default", bundleName: "Raw", ftype: ImageAsset}, - // {path:"Zjm/raw1", bundleName: "Raw", ftype: ImageAsset}, - // {path:"touming", bundleName: "common", ftype: ImageAsset}, - // // {path:"chanpin_1_0", bundleName: "daoju", ftype: ImageAsset}, //有合图加载失败 - // {path:"zjm_1", bundleName: "Zhujiemian", ftype: ImageAsset}, - // {path:"zjm_19", bundleName: "Zhujiemian", ftype: ImageAsset}, - // {path:"zjm_30", bundleName: "Zhujiemian", ftype: ImageAsset}, - // {path:"mohu", bundleName: "Materials", ftype: Material}, - // {path:"UI/Cross/Cross_UI", bundleName: "PB", ftype: Prefab}, - // {path:"UI/StartUI/Start_UI", bundleName: "PB", ftype: Prefab}, - // {path:"commonGlobal", bundleName: "DataTable", ftype: JsonAsset}, - ]; - let num_prefab = 0; //已加载数量 - let num_succeed = 0;//加载成功数量 - let preloadFunc = () => { - if (num_prefab < preloadTab.length) { - let cfg = preloadTab[num_prefab] - ResManager.I.preLoadSubpackageFile(cfg.path, cfg.bundleName, cfg.ftype, (ret) => { - num_prefab++; - num_succeed++; - let percent = 0.45 * (num_prefab / preloadTab.length) - this.showLoadProgress(0.55 + percent); - console.log("加载成功：", cfg.path); - preloadFunc(); - }, (err)=>{ - num_prefab++; - console.log("加载失败：", err); - }); - } else { - if (num_succeed >= num_prefab) { - this.loadDataTable(); - } - } - } - preloadFunc(); - } + //显示加载进度 + showLoadProgress(percent) { + this.jinduFilled.fillRange = percent; + } - //加载配置表 - loadDataTable(){ - let dataArr = [ - //"commonGlobal", - // "levelHole", - //"Music", - //"Sound", - ] + //登录 + onLogin() { + //初始化SDK信息 + // SDKManager.init(() => { + // //检测是否有授权，有授权直接登录，没有授权就先进主界面，到主界面获取权限 + // SDKManager.checkAutoSetting("userInfo", (ishave) => { + // if (ishave) { + // console.log("有授权，直接登录") + // HttpUnit.ins.login((loginData) => { + // if (loginData == null) { + // //登录失败，这里处理重复登录的逻辑 + // } else { + // this.loginFinish = true + // } + // }) + // } else { + // console.log("没有授权，等待授权后登录") + // // this.loginFinish = true + // this.jinduBar.active = false + // this.LabProgress.node.active = false + // //登录按钮 + // this.btnLogin.node.active = true + // let loginPath = "" + // if (SDKManager.isWenxin()) { + // loginPath = "login1" + // } else if (SDKManager.isByteDance()) { + // loginPath = "login2" + // } else if (SDKManager.isKuaishou()) { + // loginPath = "login3" + // } + // ResManager.I.changeResourceSpriteFrame(this.btnLogin, loginPath) + // + // HttpUnit.ins.login((loginData) => { + // if (loginData == null) { + // //登录失败，这里处理重复登录的逻辑 + // } else { + // this.loginFinish = true + // } + // }) + // } + // }) + // }) + this.loginFinish = true; + } - //配置表使用方法： let cfgs = Resource.getConfig("Sound") - let num_prefab = 0; - let preloadFunc = () => { - if (num_prefab < dataArr.length) { - let cfgname = dataArr[num_prefab] - ResManager.I.loadSubpackageDataTable(cfgname, (ret: JsonAsset) => { - num_prefab++; - Resource.addSubJsonConfig(cfgname, ret.json) - preloadFunc(); - }); - } else { - this.preloadFinish = true; - this.onLogin(); - } - } - preloadFunc(); - } - - //显示加载进度 - showLoadProgress(percent) { - this.jinduFilled.fillRange = percent; - } - - //登录 - onLogin() { - //初始化SDK信息 - // SDKManager.init(() => { - // //检测是否有授权，有授权直接登录，没有授权就先进主界面，到主界面获取权限 - // SDKManager.checkAutoSetting("userInfo", (ishave) => { - // if (ishave) { - // console.log("有授权，直接登录") - // HttpUnit.ins.login((loginData) => { - // if (loginData == null) { - // //登录失败，这里处理重复登录的逻辑 - // } else { - // this.loginFinish = true - // } - // }) - // } else { - // console.log("没有授权，等待授权后登录") - // // this.loginFinish = true - // this.jinduBar.active = false - // this.LabProgress.node.active = false - // //登录按钮 - // this.btnLogin.node.active = true - // let loginPath = "" - // if (SDKManager.isWenxin()) { - // loginPath = "login1" - // } else if (SDKManager.isByteDance()) { - // loginPath = "login2" - // } else if (SDKManager.isKuaishou()) { - // loginPath = "login3" - // } - // ResManager.I.changeResourceSpriteFrame(this.btnLogin, loginPath) - // - // HttpUnit.ins.login((loginData) => { - // if (loginData == null) { - // //登录失败，这里处理重复登录的逻辑 - // } else { - // this.loginFinish = true - // } - // }) - // } - // }) - // }) - this.loginFinish = true; - } - - enterGame() { - //let islogin = HttpUnit.IsLogin(); - //console.log("进入游戏，登录状态：", islogin); - this.jinduBar.active = false - this.LabProgress.node.active = false - //this.btnLogin.node.active = false - // if (islogin) { - // } else { - // //没登录成功，先进主界面，在主界面里进行登录 - // } - ResManager.I.goMainScene(); //进入下一个场景 - // ResManager.I.goCustomScene("Test2DScene"); //进入自定义场景 - } - + enterGame() { + //let islogin = HttpUnit.IsLogin(); + //console.log("进入游戏，登录状态：", islogin); + this.jinduBar.active = false; + this.LabProgress.node.active = false; + //this.btnLogin.node.active = false + // if (islogin) { + // } else { + // //没登录成功，先进主界面，在主界面里进行登录 + // } + ResManager.I.goMainScene(); //进入下一个场景 + // ResManager.I.goCustomScene("Test2DScene"); //进入自定义场景 + } } - - diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index 08dd38f9..85eea4a1 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -22,6 +22,7 @@ import { ImagePopup } from "../components/ImagePopup"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import { VideoRoleType } from "db://assets/Scripts/Main/Common/GlobalValue"; import ConfigManager from "../../manager/ConfigManager"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; const { ccclass, property } = _decorator; @ccclass("ChatPanel") @@ -46,6 +47,7 @@ export class ChatPanel extends li_BaseView { id: number; private _nodeTab: any = {}; + nameKey: string; openUIDataCT(data) { this.id = data; // 设置当前聊天的角色ID @@ -64,13 +66,23 @@ export class ChatPanel extends li_BaseView { this, this.onDialogUpdate ); + + Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.girlName.string = LanguageUtils.getText(this.nameKey); + }); + } + onDestroy(): void { + Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.girlName.string = LanguageUtils.getText(this.nameKey); + }); } refresh(id: number) { this.id = id; const data = ConfigManager.tables.TbGirls.get(this.id); const dataDetail = ConfigManager.tables.TbGirlsDetail.get(this.id); if (!data) return; - this.girlName.string = data.name; + this.nameKey = data.nameKey; + this.girlName.string = LanguageUtils.getText(data.nameKey); ResManager.I.changeBundleSpriteFrame( this.girlImg, data.avatarPath, diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index e6da28c3..da1411c5 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -4,6 +4,9 @@ import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import { DetailImageItem } from "./DetailImageItem"; import { NavigationManager } from "../../manager/NavigationManager"; import ConfigManager from "../../manager/ConfigManager"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; +import Utils from "../../../Main/Common/Utils"; +import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; const { ccclass, property } = _decorator; @@ -47,6 +50,19 @@ export class GirlDetailPanel extends li_BaseView { super.onLoadCT(); this.imgItemInst.node.active = false; this.refresh(this.id); + + Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.girlName.string = this.descName.string = LanguageUtils.getText( + this.nameKey + ); + let desc = ""; + const tags = LanguageUtils.getText(this.tagKey).split("|"); + for (let i = 0; i < tags.length; i++) { + if (i != 0) desc += "\n"; + desc += tags[i]; + } + this.tags.string = desc; + }); } setVideEnable(enable: boolean) { @@ -55,12 +71,16 @@ export class GirlDetailPanel extends li_BaseView { this.avatarVideo.play(); } } - + nameKey: string; + tagKey: string; refresh(index: number) { console.log(index); const dataDetail = ConfigManager.tables.TbGirlsDetail.get(this.id); const data = ConfigManager.tables.TbGirls.get(this.id); - this.girlName.string = this.descName.string = data.name; + this.nameKey = data.nameKey; + this.girlName.string = this.descName.string = LanguageUtils.getText( + data.nameKey + ); if (dataDetail.pics[0].endsWith("video")) { ResManager.I.changeBundleVideo( @@ -86,9 +106,11 @@ export class GirlDetailPanel extends li_BaseView { this.desc.string = dataDetail.detailDesc; let desc = ""; - for (let i = 0; i < data.tag.length; i++) { + this.tagKey = data.tagKey; + const tags = LanguageUtils.getText(data.tagKey).split("|"); + for (let i = 0; i < tags.length; i++) { if (i != 0) desc += "\n"; - desc += data.tag[i]; + desc += tags[i]; } this.tags.string = desc; for (let i = 0; i < 5; i++) { diff --git a/assets/Scripts/chat18x/ui/panels/GirlListItem.ts b/assets/Scripts/chat18x/ui/panels/GirlListItem.ts index 21591e78..35365e90 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListItem.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListItem.ts @@ -5,6 +5,8 @@ import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { NavigationManager } from "../../manager/NavigationManager"; import { Girl, PriceType } from "../../../schema/schema"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; +import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; const { ccclass, property } = _decorator; @@ -29,15 +31,49 @@ export class GirlListItem extends Component { id: number = -1; + nameKey: string; + tagKey: string; + protected onLoad(): void { + Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.girlName.string = this.girlName.string = LanguageUtils.getText( + this.nameKey + ); + let desc = ""; + const tags = LanguageUtils.getText(this.tagKey).split("|"); + for (let i = 0; i < tags.length; i++) { + if (i != 0) desc += "\n"; + desc += tags[i]; + } + this.tags.string = desc; + }); + } + protected onDestroy(): void { + Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.girlName.string = this.girlName.string = LanguageUtils.getText( + this.nameKey + ); + let desc = ""; + const tags = LanguageUtils.getText(this.tagKey).split("|"); + for (let i = 0; i < tags.length; i++) { + if (i != 0) desc += "\n"; + desc += tags[i]; + } + this.tags.string = desc; + }); + } + baseNode: Node; refreshData(data: Girl, baseNode: Node) { this.baseNode = baseNode; this.id = data.id; - this.girlName.string = data.name; + this.nameKey = data.nameKey; + this.girlName.string = LanguageUtils.getText(data.nameKey); + this.tagKey = data.tagKey; let desc = ""; - for (let i = 0; i < data.tag.length; i++) { - if (i != 0) desc += "&"; - desc += data.tag[i]; + const tags = LanguageUtils.getText(data.tagKey).split("|"); + for (let i = 0; i < tags.length; i++) { + if (i != 0) desc += "|"; + desc += tags[i]; } this.tags.string = desc; this.price.node.active = data.priceType == PriceType.pay; diff --git a/assets/Scripts/chat18x/ui/panels/ThemeItem.ts b/assets/Scripts/chat18x/ui/panels/ThemeItem.ts index 59217e54..01e649f2 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemeItem.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemeItem.ts @@ -4,6 +4,8 @@ import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { NavigationManager } from "../../manager/NavigationManager"; import { TbThemes, Theme } from "../../../schema/schema"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; +import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; const { ccclass, property } = _decorator; @ccclass("ThemeItem") @@ -19,11 +21,24 @@ export class ThemeItem extends Component { private category: number; private isLocked: boolean; - start() {} + + key: string; + protected onLoad(): void { + Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.titleName.string = LanguageUtils.getText(this.key); + }); + } + protected onDestroy(): void { + Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.titleName.string = LanguageUtils.getText(this.key); + }); + } + refresh(themeData: Theme) { this.lockImg.node.active = !themeData.isRelease; this.isLocked = !themeData.isRelease; - this.titleName.string = themeData.name; + this.key = themeData.key; + this.titleName.string = LanguageUtils.getText(themeData.key); this.category = themeData.category; ResManager.I.changeBundleSpriteFrame( this.img, diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index b7953b00..46ba2b80 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -15,6 +15,7 @@ import { ThemeItem } from "./ThemeItem"; import { NavigationManager } from "../../manager/NavigationManager"; import { GirlListItem } from "./GirlListItem"; import ConfigManager from "../../manager/ConfigManager"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; const { ccclass, property } = _decorator; @@ -43,6 +44,7 @@ export class ThemePanel extends li_BaseView { this.itemInst = this._nodeTab.ThemeItem.getComponent(ThemeItem); this.itemInst.node.active = false; this.content = this._nodeTab.AllThemesLayout; + this.Show(); } @@ -50,7 +52,6 @@ export class ThemePanel extends li_BaseView { //some temp data this.coinNum.string = (50.0).toString(); this.recId = 1; - if (this.cache) { for (let i = this.cache.length - 1; i >= 0; i--) { this.cache[i].node.destroy(); diff --git a/assets/Scripts/schema/schema.ts b/assets/Scripts/schema/schema.ts index 9baae0fe..e977f8e3 100644 --- a/assets/Scripts/schema/schema.ts +++ b/assets/Scripts/schema/schema.ts @@ -60,91 +60,15 @@ export enum PriceType { -export namespace demo { -export class item { - - constructor(_buf_: ByteBuf) { - this.id = _buf_.readInt() - this.name = _buf_.readString() - this.desc = _buf_.readString() - this.count = _buf_.readInt() - } - - /** - * id - */ - readonly id: number - /** - * 名称 - */ - readonly name: string - /** - * 描述 - */ - readonly desc: string - /** - * 个数 - */ - readonly count: number - - resolve(tables:Tables) { - - - - - } -} - -} - - -export namespace demo { -export class Reward { - - constructor(_buf_: ByteBuf) { - this.id = _buf_.readInt() - this.name = _buf_.readString() - this.desc = _buf_.readString() - this.count = _buf_.readInt() - } - - /** - * id - */ - readonly id: number - /** - * 名称 - */ - readonly name: string - /** - * 描述 - */ - readonly desc: string - /** - * 个数 - */ - readonly count: number - - resolve(tables:Tables) { - - - - - } -} - -} - - export class Girl { constructor(_buf_: ByteBuf) { this.id = _buf_.readInt() - this.name = _buf_.readString() + this.nameKey = _buf_.readString() this.age = _buf_.readString() this.category = _buf_.readInt() - { let n = Math.min(_buf_.readSize(), _buf_.size); this.tag = []; for(let i = 0 ; i < n ; i++) { let _e0 ;_e0 = _buf_.readString(); this.tag.push(_e0);}} + this.tagKey = _buf_.readString() this.priceType = _buf_.readInt() this.avatarPath = _buf_.readString() this.starCount = _buf_.readInt() @@ -155,9 +79,9 @@ export class Girl { */ readonly id: number /** - * 名称 + * 名字键 */ - readonly name: string + readonly nameKey: string /** * 年龄 */ @@ -167,9 +91,9 @@ export class Girl { */ readonly category: Category /** - * 标签 + * 标签键 */ - readonly tag: string[] + readonly tagKey: string /** * 付费类型 */ @@ -231,10 +155,55 @@ export class GirlDetail { +export class Language { + + constructor(_buf_: ByteBuf) { + this.key = _buf_.readString() + this.languageEn = _buf_.readString() + this.languageCn = _buf_.readString() + this.languageHi = _buf_.readString() + this.languageFr = _buf_.readString() + this.languageDe = _buf_.readString() + } + + /** + * key + */ + readonly key: string + readonly languageEn: string + readonly languageCn: string + /** + * 印地语翻译 + */ + readonly languageHi: string + /** + * 法语翻译 + */ + readonly languageFr: string + /** + * 德语翻译 + */ + readonly languageDe: string + + resolve(tables:Tables) { + + + + + + + } +} + + + + + export class Theme { constructor(_buf_: ByteBuf) { this.id = _buf_.readInt() + this.key = _buf_.readString() this.name = _buf_.readString() this.category = _buf_.readInt() this.isRelease = _buf_.readBool() @@ -245,6 +214,10 @@ export class Theme { * id */ readonly id: number + /** + * 多语言键 + */ + readonly key: string /** * 主题名称 */ @@ -268,6 +241,7 @@ export class Theme { + } } @@ -344,25 +318,25 @@ export class vector4 { -export namespace demo { -export class TbReward { - private _dataMap: Map - private _dataList: demo.Reward[] + +export class TbLanguage { + private _dataMap: Map + private _dataList: Language[] constructor(_buf_: ByteBuf) { - this._dataMap = new Map() + this._dataMap = new Map() this._dataList = [] for(let n = _buf_.readInt(); n > 0; n--) { - let _v: demo.Reward - _v = new demo.Reward(_buf_) + let _v: Language + _v = new Language(_buf_) this._dataList.push(_v) - this._dataMap.set(_v.id, _v) + this._dataMap.set(_v.key, _v) } } - getDataMap(): Map { return this._dataMap; } - getDataList(): demo.Reward[] { return this._dataList; } + getDataMap(): Map { return this._dataMap; } + getDataList(): Language[] { return this._dataList; } - get(key: number): demo.Reward | undefined { + get(key: string): Language | undefined { return this._dataMap.get(key); } @@ -374,7 +348,7 @@ export class TbReward { } } -} + @@ -476,76 +450,38 @@ export class TbThemes { -export namespace demo { -export class Tbitem { - private _dataMap: Map - private _dataList: demo.item[] - constructor(_buf_: ByteBuf) { - this._dataMap = new Map() - this._dataList = [] - for(let n = _buf_.readInt(); n > 0; n--) { - let _v: demo.item - _v = new demo.item(_buf_) - this._dataList.push(_v) - this._dataMap.set(_v.id, _v) - } - } - - getDataMap(): Map { return this._dataMap; } - getDataList(): demo.item[] { return this._dataList; } - - get(key: number): demo.item | undefined { - return this._dataMap.get(key); - } - - resolve(tables:Tables) { - for(let data of this._dataList) - { - data.resolve(tables) - } - } - -} -} - - type ByteBufLoader = (file: string) => ByteBuf export class Tables { - private _TbReward: demo.TbReward - get TbReward(): demo.TbReward { return this._TbReward;} + private _TbLanguage: TbLanguage + get TbLanguage(): TbLanguage { return this._TbLanguage;} private _TbGirls: TbGirls get TbGirls(): TbGirls { return this._TbGirls;} private _TbGirlsDetail: TbGirlsDetail get TbGirlsDetail(): TbGirlsDetail { return this._TbGirlsDetail;} private _TbThemes: TbThemes get TbThemes(): TbThemes { return this._TbThemes;} - private _Tbitem: demo.Tbitem - get Tbitem(): demo.Tbitem { return this._Tbitem;} static getTableNames(): string[] { let names: string[] = []; - names.push('demo_tbreward'); + names.push('tblanguage'); names.push('tbgirls'); names.push('tbgirlsdetail'); names.push('tbthemes'); - names.push('demo_tbitem'); return names; } constructor(loader: ByteBufLoader) { - this._TbReward = new demo.TbReward(loader('demo_tbreward')) + this._TbLanguage = new TbLanguage(loader('tblanguage')) this._TbGirls = new TbGirls(loader('tbgirls')) this._TbGirlsDetail = new TbGirlsDetail(loader('tbgirlsdetail')) this._TbThemes = new TbThemes(loader('tbthemes')) - this._Tbitem = new demo.Tbitem(loader('demo_tbitem')) - this._TbReward.resolve(this) + this._TbLanguage.resolve(this) this._TbGirls.resolve(this) this._TbGirlsDetail.resolve(this) this._TbThemes.resolve(this) - this._Tbitem.resolve(this) } } diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index eb6450a1..8704f604 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -28,23 +28,23 @@ "__id__": 112 }, { - "__id__": 211 + "__id__": 213 } ], "_active": true, "_components": [ - { - "__id__": 241 - }, { "__id__": 243 }, { "__id__": 245 + }, + { + "__id__": 247 } ], "_prefab": { - "__id__": 247 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -103,23 +103,23 @@ "__id__": 150 }, { - "__id__": 196 + "__id__": 198 } ], "_active": true, "_components": [ - { - "__id__": 204 - }, { "__id__": 206 }, { "__id__": 208 + }, + { + "__id__": 210 } ], "_prefab": { - "__id__": 210 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -3410,23 +3410,23 @@ "__id__": 151 }, { - "__id__": 174 + "__id__": 176 } ], "_active": true, "_components": [ - { - "__id__": 189 - }, { "__id__": 191 }, { "__id__": 193 + }, + { + "__id__": 195 } ], "_prefab": { - "__id__": 195 + "__id__": 197 }, "_lpos": { "__type__": "cc.Vec3", @@ -3475,9 +3475,6 @@ ], "_active": true, "_components": [ - { - "__id__": 164 - }, { "__id__": 166 }, @@ -3485,11 +3482,14 @@ "__id__": 168 }, { - "__id__": 171 + "__id__": 170 + }, + { + "__id__": 173 } ], "_prefab": { - "__id__": 173 + "__id__": 175 }, "_lpos": { "__type__": "cc.Vec3", @@ -3695,10 +3695,13 @@ }, { "__id__": 161 + }, + { + "__id__": 163 } ], "_prefab": { - "__id__": 163 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -3825,6 +3828,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c7ZJkEwKRCTajinGWIDefs" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 158 + }, + "_enabled": true, + "__prefab": { + "__id__": 164 + }, + "languageKey": "chatpanel.inputplaceholder", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "47FCHFhs9Hur4PavpxytHf" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3848,7 +3872,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", @@ -3876,7 +3900,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 169 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3921,14 +3945,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 171 }, "editingDidBegan": [], "textChanged": [], "editingDidEnded": [], "editingReturn": [ { - "__id__": 170 + "__id__": 172 } ], "_textLabel": { @@ -3973,7 +3997,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 174 }, "_alignFlags": 44, "_target": null, @@ -4022,23 +4046,23 @@ }, "_children": [ { - "__id__": 175 + "__id__": 177 } ], "_active": true, "_components": [ - { - "__id__": 181 - }, { "__id__": 183 }, { "__id__": 185 + }, + { + "__id__": 187 } ], "_prefab": { - "__id__": 188 + "__id__": 190 }, "_lpos": { "__type__": "cc.Vec3", @@ -4075,20 +4099,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 176 }, "_children": [], "_active": true, "_components": [ { - "__id__": 176 + "__id__": 178 }, { - "__id__": 178 + "__id__": 180 } ], "_prefab": { - "__id__": 180 + "__id__": 182 }, "_lpos": { "__type__": "cc.Vec3", @@ -4125,11 +4149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", @@ -4153,11 +4177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 181 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4234,11 +4258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 176 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 184 }, "_contentSize": { "__type__": "cc.Size", @@ -4262,11 +4286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 176 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 186 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4307,15 +4331,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 176 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 188 }, "clickEvents": [ { - "__id__": 187 + "__id__": 189 } ], "_interactable": true, @@ -4367,7 +4391,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 174 + "__id__": 176 }, "_id": "" }, @@ -4408,7 +4432,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 192 }, "_contentSize": { "__type__": "cc.Size", @@ -4436,7 +4460,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 194 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4481,7 +4505,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 196 }, "_alignFlags": 44, "_target": null, @@ -4531,18 +4555,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 197 - }, { "__id__": 199 }, { "__id__": 201 + }, + { + "__id__": 203 } ], "_prefab": { - "__id__": 203 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -4579,11 +4603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -4607,11 +4631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 202 }, "_alignFlags": 45, "_target": null, @@ -4643,11 +4667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 204 }, "_resourceType": 1, "_remoteURL": "", @@ -4690,7 +4714,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 207 }, "_contentSize": { "__type__": "cc.Size", @@ -4718,7 +4742,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 207 + "__id__": 209 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4763,7 +4787,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 211 }, "_alignFlags": 45, "_target": null, @@ -4812,20 +4836,20 @@ }, "_children": [ { - "__id__": 212 + "__id__": 214 } ], "_active": true, "_components": [ { - "__id__": 236 + "__id__": 238 }, { - "__id__": 238 + "__id__": 240 } ], "_prefab": { - "__id__": 240 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -4862,24 +4886,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 211 + "__id__": 213 }, "_children": [ { - "__id__": 213 + "__id__": 215 } ], "_active": true, "_components": [ { - "__id__": 231 + "__id__": 233 }, { - "__id__": 233 + "__id__": 235 } ], "_prefab": { - "__id__": 235 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -4916,27 +4940,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 212 + "__id__": 214 }, "_children": [ { - "__id__": 214 + "__id__": 216 } ], "_active": true, "_components": [ - { - "__id__": 224 - }, { "__id__": 226 }, { "__id__": 228 + }, + { + "__id__": 230 } ], "_prefab": { - "__id__": 230 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -4973,14 +4997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 215 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 215 - }, { "__id__": 217 }, @@ -4989,10 +5010,13 @@ }, { "__id__": 221 + }, + { + "__id__": 223 } ], "_prefab": { - "__id__": 223 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -5029,11 +5053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -5057,11 +5081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5102,11 +5126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 222 }, "_alignFlags": 12, "_target": null, @@ -5138,11 +5162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 224 }, "clickEvents": [], "_interactable": true, @@ -5207,11 +5231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -5235,11 +5259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 229 }, "_type": 3, "_inverted": false, @@ -5257,11 +5281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 231 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5315,11 +5339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 212 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -5343,11 +5367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 212 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5401,11 +5425,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -5429,14 +5453,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 241 }, "image": { - "__id__": 217 + "__id__": 219 }, "_id": "" }, @@ -5467,7 +5491,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -5495,7 +5519,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 246 }, "_alignFlags": 45, "_target": null, @@ -5531,11 +5555,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 248 }, "m_rootNode": null, "editBox": { - "__id__": 168 + "__id__": 170 }, "girlName": { "__id__": 24 @@ -5547,7 +5571,7 @@ "__id__": 77 }, "popUpImage": { - "__id__": 238 + "__id__": 240 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index aafcf91c..1c69b412 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -24,21 +24,21 @@ ], "_active": true, "_components": [ - { - "__id__": 244 - }, - { - "__id__": 246 - }, { "__id__": 248 }, { "__id__": 250 + }, + { + "__id__": 252 + }, + { + "__id__": 254 } ], "_prefab": { - "__id__": 252 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -90,18 +90,18 @@ ], "_active": true, "_components": [ - { - "__id__": 237 - }, - { - "__id__": 239 - }, { "__id__": 241 + }, + { + "__id__": 243 + }, + { + "__id__": 245 } ], "_prefab": { - "__id__": 243 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -2360,23 +2360,23 @@ "__id__": 103 }, { - "__id__": 142 + "__id__": 144 } ], "_active": true, "_components": [ - { - "__id__": 230 - }, - { - "__id__": 232 - }, { "__id__": 234 + }, + { + "__id__": 236 + }, + { + "__id__": 238 } ], "_prefab": { - "__id__": 236 + "__id__": 240 }, "_lpos": { "__type__": "cc.Vec3", @@ -2420,23 +2420,23 @@ "__id__": 104 }, { - "__id__": 127 + "__id__": 129 } ], "_active": true, "_components": [ - { - "__id__": 135 - }, { "__id__": 137 }, { "__id__": 139 + }, + { + "__id__": 141 } ], "_prefab": { - "__id__": 141 + "__id__": 143 }, "_lpos": { "__type__": "cc.Vec3", @@ -2480,14 +2480,11 @@ "__id__": 105 }, { - "__id__": 111 + "__id__": 113 } ], "_active": true, "_components": [ - { - "__id__": 117 - }, { "__id__": 119 }, @@ -2495,11 +2492,14 @@ "__id__": 121 }, { - "__id__": 124 + "__id__": 123 + }, + { + "__id__": 126 } ], "_prefab": { - "__id__": 126 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -2546,10 +2546,13 @@ }, { "__id__": 108 + }, + { + "__id__": 110 } ], "_prefab": { - "__id__": 110 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -2676,6 +2679,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "545u29/NhLC4K974kd3yL1" }, + { + "__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": "43z/1+Eh5B6qwco6wNwrcl" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2701,14 +2725,14 @@ "_active": true, "_components": [ { - "__id__": 112 + "__id__": 114 }, { - "__id__": 114 + "__id__": 116 } ], "_prefab": { - "__id__": 116 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -2745,11 +2769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -2773,11 +2797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2835,7 +2859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 120 }, "_contentSize": { "__type__": "cc.Size", @@ -2863,7 +2887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2908,11 +2932,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 124 }, "clickEvents": [ { - "__id__": 123 + "__id__": 125 } ], "_interactable": true, @@ -2992,7 +3016,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 127 }, "_alignFlags": 16, "_target": null, @@ -3042,18 +3066,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 128 - }, { "__id__": 130 }, { "__id__": 132 + }, + { + "__id__": 134 } ], "_prefab": { - "__id__": 134 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -3090,11 +3114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -3118,11 +3142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3186,11 +3210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 135 }, "_alignFlags": 41, "_target": null, @@ -3239,7 +3263,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 138 }, "_contentSize": { "__type__": "cc.Size", @@ -3267,7 +3291,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 140 }, "_alignFlags": 41, "_target": null, @@ -3303,7 +3327,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3361,38 +3385,38 @@ }, "_children": [ { - "__id__": 143 + "__id__": 145 }, { - "__id__": 151 + "__id__": 153 }, { - "__id__": 159 + "__id__": 161 }, { - "__id__": 167 + "__id__": 171 }, { - "__id__": 175 + "__id__": 179 }, { - "__id__": 215 + "__id__": 219 } ], "_active": true, "_components": [ - { - "__id__": 223 - }, - { - "__id__": 225 - }, { "__id__": 227 + }, + { + "__id__": 229 + }, + { + "__id__": 231 } ], "_prefab": { - "__id__": 229 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", @@ -3429,23 +3453,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 144 - }, { "__id__": 146 }, { "__id__": 148 + }, + { + "__id__": 150 } ], "_prefab": { - "__id__": 150 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -3482,11 +3506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3510,11 +3534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3578,11 +3602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 151 }, "_alignFlags": 33, "_target": null, @@ -3627,23 +3651,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 152 - }, { "__id__": 154 }, { "__id__": 156 + }, + { + "__id__": 158 } ], "_prefab": { - "__id__": 158 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -3680,11 +3704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -3708,11 +3732,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3776,11 +3800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 159 }, "_alignFlags": 33, "_target": null, @@ -3825,23 +3849,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 160 - }, { "__id__": 162 }, { "__id__": 164 + }, + { + "__id__": 166 + }, + { + "__id__": 168 } ], "_prefab": { - "__id__": 166 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -3878,11 +3905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 163 }, "_contentSize": { "__type__": "cc.Size", @@ -3906,11 +3933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 165 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3974,11 +4001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 167 }, "_alignFlags": 45, "_target": null, @@ -4004,6 +4031,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "17ISc5rWBM64I+GKljUoZT" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 161 + }, + "_enabled": true, + "__prefab": { + "__id__": 169 + }, + "languageKey": "girldetailpanel.desc", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b5ps6+2hZMhpefFVMEHWWF" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -4023,23 +4071,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 168 - }, - { - "__id__": 170 - }, { "__id__": 172 + }, + { + "__id__": 174 + }, + { + "__id__": 176 } ], "_prefab": { - "__id__": 174 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -4076,11 +4124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -4104,11 +4152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4172,11 +4220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 177 }, "_alignFlags": 41, "_target": null, @@ -4221,27 +4269,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [ { - "__id__": 176 + "__id__": 180 } ], "_active": true, "_components": [ - { - "__id__": 208 - }, - { - "__id__": 210 - }, { "__id__": 212 + }, + { + "__id__": 214 + }, + { + "__id__": 216 } ], "_prefab": { - "__id__": 214 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -4278,39 +4326,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 175 + "__id__": 179 }, "_children": [ { - "__id__": 177 + "__id__": 181 }, { - "__id__": 183 - }, - { - "__id__": 189 + "__id__": 187 }, { "__id__": 193 + }, + { + "__id__": 197 } ], "_active": true, "_components": [ - { - "__id__": 199 - }, - { - "__id__": 201 - }, { "__id__": 203 }, { "__id__": 205 + }, + { + "__id__": 207 + }, + { + "__id__": 209 } ], "_prefab": { - "__id__": 207 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", @@ -4347,20 +4395,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 176 + "__id__": 180 }, "_children": [], "_active": true, "_components": [ { - "__id__": 178 + "__id__": 182 }, { - "__id__": 180 + "__id__": 184 } ], "_prefab": { - "__id__": 182 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -4397,11 +4445,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4425,11 +4473,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4483,20 +4531,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 176 + "__id__": 180 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 188 }, { - "__id__": 186 + "__id__": 190 } ], "_prefab": { - "__id__": 188 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -4533,11 +4581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -4561,11 +4609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4619,17 +4667,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 176 + "__id__": 180 }, "_children": [], "_active": false, "_components": [ { - "__id__": 190 + "__id__": 194 } ], "_prefab": { - "__id__": 192 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -4666,11 +4714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -4707,20 +4755,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 176 + "__id__": 180 }, "_children": [], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 198 }, { - "__id__": 196 + "__id__": 200 } ], "_prefab": { - "__id__": 198 + "__id__": 202 }, "_lpos": { "__type__": "cc.Vec3", @@ -4757,11 +4805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 199 }, "_contentSize": { "__type__": "cc.Size", @@ -4785,11 +4833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 201 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4866,11 +4914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -4894,11 +4942,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 206 }, "_alignFlags": 45, "_target": null, @@ -4930,11 +4978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 208 }, "_type": 3, "_inverted": false, @@ -4952,11 +5000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5010,11 +5058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -5038,11 +5086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 215 }, "clickEvents": [], "_interactable": true, @@ -5094,20 +5142,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 217 }, "img": { - "__id__": 180 + "__id__": 184 }, "lock": { - "__id__": 183 + "__id__": 187 }, "question": { - "__id__": 193 + "__id__": 197 }, "_id": "" }, @@ -5134,23 +5182,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 216 - }, - { - "__id__": 218 - }, { "__id__": 220 + }, + { + "__id__": 222 + }, + { + "__id__": 224 } ], "_prefab": { - "__id__": 222 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -5187,11 +5235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 221 }, "_contentSize": { "__type__": "cc.Size", @@ -5215,11 +5263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 223 }, "_alignFlags": 45, "_target": null, @@ -5251,11 +5299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 225 }, "_resizeMode": 0, "_layoutType": 1, @@ -5302,11 +5350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -5330,11 +5378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 230 }, "_alignFlags": 45, "_target": null, @@ -5366,11 +5414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5428,7 +5476,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -5456,7 +5504,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5501,7 +5549,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 239 }, "_alignFlags": 44, "_target": null, @@ -5550,7 +5598,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -5578,7 +5626,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5623,7 +5671,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 246 }, "_alignFlags": 45, "_target": null, @@ -5672,7 +5720,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 249 }, "_contentSize": { "__type__": "cc.Size", @@ -5700,7 +5748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 251 }, "_alignFlags": 45, "_target": null, @@ -5736,7 +5784,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 253 }, "_id": "" }, @@ -5754,7 +5802,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 255 }, "m_rootNode": null, "avatar": { @@ -5770,25 +5818,25 @@ "__id__": 57 }, "tags": { - "__id__": 130 + "__id__": 132 }, "descName": { - "__id__": 146 + "__id__": 148 }, "descAge": { - "__id__": 154 + "__id__": 156 }, "desc": { - "__id__": 170 + "__id__": 174 }, "chatBtn": { "__id__": 104 }, "imgItemInst": { - "__id__": 212 + "__id__": 216 }, "imgsLayout": { - "__id__": 215 + "__id__": 219 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab index 7916c495..9a874315 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -24,18 +24,18 @@ ], "_active": true, "_components": [ - { - "__id__": 228 - }, { "__id__": 230 }, { "__id__": 232 + }, + { + "__id__": 234 } ], "_prefab": { - "__id__": 234 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -79,23 +79,23 @@ "__id__": 3 }, { - "__id__": 30 + "__id__": 32 } ], "_active": true, "_components": [ - { - "__id__": 221 - }, { "__id__": 223 }, { "__id__": 225 + }, + { + "__id__": 227 } ], "_prefab": { - "__id__": 227 + "__id__": 229 }, "_lpos": { "__type__": "cc.Vec3", @@ -144,18 +144,18 @@ ], "_active": true, "_components": [ - { - "__id__": 23 - }, { "__id__": 25 }, { "__id__": 27 + }, + { + "__id__": 29 } ], "_prefab": { - "__id__": 29 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", @@ -455,10 +455,13 @@ }, { "__id__": 20 + }, + { + "__id__": 22 } ], "_prefab": { - "__id__": 22 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -621,6 +624,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "ac6+w0fbBCQqxPerSTlytw" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 15 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "languageKey": "girllistpanel.title", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "44CvqaSyxISoNVe7deH33M" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -644,7 +668,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", @@ -672,7 +696,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 28 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -717,7 +741,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 30 }, "_alignFlags": 41, "_target": null, @@ -766,14 +790,11 @@ }, "_children": [ { - "__id__": 31 + "__id__": 33 } ], "_active": true, "_components": [ - { - "__id__": 212 - }, { "__id__": 214 }, @@ -782,10 +803,13 @@ }, { "__id__": 218 + }, + { + "__id__": 220 } ], "_prefab": { - "__id__": 220 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -822,18 +846,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 30 + "__id__": 32 }, "_children": [ { - "__id__": 32 + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 203 - }, { "__id__": 205 }, @@ -842,10 +863,13 @@ }, { "__id__": 209 + }, + { + "__id__": 211 } ], "_prefab": { - "__id__": 211 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -882,21 +906,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 31 + "__id__": 33 }, "_children": [ { - "__id__": 33 + "__id__": 35 }, { - "__id__": 188 + "__id__": 190 } ], "_active": true, "_components": [ - { - "__id__": 194 - }, { "__id__": 196 }, @@ -905,10 +926,13 @@ }, { "__id__": 200 + }, + { + "__id__": 202 } ], "_prefab": { - "__id__": 202 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -945,30 +969,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 32 + "__id__": 34 }, "_children": [ { - "__id__": 34 + "__id__": 36 }, { - "__id__": 40 + "__id__": 42 }, { - "__id__": 58 + "__id__": 60 }, { - "__id__": 64 + "__id__": 66 }, { - "__id__": 126 + "__id__": 128 } ], "_active": true, "_components": [ - { - "__id__": 179 - }, { "__id__": 181 }, @@ -977,10 +998,13 @@ }, { "__id__": 185 + }, + { + "__id__": 187 } ], "_prefab": { - "__id__": 187 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -1017,20 +1041,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 35 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 37 }, { - "__id__": 37 + "__id__": 39 } ], "_prefab": { - "__id__": 39 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", @@ -1067,11 +1091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -1095,11 +1119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 40 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1153,18 +1177,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 35 }, "_children": [ { - "__id__": 41 + "__id__": 43 } ], "_active": true, "_components": [ - { - "__id__": 49 - }, { "__id__": 51 }, @@ -1173,10 +1194,13 @@ }, { "__id__": 55 + }, + { + "__id__": 57 } ], "_prefab": { - "__id__": 57 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1213,23 +1237,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 42 - }, { "__id__": 44 }, { "__id__": 46 + }, + { + "__id__": 48 } ], "_prefab": { - "__id__": 48 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -1266,11 +1290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -1294,11 +1318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1339,11 +1363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 49 }, "_alignFlags": 18, "_target": null, @@ -1388,11 +1412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1416,11 +1440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 54 }, "_type": 3, "_inverted": false, @@ -1438,11 +1462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1483,11 +1507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "_alignFlags": 34, "_target": null, @@ -1532,20 +1556,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 35 }, "_children": [], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 61 }, { - "__id__": 61 + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -1582,11 +1606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -1610,11 +1634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1668,33 +1692,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 35 }, "_children": [ { - "__id__": 65 + "__id__": 67 }, { - "__id__": 73 + "__id__": 75 }, { - "__id__": 81 + "__id__": 83 } ], "_active": true, "_components": [ - { - "__id__": 119 - }, { "__id__": 121 }, { "__id__": 123 + }, + { + "__id__": 125 } ], "_prefab": { - "__id__": 125 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -1731,23 +1755,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 64 + "__id__": 66 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 66 - }, { "__id__": 68 }, { "__id__": 70 + }, + { + "__id__": 72 } ], "_prefab": { - "__id__": 72 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -1784,11 +1808,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1812,11 +1836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1880,11 +1904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 73 }, "_alignFlags": 32, "_target": null, @@ -1929,23 +1953,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 64 + "__id__": 66 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 74 - }, { "__id__": 76 }, { "__id__": 78 + }, + { + "__id__": 80 } ], "_prefab": { - "__id__": 80 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -1982,11 +2006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -2010,11 +2034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2078,11 +2102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 81 }, "_alignFlags": 37, "_target": null, @@ -2127,39 +2151,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 64 + "__id__": 66 }, "_children": [ { - "__id__": 82 + "__id__": 84 }, { - "__id__": 88 + "__id__": 90 }, { - "__id__": 94 + "__id__": 96 }, { - "__id__": 100 + "__id__": 102 }, { - "__id__": 106 + "__id__": 108 } ], "_active": true, "_components": [ - { - "__id__": 112 - }, { "__id__": 114 }, { "__id__": 116 + }, + { + "__id__": 118 } ], "_prefab": { - "__id__": 118 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -2196,20 +2220,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 85 }, { - "__id__": 85 + "__id__": 87 } ], "_prefab": { - "__id__": 87 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -2246,11 +2270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 86 }, "_contentSize": { "__type__": "cc.Size", @@ -2274,11 +2298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 88 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2332,20 +2356,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 91 }, { - "__id__": 91 + "__id__": 93 } ], "_prefab": { - "__id__": 93 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -2382,11 +2406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -2410,11 +2434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2468,20 +2492,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 97 }, { - "__id__": 97 + "__id__": 99 } ], "_prefab": { - "__id__": 99 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -2518,11 +2542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -2546,11 +2570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2604,20 +2628,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 101 + "__id__": 103 }, { - "__id__": 103 + "__id__": 105 } ], "_prefab": { - "__id__": 105 + "__id__": 107 }, "_lpos": { "__type__": "cc.Vec3", @@ -2654,11 +2678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -2682,11 +2706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 106 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2740,20 +2764,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 109 }, { - "__id__": 109 + "__id__": 111 } ], "_prefab": { - "__id__": 111 + "__id__": 113 }, "_lpos": { "__type__": "cc.Vec3", @@ -2790,11 +2814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", @@ -2818,11 +2842,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 112 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2876,11 +2900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -2904,11 +2928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 117 }, "_alignFlags": 36, "_target": null, @@ -2940,11 +2964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 119 }, "_resizeMode": 1, "_layoutType": 1, @@ -2991,11 +3015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -3019,11 +3043,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 124 }, "_alignFlags": 37, "_target": null, @@ -3055,11 +3079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": false, "__prefab": { - "__id__": 124 + "__id__": 126 }, "_resizeMode": 1, "_layoutType": 2, @@ -3106,30 +3130,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 35 }, "_children": [ { - "__id__": 127 + "__id__": 129 }, { - "__id__": 155 + "__id__": 157 } ], "_active": true, "_components": [ - { - "__id__": 172 - }, { "__id__": 174 }, { "__id__": 176 + }, + { + "__id__": 178 } ], "_prefab": { - "__id__": 178 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -3166,27 +3190,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 128 }, "_children": [ { - "__id__": 128 + "__id__": 130 }, { - "__id__": 136 + "__id__": 138 }, { - "__id__": 144 + "__id__": 146 } ], "_active": true, "_components": [ { - "__id__": 152 + "__id__": 154 } ], "_prefab": { - "__id__": 154 + "__id__": 156 }, "_lpos": { "__type__": "cc.Vec3", @@ -3223,23 +3247,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 129 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 129 - }, { "__id__": 131 }, { "__id__": 133 + }, + { + "__id__": 135 } ], "_prefab": { - "__id__": 135 + "__id__": 137 }, "_lpos": { "__type__": "cc.Vec3", @@ -3276,11 +3300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 132 }, "_contentSize": { "__type__": "cc.Size", @@ -3304,11 +3328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 134 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3372,11 +3396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 136 }, "_alignFlags": 18, "_target": null, @@ -3421,23 +3445,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 129 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 137 - }, { "__id__": 139 }, { "__id__": 141 + }, + { + "__id__": 143 } ], "_prefab": { - "__id__": 143 + "__id__": 145 }, "_lpos": { "__type__": "cc.Vec3", @@ -3474,11 +3498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 140 }, "_contentSize": { "__type__": "cc.Size", @@ -3502,11 +3526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3570,11 +3594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 144 }, "_alignFlags": 18, "_target": null, @@ -3619,23 +3643,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 129 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 145 - }, { "__id__": 147 }, { "__id__": 149 + }, + { + "__id__": 151 } ], "_prefab": { - "__id__": 151 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -3672,11 +3696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -3700,11 +3724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 150 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3768,11 +3792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 152 }, "_alignFlags": 18, "_target": null, @@ -3817,11 +3841,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -3858,18 +3882,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 128 }, "_children": [ { - "__id__": 156 + "__id__": 158 } ], "_active": true, "_components": [ - { - "__id__": 162 - }, { "__id__": 164 }, @@ -3877,11 +3898,14 @@ "__id__": 166 }, { - "__id__": 169 + "__id__": 168 + }, + { + "__id__": 171 } ], "_prefab": { - "__id__": 171 + "__id__": 173 }, "_lpos": { "__type__": "cc.Vec3", @@ -3918,20 +3942,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 155 + "__id__": 157 }, "_children": [], "_active": true, "_components": [ { - "__id__": 157 + "__id__": 159 }, { - "__id__": 159 + "__id__": 161 } ], "_prefab": { - "__id__": 161 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", @@ -3968,11 +3992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 160 }, "_contentSize": { "__type__": "cc.Size", @@ -3996,11 +4020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 162 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4077,11 +4101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 155 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", @@ -4105,11 +4129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 155 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 167 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4150,15 +4174,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 155 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 169 }, "clickEvents": [ { - "__id__": 168 + "__id__": 170 } ], "_interactable": true, @@ -4210,7 +4234,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 155 + "__id__": 157 }, "_id": "" }, @@ -4221,7 +4245,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 33 + "__id__": 35 }, "component": "", "_componentId": "c9c6617GnRNFoQQMkVBz8Be", @@ -4234,11 +4258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 155 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 172 }, "_alignFlags": 16, "_target": null, @@ -4283,11 +4307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 175 }, "_contentSize": { "__type__": "cc.Size", @@ -4311,11 +4335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 177 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4356,11 +4380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 179 }, "_alignFlags": 13, "_target": null, @@ -4405,11 +4429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -4433,11 +4457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 184 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4478,11 +4502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 186 }, "_alignFlags": 40, "_target": null, @@ -4514,35 +4538,35 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 188 }, "avatar": { - "__id__": 44 + "__id__": 46 }, "girlName": { - "__id__": 68 + "__id__": 70 }, "tags": { - "__id__": 76 + "__id__": 78 }, "price": { - "__id__": 131 + "__id__": 133 }, "freeNode": { - "__id__": 136 + "__id__": 138 }, "tryNode": { - "__id__": 144 + "__id__": 146 }, "chatBtn": { - "__id__": 155 + "__id__": 157 }, "starParent": { - "__id__": 81 + "__id__": 83 }, "_id": "" }, @@ -4569,20 +4593,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 32 + "__id__": 34 }, "_children": [], "_active": true, "_components": [ { - "__id__": 189 + "__id__": 191 }, { - "__id__": 191 + "__id__": 193 } ], "_prefab": { - "__id__": 193 + "__id__": 195 }, "_lpos": { "__type__": "cc.Vec3", @@ -4619,11 +4643,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 192 }, "_contentSize": { "__type__": "cc.Size", @@ -4647,11 +4671,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 194 }, "_resizeMode": 1, "_layoutType": 2, @@ -4698,11 +4722,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -4726,11 +4750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 199 }, "_type": 0, "_inverted": false, @@ -4748,11 +4772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 201 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4794,11 +4818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 203 }, "_alignFlags": 45, "_target": null, @@ -4843,11 +4867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 206 }, "_contentSize": { "__type__": "cc.Size", @@ -4871,11 +4895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 208 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4916,11 +4940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 210 }, "bounceDuration": 0.23, "brake": 0.75, @@ -4931,7 +4955,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 188 + "__id__": 190 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -4947,11 +4971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 212 }, "_alignFlags": 45, "_target": null, @@ -4996,11 +5020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -5024,11 +5048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 217 }, "_alignFlags": 45, "_target": null, @@ -5060,11 +5084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 219 }, "_type": 0, "_inverted": false, @@ -5082,11 +5106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5145,7 +5169,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 224 }, "_contentSize": { "__type__": "cc.Size", @@ -5173,7 +5197,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 226 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5218,7 +5242,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 228 }, "_alignFlags": 45, "_target": null, @@ -5267,7 +5291,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -5295,7 +5319,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 233 }, "_alignFlags": 45, "_target": null, @@ -5331,7 +5355,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 235 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index f19bafe4..ccf31e07 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -24,18 +24,18 @@ ], "_active": true, "_components": [ - { - "__id__": 174 - }, - { - "__id__": 176 - }, { "__id__": 178 + }, + { + "__id__": 180 + }, + { + "__id__": 182 } ], "_prefab": { - "__id__": 180 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", @@ -79,23 +79,23 @@ "__id__": 3 }, { - "__id__": 57 + "__id__": 59 } ], "_active": true, "_components": [ - { - "__id__": 167 - }, - { - "__id__": 169 - }, { "__id__": 171 + }, + { + "__id__": 173 + }, + { + "__id__": 175 } ], "_prefab": { - "__id__": 173 + "__id__": 177 }, "_lpos": { "__type__": "cc.Vec3", @@ -142,26 +142,26 @@ "__id__": 14 }, { - "__id__": 22 + "__id__": 24 }, { - "__id__": 32 + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 50 - }, { "__id__": 52 }, { "__id__": 54 + }, + { + "__id__": 56 } ], "_prefab": { - "__id__": 56 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -447,10 +447,13 @@ }, { "__id__": 19 + }, + { + "__id__": 21 } ], "_prefab": { - "__id__": 21 + "__id__": 23 }, "_lpos": { "__type__": "cc.Vec3", @@ -613,6 +616,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f4tGrm/2ZHUK1HW6SAZGkC" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "languageKey": "themepanel.title", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0eBWTBCxtOaYvuKO4mrn2y" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -637,9 +661,6 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 23 - }, { "__id__": 25 }, @@ -648,10 +669,13 @@ }, { "__id__": 29 + }, + { + "__id__": 31 } ], "_prefab": { - "__id__": 31 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -688,11 +712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", @@ -716,11 +740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 28 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -761,11 +785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 30 }, "clickEvents": [], "_interactable": true, @@ -805,7 +829,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 22 + "__id__": 24 }, "_id": "" }, @@ -819,11 +843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 32 }, "_alignFlags": 12, "_target": null, @@ -872,14 +896,11 @@ }, "_children": [ { - "__id__": 33 + "__id__": 35 } ], "_active": true, "_components": [ - { - "__id__": 41 - }, { "__id__": 43 }, @@ -888,10 +909,13 @@ }, { "__id__": 47 + }, + { + "__id__": 49 } ], "_prefab": { - "__id__": 49 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -928,23 +952,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 32 + "__id__": 34 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 34 - }, { "__id__": 36 }, { "__id__": 38 + }, + { + "__id__": 40 } ], "_prefab": { - "__id__": 40 + "__id__": 42 }, "_lpos": { "__type__": "cc.Vec3", @@ -981,11 +1005,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -1009,11 +1033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 39 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1077,11 +1101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 41 }, "_alignFlags": 34, "_target": null, @@ -1126,11 +1150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -1154,11 +1178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 46 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1199,11 +1223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 48 }, "clickEvents": [], "_interactable": true, @@ -1243,7 +1267,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 32 + "__id__": 34 }, "_id": "" }, @@ -1257,11 +1281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 50 }, "_alignFlags": 36, "_target": null, @@ -1310,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", @@ -1338,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 55 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1383,7 +1407,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 57 }, "_alignFlags": 41, "_target": null, @@ -1432,29 +1456,29 @@ }, "_children": [ { - "__id__": 58 + "__id__": 60 }, { - "__id__": 116 + "__id__": 120 }, { - "__id__": 152 + "__id__": 156 } ], "_active": true, "_components": [ - { - "__id__": 160 - }, - { - "__id__": 162 - }, { "__id__": 164 + }, + { + "__id__": 166 + }, + { + "__id__": 168 } ], "_prefab": { - "__id__": 166 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -1491,27 +1515,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 59 }, "_children": [ { - "__id__": 59 + "__id__": 61 }, { - "__id__": 67 + "__id__": 69 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 115 }, { - "__id__": 113 + "__id__": 117 } ], "_prefab": { - "__id__": 115 + "__id__": 119 }, "_lpos": { "__type__": "cc.Vec3", @@ -1548,23 +1572,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 58 + "__id__": 60 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 60 - }, { "__id__": 62 }, { "__id__": 64 + }, + { + "__id__": 66 } ], "_prefab": { - "__id__": 66 + "__id__": 68 }, "_lpos": { "__type__": "cc.Vec3", @@ -1601,11 +1625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1629,11 +1653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 65 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1674,11 +1698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 67 }, "_alignFlags": 45, "_target": null, @@ -1723,33 +1747,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 58 + "__id__": 60 }, "_children": [ { - "__id__": 68 + "__id__": 70 }, { - "__id__": 84 + "__id__": 86 }, { - "__id__": 90 + "__id__": 94 }, { - "__id__": 96 + "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 106 + "__id__": 110 }, { - "__id__": 108 + "__id__": 112 } ], "_prefab": { - "__id__": 110 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -1786,18 +1810,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 69 }, "_children": [ { - "__id__": 69 + "__id__": 71 } ], "_active": true, "_components": [ - { - "__id__": 75 - }, { "__id__": 77 }, @@ -1806,10 +1827,13 @@ }, { "__id__": 81 + }, + { + "__id__": 83 } ], "_prefab": { - "__id__": 83 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", @@ -1846,20 +1870,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 70 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 72 }, { - "__id__": 72 + "__id__": 74 } ], "_prefab": { - "__id__": 74 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1896,11 +1920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1924,11 +1948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 75 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1982,11 +2006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 78 }, "_contentSize": { "__type__": "cc.Size", @@ -2010,11 +2034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 80 }, "_type": 3, "_inverted": false, @@ -2032,11 +2056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2077,11 +2101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 84 }, "_alignFlags": 10, "_target": null, @@ -2126,20 +2150,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 85 + "__id__": 87 }, { - "__id__": 87 + "__id__": 89 + }, + { + "__id__": 91 } ], "_prefab": { - "__id__": 89 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", @@ -2176,11 +2203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 88 }, "_contentSize": { "__type__": "cc.Size", @@ -2204,11 +2231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2266,6 +2293,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1aokKxs8xCaopAEmW17wea" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 86 + }, + "_enabled": true, + "__prefab": { + "__id__": 92 + }, + "languageKey": "themepanel.recomandtext", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f27dtUVaVPtrXLZ2dAintD" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2285,20 +2333,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 91 + "__id__": 95 }, { - "__id__": 93 + "__id__": 97 } ], "_prefab": { - "__id__": 95 + "__id__": 99 }, "_lpos": { "__type__": "cc.Vec3", @@ -2335,11 +2383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 96 }, "_contentSize": { "__type__": "cc.Size", @@ -2363,11 +2411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 98 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2444,26 +2492,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 97 - }, - { - "__id__": 99 - }, { "__id__": 101 }, { "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 } ], "_prefab": { - "__id__": 105 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -2500,11 +2548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 102 }, "_contentSize": { "__type__": "cc.Size", @@ -2528,11 +2576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 104 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2573,11 +2621,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 106 }, "_alignFlags": 34, "_target": null, @@ -2609,11 +2657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 108 }, "clickEvents": [], "_interactable": true, @@ -2678,11 +2726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 111 }, "_contentSize": { "__type__": "cc.Size", @@ -2706,11 +2754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 113 }, "_alignFlags": 45, "_target": null, @@ -2755,11 +2803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 116 }, "_contentSize": { "__type__": "cc.Size", @@ -2783,11 +2831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 118 }, "_alignFlags": 41, "_target": null, @@ -2832,33 +2880,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 59 }, "_children": [ { - "__id__": 117 + "__id__": 121 }, { - "__id__": 133 + "__id__": 137 }, { - "__id__": 139 + "__id__": 143 } ], "_active": true, "_components": [ - { - "__id__": 145 - }, - { - "__id__": 147 - }, { "__id__": 149 + }, + { + "__id__": 151 + }, + { + "__id__": 153 } ], "_prefab": { - "__id__": 151 + "__id__": 155 }, "_lpos": { "__type__": "cc.Vec3", @@ -2895,30 +2943,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 116 + "__id__": 120 }, "_children": [ { - "__id__": 118 + "__id__": 122 } ], "_active": true, "_components": [ - { - "__id__": 124 - }, - { - "__id__": 126 - }, { "__id__": 128 }, { "__id__": 130 + }, + { + "__id__": 132 + }, + { + "__id__": 134 } ], "_prefab": { - "__id__": 132 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2955,20 +3003,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 117 + "__id__": 121 }, "_children": [], "_active": true, "_components": [ { - "__id__": 119 + "__id__": 123 }, { - "__id__": 121 + "__id__": 125 } ], "_prefab": { - "__id__": 123 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -3005,11 +3053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -3033,11 +3081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3091,11 +3139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 129 }, "_contentSize": { "__type__": "cc.Size", @@ -3119,11 +3167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 131 }, "_alignFlags": 45, "_target": null, @@ -3155,11 +3203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 133 }, "_type": 3, "_inverted": false, @@ -3177,11 +3225,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3235,20 +3283,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 116 + "__id__": 120 }, "_children": [], "_active": true, "_components": [ { - "__id__": 134 + "__id__": 138 }, { - "__id__": 136 + "__id__": 140 } ], "_prefab": { - "__id__": 138 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -3285,11 +3333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -3313,11 +3361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3371,20 +3419,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 116 + "__id__": 120 }, "_children": [], "_active": true, "_components": [ { - "__id__": 140 + "__id__": 144 }, { - "__id__": 142 + "__id__": 146 } ], "_prefab": { - "__id__": 144 + "__id__": 148 }, "_lpos": { "__type__": "cc.Vec3", @@ -3421,11 +3469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -3449,11 +3497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 147 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3530,11 +3578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 150 }, "_contentSize": { "__type__": "cc.Size", @@ -3558,11 +3606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 152 }, "clickEvents": [], "_interactable": true, @@ -3614,20 +3662,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 154 }, "lockImg": { - "__id__": 136 + "__id__": 140 }, "titleName": { - "__id__": 142 + "__id__": 146 }, "img": { - "__id__": 121 + "__id__": 125 }, "_id": "" }, @@ -3654,23 +3702,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 153 - }, - { - "__id__": 155 - }, { "__id__": 157 + }, + { + "__id__": 159 + }, + { + "__id__": 161 } ], "_prefab": { - "__id__": 159 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", @@ -3707,11 +3755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", @@ -3735,11 +3783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 160 }, "_alignFlags": 45, "_target": null, @@ -3771,11 +3819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 162 }, "_resizeMode": 1, "_layoutType": 3, @@ -3822,11 +3870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", @@ -3850,11 +3898,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 167 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3895,11 +3943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 169 }, "_alignFlags": 45, "_target": null, @@ -3948,7 +3996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 172 }, "_contentSize": { "__type__": "cc.Size", @@ -3976,7 +4024,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 174 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4021,7 +4069,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 176 }, "_alignFlags": 45, "_target": null, @@ -4070,7 +4118,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", @@ -4098,7 +4146,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 181 }, "_alignFlags": 45, "_target": null, @@ -4134,7 +4182,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 183 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/DataTable/demo_tbitem.bin b/assets/bundles/DataTable/demo_tbitem.bin deleted file mode 100644 index 6db22b43..00000000 --- a/assets/bundles/DataTable/demo_tbitem.bin +++ /dev/null @@ -1,2 +0,0 @@ -道具1描述1 -道具2描述2d \ No newline at end of file diff --git a/assets/bundles/DataTable/demo_tbreward.bin b/assets/bundles/DataTable/demo_tbreward.bin deleted file mode 100644 index 98dbcc02..00000000 --- a/assets/bundles/DataTable/demo_tbreward.bin +++ /dev/null @@ -1,2 +0,0 @@ -道具1碎片 -道具2金币d \ No newline at end of file diff --git a/assets/bundles/DataTable/demo_tbreward.bin.meta b/assets/bundles/DataTable/demo_tbreward.bin.meta deleted file mode 100644 index b8ec9c0f..00000000 --- a/assets/bundles/DataTable/demo_tbreward.bin.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.3", - "importer": "buffer", - "imported": true, - "uuid": "22867eec-f2ee-4997-b2b4-b277af84b625", - "files": [ - ".bin", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/bundles/DataTable/tbgirls.bin b/assets/bundles/DataTable/tbgirls.bin index 4825248e..9f63c060 100644 Binary files a/assets/bundles/DataTable/tbgirls.bin and b/assets/bundles/DataTable/tbgirls.bin differ diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin new file mode 100644 index 00000000..78cd1e67 --- /dev/null +++ b/assets/bundles/DataTable/tblanguage.bin @@ -0,0 +1,9 @@ +themepanel.title Girls Online 在线选妃+ऑनलाइन लड़कियाँFilles en ligneMädchen Onlinethemepanel.recomandtextDaily Recomand 每日推荐%दैनिक सिफारिशRecommandation quotidienneTägliche Empfehlunggirllistpanel.title Girl List 技师列表,लड़कियों की सूचीListe des filles Mädchenlistegirldetailpanel.chatbtn +Send Msgs! 发送消息संदेश भेजेंEnvoyer un messageNachricht sendengirldetailpanel.nameName:名字: +नाम:Nom :Name:girldetailpanel.ageAge:年龄: उम्र:Âge :Alter:girldetailpanel.desc Description: 自我介绍:विवरण: Description : Beschreibung:chatpanel.inputplaceholder Messages! 请输入：संदेश लिखेंÉcrivez ici...Nachricht eingeben category_1001 mature_lady熟女%परिपक्व महिला Femme mature +Reife Dame category_1002eighteen18岁अठारह वर्ष Dix-huit ansAchtzehn category_1003 hot_mommy辣妈सेक्सी माँ +Maman sexy Heiße Mama category_1004binding捆绑 बंधनBondageFesseln category_1005 public_fight 公众野战+सार्वजनिक संभोग Sexe publicÖffentlicher Sex category_1006cartoon卡通कार्टून Dessin animé Zeichentrickgirl_10001_name Anaya Kapoor 阿纳雅आन्या कपूर Anaya Kapoor Anaya Kapoorgirl_10002_name Meher Joshi梅尔मेहर जोशी Meher Joshi Meher Joshigirl_10003_name +Sana Reddy萨娜साना रेड्डी +Sana Reddy +Sana Reddygirl_10001_tag Hot|Horny 火辣|饥渴"सेक्सी|कामुकChaude|Excitée +Heiß|Geilgirl_10002_tag%Earth-tone linens,handcrafted jewelry土色亚麻制品|手工珠宝Yभूरे रंग के लिनन|हस्तनिर्मित गहनेLinge terreux,Bijoux artisanaux'Erdfarbene Leinen,Handgemachter Schmuckgirl_10003_tagSinger-Songwriter,Dancer 舞者|歌手2गायक-गीतकार|नर्तकीChanteuse-compositrice,Danseuse Sängerin-Songwriterin,Tänzerin \ No newline at end of file diff --git a/assets/bundles/DataTable/demo_tbitem.bin.meta b/assets/bundles/DataTable/tblanguage.bin.meta similarity index 74% rename from assets/bundles/DataTable/demo_tbitem.bin.meta rename to assets/bundles/DataTable/tblanguage.bin.meta index 2328ee7b..1ddbddce 100644 --- a/assets/bundles/DataTable/demo_tbitem.bin.meta +++ b/assets/bundles/DataTable/tblanguage.bin.meta @@ -2,7 +2,7 @@ "ver": "1.0.3", "importer": "buffer", "imported": true, - "uuid": "63fbd1bd-9cb1-4fa3-aca9-15b259a9c421", + "uuid": "4c2b1986-c2f8-47a9-be89-9dbe639a2f4a", "files": [ ".bin", ".json" diff --git a/assets/bundles/DataTable/tbthemes.bin b/assets/bundles/DataTable/tbthemes.bin index 4c92763b..b45e2a01 100644 Binary files a/assets/bundles/DataTable/tbthemes.bin and b/assets/bundles/DataTable/tbthemes.bin differ