From 2f8251fe630eb30d9c74c558ff591e9f0bd282d7 Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Wed, 20 Aug 2025 23:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=92=8C=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Fgui/Common/Common_fui.bytes | Bin 33663 -> 34279 bytes Assets/Resources/Fgui/Main/Main_fui.bytes | Bin 14301 -> 14732 bytes .../Dispatcher/Interface/IMessageHandler.cs | 1 + .../Dispatcher/MessageDispatcherComponent.cs | 61 -------------- Assets/Scripts/Net/Net.cs | 75 ++++++++++++++++++ Assets/Scripts/Net/Net.cs.meta | 3 + Assets/Scripts/Net/NetExtends.cs | 12 +++ Assets/Scripts/Net/NetExtends.cs.meta | 3 + Assets/Scripts/Startup/Init.cs | 6 +- Assets/Scripts/UI/Binders/CommonBinder.cs | 1 + .../Scripts/UI/Common/CommonInput.Designer.cs | 29 +++++++ .../UI/Common/CommonInput.Designer.cs.meta | 2 + Assets/Scripts/UI/Common/CommonInput.cs | 47 +++++++++++ Assets/Scripts/UI/Common/CommonInput.cs.meta | 2 + Assets/Scripts/UI/Login.meta | 3 + Assets/Scripts/UI/Login/LoginHelper.cs | 54 +++++++++++++ Assets/Scripts/UI/Login/LoginHelper.cs.meta | 3 + .../Scripts/UI/Login/LoginPanel.Designer.cs | 32 ++++++++ .../UI/Login/LoginPanel.Designer.cs.meta | 2 + Assets/Scripts/UI/Login/LoginPanel.cs | 25 ++++++ Assets/Scripts/UI/Login/LoginPanel.cs.meta | 2 + .../assets/Common/Com/Buttons/BtnCommon.xml | 16 ++-- .../assets/Common/Com/Inputs/CommonInput.xml | 16 ++++ FGUIProject/assets/Common/package.xml | 3 +- FGUIProject/assets/Main/LoginPanel.xml | 15 ++++ FGUIProject/assets/Main/package.xml | 1 + .../settings/whoot/6hgkvlau9zboma.json | 1 + .../settings/whoot/hxr7rc7p9zbo1g.json | 1 + 28 files changed, 346 insertions(+), 70 deletions(-) create mode 100644 Assets/Scripts/Net/Net.cs create mode 100644 Assets/Scripts/Net/Net.cs.meta create mode 100644 Assets/Scripts/Net/NetExtends.cs create mode 100644 Assets/Scripts/Net/NetExtends.cs.meta create mode 100644 Assets/Scripts/UI/Common/CommonInput.Designer.cs create mode 100644 Assets/Scripts/UI/Common/CommonInput.Designer.cs.meta create mode 100644 Assets/Scripts/UI/Common/CommonInput.cs create mode 100644 Assets/Scripts/UI/Common/CommonInput.cs.meta create mode 100644 Assets/Scripts/UI/Login.meta create mode 100644 Assets/Scripts/UI/Login/LoginHelper.cs create mode 100644 Assets/Scripts/UI/Login/LoginHelper.cs.meta create mode 100644 Assets/Scripts/UI/Login/LoginPanel.Designer.cs create mode 100644 Assets/Scripts/UI/Login/LoginPanel.Designer.cs.meta create mode 100644 Assets/Scripts/UI/Login/LoginPanel.cs create mode 100644 Assets/Scripts/UI/Login/LoginPanel.cs.meta create mode 100644 FGUIProject/assets/Common/Com/Inputs/CommonInput.xml create mode 100644 FGUIProject/assets/Main/LoginPanel.xml create mode 100644 FGUIProject/settings/whoot/6hgkvlau9zboma.json create mode 100644 FGUIProject/settings/whoot/hxr7rc7p9zbo1g.json diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index c3a454bfd0983000bbca3847893011692cc537b3..b3599cc62344c6ce087b8f4bd8e374e2cd110740 100644 GIT binary patch delta 5673 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 S)}E%Gm)f6q^>lUqApZ*p9z+lT delta 5260 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 O1~tq{ZT@!kHTfSRPxsCM diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index be3fd8958cc0f3b460648c99ce7f75f89eea4031..da95ae2194dfc3fe3183c5f9f1d52f1ec9c3dec8 100644 GIT binary patch delta 1403 zcmah}Yfu|i6#gzZ$+F0!5JEO2G=VnZ5uiLuNl5)sRJ28Em=55Gh`=yNDG4)DXY3DK ze>gf0*6Qg)tQAnIB0fNT6{HkuTdeibs;#e9d?3EHzO@y+yI~lASlyX(cIP|a_wDXI z=ibx7jvKdmm8|2?uIz)_jft#=eXx9eTs~{zxE*)k*11^$N?QP(MC~ zQY6ABVl9ouD%9Y%klnbP2HbHLbO_2_*a~o!I39kNNl`c$ChV*2X*rgrN_QqaRNQBkGZt3|*J7h_NRrXjb@Bc$)4s z`&b_xHfP!f5Y&FR1Zz-8)qs@wk_o1JLm8CH% z)`jQAqU4FESQ>X)s9P~>b%!O5zknC1)RHG0Zn0$B_Mv)VUCU5`YE;V@7Q$YP(4-|# z-zS0s)Kl$TCIM52#4u_^-^ug zj)*1OZ_A~XHoJZjuL$<_wyJ+ruHZ-UD#=NHb}Zy-<#-LRUx1gk*w5Zr;Ju0C7vNoP z_p=i!PhwFVZ{ckkvDdIel##rWDjY`b{YSNCUc=wPNjl~TRj<;9;mG_js4Wk%stm&B z6yE(0oA>bk|Jqbax>k-4@F8_BtzoCN&(WF9{0u&#GN<1*g>_m#3gCqgD^ZMM86S(U z_yk*NpVQ4grDMB5XsXlBZ>uw^bc{0{^=62I zKGd3O&J0WqIr3r$5_BwbZdRN* zQR3IaL@*R`u1Zf&=QNy%mtTT>Awq==f*qKlg zF&RJjqsGaG2gQNxLljUznN@^2Km-Nl%Wp+t^ZOf=F9p%nw=Zh=gYhQsb8nvWoaa3` z=iHtJ$GZALT4@X9M#=e4jh0G3KI z9d+u898aT5VaP@;ZbB4u(SjBe){5kHSWn%#VKzkDas$dUg6YGvbRxHk4`7IV_N%kg z+;VIHc)9qR0vfqOBePwVf?m6qZ^R}VwU-NvG?8j!R z%qusDvY?|ur<;27Y}V3SHxz zDH}H?8t2as(gvr?upK*u`mnR{lE@8wCtjs{^CN7RG|l694ZANRTj7eZJ^#pF#~YWC zZMiDK_NHaVERKD6lZxFjHcI^kGiZ<7A}`-5=XpDS3;QWta4~v|+=;PEb|O9bi^|5d z)d3v*5355s{J*TCivDhnxA6{T6vf!PvaAJ~%HPBLG*%RGe1Lj6lWP$|7&B0V8WTPg zm3)Mc$?GX$M`(_xK>0*4pW-NW3+5P&c&)VEV=<@MaZCu@Cr%xedE7h`pUJrDwJ2$y z&+!EXy|bjlm-vdhy%p?hq3}rN8+=O>g8A-W=6n1=)xHY$qjY)Dr}Ce0oYwdn_zC<> z7ksy|U#QIFGEU(*iBq(wIL1%o3>_(su(LF**Z8majb@cZbvQ?>OH@71<00Bw(x}Jp zxImUt5%@z+tBK=JOw!WQ7*8>XKPgBqzeO|yOegknRY5s*`t9i{F)pUm;}3DY*!wb5 z{*|!lnIScqnq)>g>9;Zi83P`H0f|wGizTj=cqmZFl;oK}t-)bv3*A>0L}q - /// 处理路由消息，将消息分发给相应的路由消息处理器。 - /// - /// 会话对象 - /// 消息类型 - /// 实体对象 - /// 消息对象 - /// RPC标识 - public async FTask RouteMessageHandler(Session session, Type type, Entity entity, object message, uint rpcId) - { - if (!_routeMessageHandlers.TryGetValue(type, out var routeMessageHandler)) - { - Log.Warning($"Scene:{session.Scene.Id} Found Unhandled RouteMessage: {message.GetType()}"); - - if (message is IRouteRequest request) - { - FailRouteResponse(session, request.GetType(), InnerErrorCode.ErrEntityNotFound, rpcId); - } - - return; - } - - var runtimeId = entity.RuntimeId; - var sessionRuntimeId = session.RuntimeId; - - if (entity is Scene) - { - // 如果是Scene的话、就不要加锁了、如果加锁很一不小心就可能会造成死锁 - await routeMessageHandler.Handle(session, entity, rpcId, message); - return; - } - - // 使用协程锁来确保多线程安全 - using (await _receiveRouteMessageLock.Wait(runtimeId)) - { - if (sessionRuntimeId != session.RuntimeId) - { - return; - } - - if (runtimeId != entity.RuntimeId) - { - if (message is IRouteRequest request) - { - FailRouteResponse(session, request.GetType(), InnerErrorCode.ErrEntityNotFound, rpcId); - } - - return; - } - - await routeMessageHandler.Handle(session, entity, rpcId, message); - } - } - - internal bool GetCustomRouteType(long protocolCode, out int routeType) - { - return _customRouteMap.TryGetValue(protocolCode, out routeType); - } -#endif internal void FailRouteResponse(Session session, Type requestType, uint error, uint rpcId) { var response = CreateRouteResponse(requestType, error); diff --git a/Assets/Scripts/Net/Net.cs b/Assets/Scripts/Net/Net.cs new file mode 100644 index 000000000..f488db1e7 --- /dev/null +++ b/Assets/Scripts/Net/Net.cs @@ -0,0 +1,75 @@ +using Assets.Scripts.Entity; +using Assets.Scripts.Hotfix; +using NBC; +using NBC.Network; +using NBC.Network.Interface; + +namespace NBF +{ + public class Net : EventDispatcher + { + public static Session Session { get; private set; } + + public const int HeartbeatInterval = 5000; + + #region 单例 + + private static Net _inst; + + public static Net Inst => _inst ??= new Net(); + + public Net() + { + } + + #endregion + + #region 连接创建和回调 + + public static Session CreateSession(string address) + { + var session = SessionHelper.CreateSession(App.Main, address, OnConnectComplete, + OnConnectFail, + OnConnectDisconnect); + + Session = session; + return session; + } + + private static void OnConnectComplete() + { + Log.Debug("连接成功"); + Session.AddComponent().Start(HeartbeatInterval); + } + + private static void OnConnectFail() + { + Log.Debug("连接失败"); + // SetLoginState(false); + } + + private static void OnConnectDisconnect() + { + Log.Debug("连接断开"); + // SetLoginState(false); + } + + #endregion + + #region 消息收发 + + public static FTask Call(IRequest request, long routeId = 0) + { + // var response = await Session.Call(request, routeId); + // response.DispatchMessage(); + return Session.Call(request, routeId);; + } + + public static void Send(IMessage message, uint rpcId = 0, long routeId = 0) + { + Session.Send(message, rpcId, routeId); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Net/Net.cs.meta b/Assets/Scripts/Net/Net.cs.meta new file mode 100644 index 000000000..901c251c4 --- /dev/null +++ b/Assets/Scripts/Net/Net.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1fe56eeffd614eaea7055d1c65f6859f +timeCreated: 1755701226 \ No newline at end of file diff --git a/Assets/Scripts/Net/NetExtends.cs b/Assets/Scripts/Net/NetExtends.cs new file mode 100644 index 000000000..01a66a128 --- /dev/null +++ b/Assets/Scripts/Net/NetExtends.cs @@ -0,0 +1,12 @@ +using NBC.Network.Interface; + +namespace NBF +{ + public static class NetExtends + { + public static void DispatchMessage(this IResponse response) + { + Net.Inst.DispatchEventWith(response.OpCode().ToString(), response); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Net/NetExtends.cs.meta b/Assets/Scripts/Net/NetExtends.cs.meta new file mode 100644 index 000000000..bca84f9d5 --- /dev/null +++ b/Assets/Scripts/Net/NetExtends.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 25d56f7c87744a199e926365a516b85f +timeCreated: 1755702255 \ No newline at end of file diff --git a/Assets/Scripts/Startup/Init.cs b/Assets/Scripts/Startup/Init.cs index 67364d641..39da618d1 100644 --- a/Assets/Scripts/Startup/Init.cs +++ b/Assets/Scripts/Startup/Init.cs @@ -132,9 +132,11 @@ namespace NBF // UI.Inst.OpenUI(); LoadData(); CommonTopPanel.Show(); + LoginPanel.Show(); // FishingPanel.Show(); - PreviewPanel.Show(); - Fishing.Inst.Go(1); + // PreviewPanel.Show(); + + // Fishing.Inst.Go(1); // HomePanel.Show(); // ChatTestPanel.Show(); diff --git a/Assets/Scripts/UI/Binders/CommonBinder.cs b/Assets/Scripts/UI/Binders/CommonBinder.cs index 0972390c5..07b121422 100644 --- a/Assets/Scripts/UI/Binders/CommonBinder.cs +++ b/Assets/Scripts/UI/Binders/CommonBinder.cs @@ -12,6 +12,7 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(SelectPages.URL, typeof(SelectPages)); UIObjectFactory.SetPackageItemExtension(ModelTexture.URL, typeof(ModelTexture)); UIObjectFactory.SetPackageItemExtension(BottomMenu.URL, typeof(BottomMenu)); + UIObjectFactory.SetPackageItemExtension(CommonInput.URL, typeof(CommonInput)); UIObjectFactory.SetPackageItemExtension(ClassifyList.URL, typeof(ClassifyList)); UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu)); UIObjectFactory.SetPackageItemExtension(MarqueeTag.URL, typeof(MarqueeTag)); diff --git a/Assets/Scripts/UI/Common/CommonInput.Designer.cs b/Assets/Scripts/UI/Common/CommonInput.Designer.cs new file mode 100644 index 000000000..9b4d5a314 --- /dev/null +++ b/Assets/Scripts/UI/Common/CommonInput.Designer.cs @@ -0,0 +1,29 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class CommonInput + { + public const string URL = "ui://6hgkvlau9zboma"; + + public Controller FocusState; + public GTextInput Input; + public GImage bottomBack; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + FocusState = GetController("FocusState"); + Input = (GTextInput)GetChild("Input"); + bottomBack = (GImage)GetChild("bottomBack"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/CommonInput.Designer.cs.meta b/Assets/Scripts/UI/Common/CommonInput.Designer.cs.meta new file mode 100644 index 000000000..ba80ab955 --- /dev/null +++ b/Assets/Scripts/UI/Common/CommonInput.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fb776407f4f25e64a8e803ba135bddef \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/CommonInput.cs b/Assets/Scripts/UI/Common/CommonInput.cs new file mode 100644 index 000000000..5a310ba36 --- /dev/null +++ b/Assets/Scripts/UI/Common/CommonInput.cs @@ -0,0 +1,47 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class CommonInput : GComponent + { + public EventListener onChanged => Input.onChanged; + + public override string text + { + get => Input.text; + set => Input.text = value; + } + + public string title + { + get => text; + set => text = value; + } + + public string promptText + { + get => Input.promptText; + set => Input.promptText = value; + } + + private void OnInited() + { + onFocusIn.Add(OnInputFocusIn); + onFocusOut.Add(OnInputFocusOut); + } + + private void OnInputFocusIn() + { + FocusState.selectedIndex = 1; + } + + private void OnInputFocusOut() + { + FocusState.selectedIndex = 0; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/CommonInput.cs.meta b/Assets/Scripts/UI/Common/CommonInput.cs.meta new file mode 100644 index 000000000..11e371554 --- /dev/null +++ b/Assets/Scripts/UI/Common/CommonInput.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c7adc7972d1d401489dc796fb27d1eaa \ No newline at end of file diff --git a/Assets/Scripts/UI/Login.meta b/Assets/Scripts/UI/Login.meta new file mode 100644 index 000000000..38f4f0677 --- /dev/null +++ b/Assets/Scripts/UI/Login.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 12482424a8714a5fb52ce23312a0a0f6 +timeCreated: 1755697902 \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginHelper.cs b/Assets/Scripts/UI/Login/LoginHelper.cs new file mode 100644 index 000000000..0763a30f7 --- /dev/null +++ b/Assets/Scripts/UI/Login/LoginHelper.cs @@ -0,0 +1,54 @@ +using Assets.Scripts.Entity; +using Assets.Scripts.Hotfix; +using NBC; +using NBC.Network; + +namespace NBF +{ + public static class LoginHelper + { + private static Session _session; + + public static async FTask Login(string account) + { + _session = Net.CreateSession("127.0.0.1:20001"); + + var acc = account; + + // 发送登录的请求给服务器 + var response = (A2C_LoginResponse)await Net.Call(new C2A_LoginRequest() + { + Username = acc, + Password = acc, + LoginType = 1 + }); + + if (response.ErrorCode != 0) + { + Log.Error($"登录发生错误{response.ErrorCode}"); + return; + } + + if (!App.Main.GetComponent().Parse(response.ToKen, out var payload)) + { + return; + } + + // 根据ToKen返回的Address登录到Gate服务器 + _session = Net.CreateSession(payload.Address); + + // 发送登录请求到Gate服务器 + var loginResponse = (G2C_LoginResponse)await Net.Call(new C2G_LoginRequest() + { + ToKen = response.ToKen + }); + if (loginResponse.ErrorCode != 0) + { + Log.Error($"登录发生错误{loginResponse.ErrorCode}"); + return; + } + + Log.Debug($"登录到Gate服务器成功！ErrorCode:{loginResponse.ErrorCode}"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginHelper.cs.meta b/Assets/Scripts/UI/Login/LoginHelper.cs.meta new file mode 100644 index 000000000..c2ec3022e --- /dev/null +++ b/Assets/Scripts/UI/Login/LoginHelper.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 031ed023449844cdb9d6c4eb5d7fee90 +timeCreated: 1755698636 \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.Designer.cs b/Assets/Scripts/UI/Login/LoginPanel.Designer.cs new file mode 100644 index 000000000..adde27e5f --- /dev/null +++ b/Assets/Scripts/UI/Login/LoginPanel.Designer.cs @@ -0,0 +1,32 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + +using FairyGUI; +using FairyGUI.Utils; +using NBC; +using System.Collections.Generic; + +namespace NBF +{ + /// + public partial class LoginPanel + { + public GObject this[string aKey] => ContentPane.GetChild(aKey); + public override string UIPackName => "Main"; + public override string UIResName => "LoginPanel"; + + [AutoFind(Name = "Back")] + public GLabel Back; + [AutoFind(Name = "InputAccount")] + public CommonInput InputAccount; + [AutoFind(Name = "BtnLogin")] + public GButton BtnLogin; + public override string[] GetDependPackages(){ return new string[] {"Common"}; } + + public static void Show(object param = null){ App.UI.OpenUI(param); } + + public static void Hide(){ App.UI.HideUI(); } + + public static void Del(){ App.UI.DestroyUI(); } + + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.Designer.cs.meta b/Assets/Scripts/UI/Login/LoginPanel.Designer.cs.meta new file mode 100644 index 000000000..c674924f4 --- /dev/null +++ b/Assets/Scripts/UI/Login/LoginPanel.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3b11ed3a4a10a3549a06d7845c9c4cfd \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs new file mode 100644 index 000000000..5569c677c --- /dev/null +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -0,0 +1,25 @@ +// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖 + +using FairyGUI; +using UnityEngine; +using NBC; +using UIPanel = NBC.UIPanel; + +namespace NBF +{ + public partial class LoginPanel : UIPanel + { + protected override void OnInit() + { + this.AutoAddClick(OnClick); + } + + private void OnClick(GComponent btn) + { + if (btn == BtnLogin) + { + LoginHelper.Login(InputAccount.text).Coroutine(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs.meta b/Assets/Scripts/UI/Login/LoginPanel.cs.meta new file mode 100644 index 000000000..0775b510a --- /dev/null +++ b/Assets/Scripts/UI/Login/LoginPanel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b2d32e54ef5680541959b782ee8d0c7a \ No newline at end of file diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnCommon.xml b/FGUIProject/assets/Common/Com/Buttons/BtnCommon.xml index 1e7527056..63b95d17d 100644 --- a/FGUIProject/assets/Common/Com/Buttons/BtnCommon.xml +++ b/FGUIProject/assets/Common/Com/Buttons/BtnCommon.xml @@ -1,11 +1,15 @@ - - + + - - - + + + + + + + -