From 5c0730c8f927cb2ba002b6fc669954bccae5dcc1 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Mon, 11 Nov 2024 19:21:35 +0800 Subject: [PATCH] NetFix --- .../Assets/Plugins/AxiReplay/NetReplay.cs | 1 + .../Assets/Script/Manager/AppRoom.cs | 7 +- .../Script/NesEmulator/CoreSupporter.cs | 14 +- .../Assets/Script/Network/NetMsg.cs | 2 +- .../Assets/Script/Network/NetworkHelper.cs | 1 - AxibugEmuOnline.Server/Manager/AppSrv.cs | 2 +- .../Manager/ClientManager.cs | 4 +- AxibugEmuOnline.Server/Manager/LogManager.cs | 10 +- AxibugEmuOnline.Server/Manager/RoomManager.cs | 146 ++++++++++++------ 9 files changed, 135 insertions(+), 52 deletions(-) diff --git a/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs b/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs index 3a97a6e..8e87aa0 100644 --- a/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs +++ b/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs @@ -60,6 +60,7 @@ namespace AxiReplay inputDiff = true; mNextReplay = mNetReplayQueue.Dequeue(); } + bFrameDiff = mRemoteFrameIdx - mCurrClientFrameIdx; data = mCurrReplay; } diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs index d9639a4..4070926 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs @@ -404,10 +404,15 @@ namespace AxibugEmuOnline.Client.Manager App.network.SendToServer((int)CommandID.CmdRoomSingelPlayerInput, ProtoBufHelper.Serizlize(_Protobuf_Room_SinglePlayerInputData)); } + ulong TestAllData = 0; void RecvHostSyn_RoomFrameAllInputData(byte[] reqData) { Protobuf_Room_Syn_RoomFrameAllInputData msg = ProtoBufHelper.DeSerizlize(reqData); - //App.log.Debug($"ServerFrameID->{msg.ServerFrameID} FrameID->{msg.FrameID} ClientFrame->{netReplay.mCurrClientFrameIdx} InputData->{msg.InputData}"); + if (TestAllData != msg.InputData) + { + TestAllData = msg.InputData; + App.log.Debug($"ServerFrameID->{msg.ServerFrameID} FrameID->{msg.FrameID} ClientFrame->{netReplay.mCurrClientFrameIdx} InputData->{msg.InputData}"); + } netReplay.InData(new ReplayStep() { FrameStartID = (int)msg.FrameID, InPut = msg.InputData }, (int)msg.ServerFrameID); } diff --git a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/CoreSupporter.cs b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/CoreSupporter.cs index b13440e..089fd19 100644 --- a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/CoreSupporter.cs +++ b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/CoreSupporter.cs @@ -98,17 +98,27 @@ namespace AxibugEmuOnline.Client return m_sampledState; } + uint LastTestInput = 0; public void SampleInput() { if (InGameUI.Instance.IsNetPlay) { if (App.roomMgr.netReplay.TryGetNextFrame(out var replayData, out int frameDiff, out bool inputDiff)) { - App.log.Debug($"TryGetNextFrame remoteFrame->{App.roomMgr.netReplay.mRemoteFrameIdx} diff->{frameDiff} " + - $"frame=>{replayData.FrameStartID} InPut=>{replayData.InPut}"); + if (inputDiff) + { + App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} TryGetNextFrame remoteFrame->{App.roomMgr.netReplay.mRemoteFrameIdx} diff->{frameDiff} " + + $"frame=>{replayData.FrameStartID} InPut=>{replayData.InPut}"); + } + m_sampledState = FromNet(replayData); var localState = NesControllerMapper.Get().CreateState(); var rawData = ToNet(localState); + if (LastTestInput != rawData) + { + LastTestInput = rawData; + App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} Input F:{App.roomMgr.netReplay.mCurrClientFrameIdx} | I:{rawData}"); + } App.roomMgr.SendRoomSingelPlayerInput((uint)App.roomMgr.netReplay.mCurrClientFrameIdx, rawData); } else diff --git a/AxibugEmuOnline.Client/Assets/Script/Network/NetMsg.cs b/AxibugEmuOnline.Client/Assets/Script/Network/NetMsg.cs index 4b4dfa1..cd8cf07 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Network/NetMsg.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Network/NetMsg.cs @@ -66,7 +66,7 @@ namespace AxibugEmuOnline.Client.Network public void DequeueNesMsg() { - if (queueNetMsg.Count > 0) + while (queueNetMsg.Count > 0) { (int, int, byte[]) msgData = queueNetMsg.Dequeue(); PostNetMsgEvent(msgData.Item1, msgData.Item2, msgData.Item3); diff --git a/AxibugEmuOnline.Client/Assets/Script/Network/NetworkHelper.cs b/AxibugEmuOnline.Client/Assets/Script/Network/NetworkHelper.cs index 13363bc..0d2e358 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Network/NetworkHelper.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Network/NetworkHelper.cs @@ -82,7 +82,6 @@ namespace AxibugEmuOnline.Client.Network try { //抛出网络数据 - //网络线程直接抛 if (CMDID == (int)CommandID.CmdPing || CMDID == (int)CommandID.CmdPong) NetMsg.Instance.PostNetMsgEvent(CMDID, ERRCODE, data); diff --git a/AxibugEmuOnline.Server/Manager/AppSrv.cs b/AxibugEmuOnline.Server/Manager/AppSrv.cs index bfd0374..4b19c90 100644 --- a/AxibugEmuOnline.Server/Manager/AppSrv.cs +++ b/AxibugEmuOnline.Server/Manager/AppSrv.cs @@ -26,7 +26,7 @@ namespace AxibugEmuOnline.Server g_Log = new LogManager(); g_Login = new LoginManager(); g_Chat = new ChatManager(); - g_SocketMgr = new IOCPNetWork(1024, 4096); + g_SocketMgr = new IOCPNetWork(1024, 4096*2); g_Room = new RoomManager(); g_SocketMgr.Init(); diff --git a/AxibugEmuOnline.Server/Manager/ClientManager.cs b/AxibugEmuOnline.Server/Manager/ClientManager.cs index 0a08463..768807c 100644 --- a/AxibugEmuOnline.Server/Manager/ClientManager.cs +++ b/AxibugEmuOnline.Server/Manager/ClientManager.cs @@ -91,10 +91,10 @@ namespace AxibugEmuOnline.Server.Manager DateTime CheckDT = DateTime.Now.AddMinutes(-1 * _RemoveOfflineCacheMin); ClientInfo[] OfflineClientlist = ClientList.Where(w => w.IsOffline == true && w.LogOutDT < CheckDT).ToArray(); - Console.WriteLine("开始清理离线过久的玩家的缓存"); for (int i = 0; i < OfflineClientlist.Length; i++) { - //to do 掉线处理 + Console.WriteLine($"清理离线过久玩家 UID->{OfflineClientlist[i].UID} Name->{OfflineClientlist[i].NickName}"); + //掉线处理 RemoveClient(OfflineClientlist[i]); } GC.Collect(); diff --git a/AxibugEmuOnline.Server/Manager/LogManager.cs b/AxibugEmuOnline.Server/Manager/LogManager.cs index 927f0b2..8121df1 100644 --- a/AxibugEmuOnline.Server/Manager/LogManager.cs +++ b/AxibugEmuOnline.Server/Manager/LogManager.cs @@ -6,9 +6,17 @@ { Console.WriteLine(str); } + public void DebugCmd(string str) + { + ConsoleColor srcColor = Console.ForegroundColor; + Console.ForegroundColor = ConsoleColor.Blue; + Console.WriteLine($"[{DateTime.Now.ToString("hh:mm:ss.fff")}][{str}]"); + Console.ForegroundColor = srcColor; + } public void Debug(string str) { - Console.WriteLine(str); + Console.WriteLine($"[{DateTime.Now.ToString("hh:mm:ss.fff")}][{str}]"); + //Console.WriteLine(str); } public void Warning(string str) diff --git a/AxibugEmuOnline.Server/Manager/RoomManager.cs b/AxibugEmuOnline.Server/Manager/RoomManager.cs index 5794d62..1fd03dd 100644 --- a/AxibugEmuOnline.Server/Manager/RoomManager.cs +++ b/AxibugEmuOnline.Server/Manager/RoomManager.cs @@ -31,9 +31,15 @@ namespace AxibugEmuOnline.Server NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdScreen, OnCmdScreen); - roomTickARE = AppSrv.g_Tick.AddNewARE(TickManager.TickType.Interval_16MS); - threadRoomTick = new Thread(UpdateLoopTick); - threadRoomTick.Start(); + //roomTickARE = AppSrv.g_Tick.AddNewARE(TickManager.TickType.Interval_16MS); + //threadRoomTick = new Thread(UpdateLoopTick); + //threadRoomTick.Start(); + + System.Timers.Timer mTimer16ms = new System.Timers.Timer(16);//实例化Timer类 + mTimer16ms.Elapsed += new System.Timers.ElapsedEventHandler((source, e) => { UpdateAllRoomLogic(); });//到达时间的时候执行事件； + mTimer16ms.AutoReset = true;//设置是执行一次（false）还是一直执行(true)； + mTimer16ms.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件； + mTimer16ms.Start(); } #region 房间管理 @@ -123,7 +129,7 @@ namespace AxibugEmuOnline.Server public void OnCmdRoomList(Socket sk, byte[] reqData) { - AppSrv.g_Log.Debug($"OnCmdRoomList "); + AppSrv.g_Log.DebugCmd($"OnCmdRoomList"); ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); Protobuf_Room_List msg = ProtoBufHelper.DeSerizlize(reqData); @@ -135,7 +141,7 @@ namespace AxibugEmuOnline.Server } public void CmdRoomGetScreen(Socket sk, byte[] reqData) { - AppSrv.g_Log.Debug($"OnCmdRoomList "); + AppSrv.g_Log.DebugCmd($"CmdRoomGetScreen"); ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); Protobuf_Room_Get_Screen msg = ProtoBufHelper.DeSerizlize(reqData); @@ -177,7 +183,7 @@ namespace AxibugEmuOnline.Server public void OnCmdRoomCreate(Socket sk, byte[] reqData) { - AppSrv.g_Log.Debug($"OnCmdRoomCreate "); + AppSrv.g_Log.DebugCmd($"OnCmdRoomCreate"); ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); Protobuf_Room_Create msg = ProtoBufHelper.DeSerizlize(reqData); Protobuf_Room_Create_RESP resp = new Protobuf_Room_Create_RESP(); @@ -202,16 +208,21 @@ namespace AxibugEmuOnline.Server public void OnCmdRoomJoin(Socket sk, byte[] reqData) { - AppSrv.g_Log.Debug($"OnCmdRoomJoin "); + AppSrv.g_Log.DebugCmd($"OnCmdRoomJoin"); ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); Protobuf_Room_Join msg = ProtoBufHelper.DeSerizlize(reqData); Protobuf_Room_Create_RESP resp = new Protobuf_Room_Create_RESP(); ErrorCode joinErrcode; - Data_RoomData room = GetRoomData(_c.RoomState.RoomID); + Data_RoomData room = GetRoomData(msg.RoomID); bool bHadRoomStateChange = false; if (room == null) + { joinErrcode = ErrorCode.ErrorRoomNotFound; - else + + AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomJoin, (int)joinErrcode, ProtoBufHelper.Serizlize(resp)); + return; + } + lock (room) { //加入 if (room.Join(msg.PlayerNum, _c, out joinErrcode, out bHadRoomStateChange)) @@ -219,20 +230,22 @@ namespace AxibugEmuOnline.Server Data_RoomData roomData = GetRoomData(msg.RoomID); resp.RoomMiniInfo = GetProtoDataRoom(roomData); } + + AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomJoin, (int)joinErrcode, ProtoBufHelper.Serizlize(resp)); + Protobuf_Room_MyRoom_State_Change(msg.RoomID); + + if (joinErrcode == ErrorCode.ErrorOk && bHadRoomStateChange) + SendRoomStateChange(room); + + if (room != null) + { + SendRoomUpdateToAll(room.RoomID, 0); + } } - - AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomJoin, (int)joinErrcode, ProtoBufHelper.Serizlize(resp)); - Protobuf_Room_MyRoom_State_Change(msg.RoomID); - - if (joinErrcode == ErrorCode.ErrorOk && bHadRoomStateChange) - SendRoomStateChange(room); - - - SendRoomUpdateToAll(room.RoomID, 0); } public void OnCmdRoomLeave(Socket sk, byte[] reqData) { - AppSrv.g_Log.Debug($"OnCmdRoomLeave "); + AppSrv.g_Log.DebugCmd($"OnCmdRoomLeave"); ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); Protobuf_Room_Leave msg = ProtoBufHelper.DeSerizlize(reqData); LeaveRoom(_c, msg.RoomID); @@ -260,20 +273,25 @@ namespace AxibugEmuOnline.Server // RemoveRoom(room.RoomID); } - public void LeaveRoom(ClientInfo _c,int RoomID) + public void LeaveRoom(ClientInfo _c, int RoomID) { + AppSrv.g_Log.Debug($"LeaveRoom"); + if (RoomID < 0) + return; Protobuf_Room_Leave_RESP resp = new Protobuf_Room_Leave_RESP(); ErrorCode errcode; Data_RoomData room = GetRoomData(_c.RoomState.RoomID); bool bHadRoomStateChange = false; if (room == null) + { errcode = ErrorCode.ErrorRoomNotFound; - else + AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomLeave, (int)errcode, ProtoBufHelper.Serizlize(resp)); + return; + } + + if (room.Leave(_c, out errcode, out bHadRoomStateChange)) { - if (room.Leave(_c, out errcode, out bHadRoomStateChange)) - { - resp.RoomID = RoomID; - } + resp.RoomID = RoomID; } AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomLeave, (int)errcode, ProtoBufHelper.Serizlize(resp)); Protobuf_Room_MyRoom_State_Change(RoomID); @@ -282,7 +300,7 @@ namespace AxibugEmuOnline.Server SendRoomStateChange(room); if (room.GetPlayerCount() < 1) - { + { RemoveRoom(room.RoomID); SendRoomUpdateToAll(room.RoomID, 1); } @@ -293,6 +311,7 @@ namespace AxibugEmuOnline.Server public void OnHostPlayerUpdateStateRaw(Socket sk, byte[] reqData) { ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); + AppSrv.g_Log.DebugCmd($"OnHostPlayerUpdateStateRaw 上报即时存档 UID->{_c.UID}"); Protobuf_Room_HostPlayer_UpdateStateRaw msg = ProtoBufHelper.DeSerizlize(reqData); Protobuf_Room_HostPlayer_UpdateStateRaw_RESP resp = new Protobuf_Room_HostPlayer_UpdateStateRaw_RESP(); ErrorCode errcode = ErrorCode.ErrorOk; @@ -307,7 +326,6 @@ namespace AxibugEmuOnline.Server if (errcode == ErrorCode.ErrorOk) { room.SetLoadRaw(msg.LoadStateRaw, out bool bHadRoomStateChange); - if (bHadRoomStateChange) SendRoomStateChange(room); } @@ -316,14 +334,24 @@ namespace AxibugEmuOnline.Server public void OnRoomPlayerReady(Socket sk, byte[] reqData) { ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); + AppSrv.g_Log.DebugCmd($"OnRoomPlayerReady _c->{_c.UID}"); Protobuf_Room_Player_Ready msg = ProtoBufHelper.DeSerizlize(reqData); ErrorCode errcode = ErrorCode.ErrorOk; Data_RoomData room = GetRoomData(_c.RoomState.RoomID); if (room == null) return; - + lock (room) + { + AppSrv.g_Log.Debug($"SetRePlayerReady RoomID->{room.RoomID},UID->{_c.UID}, PlayerIdx->{_c.RoomState.PlayerIdx}"); + room.SetRePlayerReady(_c.RoomState.PlayerIdx, out errcode, out bool bHadRoomStateChange); + if (bHadRoomStateChange) + { + SendRoomStateChange(room); + } + } } + ulong LastTestRecv = 0; public void OnSingelPlayerInput(Socket sk, byte[] reqData) { ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); @@ -336,13 +364,19 @@ namespace AxibugEmuOnline.Server //取玩家操作数据中的第一个 ServerInputSnapShot temp = new ServerInputSnapShot(); temp.all = msg.InputData; + room.SetPlayerInput(_c.RoomState.PlayerIdx, msg.FrameID, temp); + + if (LastTestRecv != room.mCurrInputData.all) + { + LastTestRecv = room.mCurrInputData.all; + AppSrv.g_Log.Debug($" {DateTime.Now.ToString("hh:mm:ss.fff")} SynTestRecv=> UID->{_c.UID} roomId->{room.mCurrFrameId} input->{msg.InputData}"); + } - room.SetPlayerInput(_c.RoomState.PlayerIdx, msg.FrameID, temp.p1_byte); } public void OnCmdScreen(Socket sk, byte[] reqData) { - AppSrv.g_Log.Debug($"OnCmdScreen lenght:{reqData.Length}"); + AppSrv.g_Log.DebugCmd($"OnCmdScreen lenght:{reqData.Length}"); ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk); Protobuf_Screnn_Frame msg = ProtoBufHelper.DeSerizlize(reqData); Data_RoomData room = AppSrv.g_Room.GetRoomData(msg.RoomID); @@ -383,6 +417,7 @@ namespace AxibugEmuOnline.Server { WaitStep = 0 }; + AppSrv.g_Log.Debug($"Step=>{0} WaitRawUpdate 广播等待主机上报即时存档"); AppSrv.g_ClientMgr.ClientSend(roomClient, (int)CommandID.CmdRoomWaitStep, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp)); } break; @@ -393,6 +428,8 @@ namespace AxibugEmuOnline.Server WaitStep = 1, LoadStateRaw = room.NextStateRaw }; + AppSrv.g_Log.Debug($"Step=>{1} WaitReady 广播即时存档"); + AppSrv.g_ClientMgr.ClientSend(roomClient, (int)CommandID.CmdRoomWaitStep, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp)); } break; @@ -402,6 +439,8 @@ namespace AxibugEmuOnline.Server { WaitStep = 2, }; + AppSrv.g_Log.Debug($"Step=>{2} 广播开始游戏"); + AppSrv.g_ClientMgr.ClientSend(roomClient, (int)CommandID.CmdRoomWaitStep, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp)); } break; @@ -421,12 +460,12 @@ namespace AxibugEmuOnline.Server } void UpdateAllRoomLogic() { + if (mKeyRoomList.Count < 1) + return; for (int i = 0; i < mKeyRoomList.Count; i++) { int roomid = mKeyRoomList[i]; - if (!mDictRoom.TryGetValue(roomid, out Data_RoomData room)) - continue; - if (room.GameState < RoomGameState.InOnlineGame) + if (!mDictRoom.TryGetValue(roomid, out Data_RoomData room) || room.GameState < RoomGameState.InOnlineGame) continue; //更新帧 room.TakeFrame(); @@ -531,6 +570,7 @@ namespace AxibugEmuOnline.Server if (oldUID >= 0) SynUIDs.Remove(oldUID); SynUIDs.Add(_c.UID); + AppSrv.g_Log.Debug($"SetPlayerUID RoomID->{RoomID} _c.UID->{_c.UID} PlayerIdx->{PlayerIdx}"); _c.RoomState.SetRoomData(this.RoomID, PlayerIdx); } @@ -607,14 +647,14 @@ namespace AxibugEmuOnline.Server return list; } - public void SetPlayerInput(int PlayerIdx, long mFrameID, byte input) + public void SetPlayerInput(int PlayerIdx, long mFrameID, ServerInputSnapShot allinput) { switch (PlayerIdx) { - case 0: mCurrInputData.p1_byte = input; break; - case 1: mCurrInputData.p2_byte = input; break; - case 2: mCurrInputData.p3_byte = input; break; - case 3: mCurrInputData.p4_byte = input; break; + case 0: mCurrInputData.p1_byte = allinput.p1_byte; break; + case 1: mCurrInputData.p2_byte = allinput.p2_byte; break; + case 2: mCurrInputData.p3_byte = allinput.p3_byte; break; + case 3: mCurrInputData.p4_byte = allinput.p4_byte; break; } } @@ -651,10 +691,14 @@ namespace AxibugEmuOnline.Server ClientInfo player = playerlist[i]; maxNetDelay = Math.Max(maxNetDelay, player.AveNetDelay); } + mCurrFrameId = 0; + mCurrInputData.all = 1; int TaskFrameCount = (int)((maxNetDelay / 0.016f) + 5f); + AppSrv.g_Log.Debug($"服务器提前跑帧数：({maxNetDelay} / {0.016f}) + {5f} = {TaskFrameCount}"); + TaskFrameCount = 0; for (int i = 0; i < TaskFrameCount; i++) { TakeFrame(); @@ -667,6 +711,7 @@ namespace AxibugEmuOnline.Server mCurrFrameId++; } + ulong LastTestSend = 0; /// /// 广播数据 /// @@ -681,11 +726,16 @@ namespace AxibugEmuOnline.Server InputData = data.inputdata.all, ServerFrameID = mCurrFrameId }; + + if (LastTestSend != data.inputdata.all) + { + LastTestSend = data.inputdata.all; + AppSrv.g_Log.Debug($" {DateTime.Now.ToString("hh:mm:ss.fff")} SynInput=> RoomID->{RoomID} ServerFrameID->{mCurrFrameId} SynUIDs=>{string.Join(",", SynUIDs)} "); + } AppSrv.g_ClientMgr.ClientSend(SynUIDs, (int)CommandID.CmdRoomSynPlayerInput, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp)); } } - #region 房间进出 /// /// 进入房间 @@ -704,6 +754,7 @@ namespace AxibugEmuOnline.Server errcode = ErrorCode.ErrorRoomSlotReadlyHadPlayer; return false; } + AppSrv.g_Log.Debug($"Join _c.UID->{_c.UID} RoomID->{RoomID}"); SetPlayerUID(PlayerNum, _c); int newPlayerCount = GetPlayerCount(); errcode = ErrorCode.ErrorOk; @@ -730,6 +781,16 @@ namespace AxibugEmuOnline.Server } #endregion + public bool SetRePlayerReady(int PlayerIdx, out ErrorCode errcode, out bool bHadRoomStateChange) + { + int oldPlayerCount = GetPlayerCount(); + PlayerReadyState[PlayerIdx] = true; + int newPlayerCount = GetPlayerCount(); + errcode = ErrorCode.ErrorOk; + bHadRoomStateChange = CheckRoomStateChange(oldPlayerCount, newPlayerCount); + return true; + } + bool CheckRoomStateChange(int oldPlayerCount, int newPlayerCount) { bool bChanged = false; @@ -773,14 +834,13 @@ namespace AxibugEmuOnline.Server bChanged = true; break; } - //没有为准备的 + //没有未准备的 bool bAllReady = IsAllReady(); if (bAllReady) { + this.GameState = RoomGameState.InOnlineGame; //新开Tick StartNewTick(); - - this.GameState = RoomGameState.InOnlineGame; bChanged = true; break; } @@ -797,7 +857,6 @@ namespace AxibugEmuOnline.Server if (bMorePlayer)//加入更多玩家 { this.GameState = RoomGameState.WaitRawUpdate; - //TODO 服务器Tick提前跑帧 bChanged = true; break; } @@ -809,6 +868,7 @@ namespace AxibugEmuOnline.Server public void SetLoadRaw(Google.Protobuf.ByteString NextStateRaw, out bool bHadRoomStateChange) { int oldPlayerCount = GetPlayerCount(); + AppSrv.g_Log.Debug($"SetLoadRaw proto Lenght->{NextStateRaw.Length}"); this.NextStateRaw = NextStateRaw; int newPlayerCount = GetPlayerCount(); bHadRoomStateChange = CheckRoomStateChange(oldPlayerCount, newPlayerCount);