From 707946304e638e6ca5d81201d316c32a742c729c Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Tue, 12 Aug 2025 19:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataTables/Datas/#demo.item.xlsx | Bin 9039 -> 0 bytes DataTables/Datas/__tables__.xlsx | Bin 9735 -> 9731 bytes DataTables/Datas/girls.xlsx | Bin 10896 -> 10846 bytes DataTables/Datas/l10n/Demo.xlsx | Bin 9189 -> 0 bytes DataTables/Datas/l10n/Patch.xlsx | Bin 10126 -> 0 bytes DataTables/Datas/l10n/texts.json | 9 - DataTables/Datas/language.xlsx | Bin 0 -> 12990 bytes DataTables/Datas/texts.json | 4 + DataTables/Datas/themes.xlsx | Bin 10792 -> 10892 bytes DataTables/Datas/~$__tables__.xlsx | Bin 0 -> 165 bytes DataTables/Datas/~$girls.xlsx | Bin 0 -> 165 bytes DataTables/Datas/~$language.xlsx | Bin 0 -> 165 bytes DataTables/Datas/~$themes.xlsx | Bin 0 -> 165 bytes DataTables/gen.bat | 4 +- DataTables/output/demo_tbitem.json | 14 - DataTables/output/demo_tbreward.json | 14 - DataTables/output/tbgirls.json | 18 +- DataTables/output/tblanguage.json | 162 +++++ DataTables/output/tbthemes.json | 6 + assets/Scripts/Main/Common/LanguageLabel.ts | 134 ++++ .../Scripts/Main/Common/LanguageLabel.ts.meta | 9 + assets/Scripts/Main/Common/LanguageUtils.ts | 201 ++++++ .../Scripts/Main/Common/LanguageUtils.ts.meta | 9 + assets/Scripts/Main/Config/CommonConfig.ts | 1 + assets/Scripts/Main/Config/InnerMsgCode.ts | 1 + assets/Scripts/Sub/UI/PreloadUI.ts | 417 +++++------ assets/Scripts/chat18x/ui/panels/ChatPanel.ts | 14 +- .../chat18x/ui/panels/GirlDetailPanel.ts | 30 +- .../Scripts/chat18x/ui/panels/GirlListItem.ts | 44 +- assets/Scripts/chat18x/ui/panels/ThemeItem.ts | 19 +- .../Scripts/chat18x/ui/panels/ThemePanel.ts | 3 +- assets/Scripts/schema/schema.ts | 210 ++---- assets/bundles/Chat18x/ChatPanel.prefab | 246 ++++--- assets/bundles/Chat18x/GirlDetailPanel.prefab | 494 +++++++------ assets/bundles/Chat18x/GirlListPanel.prefab | 650 +++++++++--------- assets/bundles/Chat18x/ThemePanel.prefab | 542 ++++++++------- assets/bundles/DataTable/demo_tbitem.bin | 2 - assets/bundles/DataTable/demo_tbreward.bin | 2 - .../bundles/DataTable/demo_tbreward.bin.meta | 12 - assets/bundles/DataTable/tbgirls.bin | Bin 251 -> 232 bytes assets/bundles/DataTable/tblanguage.bin | 9 + ...mo_tbitem.bin.meta => tblanguage.bin.meta} | 2 +- assets/bundles/DataTable/tbthemes.bin | Bin 187 -> 271 bytes 43 files changed, 1977 insertions(+), 1305 deletions(-) delete mode 100644 DataTables/Datas/#demo.item.xlsx delete mode 100644 DataTables/Datas/l10n/Demo.xlsx delete mode 100644 DataTables/Datas/l10n/Patch.xlsx delete mode 100644 DataTables/Datas/l10n/texts.json create mode 100644 DataTables/Datas/language.xlsx create mode 100644 DataTables/Datas/texts.json create mode 100644 DataTables/Datas/~$__tables__.xlsx create mode 100644 DataTables/Datas/~$girls.xlsx create mode 100644 DataTables/Datas/~$language.xlsx create mode 100644 DataTables/Datas/~$themes.xlsx delete mode 100644 DataTables/output/demo_tbitem.json delete mode 100644 DataTables/output/demo_tbreward.json create mode 100644 DataTables/output/tblanguage.json create mode 100644 assets/Scripts/Main/Common/LanguageLabel.ts create mode 100644 assets/Scripts/Main/Common/LanguageLabel.ts.meta create mode 100644 assets/Scripts/Main/Common/LanguageUtils.ts create mode 100644 assets/Scripts/Main/Common/LanguageUtils.ts.meta delete mode 100644 assets/bundles/DataTable/demo_tbitem.bin delete mode 100644 assets/bundles/DataTable/demo_tbreward.bin delete mode 100644 assets/bundles/DataTable/demo_tbreward.bin.meta create mode 100644 assets/bundles/DataTable/tblanguage.bin rename assets/bundles/DataTable/{demo_tbitem.bin.meta => tblanguage.bin.meta} (74%) diff --git a/DataTables/Datas/#demo.item.xlsx b/DataTables/Datas/#demo.item.xlsx deleted file mode 100644 index 974ed8bdf83d842aaf4e938c1cba4620346107dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9039 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 SkN!~=lm0|YGpvjJefbXyNbe2+ delta 2702 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 diff --git a/DataTables/Datas/l10n/Patch.xlsx b/DataTables/Datas/l10n/Patch.xlsx deleted file mode 100644 index 77428df8d56721c395a5a0932dc07eec0238c58f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10126 zcmeHtg_x8};-67pWcgFyN4j@v}3`lo(gMc(ji*!mzH`0;{N{MvJ&>i3CIltF) zIOqEd-gjTu?Ade8v)0UB`@Yw6uk}2SRS^&g0muMU002M-@JSq?^M(Tef{*|J0stz! zzMO--tA)L*k(QUEh08N8Pdi)MJVbbwTmU?5{Qr*s;s}%{58HS1;3}M@T;e1&5CL7m zPl$pPXoiW=F5#H68Hl6oypYiY7Nfk1OFdbF)$+b(`|Lf0h*MT&i0aBnuh=pnKR049 zb}5SG2pcM7)_+F|u#Kw?uZVygFN>&S_HEcEx~tX@V(htq@eIti`zWABR}vOsN;*iGL$ zTbxLN#)!fOWmB^|e! zQGbkXmAg9`U5f=z#6Q%^eKh5`=lpD#hJ@Hv~FZBSgs>KT|1t7O+tE zjwV5{c|#W!o=g~Xuo@zU>$O_NC06GVjl7VO#hqZ_BH+*Ng2=UkBzg%W<=q_u;PKxm zOJLY;0S}|>B8-t3Fv=P^TiCjAbNxL3kE;L0{QS$UmnW*JA^>s2p}}`_AKS#{*yty1 zxfM3m%x~a;uWyWnUdQJ*-<&DRxW1{U_Rg&G$o6`D0;zfH`4-p59Y0k8EjSbMsYSb6 z^`@~A1uw~2F?JW!9Yk+ix>I(-7t6Nx=Ie=Mbop{#C>P^hAgP;@c5kpmlfiRgofKzM zy<-)eQbvQ6HLCDM^2a0my`vyhF&Bh9$@A8WRzV@Ps^`Pr4ub^`*y9W3N8@$R<7Z^I zj|B3x-xM%(z4IU1iX6J4H$$Li*1O5sgxXAKXecsDblg$9?UxfR!f+TJ{=RnAN^Ky35&u%DYI2uem)GN3llN`fCC%hY0K^5;A~^+ z;9&D}hRfHIaG2x4UBEb&LY*h_n^g`S2(oLk3asb3OyEF<*URIiCoDVTn#MyD@N|hdUAReTYRdGJrL+dz(hMd#2!1J_Gz6>^E^!;- zhm%U{G{MOLU}4O5EjgjC0y)*grg+bfxw}nYYS!`n?aqC;IQ)+oL3X~Sxg~@u508nZ z#V{r*PJAj?ygc-H7I(XP;$@W*HLdv#suO=G)mT@(o3-H?^W#lNnJ#U^mpP)2n$~kV z0$V!Bl8G4TeCf8hKqgUS4d)0?p*Gh_;!vE!jV9BTvZ7Pfwy4U(tnnvB=5iKg7sFvh z%=JrqPA@W@&)tYz##tgYr7hqtMPh8a!+D_tR{p*l7?w+^<3zqxO>UZ{pJEPF$x9Hi zEd9VrR&5<~0eroZXD%O$pSPJzfQHEIiVmFCiG8(kIKgSNJmRuXv;LuED;D8K$I)

