完善Replay fixedbug

IReplayReader.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace AxiReplay
+{
+    internal interface IReplayReader : IDisposable
+    {
+        bool NextFrame(out ReplayStep data);
+        bool TakeFrame(int addFrame, out ReplayStep data);
+        bool NextFramebyFrameIdx(int FrameID, out ReplayStep data);
+    }
+}

IReplayWriter.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace AxiReplay
+{
+    internal interface IReplayWriter : IDisposable
+    {
+        void NextFrame(UInt64 frameInput);
+        void NextFramebyFrameIdx(int FrameID, UInt64 frameInput);
+        void TakeFrame(int addFrame, UInt64 frameInput);
+        void SaveData(string path, bool bNeedDump = false, string dumpFilePath = null);
+    }
+}

NetReplay.cs

@@ -0,0 +1,147 @@
+using System.Collections.Generic;
+
+namespace AxiReplay
+{
+    public class NetReplay
+    {
+        /// <summary>
+        /// 客户端当前帧
+        /// </summary>
+        public int mCurrClientFrameIdx = 0;
+        /// <summary>
+        /// 服务器远端当前帧
+        /// </summary>
+        public int mRemoteFrameIdx { get; private set; }
+        /// <summary>
+        /// 服务器远端当前提前量
+        /// </summary>
+        public int mRemoteForwardCount { get; private set; }
+        /// <summary>
+        /// Remote 2 Client Frame Gap
+        /// </summary>
+        public int mDiffFrameCount => mRemoteFrameIdx - mCurrClientFrameIdx;
+        /// <summary>
+        /// 网络数据队列
+        /// </summary>
+        Queue<ReplayStep> mNetReplayQueue = new Queue<ReplayStep>();
+        /// <summary>
+        /// 当前数据
+        /// </summary>
+        ReplayStep mCurrReplay;
+        /// <summary>
+        /// 下一个数据数据
+        /// </summary>
+        ReplayStep mNextReplay;
+
+        bool bNetInit = false;
+        public NetReplay()
+        {
+            ResetData();
+        }
+        public void ResetData()
+        {
+            mNetReplayQueue.Clear();
+            mCurrReplay = default(ReplayStep);
+            mCurrReplay.FrameStartID = int.MinValue;
+            bNetInit = false;
+        }
+        public void InData(ReplayStep inputData, int ServerFrameIdx)
+        {
+            mNetReplayQueue.Enqueue(inputData);
+            mRemoteFrameIdx = inputData.FrameStartID;
+            if (!bNetInit)
+            {
+                bNetInit = true;
+                mNextReplay = mNetReplayQueue.Dequeue();
+            }
+        }
+        public bool TryGetNextFrame(out ReplayStep data, out int frameDiff, out bool inputDiff)
+        {
+            if (!bNetInit)
+            {
+                data = default(ReplayStep);
+                frameDiff = default(int);
+                inputDiff = false;
+                return false;
+            }
+            TakeFrame(1, out data, out frameDiff, out inputDiff);
+            return frameDiff > 0;
+        }
+
+        public bool TryGetNextFrame(int targetFrame, out ReplayStep data, out int frameDiff, out bool inputDiff)
+        {
+            if (!bNetInit)
+            {
+                data = default(ReplayStep);
+                frameDiff = default(int);
+                inputDiff = false;
+                return false;
+            }
+            return TakeFrameToTargetFrame(targetFrame, out data, out frameDiff, out inputDiff);
+        }
+
+        void TakeFrame(int addFrame, out ReplayStep data, out int bFrameDiff, out bool inputDiff)
+        {
+            int targetFrame = mCurrClientFrameIdx + addFrame;
+            TakeFrameToTargetFrame(targetFrame, out data, out bFrameDiff, out inputDiff);
+        }
+
+        bool TakeFrameToTargetFrame(int targetFrame, out ReplayStep data, out int bFrameDiff, out bool inputDiff)
+        {
+            bool result;
+            inputDiff = false;
+            if (targetFrame == mNextReplay.FrameStartID && targetFrame <= mRemoteFrameIdx && mNetReplayQueue.Count > 0)
+            {
+                //当前帧追加
+                mCurrClientFrameIdx = targetFrame;
+                ulong oldInput = mCurrReplay.InPut;
+                mCurrReplay = mNextReplay;
+                if (oldInput != mCurrReplay.InPut)
+                    inputDiff = true;
+                mNextReplay = mNetReplayQueue.Dequeue();
+                result = true;
+            }
+            else
+                result = false;
+
+            bFrameDiff = mRemoteFrameIdx - mCurrClientFrameIdx;
+            data = mCurrReplay;
+
+            return result;
+        }
+
+        public int GetSkipFrameCount()
+        {
+            if(!bNetInit)
+                return 0;
+            //本地队列差异高于服务器提前量的值
+            int moreNum = mDiffFrameCount - mRemoteForwardCount;
+            //if (mDiffFrameCount < 0 || mDiffFrameCount > 10000)
+            //    return 0;
+
+            ////游戏刚开始的一小段时间，直接追满
+            //if (mCurrClientFrameIdx < 60)
+            //    return moreNum;
+
+            int skip = 0;
+            if (mDiffFrameCount > short.MaxValue) skip = 0;
+            else if (moreNum <= 1) skip = 0;
+            else if (moreNum <= 3) skip = 2;
+            else if (moreNum <= 6) skip = 2;
+            else if (moreNum <= 20) skip = moreNum / 2; //20帧以内，平滑跳帧数
+            else skip = moreNum;//完全追上
+            return skip;
+
+            //var frameGap = mDiffFrameCount;
+            //if (frameGap > 10000) return 0;
+            //if (frameGap <= 2) skip = 0;
+            //if (frameGap > 2 && frameGap < 6) skip = 1 + 1;
+            //else if (frameGap > 7 && frameGap < 12) skip = 2 + 1;
+            //else if (frameGap > 13 && frameGap < 20) skip = 3 + 1;
+            //else skip = frameGap - 2;
+
+
+            //return skip;
+        }
+    }
+}

