From 939d3d81fcb5b7d3d5e086ed1049c172df80e35f Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Sat, 11 Oct 2025 09:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E5=8C=85ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Fgui/Common/Common_fui.bytes | Bin 34966 -> 35255 bytes Assets/Resources/Fgui/Main/Main_fui.bytes | Bin 14732 -> 14833 bytes Assets/Resources/Fgui/Shop/Shop_fui.bytes | Bin 1999 -> 1999 bytes Assets/Scripts/Fishing2/Role/Role.cs | 9 ++ Assets/Scripts/Fishing2/Role/RoleBag.cs | 24 +++++ Assets/Scripts/Fishing2/Role/RoleBag.cs.meta | 3 + Assets/Scripts/Fishing2/Role/RoleFishBag.cs | 9 ++ .../Scripts/Fishing2/Role/RoleFishBag.cs.meta | 3 + Assets/Scripts/Model/Data/TabListData.cs | 93 +++++++++++------- Assets/Scripts/Model/Login/LoginHelper.cs | 14 +-- Assets/Scripts/UI/Binders/CommonBinder.cs | 1 + Assets/Scripts/UI/Common/ClassifyList.cs | 24 ++++- .../UI/Common/Items/ListTitleItem.Designer.cs | 25 +++++ .../Items/ListTitleItem.Designer.cs.meta | 2 + .../Scripts/UI/Common/Items/ListTitleItem.cs | 15 +++ .../UI/Common/Items/ListTitleItem.cs.meta | 2 + Assets/Scripts/UI/Login/LoginPanel.cs | 11 +++ .../assets/Common/Com/ClassifyList.xml | 3 - .../assets/Common/Com/Items/ListTitleItem.xml | 7 ++ FGUIProject/assets/Common/package.xml | 1 + FGUIProject/assets/Main/BagPanel.xml | 3 +- FGUIProject/assets/Shop/FishingShopPanel.xml | 2 +- .../settings/whoot/6hgkvlaush9ymc.json | 1 + 23 files changed, 201 insertions(+), 51 deletions(-) create mode 100644 Assets/Scripts/Fishing2/Role/RoleBag.cs create mode 100644 Assets/Scripts/Fishing2/Role/RoleBag.cs.meta create mode 100644 Assets/Scripts/Fishing2/Role/RoleFishBag.cs create mode 100644 Assets/Scripts/Fishing2/Role/RoleFishBag.cs.meta create mode 100644 Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs create mode 100644 Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs.meta create mode 100644 Assets/Scripts/UI/Common/Items/ListTitleItem.cs create mode 100644 Assets/Scripts/UI/Common/Items/ListTitleItem.cs.meta create mode 100644 FGUIProject/assets/Common/Com/Items/ListTitleItem.xml create mode 100644 FGUIProject/settings/whoot/6hgkvlaush9ymc.json diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index 83524db00f2ddd0913de780399918728bcdbd80e..c4d2f8d2504a394b6d182c3d421aaa9e85ab4c63 100644 GIT binary patch delta 3466 zcmZ{m4OCRe8HVpSvv(J}Di|%Rk`**uP!?UqA3%N<1O)_T5#>jLMQ{ZaTn!j7M$x9$ z_Ouq`XsA6l*q$`no-}ApV>GcOjV(!Pf=z8SZ44w$W12L zL8DE>;l`1V;|z|oI9|iihXcQ0y4aa8jY#bFObmEf85L^^_>qTBnGe3!UOxij$Iro?1i6VheMMJ*lC5 z7A-v0nVL^#noD?@L;O6=E@r1YkeZvmWo!z@!H;j|luBu$H@%XllSjmQ$|*xmk7v>% zam3@LEHPkrSSXtoi;#?X%M!x$U85(96&aObIh2bU1`Z*YAYAN^nPk&!kd!C-Gh+Bs z$`>J-UMet4E~Dk5CDVIvp;lxgElf+(GPNuuXKO{eoG^K*NDO3_@fB1oQWl-2mEz<* z&X9PGR#6F+iiue+y^PACa-mk!8mKm?3aW%Up5;obA|I8SyQ|5~_i7ZJrZ!QdYFaxS zOF%5)?pO`g(mD~A?a=+SUa2~&huW1Lq52!CQK=@{q*Q=5LtP)qX{Htx*-8&6)kaHUI`k*$CqeNPbqB=>I*H89GQk|@Y5JK`&(LXA<5@amstIzF&(d@Byf~lh60v!a zVrQ)Iff?l?LfL{Z$;ycj=$e-=O5EH|XzB1NoEqKfuos zyGj3qiZ5{Kx9DF`6;QY7a}<%A_yyfDm0UP&M^aX%wYd{AQ)#B zri-v;4&BOZEClN-&t{|8m(V%B%uOMpZJA3S!^WbY3l+-3psqlTWB0J}B4c?3jW-K~ zGY9&z)I>H(smUw?lSg5E%hd!OnVETdFa4U;r zE>u+)7?0^aFIoy+`b;)UDL0!9bqU@amH=h(y7akh9+qKqu|uEF7O+I&^*Zz|^nmeT9T*38lo4!_;J2IpWccns4uYwmV~xRI1wCK|SO=~KJJuNXGI<@gT1{w<6%UWCFQK&?Qf!QTTrD`m|d^gcxI8u%6%T4nIJ!Ne*V^`Z9;dV9f7z-~~^ z<1)Aw9I7(xTjUs8z}%GnDkralU+6P<1K0{~1iO5Oy~)hO=3BZ&yU)pe@COkOfR1W| zZv{PIGgt?H40eD?;Azkg_Jg&cZLPuI2i;&5SPISs+rb#{7?=b0t&O(eCEhA-!uSG= ztTFg}Fb8}S41jyVPVix{r^c{MqCTxO5o;Jd*(5X&q&{KMOV<<{{G`km&o_QT&{p5Ke>IBK5% z81mig4f{6flV`-=4!?c9!8^fYpxmB5a1VGB{4N+-XYku#4tN9%fYo3pD7Uo-YzMD_ zN5Rl~gZ}_b1fK^-lf_{BFb_2QPz*!J&G2GsZR;JQKab2H9&h z+b*;1HQT|4*ion@A9!vP?gl5Hj%?2cnO(QR;6FyM1AGcR4L%9>Z!qk~Y}0N=gQ;Ag?ojq>bvwA;inv+YBqkZlt;!E>7leab1YGVo-np;*jv^4tjTKr9#ZPNmuKl#BVZCr8f{eJ(ZsQdlRfyS*Z4S`Lk J&a_<({Wr(qz3Tt~ delta 3380 zcmZ{mc~n%_9mn7A-g%66#4QR6jymdfVF2TXf{YBZxF8B5vdFLs2slwfs4<4Rm1ASe zY0RxQNyVBprfC{X)evJWX=Byco0a5J&`Yyq&%$gzoo35fi5qB+ zEDISgkB%KBcPtz%yAz!>SKdr4r+KoTIY+Xjs;VmVg+CU}DT?AwGIdK&snQNb4vEy`aY|>qCJR8eOb)ljXrI@$=kFKwV^6K&R+db(d*13dt{9IV+w59-WTdPv(gdKk7ceW0K1v_ofh z(k^Yg>D#c^f;D^SJ38|S?bY^O`W`HH$v{8fr$=>WA3df`(hq3AwbldlLv4@K6WX4n zAL+V-)C&97(s1(-{aD*!dP>{V^b>8*&=FWK>Yk;aYI}};rtNw9xwaRm4W{<^D7~od z7j#V9aXJCRXs(y2ok{~|7>je77(AzFgI=bS^ol&b%*{{HtMbaSvHUdsQc?CSo51LG zdEfGI^9=n)+gUoN?L57q?E?MQvPj*2lR9CSabFkxUdP^|ive@JO@E+21}2k;$xIJU z1`kv>{fREgl^NmYJM?F5@6vmgMe6ot`ir(JbXD6m`YY_Uj6h9Ti185pU8g>ve`x!V zK7w_v2n(T)>7R5%?ponCd+A>=HR31qZ&=rgvHVl;Bjj$*R}W1QKn zDpiQjKvlHCOcugyGH#{Yw6j65D%fE54J$U2Z1OzXp=>A{rg}1mvk}@xvU{|RVxzT% zv2ctSyDAcI8&w^_A_Frp$1$h2@eJoK4+U!`vB_u;%?dZCFahgb8a9bdWz*QOubJ?4 zto{{Qp5-=YuqbVA77aUtSPYAWeF~e&?!_(@uL(D2vDs{nT$CMd&Smpph1oGY4%`dQ z2Vc#0dls;GHYc!=zs4Rl1-EF7!4lZQug>8CAIcKZ!=%-2)58{7eMW__B<6+gLNJ*v zh8>5cuvD0uL>fzn^&_@~ErrGAjGeHIEw=_Y&*E@ef`j9HGS~{#ROPtMOtunBI{;h7 zvS8<7*=#lJc8=SV!`9ILz?OZ6J{}JCfd%BUwO^MroGcG-617eFtbi3-wvH8P^RZ%W zC9G6i87tRT!PdjN)e-)5vv@+ieX5^*Z99g_Jgc@Y!TETN!gKPnFz;-YR>;c~d%{;+p zfH8T(KAklfM#xn;E6>HJBG!c1L>=3S*m%S`^MoTp#h4d6x?TG6oc1u)wpGiEc`mzK zxk0i%-^E9v-k&cVBUQ|-!9Av`=fe^2$QSld73Yg(e8FTBhHP2EE zjhchK0?XejeML^5jd&;WAA`5RUeM_i{1Y(EHw`oQ`-J_bwa^Cny3fTkk?HUW$0}=$ zTd>Z9vel>77+NeGx2)(LjB$_bL;vri+E*<2Ww5ze_1A{h-_Ys?yTLy29Z;00Y-Wkz z@1oTReh9XLY7OT=A9$lg*!^k@W0SmE>f#lMc}fMZ1S`R6u%%QuYOET(MQtxif2otN zL%aw1I?yZ=ydI1JH-Wj}2VfI87d!%%ft_FpcniD&I?Dww1k=EopdXwB?gvxAj`Ars z`T}wtfjeMmh2XQmdEnci58MqlgWJJ2uo>(I_kevB!tscjxa}AY=n2_Vp|&-1y>PTx zQT*S@Ps^C~D%y(ZzJaK14r-me0e##+9GidxIEAAbCjFJF+EXbUM}yHlR`m<0Zb7_Q z#f=_}7-7ZL(t8lc)*`MRl?P>q)k{p3;7!Qpg4kf$R3#jN!@x$H`0iCXtqtu&e5-Z$ z8<@votJfz{@2nP%Mir+dE8c0X#9uAAM0P)@j->|r06g7gs1ZLI<`_pPvzDqt;o&+@J5Y#0!P;h z?m^2_t6G)TwZ*!&Ti2f2Y3h}rzTMm|owZIr1=TTisyeq$@MqC#0-pzufX{)Qb;9wC z8qQ3|i=;!g)j9b!#GM-je;G{MsP6XT+9>y1*A8SdSfjiSo?=^Ms9*5YY^%i%woUr{ Sf|^e3_KP7W-rM^Au>S*x4bY?j diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index da95ae2194dfc3fe3183c5f9f1d52f1ec9c3dec8..55d579eadacf617e93cf0f5df9aa25b2437b3d1f 100644 GIT binary patch delta 609 zcmYk3S!fec6o&tk88exrn#KeZibgY-Owue(+PXyRLt6_HkO-z)T#$fbpqds(C=n|0 zQE@BhL5hfo;)6bwf*>m5lRo)gx4Q3Jw63j*H&YNV{NLsN=jYtZJx7g-aWZXB1YoWf z_gHs+Y3n5k6S#*%wJHHh8IV_sGM%v1Lz+;FP)ax@p#wt4_@>K8GMBa9rmR9}#4@C@ z8a>D&tKyW1-^M79c!GR2?vQaGm-$wpFPbs4YtV^qtVISH6%R!AAsz_^g$C*mSPn=9 zPU%b7r!7?Ey%Hwzm~El$^n^#X4mNyV=_#J^_0Wc<=h*n){T=8+mx>pn(@PHNaeBo$ zT~l6*^BcV7VLeLkcr5JU8@k(Bci&?~@Q%=WPU-=v0Uyk|H|$pGT|VLyr@}pEhtH_+ zaJY@Wh=guBUopj#!uj^k`Hmml8EK=RW|zYeuk;JQ`Fx~Tn#K%INBZawC)LGPmxL;6 zTx#AX6Nq@CIcp&cpOd}pj48Y>nxi>kZ$~BecN_dO&+?&F}D@%X)}DFc}{13c9=Z(vK)ud}h@-&g(~o3!mhEBIwrkET8d( z?*z|C!&lU}98AzR>q3{wCcbmbNYK`P@&k1)SjkUmSuwm~8x5`-m&Fc#@!5ef`pt3s z5w%C)51RaZ;EIC3_{T=*dl1Dbf7pA%iD?@r<&AfGbd+nUb;1R9cpfVDrd&w_}`;*GZVX + { + protected override void Awake(Role self) + { + // self.AddComponent(); + // self.AddComponent(); + } + } + public async FTask GetRoleInfo() { var response = (Game2C_GetRoleInfoResponse)await Net.Call(new C2Game_GetRoleInfoRequest()); diff --git a/Assets/Scripts/Fishing2/Role/RoleBag.cs b/Assets/Scripts/Fishing2/Role/RoleBag.cs new file mode 100644 index 000000000..c5e3f3d5d --- /dev/null +++ b/Assets/Scripts/Fishing2/Role/RoleBag.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using NBC; +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class RoleBag : Entity + { + public readonly List Items = new List(); + public readonly List Rigs = new List(); + + public async FTask GetBagInfo() + { + Items.Clear(); + Rigs.Clear(); + var response = (Game2C_GetItemsResponse)await Net.Call(new C2Game_GetItemsRequest()); + if (response.ErrorCode == ErrorCode.Success) + { + Items.AddRange(response.Items); + Rigs.AddRange(response.Rigs); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Role/RoleBag.cs.meta b/Assets/Scripts/Fishing2/Role/RoleBag.cs.meta new file mode 100644 index 000000000..f22de6449 --- /dev/null +++ b/Assets/Scripts/Fishing2/Role/RoleBag.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4affcf4934a845c59879e02b01acc709 +timeCreated: 1760102338 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Role/RoleFishBag.cs b/Assets/Scripts/Fishing2/Role/RoleFishBag.cs new file mode 100644 index 000000000..7caa8b360 --- /dev/null +++ b/Assets/Scripts/Fishing2/Role/RoleFishBag.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class RoleFishBag : Entity + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Role/RoleFishBag.cs.meta b/Assets/Scripts/Fishing2/Role/RoleFishBag.cs.meta new file mode 100644 index 000000000..e702a5969 --- /dev/null +++ b/Assets/Scripts/Fishing2/Role/RoleFishBag.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4848b3391419459b883ae2fcb5fc88e6 +timeCreated: 1760102442 \ No newline at end of file diff --git a/Assets/Scripts/Model/Data/TabListData.cs b/Assets/Scripts/Model/Data/TabListData.cs index 816a75bcf..693544d63 100644 --- a/Assets/Scripts/Model/Data/TabListData.cs +++ b/Assets/Scripts/Model/Data/TabListData.cs @@ -4,50 +4,75 @@ using Random = UnityEngine.Random; namespace NBF { + // public class TabItemData + // { + // public string Name; // 菜单显示名 + // public string Key; // 唯一标识 + // public string Icon; // 图标 + // public bool IsAll; // 是否是“全部”选项 + // public List Children = new List(); // 二级菜单 + // } + public class TabItemData { public string Name; public string Key; public string Icon; - } + public bool IsAll; - public class TabListData : TabItemData - { - } - public class TabSubItemData : TabListData - { + // 条目可以是任意对象类型 public List Items = new List(); + + // 子菜单 + public List Children = new List(); } - /// - /// 保护二级子目录的列表 - /// - public class TabListAndSubListData : TabListData - { - public List SubTab = new List(); + // public class TabItemData + // { + // public string Name; + // public string Key; + // public string Icon; + // } + // + // public class TabListData : TabItemData + // { + // } + // + // public class TabSubItemData : TabListData + // { + // public List Items = new List(); + // } - public void AddTestData(int index) - { - Name = $"标题-{index + 1}"; - - string[] testIcon = { "Globe", "Granade", "Gun" }; - var count1 = Random.Range(5, 10); - var count2 = Random.Range(90, 200); - for (int i = 0; i < count1; i++) - { - TabSubItemData subTab = new TabSubItemData(); - subTab.Name = $"类型-{i}"; - subTab.Icon = testIcon[Random.Range(0, testIcon.Length)]; - for (int j = 0; j < count2; j++) - { - var item = new ShopGearData(); - item.title = $"Item {index}-{i}-" + j; - subTab.Items.Add(item); - } - SubTab.Add(subTab); - } - } - } + // /// + // /// 保护二级子目录的列表 + // /// + // public class TabListAndSubListData : TabListData + // { + // public List SubTab = new List(); + // + // public void AddTestData(int index) + // { + // Name = $"标题-{index + 1}"; + // + // string[] testIcon = { "Globe", "Granade", "Gun" }; + // var count1 = Random.Range(5, 10); + // var count2 = Random.Range(90, 200); + // for (int i = 0; i < count1; i++) + // { + // TabSubItemData subTab = new TabSubItemData(); + // subTab.Name = $"类型-{i}"; + // subTab.Icon = testIcon[Random.Range(0, testIcon.Length)]; + // for (int j = 0; j < count2; j++) + // { + // var item = new ShopGearData(); + // item.title = $"Item {index}-{i}-" + j; + // subTab.Items.Add(item); + // } + // + // SubTab.Add(subTab); + // } + // } + // } } \ No newline at end of file diff --git a/Assets/Scripts/Model/Login/LoginHelper.cs b/Assets/Scripts/Model/Login/LoginHelper.cs index f2df5fcae..4113266da 100644 --- a/Assets/Scripts/Model/Login/LoginHelper.cs +++ b/Assets/Scripts/Model/Login/LoginHelper.cs @@ -63,15 +63,15 @@ namespace NBF await role.GetRoleInfo(); Log.Debug( $"获取角色信息成功！roleId={role.Id} Room={role.RoomCode} RoleInfo={JsonConvert.SerializeObject(role.Info)}"); - var mapId = role.Info.MapId; - if (mapId == 0) - { - Log.Warning("账号没有进入过地图，进入新手引导地图"); - mapId = 99; - } + //获取背包数据 + var roleBag = role.GetOrAddComponent(); + + await roleBag.GetBagInfo(); + Game.SelfId = loginResponse.RoleId; - await MapHelper.EnterMap(mapId, role.RoomCode); + + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Binders/CommonBinder.cs b/Assets/Scripts/UI/Binders/CommonBinder.cs index 07b121422..4f18b4a8d 100644 --- a/Assets/Scripts/UI/Binders/CommonBinder.cs +++ b/Assets/Scripts/UI/Binders/CommonBinder.cs @@ -21,6 +21,7 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(NoticeItem.URL, typeof(NoticeItem)); UIObjectFactory.SetPackageItemExtension(CommonSubMenu.URL, typeof(CommonSubMenu)); UIObjectFactory.SetPackageItemExtension(BtnInputControl.URL, typeof(BtnInputControl)); + UIObjectFactory.SetPackageItemExtension(ListTitleItem.URL, typeof(ListTitleItem)); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/ClassifyList.cs b/Assets/Scripts/UI/Common/ClassifyList.cs index 3605a081c..47e8bcbe1 100644 --- a/Assets/Scripts/UI/Common/ClassifyList.cs +++ b/Assets/Scripts/UI/Common/ClassifyList.cs @@ -63,14 +63,17 @@ namespace NBF } } - public void SetListData(List listData, ListSelectionMode selectionMode = ListSelectionMode.Single) + public void SetListData(List listData, + ListSelectionMode selectionMode = ListSelectionMode.Single) { List.selectedIndex = -1; - List.defaultItem = GetListDefaultItemResource(listData); + List.defaultItem = ListTitleItem.URL; + List.itemProvider = GetListItemResource; List.itemRenderer = OnRenderItem; List.onClickItem.Add(OnClickListItem); - List.SetVirtual(); + // List.SetVirtual(); _listData.Clear(); + foreach (var obj in listData) { _listData.Add(obj); @@ -92,19 +95,30 @@ namespace NBF if (obj is ListItemBase item) { item.SetData(_listData[index]); + obj.SetSize(350, 300); + } + else if (obj is ListTitleItem titleItem) + { + titleItem.SetSize(List.width, 32); } } + //根据索引的不同，返回不同的资源URL - string GetListDefaultItemResource(List listData) + string GetListItemResource(int index) { - var itemData = listData.Find(t => t != null); + var itemData = _listData[index]; if (itemData is ShopGearData) { return ShopGearItem.URL; } + if (itemData is string title) + { + return ListTitleItem.URL; + } + return List.defaultItem; } } diff --git a/Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs b/Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs new file mode 100644 index 000000000..6d43987c2 --- /dev/null +++ b/Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs @@ -0,0 +1,25 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class ListTitleItem + { + public const string URL = "ui://6hgkvlaush9ymc"; + + public Controller show; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + show = GetController("show"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs.meta b/Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs.meta new file mode 100644 index 000000000..cbcc12e26 --- /dev/null +++ b/Assets/Scripts/UI/Common/Items/ListTitleItem.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f130a01ca6286e1408db0809028cf787 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Items/ListTitleItem.cs b/Assets/Scripts/UI/Common/Items/ListTitleItem.cs new file mode 100644 index 000000000..87a2c07f6 --- /dev/null +++ b/Assets/Scripts/UI/Common/Items/ListTitleItem.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class ListTitleItem : GLabel + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Items/ListTitleItem.cs.meta b/Assets/Scripts/UI/Common/Items/ListTitleItem.cs.meta new file mode 100644 index 000000000..a79cd7d10 --- /dev/null +++ b/Assets/Scripts/UI/Common/Items/ListTitleItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b2881797917479b469f018a06726152d \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 91982d2fb..65156698a 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -76,6 +76,17 @@ namespace NBF private async FTask OnLoginClick() { await LoginHelper.Login(InputAccount.text); + + BagPanel.Show(); + FishingShopPanel.Show(); + + // var mapId = role.Info.MapId; + // if (mapId == 0) + // { + // Log.Warning("账号没有进入过地图，进入新手引导地图"); + // mapId = 99; + // } + // await MapHelper.EnterMap(mapId, role.RoomCode); // await MapHelper.EnterMap(99); Del(); } diff --git a/FGUIProject/assets/Common/Com/ClassifyList.xml b/FGUIProject/assets/Common/Com/ClassifyList.xml index 083cb9b79..5eafd4f1e 100644 --- a/FGUIProject/assets/Common/Com/ClassifyList.xml +++ b/FGUIProject/assets/Common/Com/ClassifyList.xml @@ -32,9 +32,6 @@ - - - \ No newline at end of file diff --git a/FGUIProject/assets/Common/Com/Items/ListTitleItem.xml b/FGUIProject/assets/Common/Com/Items/ListTitleItem.xml new file mode 100644 index 000000000..ce5caaa07 --- /dev/null +++ b/FGUIProject/assets/Common/Com/Items/ListTitleItem.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 9bde31a31..c1a2edaaa 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -222,6 +222,7 @@ + \ No newline at end of file diff --git a/FGUIProject/assets/Main/BagPanel.xml b/FGUIProject/assets/Main/BagPanel.xml index aa2cc6d81..f6109d1ce 100644 --- a/FGUIProject/assets/Main/BagPanel.xml +++ b/FGUIProject/assets/Main/BagPanel.xml @@ -4,11 +4,12 @@ - + + \ No newline at end of file diff --git a/FGUIProject/assets/Shop/FishingShopPanel.xml b/FGUIProject/assets/Shop/FishingShopPanel.xml index af351119e..19ed44c0c 100644 --- a/FGUIProject/assets/Shop/FishingShopPanel.xml +++ b/FGUIProject/assets/Shop/FishingShopPanel.xml @@ -8,7 +8,7 @@ - + diff --git a/FGUIProject/settings/whoot/6hgkvlaush9ymc.json b/FGUIProject/settings/whoot/6hgkvlaush9ymc.json new file mode 100644 index 000000000..4cb7a8131 --- /dev/null +++ b/FGUIProject/settings/whoot/6hgkvlaush9ymc.json @@ -0,0 +1 @@ +{"url":"ui://6hgkvlaush9ymc","name":"ListTitleItem","scriptType":"component","isCustomName":false,"customName":"","annotation":"","member":{}} \ No newline at end of file