wElMIV+ouco$YPZ$2gSsLXY=IJz2(cd`kq^N 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 G?*0#*?AJ^H literal 0 HcmV?d00001 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 824f2ae2628887da6b162dbd42d94fa2756f271e..500330d0620c1ec10fa01c7d8c5020ce9ff02648 100644 GIT binary patch delta 2652 zcmV-i3ZwO?RE$-yo&kSPafCEF0RR9+0ssIJ0001FZ(~q$Z*X%jV{dY0E_iKheUV*H z!ypuf?@jy<4fie3xn+{JiyzsQOH7>6ct_x@BNj>k?e_0wT~}u`UXu6W;XQ|9vC~cR z3C^q5l!#^oC16A=m8nbgyk4erl=#4nP3trd@#t!7xp?O_;GB>d))2Vlf#ZWPwWARYN-0LA{cue$ zkOD&k8cgt*W)y$30i5=KUg(oEQme4Hai*c}xm${3IMO?>MzHI;tef;TVt;eV|kV^&|^>&m<0t}jUwqsR}Dhns>N z%H|ZKzy8d=JRz^Ad2`4s(%=|<;2wQl|NPVHM!L8Dj4|~fL(|9TOlkWPe*}GT#&zEN zq{R)497$K_6#nf_LEm;bKk!L)70kkL8Ps{%Ad%svyC(-Z9?Jr!q`1_$p(06#tDM66 z`*Yd$GTZy%u6&0szkyb{9&L%K7#Z_Li^=-xvgk-pj?^zm9f+k(RXzvLhR(W}Bytq1 z&bzlu`vnrWAZ}k)CH>%Xf8~NORe5f=n}2J2zi5V4Xa$NM15A@kPf4BTG)L+mr~-=ddY6e1Yl$loQt_1bTb=KEJ%;ez4=cm;XP1A9W=82BrMLYABZ zEM;EM@`@8&RWZsU!25ssUD$89MKIn&|1IyAao>FJyaPVwmx?B&fBL69&~uEQk&OL8 zZolC2bf&PFrT>6Da-mh(;NS2SS1=()OLn7zRFD<^dUeS>j=Va5kI@X)KW6OdM+NTY z3meJ#K*Dt(qX&Qf2savWui%9pmS#?04AX&^)93!(vzNncxPG$C$AN_FK+ZyccJC_T z`R3(-tDL>`qr0a=e>eDaxJr@X|ELkTP0Wv$^Cu{nTWTO$$PL3hyk2$W=E3vLOx5OW z_laH}!F&Y^eq&MIUob`w(d#-~1y^ucF%X+65t&3XC1xg(PKmimY^TJ+B(f>-U=q72 zu^fp2sxX!U?CdB7i<+f)9H;YQZKlMNNhDL^*(B0WiS3k#f2^Kl4#aB8P9RW{v9W3; zMls-tbrgd|&0<7WQ#TS}+XnMeVh2(gP-}?nzDqw|b5wYLz;X!cpT_*~?H0 z2Lgvu7S)uhxk9NN)|6V-OdW`F70A%uub5t1ugzQBy_P@VTn^13T?rq2 z{5vm3E$L{Nmy{jvMY4=%VQcZS(~IqQ?$O)~jMMsmhtsq1?$4C|22e`_1QY-O00;nwPU1k_S{DNQ0RRAOli?H^ zf7&n`ABPJplb8+zT_ifl4W26lgG0mi4K7M5y-^{;$nUzw#?4^7` zARx4lQ)7xLAv#J~PIX@vOu$JZRZb0rf9gPVp%{&I%9zPB;yKP0$tf4OR+y?T8Zt?E z#FjET=1iDcM6rw-NMEPC(2ZKWuO4bOOSbQqh3-d!FniB)$(e%ZvxH}CSN8zXqIjS= zRC>xV%BVK0m>U-RcmSa+*&8szNF9sd$TK*d3>*)WdE1sp1%d6)jMEbmuQNo5j!V>PPbg`Lv+~W)6$nOrA79iupfKO9KQHlN%@*vl17V z4gx%dCqV*O7n49JIRWsKdMGvm7Y&oLC?y=-S{DNQ0RRAO z1ONaJ000000000103ZMW05BDk^C(>kV0RXOIs^a!-42slDOLgy36ruZL;?T{llUnr K2ID0F0000USNUWB delta 2617 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 P|9|zD=BC4opYQz-Si8?? diff --git a/DataTables/Datas/~$__tables__.xlsx b/DataTables/Datas/~$__tables__.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1e0c8b3a64122aeea8ded50bd91585a6113ab2a6 GIT binary patch literal 165 ycmd;eOv%m6%PcM_N-W7QQXm%aGB`4%Fyu01GUNeqF+&MM5kn%7%m>m6REGf9mK7ZU literal 0 HcmV?d00001 diff --git a/DataTables/Datas/~$girls.xlsx b/DataTables/Datas/~$girls.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1e0c8b3a64122aeea8ded50bd91585a6113ab2a6 GIT binary patch literal 165 ycmd;eOv%m6%PcM_N-W7QQXm%aGB`4%Fyu01GUNeqF+&MM5kn%7%m>m6REGf9mK7ZU literal 0 HcmV?d00001 diff --git a/DataTables/Datas/~$language.xlsx b/DataTables/Datas/~$language.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1e0c8b3a64122aeea8ded50bd91585a6113ab2a6 GIT binary patch literal 165 ycmd;eOv%m6%PcM_N-W7QQXm%aGB`4%Fyu01GUNeqF+&MM5kn%7%m>m6REGf9mK7ZU literal 0 HcmV?d00001 diff --git a/DataTables/Datas/~$themes.xlsx b/DataTables/Datas/~$themes.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1e0c8b3a64122aeea8ded50bd91585a6113ab2a6 GIT binary patch literal 165 ycmd;eOv%m6%PcM_N-W7QQXm%aGB`4%Fyu01GUNeqF+&MM5kn%7%m>m6REGf9mK7ZU literal 0 HcmV?d00001 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 4825248e478e096e31110cb320ba05be06bc7f39..9f63c060840dcf641711a6de5cb13fddbacd6643 100644 GIT binary patch literal 232 zcmZQxF36vrS(FoRXkcJq7@wDzo62Nl$-svsR+5;`pz4{Mn4YTd4pdpJ4_2!0Se96l zSOnq3CxSVw%Y_hz89@y*Lo&=L9%vXNhG9m?h8aN(V_7bYFw7Wgm?@HB#vsF(Fbp$B KHq01m7&8FnNkm=% delta 143 zcmV~$I|{-;5CG6@to$@~c5b6+NSc6(rJxWLo8$yTcFeAX8JR4EJw{I9H9U@Yu<^aG z`l;pUJ)fNj0_YpOm?h4Sks255(}IPEM#|az)A^zX?Fdm+YSbul69humCDe{%z%7fvpchTY?(Vts-3ecYvF$ mmuirTuOr&{Pe9w#H20%qh;~2Ewpi!@ delta 51 zcmeBY+Rez!*8Fm!pyEUaxrsUQ6KBd!JfbAco}5@zlAoW)${^sGo0y)eACi%po2qYU HU|