ReplayData.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace AxiReplay
 {
-    [StructLayout(LayoutKind.Explicit,Size = 44)]
+    [StructLayout(LayoutKind.Explicit, Size = 44)]
     public struct ReplayHandler
     {
         [FieldOffset(0)]
@@ -51,7 +51,7 @@ namespace AxiReplay
             FM32IP32,
             FM32IP64,
         }
-        public static void GetStringByteData(string str,out byte[] data,out int lenghtWithEnd,Encoding encoding)
+        public static void GetStringByteData(string str, out byte[] data, out int lenghtWithEnd, Encoding encoding)
         {
             data = encoding.GetBytes(str);
             lenghtWithEnd = data.Length + 1;

ReplayReader.cs

@@ -6,7 +6,7 @@ using static AxiReplay.ReplayData;
 
 namespace AxiReplay
 {
-    public class ReplayReader : IDisposable
+    public class ReplayReader : IReplayReader
     {
         public ReplayData.ReplayFormat mFormat { get; private set; }
         public Encoding TexEncoding { get; private set; }
@@ -21,10 +21,10 @@ namespace AxiReplay
         FileStream mStream;
         BinaryReader mBinaryReader;
 
-        int mCurrFrame = -1;
+        int mCurrFrame = 0;
         byte[] mNextOutbytes;
-        ReplayStep currStep;
+        public ReplayStep currStep;
-        ReplayStep nextStep;
+        public ReplayStep nextStep;
         bool bEnd;
 
         List<string> dbgList = new List<string>();
@@ -82,8 +82,9 @@ namespace AxiReplay
 
         void UpdateNextFrame(int targetFrame)
         {
+            int LastNextFrameStartID = nextStep.FrameStartID;
             //如果已经超过
-            while (targetFrame > nextStep.FrameStartID)
+            while (targetFrame >= nextStep.FrameStartID)
             {
                 if (nextStep.FrameStartID >= handler.AllFrame)
                 {
@@ -117,34 +118,31 @@ namespace AxiReplay
                 }
                 dbgList.Add($"{nextStep.FrameStartID} | {nextStep.InPut}");
 
+                //如果这次的NextStep1只推进了1帧，则跳过，交给下一帧判断
+                if (nextStep.FrameStartID - LastNextFrameStartID == 1)
+                {
+                    break;
+                }
+
                 targetFrame++;
             }
         }
 
         int byFrameIdx = 0;
-        /// <summary>
-        /// 往前推进帧的,指定帧下标
-        /// </summary>
-        public bool NextFramebyFrameIdx(int FrameID,out ReplayStep data)
-        {
-            bool res = TakeFrame(FrameID - byFrameIdx, out data);
-            byFrameIdx = FrameID;
-            return res;
-        }
 
         /// <summary>
         /// 往前推进1帧的Input(返回是否变化）
         /// </summary>
         public bool NextFrame(out ReplayStep data)
         {
-            return TakeFrame(1,out data);
+            return TakeFrame(1, out data);
         }
 
         /// <summary>
         /// 往前推进指定帧数量的Input (返回是否变化）
         /// </summary>
         /// <param name="addFrame"></param>
-        public bool TakeFrame(int addFrame,out ReplayStep data)
+        public bool TakeFrame(int addFrame, out ReplayStep data)
         {
             bool Changed = false;
             mCurrFrame += addFrame;
@@ -162,6 +160,23 @@ namespace AxiReplay
             return Changed;
         }
 
+        int lastTest = 0;
+        /// <summary>
+        /// 往前推进帧的,指定帧下标
+        /// </summary>
+        public bool NextFramebyFrameIdx(int FrameID, out ReplayStep data)
+        {
+            lastTest = FrameID;
+
+            if (FrameID == 3360)
+            {
+
+            }
+            bool res = TakeFrame(FrameID - byFrameIdx, out data);
+            byFrameIdx = FrameID;
+            return res;
+        }
+
         public void Dispose()
         {
             mStream.Dispose();

ReplayWriter.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 namespace AxiReplay
 {
-    public class ReplayWriter : IDisposable
+	public class ReplayWriter : IReplayWriter
 	{
 		public ReplayData.ReplayFormat mFormat { get; private set; }
 		public Encoding TexEncoding { get; private set; }
@@ -44,7 +44,8 @@ namespace AxiReplay
 			mStream = new MemoryStream();
 			mBinaryWriter = new BinaryWriter(mStream);
 
-            mCurrFrame = -1;
+            //mCurrFrame = -1;
+            mCurrFrame = 0;
             mCurrInput = int.MaxValue;
 			wirteStep = new ReplayStep();
 
@@ -57,7 +58,7 @@ namespace AxiReplay
 		/// 往前推进帧的,指定帧下标
 		/// </summary>
 		/// <param name="frameInput"></param>
-        public void NextFramebyFrameIdx(int FrameID,UInt64 frameInput)
+		public void NextFramebyFrameIdx(int FrameID, UInt64 frameInput)
 		{
 			TakeFrame(FrameID - byFrameIdx, frameInput);
 			byFrameIdx = FrameID;
@@ -111,8 +112,10 @@ namespace AxiReplay
 
 		public void SaveData(string path, bool bWithDump = false, string dumppath = null)
 		{
-            ReplayData.GetStringByteData(mTitle, out byte[] titleData, out int titleLenghtWithEnd, TexEncoding);
+			byte[] titleData; int titleLenghtWithEnd;
-            ReplayData.GetStringByteData(mNote, out byte[] noteData, out int noteLenghtWithEnd, TexEncoding);
+			ReplayData.GetStringByteData(mTitle, out titleData, out titleLenghtWithEnd, TexEncoding);
+			byte[] noteData; int noteLenghtWithEnd;
+			ReplayData.GetStringByteData(mNote, out noteData, out noteLenghtWithEnd, TexEncoding);
 
 			ReplayHandler handler = new ReplayHandler();
 			handler.Format = (int)this.mFormat;
@@ -140,7 +143,7 @@ namespace AxiReplay
 				temp.Add($"CreateTime => {handler.CreateTime}");
 				temp.Add($"AllFrame => {handler.AllFrame}");
 				temp.Add($"SingleLenght => {handler.SingleLenght}");
-                dbgList.InsertRange(0,temp);
+				dbgList.InsertRange(0, temp);
 				File.WriteAllLines(dumppath, dbgList);
 			}
 		}