diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index 91624d2e9..c3a454bfd 100644 Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index d5c667fd2..be3fd8958 100644 Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/Scripts/Generate/NetworkProtocol/Account.cs b/Assets/Scripts/Generate/NetworkProtocol/Account.cs index d077a5435..2a81c2fd0 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/Account.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/Account.cs @@ -221,7 +221,7 @@ namespace NBC [ProtoMember(5)] public long GetTime { get; set; } [ProtoMember(6)] - public long Abrasion { get; set; } + public int Abrasion { get; set; } } /// /// fish信息 diff --git a/Assets/Scripts/Generate/NetworkProtocol/Mail.cs b/Assets/Scripts/Generate/NetworkProtocol/Mail.cs index 5c4a27de7..13fa5c459 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/Mail.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/Mail.cs @@ -21,10 +21,11 @@ namespace NBC Id = default; Title = default; Content = default; - SendTime = default; - Type = default; + CreateTime = default; + ExpireTime = default; + MailType = default; + MailState = default; Items.Clear(); - IsRead = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif @@ -36,12 +37,14 @@ namespace NBC [ProtoMember(3)] public string Content { get; set; } [ProtoMember(4)] - public long SendTime { get; set; } + public long CreateTime { get; set; } [ProtoMember(5)] - public int Type { get; set; } + public long ExpireTime { get; set; } [ProtoMember(6)] - public List Items = new List(); + public int MailType { get; set; } [ProtoMember(7)] - public bool IsRead { get; set; } + public int MailState { get; set; } + [ProtoMember(8)] + public List Items = new List(); } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs index 48070f14b..61c3b78f3 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs @@ -21,6 +21,7 @@ namespace NBC Username = default; Password = default; LoginType = default; + Region = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif @@ -34,6 +35,8 @@ namespace NBC public string Password { get; set; } [ProtoMember(3)] public int LoginType { get; set; } + [ProtoMember(4)] + public int Region { get; set; } } [ProtoContract] public partial class A2C_LoginResponse : AMessage, IResponse, IProto @@ -184,4 +187,165 @@ namespace NBC [ProtoMember(3)] public uint ErrorCode { get; set; } } + /// + /// 请求邮件列表 + /// + [ProtoContract] + public partial class C2Game_GetMailsRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Game_GetMailsRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Game2C_GetMailsResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_GetMailsRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + } + /// + /// 获取邮件列表响应 + /// + [ProtoContract] + public partial class Game2C_GetMailsResponse : AMessage, ICustomRouteResponse, IProto + { + public static Game2C_GetMailsResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + Mail.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_GetMailsResponse; } + [ProtoMember(1)] + public List Mail = new List(); + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } + /// + /// 新邮件推送 + /// + [ProtoContract] + public partial class Game2C_HaveMail : AMessage, ICustomRouteMessage, IProto + { + public static Game2C_HaveMail Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Mail = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_HaveMail; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public MailInfo Mail { get; set; } + } + [ProtoContract] + public partial class Game2C_MailState : AMessage, ICustomRouteMessage, IProto + { + public static Game2C_MailState Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MailState = default; + MailId = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_MailState; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public int MailState { get; set; } + [ProtoMember(2)] + public long MailId { get; set; } + } + /// + /// 发送聊天 + /// + [ProtoContract] + public partial class C2Chat_SendMessageRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Chat_SendMessageRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Message = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Caht2C_SendMessageResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Chat_SendMessageRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.ChatRoute; + [ProtoMember(1)] + public string Message { get; set; } + } + /// + /// 发送聊天响应 + /// + [ProtoContract] + public partial class Caht2C_SendMessageResponse : AMessage, ICustomRouteResponse, IProto + { + public static Caht2C_SendMessageResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Caht2C_SendMessageResponse; } + [ProtoMember(1)] + public uint ErrorCode { get; set; } + } + /// + /// 推送消息 + /// + [ProtoContract] + public partial class Chat2C_Message : AMessage, ICustomRouteMessage, IProto + { + public static Chat2C_Message Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Message = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Chat2C_Message; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.ChatRoute; + [ProtoMember(1)] + public string Message { get; set; } + } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index 5b83c2e14..c68678599 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -9,5 +9,12 @@ namespace Fantasy public const uint G2C_RepeatLogin = 134227729; public const uint C2Game_GetRoleInfoRequest = 2281711377; public const uint Game2C_GetRoleInfoResponse = 2415929105; + public const uint C2Game_GetMailsRequest = 2281711378; + public const uint Game2C_GetMailsResponse = 2415929106; + public const uint Game2C_HaveMail = 2147493649; + public const uint Game2C_MailState = 2147493650; + public const uint C2Chat_SendMessageRequest = 2281711379; + public const uint Caht2C_SendMessageResponse = 2415929107; + public const uint Chat2C_Message = 2147493651; } } diff --git a/Assets/Scripts/Startup/Init.cs b/Assets/Scripts/Startup/Init.cs index 389388b5d..4aee2fd88 100644 --- a/Assets/Scripts/Startup/Init.cs +++ b/Assets/Scripts/Startup/Init.cs @@ -137,92 +137,14 @@ namespace NBF // Fishing.Inst.Go(1); // SettingPanel.Show(); // HomePanel.Show(); + ChatTestPanel.Show(); - //测试登录 - OnLoginButtonClick().Coroutine(); + // //测试登录 + // OnLoginButtonClick().Coroutine(); } - - #region 登录测试 - - private Session _session; - - private async FTask OnLoginButtonClick() - { - // NBC.Platform.Unity.Entry.Initialize(GetType().Assembly); - - // 根据用户名来选择目标的鉴权服务器 - // 根据鉴权服务器地址来创建一个新的网络会话 - _session = SessionHelper.CreateSession(App.Main, "127.0.0.1:20001", OnConnectComplete, - OnConnectFail, - OnConnectDisconnect); - - var acc = "test003"; - - // 发送登录的请求给服务器 - var response = (A2C_LoginResponse)await _session.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 = SessionHelper.CreateSession(App.Main, payload.Address, OnConnectComplete, OnConnectFail, - OnConnectDisconnect); - // 发送登录请求到Gate服务器 - var loginResponse = (G2C_LoginResponse)await _session.Call(new C2G_LoginRequest() - { - ToKen = response.ToKen - }); - if (loginResponse.ErrorCode != 0) - { - Log.Error($"登录发生错误{loginResponse.ErrorCode}"); - return; - } - - Log.Debug( - $"登录到Gate服务器成功！ErrorCode:{loginResponse.ErrorCode}"); - // Log.Debug( - // $"登录到Gate服务器成功！LoginTime:{loginResponse.GameAccountInfo.LoginTime} CreateTime:{loginResponse.GameAccountInfo.CreateTime}"); - - // var getResponse = (G2C_GetAccountInfoResponse)await _session.Call(new C2G_GetAccountInfoRequest()); - // var gameAcc = getResponse.GameAccountInfo; - // Log.Info($"gameAcc LoginTime:{gameAcc.LoginTime} CreateTime:{gameAcc.CreateTime}"); - // getResponse.GameAccountInfo.LoginTime.ToString() - } - - private void OnConnectComplete() - { - Log.Debug("连接成功"); - // 添加心跳组件给Session。 - // Start(2000)就是2000毫秒。 - _session.AddComponent().Start(5000); - } - - private void OnConnectFail() - { - Log.Debug("连接失败"); - } - - #endregion - - - private void OnConnectDisconnect() - { - Log.Debug("连接断开"); - } + + private void LoadData() { diff --git a/Assets/Scripts/UI/Binders/MainBinder.cs b/Assets/Scripts/UI/Binders/MainBinder.cs index a9fd15333..8fbfb8a52 100644 --- a/Assets/Scripts/UI/Binders/MainBinder.cs +++ b/Assets/Scripts/UI/Binders/MainBinder.cs @@ -18,6 +18,7 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(HomeRankPage.URL, typeof(HomeRankPage)); UIObjectFactory.SetPackageItemExtension(HomeStatisticsPage.URL, typeof(HomeStatisticsPage)); UIObjectFactory.SetPackageItemExtension(HomeButtonGroups.URL, typeof(HomeButtonGroups)); + UIObjectFactory.SetPackageItemExtension(ChatItem.URL, typeof(ChatItem)); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatItem.Designer.cs b/Assets/Scripts/UI/ChatItem.Designer.cs new file mode 100644 index 000000000..886fed44d --- /dev/null +++ b/Assets/Scripts/UI/ChatItem.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 ChatItem + { + public const string URL = "ui://hxr7rc7pn5ne1f"; + + public GTextField TextType; + public GTextField TextUser; + public GTextField TextMessage; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + TextType = (GTextField)GetChild("TextType"); + TextUser = (GTextField)GetChild("TextUser"); + TextMessage = (GTextField)GetChild("TextMessage"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatItem.Designer.cs.meta b/Assets/Scripts/UI/ChatItem.Designer.cs.meta new file mode 100644 index 000000000..59dbce795 --- /dev/null +++ b/Assets/Scripts/UI/ChatItem.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8383cf682d2c39f41bc83ea027894ec6 \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatItem.cs b/Assets/Scripts/UI/ChatItem.cs new file mode 100644 index 000000000..8bd926e5d --- /dev/null +++ b/Assets/Scripts/UI/ChatItem.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class ChatItem : GComponent + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatItem.cs.meta b/Assets/Scripts/UI/ChatItem.cs.meta new file mode 100644 index 000000000..6c7f63b2f --- /dev/null +++ b/Assets/Scripts/UI/ChatItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e369e839256e8464fbdd0922424f36e3 \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatTestPanel.Designer.cs b/Assets/Scripts/UI/ChatTestPanel.Designer.cs new file mode 100644 index 000000000..25df93cac --- /dev/null +++ b/Assets/Scripts/UI/ChatTestPanel.Designer.cs @@ -0,0 +1,46 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + +using FairyGUI; +using FairyGUI.Utils; +using NBC; +using System.Collections.Generic; + +namespace NBF +{ + /// + public partial class ChatTestPanel + { + public GObject this[string aKey] => ContentPane.GetChild(aKey); + public override string UIPackName => "Main"; + public override string UIResName => "ChatTestPanel"; + + [AutoFind(Name = "back")] + public GImage back; + [AutoFind(Name = "TextLoginInfo")] + public GTextField TextLoginInfo; + [AutoFind(Name = "InputAccount")] + public GLabel InputAccount; + [AutoFind(Name = "BtnLogout")] + public GButton BtnLogout; + [AutoFind(Name = "BtnLogin")] + public GButton BtnLogin; + [AutoFind(Name = "InputMessage")] + public GLabel InputMessage; + [AutoFind(Name = "BtnSendMessage")] + public GButton BtnSendMessage; + [AutoFind(Name = "BtnSendFriend")] + public GButton BtnSendFriend; + [AutoFind(Name = "BtnSendWorld")] + public GButton BtnSendWorld; + [AutoFind(Name = "ChatList")] + public GList ChatList; + 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/ChatTestPanel.Designer.cs.meta b/Assets/Scripts/UI/ChatTestPanel.Designer.cs.meta new file mode 100644 index 000000000..9be084761 --- /dev/null +++ b/Assets/Scripts/UI/ChatTestPanel.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c9910a4bd1e1d3b4a8c580bcc2cc34e7 \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatTestPanel.cs b/Assets/Scripts/UI/ChatTestPanel.cs new file mode 100644 index 000000000..b689e4025 --- /dev/null +++ b/Assets/Scripts/UI/ChatTestPanel.cs @@ -0,0 +1,137 @@ +// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖 + +using Assets.Scripts.Entity; +using Assets.Scripts.Hotfix; +using FairyGUI; +using UnityEngine; +using NBC; +using NBC.Network; +using UIPanel = NBC.UIPanel; + +namespace NBF +{ + public partial class ChatTestPanel : UIPanel + { + protected override void OnInit() + { + this.AutoAddClick(OnClick); + } + + protected override void OnShow() + { + SetLoginState(false); + } + + private void OnClick(GComponent btn) + { + if (btn == BtnLogin) + { + if (string.IsNullOrEmpty(InputAccount.text)) + { + Notices.Info("没有输入账号密码"); + return; + } + + OnLoginButtonClick(InputAccount.text).Coroutine(); + } + } + + private void SetLoginState(bool isLogin = false, string account = "") + { + if (isLogin) + { + BtnLogin.visible = false; + BtnLogout.visible = true; + TextLoginInfo.text = account; + } + else + { + BtnLogin.visible = true; + BtnLogout.visible = false; + } + } + + #region 登录测试 + + private Session _session; + + private async FTask OnLoginButtonClick(string account) + { + // NBC.Platform.Unity.Entry.Initialize(GetType().Assembly); + + // 根据用户名来选择目标的鉴权服务器 + // 根据鉴权服务器地址来创建一个新的网络会话 + _session = SessionHelper.CreateSession(App.Main, "127.0.0.1:20001", OnConnectComplete, + OnConnectFail, + OnConnectDisconnect); + + var acc = account; + + // 发送登录的请求给服务器 + var response = (A2C_LoginResponse)await _session.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 = SessionHelper.CreateSession(App.Main, payload.Address, OnConnectComplete, OnConnectFail, + OnConnectDisconnect); + // 发送登录请求到Gate服务器 + var loginResponse = (G2C_LoginResponse)await _session.Call(new C2G_LoginRequest() + { + ToKen = response.ToKen + }); + if (loginResponse.ErrorCode != 0) + { + Log.Error($"登录发生错误{loginResponse.ErrorCode}"); + return; + } + + SetLoginState(true, InputAccount.text); + Log.Debug( + $"登录到Gate服务器成功！ErrorCode:{loginResponse.ErrorCode}"); + // Log.Debug( + // $"登录到Gate服务器成功！LoginTime:{loginResponse.GameAccountInfo.LoginTime} CreateTime:{loginResponse.GameAccountInfo.CreateTime}"); + + // var getResponse = (G2C_GetAccountInfoResponse)await _session.Call(new C2G_GetAccountInfoRequest()); + // var gameAcc = getResponse.GameAccountInfo; + // Log.Info($"gameAcc LoginTime:{gameAcc.LoginTime} CreateTime:{gameAcc.CreateTime}"); + // getResponse.GameAccountInfo.LoginTime.ToString() + } + + private void OnConnectComplete() + { + Log.Debug("连接成功"); + // 添加心跳组件给Session。 + // Start(2000)就是2000毫秒。 + _session.AddComponent().Start(5000); + } + + private void OnConnectFail() + { + Log.Debug("连接失败"); + SetLoginState(false); + } + + private void OnConnectDisconnect() + { + Log.Debug("连接断开"); + SetLoginState(false); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/ChatTestPanel.cs.meta b/Assets/Scripts/UI/ChatTestPanel.cs.meta new file mode 100644 index 000000000..ab93f8cfb --- /dev/null +++ b/Assets/Scripts/UI/ChatTestPanel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2f05d713b2557a945b45a81473963207 \ No newline at end of file diff --git a/FGUIProject/assets/Common/Com/InputDef.xml b/FGUIProject/assets/Common/Com/Inputs/InputDef.xml similarity index 83% rename from FGUIProject/assets/Common/Com/InputDef.xml rename to FGUIProject/assets/Common/Com/Inputs/InputDef.xml index 02131a9f3..b1632fec3 100644 --- a/FGUIProject/assets/Common/Com/InputDef.xml +++ b/FGUIProject/assets/Common/Com/Inputs/InputDef.xml @@ -4,7 +4,7 @@ - + diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 751459ee0..23ecdc774 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -8,8 +8,8 @@ - - + + diff --git a/FGUIProject/assets/Main/ChatItem.xml b/FGUIProject/assets/Main/ChatItem.xml new file mode 100644 index 000000000..4c9fc749d --- /dev/null +++ b/FGUIProject/assets/Main/ChatItem.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Main/ChatTestPanel.xml b/FGUIProject/assets/Main/ChatTestPanel.xml new file mode 100644 index 000000000..2d3067ff5 --- /dev/null +++ b/FGUIProject/assets/Main/ChatTestPanel.xml @@ -0,0 +1,47 @@ + + + + + + + + + + +