Merge pull request 'master' (#52) from Alienjack/AxibugEmuOnline:master into master

Reviewed-on: #52

AxibugEmuOnline.Client/Assets/Plugins/AxiReplay/NetReplay.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace AxiReplay
 {
@@ -104,6 +105,23 @@ namespace AxiReplay
             data = mCurrReplay;
 
             return result;
-        }
+        }
+
+        public int GetSkipFrameCount()
+        {
+            var frameGap = mDiffFrameCount;
+            if (frameGap > 10000) return 0;
+
+            int skip = 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;
+        }
     }
 }

AxibugEmuOnline.Client/Assets/Script/NesEmulator/CoreSupporter.cs

@@ -119,7 +119,7 @@ namespace AxibugEmuOnline.Client
                         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);
+                    App.roomMgr.SendRoomSingelPlayerInput(frameIndex, rawData);
                 }
                 else
                 {

AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs

@@ -68,14 +68,7 @@ namespace AxibugEmuOnline.Client
 
         private void FixEmulatorFrame()
         {
-            int skipFrameCount = 0;
+            var skipFrameCount = App.roomMgr.netReplay.GetSkipFrameCount();
-            var frameGap = App.roomMgr.netReplay.mDiffFrameCount;
-            if (frameGap > 10000) return;
-
-            if (frameGap > 2 && frameGap < 6) skipFrameCount = 1;
-            else if (frameGap > 7 && frameGap < 12) skipFrameCount = 2;
-            else if (frameGap > 13 && frameGap < 20) skipFrameCount = 3;
-            else skipFrameCount = frameGap - 2;
 
             if (skipFrameCount > 0) App.log.Debug($"SKIP FRAME : {skipFrameCount}");
             for (int i = 0; i < skipFrameCount; i++)