Update FishNet

2026-04-07 03:11:52 +07:00
parent 9675b7b31d
commit ba7513d478
869 changed files with 3675 additions and 2764 deletions
@@ -140,7 +140,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &33715565
 Transform:
  m_ObjectHideFlags: 0
@@ -188,6 +188,9 @@ MonoBehaviour:
  _preventDespawnOnDisconnect: 0
  _defaultDespawnType: 0
  _initializedTimestamp: 0
+  _localLevelOfDetailCalculationType: 0
+  _useLevelOfDetail: 0
+  _useRootLevelOfDetail: 1
  NetworkObserver: {fileID: 0}
  _enablePrediction: 1
  _predictionType: 0
@@ -258,7 +261,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &128315957
 Transform:
  m_ObjectHideFlags: 0
@@ -342,7 +345,7 @@ MonoBehaviour:
  _timingType: 0
  _allowTickDropping: 0
  _maximumFrameTicks: 2
-  _tickRate: 60
+  _tickRate: 10
  _pingInterval: 1
  _physicsMode: 1
 --- !u!114 &192429409
@@ -586,6 +589,22 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 7443408886491487332}
    m_Modifications:
+    - target: {fileID: 818862022, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 155.1001
+      objectReference: {fileID: 0}
+    - target: {fileID: 818862022, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.69995
+      objectReference: {fileID: 0}
+    - target: {fileID: 3414662637240338350, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 78.1001
+      objectReference: {fileID: 0}
+    - target: {fileID: 3414662637240338350, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -121.400024
+      objectReference: {fileID: 0}
    - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3}
      propertyPath: m_Pivot.x
      value: 0
@@ -1396,7 +1415,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2ca42d40476d05444acd0179c78b44cc, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _staminaBar: {fileID: 2021829093}
 --- !u!1 &1977106728
 GameObject:
  m_ObjectHideFlags: 0
@@ -1577,6 +1595,9 @@ MonoBehaviour:
  _preventDespawnOnDisconnect: 0
  _defaultDespawnType: 0
  _initializedTimestamp: 0
+  _localLevelOfDetailCalculationType: 0
+  _useLevelOfDetail: 1
+  _useRootLevelOfDetail: 1
  NetworkObserver: {fileID: 0}
  _enablePrediction: 1
  _predictionType: 0
@@ -1707,6 +1728,8 @@ GameObject:
  - component: {fileID: 192429404}
  - component: {fileID: 7443408886491487336}
  - component: {fileID: 7443408886491487339}
+  - component: {fileID: 7443408886491487340}
+  - component: {fileID: 7443408886491487341}
  m_Layer: 0
  m_Name: NetworkManager
  m_TagString: Untagged
@@ -1774,3 +1797,39 @@ MonoBehaviour:
  _frameRate: 500
  _shareIds: 1
  _startOnHeadless: 1
+--- !u!114 &7443408886491487340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7443408886491487334}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 756c28cd3141c4140ae776188ee26729, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _runInRelease: 0
+  _networkTraffic:
+    _enableMode: 1
+    _updateClient: 1
+    _updateServer: 1
+--- !u!114 &7443408886491487341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7443408886491487334}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8bc8f0363ddc75946a958043c5e49a83, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _runInRelease: 0
+  _secondsAveraged: 1
+  _updateInterval: 1
+  _color: {r: 1, g: 1, b: 1, a: 1}
+  _placement: 1
+  _showOutgoing: 1
+  _showIncoming: 1
@@ -9,7 +9,7 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/CharacterController
    Prediction Demo.unity
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Materials/BlueMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Materials/OrangeMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Prefabs/CharacterControllerPrediction.prefab
-  uploadId: 866910
+  uploadId: 892096
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/ReadMe.txt
-  uploadId: 866910
+  uploadId: 892096
@@ -431,7 +431,7 @@ namespace FishNet.Demo.Prediction.CharacterControllers
        /// <summary>
        /// Called when the trigger on this object enters another collider.
        /// </summary>
-        private void CharacterTrigger_OnEnter(Collider c)
+        private void CharacterTrigger_OnEnter(Collider c, uint tick)
        {
            //We only care about moving platforms.
            if (!c.TryGetComponent(out MovingPlatform mp))
@@ -444,7 +444,7 @@ namespace FishNet.Demo.Prediction.CharacterControllers
        /// <summary>
        /// Called when the trigger on this object exits another collider.
        /// </summary>
-        private void CharacterTrigger_OnExit(Collider c)
+        private void CharacterTrigger_OnExit(Collider c, uint tick)
        {
            if (c == null)
                return;
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Scripts/CharacterControllerPrediction.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using FishNet.Object;
 using FishNet.Object.Prediction;
 using FishNet.Transporting;
 using FishNet.Utility.Template;
@@ -133,7 +132,7 @@ namespace FishNet.Demo.Prediction.CharacterControllers
                    _goalIndex = 0;
            }
        }
-
+        
        [Reconcile]
        private void PerformReconcile(ReconcileData rd, Channel channel = Channel.Unreliable)
        {
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Scripts/MovingPlatform.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Scripts/StaminaCanvas.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -149,6 +149,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Textures/AdaptiveInterpolation_Img.png
-  uploadId: 866910
+  uploadId: 892096
@@ -149,6 +149,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Textures/FlatInterpolation_Img.png
-  uploadId: 866910
+  uploadId: 892096
@@ -106,6 +106,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/CharacterController/Textures/Stamina_Bar.png
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/BlueMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/FrontWheel.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/GreenMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/OrangeMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/PinkMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/RedMat.mat
-  uploadId: 866910
+  uploadId: 892096
@@ -10,6 +10,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Materials/Slippery.physicMaterial
-  uploadId: 866910
+  uploadId: 892096
@@ -320,7 +320,7 @@ MonoBehaviour:
  _initializeOrder: 0
  _preventDespawnOnDisconnect: 0
  _defaultDespawnType: 0
-  _initializedTimestamp: -8584312066425166658
+  _initializedTimestamp: -8584297170534745459
  NetworkObserver: {fileID: 0}
  _enablePrediction: 1
  _predictionType: 1
@@ -336,9 +336,9 @@ MonoBehaviour:
  _spectatorInterpolation: 3
  _enableTeleport: 0
  _teleportThreshold: 1
-  <PrefabId>k__BackingField: 2
+  <PrefabId>k__BackingField: 3
  <SpawnableCollectionId>k__BackingField: 0
-  <AssetPathHash>k__BackingField: 13573084401941807464
+  <AssetPathHash>k__BackingField: 5247723621796122902
  SceneId: 0
  SerializedTransformProperties:
    Position: {x: -4.80351, y: 0.18147132, z: 5.430528}
@@ -402,7 +402,7 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 2, y: 1, z: 2}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &4223887704561426673
 GameObject:
@@ -497,7 +497,7 @@ BoxCollider:
  m_GameObject: {fileID: 4223887704561426673}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 2
  m_Size: {x: 1, y: 1, z: 1}
  m_Center: {x: 0, y: 0, z: 0}
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Prefabs/RigidbodyPrediction.prefab
-  uploadId: 866910
+  uploadId: 892096
@@ -171,7 +171,7 @@ MonoBehaviour:
  _reduceReconcilesWithFramerate: 1
  _minimumClientReconcileFramerate: 50
  _createLocalStates: 1
-  _stateInterpolation: 1
+  _stateInterpolation: 2
  _stateOrder: 1
  _dropExcessiveReplicates: 1
  _maximumServerReplicates: 15
@@ -1374,6 +1374,6 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _runInRelease: 0
  _networkTraffic:
-    _enableMode: 0
-    _updateClient: 0
-    _updateServer: 0
+    _enableMode: 1
+    _updateClient: 1
+    _updateServer: 1
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Rigidbody Prediction Demo.unity
-  uploadId: 866910
+  uploadId: 892096
@@ -22,7 +22,7 @@ namespace FishNet.Demo.Prediction.Rigidbodies
            transform.Rotate(new Vector3(0f, 1f, 0f) * (_rotateRate * Time.deltaTime));
        }

-        private void NetworkTrigger_OnEnter(Collider c)
+        private void NetworkTrigger_OnEnter(Collider c, uint tick)
        {
            if (!c.transform.root.TryGetComponent(out RigidbodyPrediction rbp))
                return;
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Scripts/Boost.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Scripts/RigidbodyPrediction.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -22,7 +22,7 @@ namespace FishNet.Demo.Prediction.Rigidbodies
            transform.Rotate(new Vector3(0f, 1f, 0f) * (_rotateRate * Time.deltaTime));
        }

-        private void NetworkTrigger_OnEnter(Collider c)
+        private void NetworkTrigger_OnEnter(Collider c, uint tick)
        {
            if (!c.transform.root.TryGetComponent(out RigidbodyPrediction rbp))
                return;
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Scripts/Spring.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -106,6 +106,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/Demos/Prediction/Rigidbody/Textures/Stamina_Bar.png
-  uploadId: 866910
+  uploadId: 892096