From a4f8a382ac6ec4948ecfaaea94019bdf48a341c0 Mon Sep 17 00:00:00 2001
From: sin365 <353374337@qq.com>
Date: Mon, 11 Nov 2024 15:40:21 +0800
Subject: [PATCH] netreplay

---
 .../Assets/Plugins/AxiReplay/NetReplay.cs     | 19 ++++++++++++++-----
 .../Assets/Script/Manager/AppRoom.cs          |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs b/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs
index a94ea03..fba2489 100644
--- a/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs
+++ b/AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs
@@ -7,7 +7,8 @@ namespace AxiReplay
         /// <summary>
         /// 客户端当前帧
         /// </summary>
-        public int mCurrClientFrameIdx { get; private set; } = -1;
+        public int mCurrClientFrameIdx => mCurrReplay.FrameStartID;
+        //public int mCurrClientFrameIdx 
         /// <summary>
         /// 服务器远端当前帧
         /// </summary>
@@ -20,6 +21,10 @@ namespace AxiReplay
         /// 当前数据
         /// </summary>
         ReplayStep mCurrReplay;
+        /// <summary>
+        /// 下一个数据数据
+        /// </summary>
+        ReplayStep mNextReplay;
         public NetReplay()
         {
             ResetData();
@@ -29,6 +34,9 @@ namespace AxiReplay
             mNetReplayQueue.Clear();
             mRemoteFrameIdx = 0;
             mCurrReplay = default(ReplayStep);
+            mCurrReplay.FrameStartID = 0;
+            mNextReplay = default(ReplayStep);
+            mNextReplay.FrameStartID = -1;
         }
         public void InData(ReplayStep inputData, int ServerFrameIdx)
         {
@@ -43,15 +51,16 @@ namespace AxiReplay
         void TakeFrame(int addFrame, out ReplayStep data, out int bFrameDiff, out bool inputDiff)
         {
             inputDiff = false;
-            int targetFrame = mCurrClientFrameIdx += addFrame;
-            if (targetFrame <= mRemoteFrameIdx && mNetReplayQueue.Count > 0)
+            int targetFrame = mCurrClientFrameIdx + addFrame;
+            if (targetFrame >= mNextReplay.FrameStartID && targetFrame <= mRemoteFrameIdx && mNetReplayQueue.Count > 0)
             {
                 //当前帧追加
-                mCurrClientFrameIdx = targetFrame;
+                //mCurrClientFrameIdx = targetFrame;
                 ulong oldInput = mCurrReplay.InPut;
-                mCurrReplay = mNetReplayQueue.Dequeue();
+                mCurrReplay = mNextReplay;
                 if (oldInput != mCurrReplay.InPut)
                     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 2166f64..5be4626 100644
--- a/AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs
+++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs
@@ -407,6 +407,7 @@ namespace AxibugEmuOnline.Client.Manager
         void RecvHostSyn_RoomFrameAllInputData(byte[] reqData)
         {
             Protobuf_Room_Syn_RoomFrameAllInputData msg = ProtoBufHelper.DeSerizlize<Protobuf_Room_Syn_RoomFrameAllInputData>(reqData);
+            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);
         }