diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs index 711fd0d5..50c3ecff 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs @@ -64,9 +64,9 @@ namespace GameLogic public async UniTask Test() { - var response = await m_gameSession.Call(new C2Chat_TestRequest() + var response = await m_gameSession.Call( new C2Chat_BoardMessageRequest() { - + Message = "Love" }); } @@ -185,7 +185,6 @@ namespace GameLogic { Log.Debug("连接成功"); m_gameSession?.AddComponent().Start(2000); - } diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/Handler/Chat2C_BoardMessageHandler.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/Handler/Chat2C_BoardMessageHandler.cs new file mode 100644 index 00000000..8e461216 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/Handler/Chat2C_BoardMessageHandler.cs @@ -0,0 +1,16 @@ +using Fantasy; +using Fantasy.Async; +using Fantasy.Network; +using Fantasy.Network.Interface; + +namespace GameLogic +{ + public class Chat2C_BoardMessageHandler : Message + { + protected override async FTask Run(Session session, Chat2C_BoardMessage message) + { + Log.Debug($"Chat2C_BoardMessage: {message.Message}"); + await FTask.CompletedTask; + } + } +} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/Handler/Chat2C_BoardMessageHandler.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/Handler/Chat2C_BoardMessageHandler.cs.meta new file mode 100644 index 00000000..6acc01ae --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/Handler/Chat2C_BoardMessageHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cfdf917f7c55d5c468c94f87ae5f5ca0 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterMessage.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterMessage.cs index 97a9543d..0f43fc62 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterMessage.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterMessage.cs @@ -319,16 +319,36 @@ namespace Fantasy public override void Dispose() { ErrorCode = default; - Message = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif } public uint OpCode() { return OuterOpcode.Chat2C_BoardMessageResponse; } + /// + /// string Message = 2; + /// + [ProtoMember(1)] + public uint ErrorCode { get; set; } + } + [ProtoContract] + public partial class Chat2C_BoardMessage : AMessage, ICustomRouteMessage, IProto + { + public static Chat2C_BoardMessage 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_BoardMessage; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.ChatRoute; [ProtoMember(1)] public string Message { get; set; } - [ProtoMember(2)] - public uint ErrorCode { get; set; } } [ProtoContract] public partial class C2Chat_TestRequest : AMessage, ICustomRouteRequest, IProto diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterOpcode.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterOpcode.cs index 5669740c..f5b1c64b 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterOpcode.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameProtocol/Server/Generate/NetworkProtocol/OuterOpcode.cs @@ -16,6 +16,7 @@ namespace Fantasy public const uint G2C_UpdateAndSaveGameNameResponse = 402663189; public const uint C2Chat_BoardMessageRequest = 2281711377; public const uint Chat2C_BoardMessageResponse = 2415929105; + public const uint Chat2C_BoardMessage = 2147493649; public const uint C2Chat_TestRequest = 2281711378; public const uint Chat2C_TestResponse = 2415929106; public const uint C2G_TestMessage = 134227731; @@ -30,14 +31,14 @@ namespace Fantasy public const uint M2C_TestResponse = 1610622737; public const uint C2G_CreateChatRouteRequest = 268445464; public const uint G2C_CreateChatRouteResponse = 402663192; - public const uint C2Chat_TestMessage = 2147493649; + public const uint C2Chat_TestMessage = 2147493650; public const uint C2Chat_TestMessageRequest = 2281711379; public const uint Chat2C_TestMessageResponse = 2415929107; public const uint C2M_MoveToMapRequest = 1476405010; public const uint M2C_MoveToMapResponse = 1610622738; public const uint C2G_SendAddressableToMap = 134227734; - public const uint C2Chat_TestRequestPushMessage = 2147493650; - public const uint Chat2C_PushMessage = 2147493651; + public const uint C2Chat_TestRequestPushMessage = 2147493651; + public const uint Chat2C_PushMessage = 2147493652; public const uint C2G_CreateSubSceneRequest = 268445465; public const uint G2C_CreateSubSceneResponse = 402663193; public const uint C2G_SendToSubSceneMessage = 134227735; diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 9811c565..001cd30a 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -1215,7 +1215,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 423a0100 m_LastClickedID: 80450 - m_ExpandedIDs: 00000000061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100 + m_ExpandedIDs: 00000000fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1244,7 +1244,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100 + m_ExpandedIDs: 00000000fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1368,7 +1368,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 127} m_SelectedIDs: 50460100 m_LastClickedID: 83536 - m_ExpandedIDs: 00000000061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100 + m_ExpandedIDs: 00000000fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1397,7 +1397,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100 + m_ExpandedIDs: 00000000fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100441e0100461e0100481e01004a1e01004c1e01004e1e0100501e0100521e0100541e0100561e0100581e01005a1e01005c1e01005e1e0100601e0100621e0100641e0100661e0100681e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Debug.log b/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Debug.log new file mode 100644 index 00000000..10f680b7 --- /dev/null +++ b/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Debug.log @@ -0,0 +1,10 @@ +2025-04-10 18:02:13.2823 (OnCreateScene_InitEvent.cs:16) 初始化鉴权服务器组件 +2025-04-10 18:02:13.6510 (OnCreateScene_InitEvent.cs:16) 初始化鉴权服务器组件 +2025-04-10 18:02:14.1352 (OnCreateScene_InitEvent.cs:21) 初始网关（Gate）服务器组件 +2025-04-10 18:02:14.5962 (OnCreateScene_InitEvent.cs:21) 初始网关（Gate）服务器组件 +2025-04-10 18:03:13.9299 (AuthenticationComponentSystem.cs:130) Authentication: Login Success(登录成功),username:wangwei,password:123,source:客户端,Position:1001 +2025-04-10 18:03:14.6191 (C2G_LoginRequestHandler.cs:31) Gate校验登录成功用户116299279127281665 +2025-04-10 18:03:14.6570 (GameAccountManageComponentSystem.cs:102) Gate 当前缓存中的 SessionID 2589138871702781952 +2025-04-10 18:03:14.6570 (C2G_LoginRequestHandler.cs:43) Gate : Login 登录成功GameAccount:session2589138871702781952 AccountId:116299279127281665 +2025-04-10 18:03:14.7414 (G2C_GetGameAccountInfoHandler.cs:37) Gate: 获取账号信息 AccountId SnowShow +2025-04-10 18:03:19.9373 (AuthenticationComponentSystem.cs:150) Authentication:Login:username:wangwei 用户移除成功 从缓存中 diff --git a/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Info.log b/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Info.log new file mode 100644 index 00000000..e6ca2795 --- /dev/null +++ b/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Info.log @@ -0,0 +1,15 @@ +2025-04-10 18:02:12.0106 初始化序列化器成功，数量为：2 +2025-04-10 18:02:12.9102 SceneConfigId = 1001 networkTarget = Inner TCPServer Listen 127.0.0.1:11001 +2025-04-10 18:02:13.1372 SceneConfigId = 1001 networkTarget = Outer KCPServer Listen 127.0.0.1:21001 +2025-04-10 18:02:13.2823 (AuthenticationJWTComponentSystem.cs:44) RSA密钥导入成功 +2025-04-10 18:02:13.4138 SceneConfigId = 1002 networkTarget = Inner TCPServer Listen 127.0.0.1:11002 +2025-04-10 18:02:13.6510 SceneConfigId = 1002 networkTarget = Outer KCPServer Listen 127.0.0.1:21002 +2025-04-10 18:02:13.6510 (AuthenticationJWTComponentSystem.cs:44) RSA密钥导入成功 +2025-04-10 18:02:13.9110 SceneConfigId = 1010 networkTarget = Inner TCPServer Listen 127.0.0.1:11010 +2025-04-10 18:02:14.1352 SceneConfigId = 1010 networkTarget = Outer KCPServer Listen 127.0.0.1:21010 +2025-04-10 18:02:14.3893 SceneConfigId = 1011 networkTarget = Inner TCPServer Listen 127.0.0.1:11011 +2025-04-10 18:02:14.5962 SceneConfigId = 1011 networkTarget = Outer KCPServer Listen 127.0.0.1:21011 +2025-04-10 18:02:14.8369 SceneConfigId = 1026 networkTarget = Inner TCPServer Listen 127.0.0.1:11026 +2025-04-10 18:02:15.0847 SceneConfigId = 1026 networkTarget = Outer TCPServer Listen 127.0.0.1:21016 +2025-04-10 18:02:15.0847 Process:1 Startup Complete SceneCount:5 +2025-04-10 18:03:14.6920 (G2Chat_LoginRequestHandler.cs:19) 登录聊天服务器成功 SnowShow AccountId 116299279127281665 GateRoutedId 2589138871702781952 diff --git a/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Warn.log b/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Warn.log new file mode 100644 index 00000000..838eabf1 --- /dev/null +++ b/GameServer/Bin/Debug/Logs/Server/Server20250410/Server..2025041018.Warn.log @@ -0,0 +1,7 @@ +2025-04-10 18:03:14.6191 (GateJWTComponentSystem.cs:47) Gate:Token签名校验成功 +2025-04-10 18:03:19.3288 Scene:738459648 Found Unhandled RouteMessage: Fantasy.C2Chat_BoardMessageRequest +2025-04-10 18:03:33.2455 Scene:738459648 Found Unhandled RouteMessage: Fantasy.C2Chat_BoardMessageRequest +2025-04-10 18:03:34.3330 Scene:738459648 Found Unhandled RouteMessage: Fantasy.C2Chat_BoardMessageRequest +2025-04-10 18:03:35.5108 Scene:738459648 Found Unhandled RouteMessage: Fantasy.C2Chat_BoardMessageRequest +2025-04-10 18:03:35.6998 Scene:738459648 Found Unhandled RouteMessage: Fantasy.C2Chat_BoardMessageRequest +2025-04-10 18:03:35.9334 Scene:738459648 Found Unhandled RouteMessage: Fantasy.C2Chat_BoardMessageRequest diff --git a/GameServer/Bin/Debug/net9.0/APlugins.dll b/GameServer/Bin/Debug/net9.0/APlugins.dll index 058f7de9..75e2e083 100644 Binary files a/GameServer/Bin/Debug/net9.0/APlugins.dll and b/GameServer/Bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Bin/Debug/net9.0/APlugins.pdb b/GameServer/Bin/Debug/net9.0/APlugins.pdb index 2252130e..f775b3ad 100644 Binary files a/GameServer/Bin/Debug/net9.0/APlugins.pdb and b/GameServer/Bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Bin/Debug/net9.0/Entity.dll b/GameServer/Bin/Debug/net9.0/Entity.dll index ff24b2ef..f509e297 100644 Binary files a/GameServer/Bin/Debug/net9.0/Entity.dll and b/GameServer/Bin/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Bin/Debug/net9.0/Entity.pdb b/GameServer/Bin/Debug/net9.0/Entity.pdb index 3b99c8c2..3e391730 100644 Binary files a/GameServer/Bin/Debug/net9.0/Entity.pdb and b/GameServer/Bin/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Bin/Debug/net9.0/Hotfix.dll b/GameServer/Bin/Debug/net9.0/Hotfix.dll index 68d0c9eb..8852219c 100644 Binary files a/GameServer/Bin/Debug/net9.0/Hotfix.dll and b/GameServer/Bin/Debug/net9.0/Hotfix.dll differ diff --git a/GameServer/Bin/Debug/net9.0/Hotfix.pdb b/GameServer/Bin/Debug/net9.0/Hotfix.pdb index ad56ee76..e47ec559 100644 Binary files a/GameServer/Bin/Debug/net9.0/Hotfix.pdb and b/GameServer/Bin/Debug/net9.0/Hotfix.pdb differ diff --git a/GameServer/Bin/Debug/net9.0/Main.dll b/GameServer/Bin/Debug/net9.0/Main.dll index ec0234d5..8cfdde79 100644 Binary files a/GameServer/Bin/Debug/net9.0/Main.dll and b/GameServer/Bin/Debug/net9.0/Main.dll differ diff --git a/GameServer/Bin/Debug/net9.0/Main.exe b/GameServer/Bin/Debug/net9.0/Main.exe index 932af6f3..2538d302 100644 Binary files a/GameServer/Bin/Debug/net9.0/Main.exe and b/GameServer/Bin/Debug/net9.0/Main.exe differ diff --git a/GameServer/Bin/Debug/net9.0/Main.pdb b/GameServer/Bin/Debug/net9.0/Main.pdb index ec9c5065..8804e989 100644 Binary files a/GameServer/Bin/Debug/net9.0/Main.pdb and b/GameServer/Bin/Debug/net9.0/Main.pdb differ diff --git a/GameServer/Config/NetworkProtocol/Outer/OuterMessage.proto b/GameServer/Config/NetworkProtocol/Outer/OuterMessage.proto index 6db6532b..335f5e18 100644 --- a/GameServer/Config/NetworkProtocol/Outer/OuterMessage.proto +++ b/GameServer/Config/NetworkProtocol/Outer/OuterMessage.proto @@ -94,9 +94,13 @@ message C2Chat_BoardMessageRequest //ICustomRouteRequest,Chat2C_BoardMessageRes } message Chat2C_BoardMessageResponse //ICustomRouteResponse { - string Message = 2; + //string Message = 2; } +message Chat2C_BoardMessage // ICustomRouteMessage,ChatRoute +{ + string Message = 1; +} @@ -117,6 +121,8 @@ message Chat2C_TestResponse // ICustomRouteResponse + + message C2G_TestMessage // IMessage { string Tag = 1; diff --git a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll index 058f7de9..75e2e083 100644 Binary files a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll and b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb index 2252130e..f775b3ad 100644 Binary files a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb and b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json index d793d088..e08151ba 100644 --- a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json +++ b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json @@ -87,7 +87,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } } diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs index 8cfbce26..a4fcad2c 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("APlugins")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+44d9249c1b3de281ff1e2af3b67b2562b4043873")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2db89cc68870cb35408d0c188c0aa3b3875543db")] [assembly: System.Reflection.AssemblyProductAttribute("APlugins")] [assembly: System.Reflection.AssemblyTitleAttribute("APlugins")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache index ef72ae11..4f2a9e60 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache @@ -1 +1 @@ -c19c21424af3bd461148be8c06a7339355b918e00fe472e5a6c66ccd6d8e6266 +12260b89f3df2fc2b803703554a4f64c5a405fed69834a594fe5b580b99a6c0a diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache index d5d26407..021eaaf1 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -83f436cdca2785e768a1bc30cedfbc2a7e9e77e17f4b31bca9f992c8de375c09 +be82aedd3948869fc82be9e73832f5c0595a3ccdf2e06cd509dd95ec85df4810 diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll index 058f7de9..75e2e083 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll and b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb index 2252130e..f775b3ad 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb and b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll b/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll index e2bc2415..2adf04c7 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll and b/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll b/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll index e2bc2415..2adf04c7 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll and b/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll differ diff --git a/GameServer/Server/APlugins/obj/project.assets.json b/GameServer/Server/APlugins/obj/project.assets.json index 78d8c70e..c5524262 100644 --- a/GameServer/Server/APlugins/obj/project.assets.json +++ b/GameServer/Server/APlugins/obj/project.assets.json @@ -1328,7 +1328,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } } diff --git a/GameServer/Server/APlugins/obj/project.nuget.cache b/GameServer/Server/APlugins/obj/project.nuget.cache index 5a3ffd3a..761610ae 100644 --- a/GameServer/Server/APlugins/obj/project.nuget.cache +++ b/GameServer/Server/APlugins/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "pU7iYx37aHI=", + "dgSpecHash": "W5My88bd6G0=", "success": true, "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "expectedPackageFiles": [ diff --git a/GameServer/Server/APlugins/obj/project.packagespec.json b/GameServer/Server/APlugins/obj/project.packagespec.json index cb39a2ea..b232294a 100644 --- a/GameServer/Server/APlugins/obj/project.packagespec.json +++ b/GameServer/Server/APlugins/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","projectName":"APlugins","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.Config":{"target":"Package","version":"[2024.1.4, )"},"Fantasy-Net.ConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterNetworkProtocol":{"target":"Package","version":"[2024.2.24, )"},"Microsoft.IdentityModel.Tokens":{"target":"Package","version":"[8.7.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","projectName":"APlugins","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.Config":{"target":"Package","version":"[2024.1.4, )"},"Fantasy-Net.ConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterNetworkProtocol":{"target":"Package","version":"[2024.2.24, )"},"Microsoft.IdentityModel.Tokens":{"target":"Package","version":"[8.7.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info index 8e22ca0d..875ae5d1 100644 --- a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info +++ b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17436510677070484 \ No newline at end of file +17442469724149989 \ No newline at end of file diff --git a/GameServer/Server/APlugins/obj/rider.project.restore.info b/GameServer/Server/APlugins/obj/rider.project.restore.info index c2c970d1..588b4605 100644 --- a/GameServer/Server/APlugins/obj/rider.project.restore.info +++ b/GameServer/Server/APlugins/obj/rider.project.restore.info @@ -1 +1 @@ -17441036760466245 \ No newline at end of file +17442722924392271 \ No newline at end of file diff --git a/GameServer/Server/Entity/Generate/NetworkProtocol/OuterMessage.cs b/GameServer/Server/Entity/Generate/NetworkProtocol/OuterMessage.cs index 77d23cd0..b1533ed6 100644 --- a/GameServer/Server/Entity/Generate/NetworkProtocol/OuterMessage.cs +++ b/GameServer/Server/Entity/Generate/NetworkProtocol/OuterMessage.cs @@ -328,16 +328,36 @@ namespace Fantasy public override void Dispose() { ErrorCode = default; - Message = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif } public uint OpCode() { return OuterOpcode.Chat2C_BoardMessageResponse; } + /// + /// string Message = 2; + /// + [ProtoMember(1)] + public uint ErrorCode { get; set; } + } + [ProtoContract] + public partial class Chat2C_BoardMessage : AMessage, ICustomRouteMessage, IProto + { + public static Chat2C_BoardMessage 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_BoardMessage; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.ChatRoute; [ProtoMember(1)] public string Message { get; set; } - [ProtoMember(2)] - public uint ErrorCode { get; set; } } [ProtoContract] public partial class C2Chat_TestRequest : AMessage, ICustomRouteRequest, IProto diff --git a/GameServer/Server/Entity/Generate/NetworkProtocol/OuterOpcode.cs b/GameServer/Server/Entity/Generate/NetworkProtocol/OuterOpcode.cs index 5669740c..f5b1c64b 100644 --- a/GameServer/Server/Entity/Generate/NetworkProtocol/OuterOpcode.cs +++ b/GameServer/Server/Entity/Generate/NetworkProtocol/OuterOpcode.cs @@ -16,6 +16,7 @@ namespace Fantasy public const uint G2C_UpdateAndSaveGameNameResponse = 402663189; public const uint C2Chat_BoardMessageRequest = 2281711377; public const uint Chat2C_BoardMessageResponse = 2415929105; + public const uint Chat2C_BoardMessage = 2147493649; public const uint C2Chat_TestRequest = 2281711378; public const uint Chat2C_TestResponse = 2415929106; public const uint C2G_TestMessage = 134227731; @@ -30,14 +31,14 @@ namespace Fantasy public const uint M2C_TestResponse = 1610622737; public const uint C2G_CreateChatRouteRequest = 268445464; public const uint G2C_CreateChatRouteResponse = 402663192; - public const uint C2Chat_TestMessage = 2147493649; + public const uint C2Chat_TestMessage = 2147493650; public const uint C2Chat_TestMessageRequest = 2281711379; public const uint Chat2C_TestMessageResponse = 2415929107; public const uint C2M_MoveToMapRequest = 1476405010; public const uint M2C_MoveToMapResponse = 1610622738; public const uint C2G_SendAddressableToMap = 134227734; - public const uint C2Chat_TestRequestPushMessage = 2147493650; - public const uint Chat2C_PushMessage = 2147493651; + public const uint C2Chat_TestRequestPushMessage = 2147493651; + public const uint Chat2C_PushMessage = 2147493652; public const uint C2G_CreateSubSceneRequest = 268445465; public const uint G2C_CreateSubSceneResponse = 402663193; public const uint C2G_SendToSubSceneMessage = 134227735; diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll index 058f7de9..75e2e083 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll and b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb index 2252130e..f775b3ad 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb and b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll index ff24b2ef..f509e297 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll and b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb index 3b99c8c2..3e391730 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb and b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs index aaed39aa..bae73bb4 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Entity")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+44d9249c1b3de281ff1e2af3b67b2562b4043873")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2db89cc68870cb35408d0c188c0aa3b3875543db")] [assembly: System.Reflection.AssemblyProductAttribute("Entity")] [assembly: System.Reflection.AssemblyTitleAttribute("Entity")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache index 5fe47552..48af02d8 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache @@ -1 +1 @@ -31795973428e07b3fceaffa0510c02f385d8b020fefa631bb45ac50c0fb11246 +2596de7d856f05558b4e7c38b369ed818d71002f6bc75d38910601be28b74e2e diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache index 898f94fa..7104cd3f 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache index c61d5254..7261b1a2 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ee0f807f67c58110e55c18fb27fbe1a6fb9fb710a19dfb6c784da9d0ba2255f8 +57f88ddec4d03f770012adec9657ae3040d3736ca41d413e6c10a5eab67a88a3 diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll index ff24b2ef..f509e297 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb index 3b99c8c2..3e391730 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll b/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll index 0d1178d7..6d1aca58 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll and b/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll b/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll index 0d1178d7..6d1aca58 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll and b/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll differ diff --git a/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json b/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json index be4bcdbd..b42d3be7 100644 --- a/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json +++ b/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json @@ -87,7 +87,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } }, @@ -170,7 +170,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } } diff --git a/GameServer/Server/Entity/obj/project.assets.json b/GameServer/Server/Entity/obj/project.assets.json index 3f068a5e..32622fa8 100644 --- a/GameServer/Server/Entity/obj/project.assets.json +++ b/GameServer/Server/Entity/obj/project.assets.json @@ -1562,7 +1562,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } } diff --git a/GameServer/Server/Entity/obj/project.nuget.cache b/GameServer/Server/Entity/obj/project.nuget.cache index 10bc24c2..64d2b278 100644 --- a/GameServer/Server/Entity/obj/project.nuget.cache +++ b/GameServer/Server/Entity/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "bprZeXiYGWA=", + "dgSpecHash": "lq0jqGeNNzM=", "success": true, "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "expectedPackageFiles": [ diff --git a/GameServer/Server/Entity/obj/project.packagespec.json b/GameServer/Server/Entity/obj/project.packagespec.json index cf8703d3..4e26180b 100644 --- a/GameServer/Server/Entity/obj/project.packagespec.json +++ b/GameServer/Server/Entity/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","projectName":"Entity","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net":{"target":"Package","version":"[2024.2.24, )"},"System.IdentityModel.Tokens.Jwt":{"target":"Package","version":"[8.7.0, )"},"System.Security.Cryptography.Cng":{"target":"Package","version":"[5.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","projectName":"Entity","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net":{"target":"Package","version":"[2024.2.24, )"},"System.IdentityModel.Tokens.Jwt":{"target":"Package","version":"[8.7.0, )"},"System.Security.Cryptography.Cng":{"target":"Package","version":"[5.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/rider.project.model.nuget.info b/GameServer/Server/Entity/obj/rider.project.model.nuget.info index b7218794..64e97e2d 100644 --- a/GameServer/Server/Entity/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Entity/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17436510677332808 \ No newline at end of file +17442469724220245 \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/rider.project.restore.info b/GameServer/Server/Entity/obj/rider.project.restore.info index 40bb7af0..588b4605 100644 --- a/GameServer/Server/Entity/obj/rider.project.restore.info +++ b/GameServer/Server/Entity/obj/rider.project.restore.info @@ -1 +1 @@ -17441036760505427 \ No newline at end of file +17442722924392271 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/Outter/Chat/Handler/Outer/C2Chat_BoardRequestMessageHandler.cs b/GameServer/Server/Hotfix/Outter/Chat/Handler/Outer/C2Chat_BoardRequestMessageHandler.cs new file mode 100644 index 00000000..d6e08f32 --- /dev/null +++ b/GameServer/Server/Hotfix/Outter/Chat/Handler/Outer/C2Chat_BoardRequestMessageHandler.cs @@ -0,0 +1,14 @@ +using Fantasy; +using Fantasy.Async; +using Fantasy.Network.Interface; + +namespace Hotfix; + +public class C2Chat_BoardRequestMessageHandler : RouteRPC +{ + protected override async FTask Run(ChatUnit entity, C2Chat_BoardMessageRequest request, Chat2C_BoardMessageResponse response, Action reply) + { + + await FTask.CompletedTask; + } +} \ No newline at end of file diff --git a/GameServer/Server/Hotfix/Outter/Gate/Handler/Inner/Chat2G_BoardMessageHandler.cs b/GameServer/Server/Hotfix/Outter/Gate/Handler/Inner/Chat2G_BoardMessageHandler.cs new file mode 100644 index 00000000..9970a902 --- /dev/null +++ b/GameServer/Server/Hotfix/Outter/Gate/Handler/Inner/Chat2G_BoardMessageHandler.cs @@ -0,0 +1,29 @@ +using Fantasy.Async; +using Fantasy.Network; +using Fantasy.Network.Interface; +using Hotfix; + +namespace Fantasy; + +public class Chat2G_BoardMessageHandler : Route +{ + protected override async FTask Run(Scene scene, Chat2G_BoardMessage message) + { + var gameAccountManager = GateComponentHelper.GetGameAccountManageComponent(scene); + //var chatMessage = new chat2c + + var chatMessage = new Chat2C_BoardMessage() + { + Message = message.Message + }; + + foreach (var account in gameAccountManager.Accounts.Values) + { + if (scene.TryGetEntity(account.SessionRuntimeId, out var session)) + { + session.Send(chatMessage ); + } + } + await FTask.CompletedTask; + } +} \ No newline at end of file diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll index 058f7de9..75e2e083 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll and b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb index 2252130e..f775b3ad 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb and b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll index ff24b2ef..f509e297 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb index 3b99c8c2..3e391730 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll index 68d0c9eb..8852219c 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb index ad56ee76..e47ec559 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs index 2346d17a..684eb5b9 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Hotfix")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+44d9249c1b3de281ff1e2af3b67b2562b4043873")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2db89cc68870cb35408d0c188c0aa3b3875543db")] [assembly: System.Reflection.AssemblyProductAttribute("Hotfix")] [assembly: System.Reflection.AssemblyTitleAttribute("Hotfix")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache index 4d3226a7..ff484e00 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache @@ -1 +1 @@ -97176770e951027e48dc8d131f455ec7d6a559b9295defaf58a669df514bceb5 +452e6163cf9030335a130f7398a7fb504798492e1115e99e0d9ce63828bdc944 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache index 04130c91..a5b5ca07 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache index f2a46a61..d28d526f 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4dc5c869fdc172064f0a72a55682c5834c70f262475d8466efabaabf7701b043 +2ff7cc1d1ae3da3560c24dda768af063649abf8994d3537277cda8bc6baced67 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll index 68d0c9eb..8852219c 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb index ad56ee76..e47ec559 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll b/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll index cf00ec48..9f056f83 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll and b/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll b/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll index cf00ec48..9f056f83 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll and b/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json index 7d5a2857..9db5f1f4 100644 --- a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json +++ b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json @@ -87,7 +87,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } }, @@ -170,7 +170,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } }, @@ -239,7 +239,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } } diff --git a/GameServer/Server/Hotfix/obj/project.assets.json b/GameServer/Server/Hotfix/obj/project.assets.json index 3eedfca9..d73a45f5 100644 --- a/GameServer/Server/Hotfix/obj/project.assets.json +++ b/GameServer/Server/Hotfix/obj/project.assets.json @@ -1566,7 +1566,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } } diff --git a/GameServer/Server/Hotfix/obj/project.nuget.cache b/GameServer/Server/Hotfix/obj/project.nuget.cache index 3f605057..4dd62124 100644 --- a/GameServer/Server/Hotfix/obj/project.nuget.cache +++ b/GameServer/Server/Hotfix/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "5ISyAvbrzVY=", + "dgSpecHash": "TouK9+QjE6Q=", "success": true, "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "expectedPackageFiles": [ diff --git a/GameServer/Server/Hotfix/obj/project.packagespec.json b/GameServer/Server/Hotfix/obj/project.packagespec.json index 26e41894..502db0a6 100644 --- a/GameServer/Server/Hotfix/obj/project.packagespec.json +++ b/GameServer/Server/Hotfix/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","projectName":"Hotfix","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","projectName":"Hotfix","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info index 7cce67cd..30e86aaa 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17436510677596105 \ No newline at end of file +17442469724317605 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/rider.project.restore.info b/GameServer/Server/Hotfix/obj/rider.project.restore.info index 40bb7af0..588b4605 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.restore.info +++ b/GameServer/Server/Hotfix/obj/rider.project.restore.info @@ -1 +1 @@ -17441036760505427 \ No newline at end of file +17442722924392271 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs index 4713d14c..fe15f4fb 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Main")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+44d9249c1b3de281ff1e2af3b67b2562b4043873")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2db89cc68870cb35408d0c188c0aa3b3875543db")] [assembly: System.Reflection.AssemblyProductAttribute("Main")] [assembly: System.Reflection.AssemblyTitleAttribute("Main")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache index 689abe62..e13aca46 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache @@ -1 +1 @@ -5a3097ff682434d61c06a4ba773e8820fa8ffc10064fc4bcb136541359fb1cd0 +f14df2838a53339a5e6583784239b0b144db1410c25680183d4c81b3d74e12d0 diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache index 0b9e561d..c6a6c7ce 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache and b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache index 356e043f..807dd411 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5e7bc7876fe554021d7b81f0bd15083a579388b7cf677bc86c864f194fe84e40 +19917914e91ef5941f3fdf471f3ec5e8b1005ae15818b7fbbf92e808c820d143 diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.dll b/GameServer/Server/Main/obj/Debug/net9.0/Main.dll index ec0234d5..8cfdde79 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.dll and b/GameServer/Server/Main/obj/Debug/net9.0/Main.dll differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb b/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb index ec9c5065..8804e989 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb and b/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe b/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe index 932af6f3..2538d302 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe and b/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll b/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll index 3760785e..0db0401a 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll and b/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll b/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll index 3760785e..0db0401a 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll and b/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll differ diff --git a/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json b/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json index 537365f0..32ce1b67 100644 --- a/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json +++ b/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json @@ -87,7 +87,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } }, @@ -170,7 +170,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } }, @@ -239,7 +239,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } } }, @@ -318,27 +318,27 @@ "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.AspNetCore.App.Runtime.win-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.NETCore.App.Host.linux-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.NETCore.App.Runtime.win-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" } ], "frameworkReferences": { @@ -346,7 +346,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } }, "runtimes": { diff --git a/GameServer/Server/Main/obj/project.assets.json b/GameServer/Server/Main/obj/project.assets.json index 8881d205..986e3286 100644 --- a/GameServer/Server/Main/obj/project.assets.json +++ b/GameServer/Server/Main/obj/project.assets.json @@ -2740,27 +2740,27 @@ "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.AspNetCore.App.Runtime.win-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.NETCore.App.Host.linux-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.NETCore.App.Runtime.win-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" }, { "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64", - "version": "[9.0.3, 9.0.3]" + "version": "[9.0.4, 9.0.4]" } ], "frameworkReferences": { @@ -2768,7 +2768,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json" } }, "runtimes": { diff --git a/GameServer/Server/Main/obj/project.nuget.cache b/GameServer/Server/Main/obj/project.nuget.cache index a2296524..7b4ad82d 100644 --- a/GameServer/Server/Main/obj/project.nuget.cache +++ b/GameServer/Server/Main/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "fAxunScTqKI=", + "dgSpecHash": "YAbywGlPXtA=", "success": true, "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "expectedPackageFiles": [ @@ -38,12 +38,12 @@ "C:\\Users\\qq137\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.runtime.linux-x64\\9.0.3\\microsoft.netcore.app.runtime.linux-x64.9.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x64\\9.0.3\\microsoft.netcore.app.runtime.win-x64.9.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x64\\9.0.3\\microsoft.windowsdesktop.app.runtime.win-x64.9.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.linux-x64\\9.0.3\\microsoft.aspnetcore.app.runtime.linux-x64.9.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x64\\9.0.3\\microsoft.aspnetcore.app.runtime.win-x64.9.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.host.linux-x64\\9.0.3\\microsoft.netcore.app.host.linux-x64.9.0.3.nupkg.sha512" + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.runtime.linux-x64\\9.0.4\\microsoft.netcore.app.runtime.linux-x64.9.0.4.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x64\\9.0.4\\microsoft.netcore.app.runtime.win-x64.9.0.4.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x64\\9.0.4\\microsoft.windowsdesktop.app.runtime.win-x64.9.0.4.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.linux-x64\\9.0.4\\microsoft.aspnetcore.app.runtime.linux-x64.9.0.4.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x64\\9.0.4\\microsoft.aspnetcore.app.runtime.win-x64.9.0.4.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.host.linux-x64\\9.0.4\\microsoft.netcore.app.host.linux-x64.9.0.4.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/GameServer/Server/Main/obj/project.packagespec.json b/GameServer/Server/Main/obj/project.packagespec.json index 0a14f658..843198af 100644 --- a/GameServer/Server/Main/obj/project.packagespec.json +++ b/GameServer/Server/Main/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","projectName":"Main","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"},"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"},"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.NLog":{"target":"Package","version":"[2024.1.20, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Runtime.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.AspNetCore.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Host.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Runtime.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.WindowsDesktop.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}}"runtimes":{"linux-x64":{"#import":[]},"win-x64":{"#import":[]}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","projectName":"Main","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"},"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"},"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.NLog":{"target":"Package","version":"[2024.1.20, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Runtime.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.AspNetCore.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Host.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Runtime.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.WindowsDesktop.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json"}}"runtimes":{"linux-x64":{"#import":[]},"win-x64":{"#import":[]}} \ No newline at end of file diff --git a/GameServer/Server/Main/obj/rider.project.model.nuget.info b/GameServer/Server/Main/obj/rider.project.model.nuget.info index 650bef0d..ac2b2b1b 100644 --- a/GameServer/Server/Main/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Main/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17436510677784519 \ No newline at end of file +17442469724386088 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/rider.project.restore.info b/GameServer/Server/Main/obj/rider.project.restore.info index d27a5abe..1bfc59f1 100644 --- a/GameServer/Server/Main/obj/rider.project.restore.info +++ b/GameServer/Server/Main/obj/rider.project.restore.info @@ -1 +1 @@ -17441036760520492 \ No newline at end of file +17442722924402245 \ No newline at end of file