From e3760babd49e089f460f34d56babb23922ca0c65 Mon Sep 17 00:00:00 2001
From: DuyCa <ca@wolffungame.com>
Date: Mon, 26 Feb 2024 15:53:06 +0700
Subject: [PATCH] f

---
 .idea/.idea.FishNet/.idea/workspace.xml            | 14 ++++----------
 ...redictonRigidbody.cs => PredictionRigidBody.cs} |  8 ++++----
 .../Object/Prediction/PredictonRigidbody.cs.meta   | 11 -----------
 Assets/FishNet/package.json                        |  2 +-
 4 files changed, 9 insertions(+), 26 deletions(-)
 rename Assets/FishNet/Runtime/Object/Prediction/{PredictonRigidbody.cs => PredictionRigidBody.cs} (96%)
 delete mode 100644 Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs.meta

diff --git a/.idea/.idea.FishNet/.idea/workspace.xml b/.idea/.idea.FishNet/.idea/workspace.xml
index 625ecc82..e086f16b 100644
--- a/.idea/.idea.FishNet/.idea/workspace.xml
+++ b/.idea/.idea.FishNet/.idea/workspace.xml
@@ -4,12 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="077f6930-06d3-41ab-843e-fd7c8b70d491" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.FishNet/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FishNet/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/FishNet/Demos/Prediction V2 (Experimental)/Rigidbody/PredictionV2_RB.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/FishNet/Demos/Prediction V2 (Experimental)/Rigidbody/PredictionV2_RB.unity" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/FishNet/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/FishNet/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/package.json" afterDir="false" />
-    </list>
+    <list default="true" id="077f6930-06d3-41ab-843e-fd7c8b70d491" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -26,11 +21,9 @@
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/a1efe86478034c12aa24d00c7dc715fe15a000/04/70531a84/Behaviour.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/a1efe86478034c12aa24d00c7dc715fe15a000/36/d4cf56dc/Component.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/ce28f77e2fe84e0f896d7a72cef969681fe00/dd/dba0b599/Rigidbody.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://D:/Wolffun/FishNet/Assets/FishNet/Demos/Prediction V2 (Experimental)/Rigidbody/Scripts/RigidBodyPv2.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://D:/Wolffun/FishNet/Assets/FishNet/Demos/Prediction V2 (Experimental)/Rigidbody/Scripts/RigidBodyPv2.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://D:/Wolffun/FishNet/Assets/FishNet/Demos/Prediction V2 (Experimental)/Rigidbody/Scripts/RigidBodyPv2.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://D:/Wolffun/FishNet/Assets/FishNet/Demos/Prediction V2 (Experimental)/Rigidbody/Scripts/RigidBodyPv2.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/FishNet/Runtime/Generated/Component/Prediction/PredictedObject.Rigidbodies.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock://D:/Wolffun/FishNet/Assets/FishNet/Runtime/Managing/Prediction/PredictionManager.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://D:/Wolffun/FishNet/Assets/FishNet/Runtime/Managing/Prediction/PredictionManager.cs" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
@@ -130,6 +123,7 @@
       <workItem from="1708515689577" duration="371000" />
       <workItem from="1708566401104" duration="5765000" />
       <workItem from="1708575544204" duration="859000" />
+      <workItem from="1708937075071" duration="297000" />
     </task>
     <servers />
   </component>
diff --git a/Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs b/Assets/FishNet/Runtime/Object/Prediction/PredictionRigidBody.cs
similarity index 96%
rename from Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs
rename to Assets/FishNet/Runtime/Object/Prediction/PredictionRigidBody.cs
index 1e8463de..a5607cf5 100644
--- a/Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs
+++ b/Assets/FishNet/Runtime/Object/Prediction/PredictionRigidBody.cs
@@ -27,7 +27,7 @@ public static class PredictionRigidbodySerializers
         //}
     }
 
-    public class PredictionRigidbody : IResettable
+    public class PredictionRigidBody : IResettable
     {
         #region Types.
         internal struct ForceData
@@ -66,7 +66,7 @@ public ForceData(Vector3 force, ForceMode mode, bool velocity)
         internal List<ForceData> PendingForces;
         #endregion
 
-        ~PredictionRigidbody()
+        ~PredictionRigidBody()
         {
             if (PendingForces != null)
                 CollectionCaches<ForceData>.StoreAndDefault(ref PendingForces);
@@ -154,13 +154,13 @@ public void ClearPendingForces()
         /// <summary>
         /// Reconciles to a state.
         /// </summary>
-        public void Reconcile(PredictionRigidbody pr)
+        public void Reconcile(PredictionRigidBody pr)
         {
             PendingForces.Clear();
             foreach (ForceData item in pr.PendingForces)
                 PendingForces.Add(new ForceData(item));
 
-            ResettableObjectCaches<PredictionRigidbody>.Store(pr);
+            ResettableObjectCaches<PredictionRigidBody>.Store(pr);
         }
 
         /// <summary>
diff --git a/Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs.meta b/Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs.meta
deleted file mode 100644
index 30941e8a..00000000
--- a/Assets/FishNet/Runtime/Object/Prediction/PredictonRigidbody.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7c964c0b90f389c4899a8120cc19d8b0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/FishNet/package.json b/Assets/FishNet/package.json
index 4771ac04..0485cfc6 100644
--- a/Assets/FishNet/package.json
+++ b/Assets/FishNet/package.json
@@ -2,7 +2,7 @@
   "name": "com.fishnet",
   "displayName": "FishNet - Unity Networking Evolved",
   "description": "FishNet - Unity Networking Evolved",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "unity": "2021.3",
   "license": "MIT",
   "repository": {