Skip to content

Commit c73e232

Browse files
author
Jesse Olmer
authored
revert: ClientNetworkAnimator (#1191) (#1203)
Reverts the introduction of ClientNetworkAnimator and modifications to NetworkAnimator types refs: e47b73f
1 parent d8a3a9b commit c73e232

File tree

12 files changed

+140
-364
lines changed

12 files changed

+140
-364
lines changed

com.unity.netcode.gameobjects/Components/NetworkAnimator.cs

Lines changed: 116 additions & 284 deletions
Large diffs are not rendered by default.

com.unity.netcode.gameobjects/Samples/ClientNetworkAnimator.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

com.unity.netcode.gameobjects/Samples/ClientNetworkAnimator/Scripts.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

com.unity.netcode.gameobjects/Samples/ClientNetworkAnimator/Scripts/ClientNetworkAnimator.asmdef

Lines changed: 0 additions & 17 deletions
This file was deleted.

com.unity.netcode.gameobjects/Samples/ClientNetworkAnimator/Scripts/ClientNetworkAnimator.asmdef.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

com.unity.netcode.gameobjects/Samples/ClientNetworkAnimator/Scripts/ClientNetworkAnimator.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

com.unity.netcode.gameobjects/Samples/ClientNetworkAnimator/Scripts/ClientNetworkAnimator.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ public override void OnNetworkSpawn()
2424
{
2525
enabled = false;
2626
}
27-
28-
transform.position += Vector3.up * NetworkObject.NetworkObjectId * 1.1f;
2927
}
3028

3129
private void Update()
3230
{
33-
if (m_NetworkAnimator.CanCommitToAnimator)
31+
if (m_NetworkAnimator.IsAuthorityOverAnimator)
3432
{
3533
if (Input.GetKeyDown(KeyCode.C))
3634
{

testproject/Assets/Tests/Manual/NetworkAnimatorTests/NetworkAnimatorTestScene.unity renamed to testproject/Assets/Tests/Manual/NetworkAnimatorTests/NetworkAnimatorEnhancement.unity

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -133,8 +133,8 @@ GameObject:
133133
m_Component:
134134
- component: {fileID: 57527693}
135135
- component: {fileID: 57527692}
136-
- component: {fileID: 57527694}
137136
- component: {fileID: 57527691}
137+
- component: {fileID: 57527694}
138138
m_Layer: 0
139139
m_Name: NetworkManager
140140
m_TagString: Untagged
@@ -151,16 +151,11 @@ MonoBehaviour:
151151
m_GameObject: {fileID: 57527690}
152152
m_Enabled: 1
153153
m_EditorHideFlags: 0
154-
m_Script: {fileID: 11500000, guid: b84c2d8dfe509a34fb59e2b81f8e1319, type: 3}
154+
m_Script: {fileID: 11500000, guid: fc5ef7b69296d69458910681f29471e6, type: 3}
155155
m_Name:
156156
m_EditorClassIdentifier:
157-
MessageBufferSize: 5120
158-
MaxConnections: 100
159-
MaxSentMessageQueueSize: 128
160-
ConnectAddress: 127.0.0.1
161-
ConnectPort: 7777
162-
ServerListenPort: 7777
163-
MessageSendMode: 0
157+
Port: 7777
158+
Address: 127.0.0.1
164159
--- !u!114 &57527692
165160
MonoBehaviour:
166161
m_ObjectHideFlags: 0
@@ -179,6 +174,9 @@ MonoBehaviour:
179174
NetworkConfig:
180175
ProtocolVersion: 0
181176
NetworkTransport: {fileID: 57527691}
177+
RegisteredScenes:
178+
- NetworkAnimatorEnhancement
179+
AllowRuntimeSceneChanges: 0
182180
PlayerPrefab: {fileID: 3214090169675393154, guid: 978fc8cd63a1294438ebf3b352814970,
183181
type: 3}
184182
NetworkPrefabs:
@@ -189,19 +187,24 @@ MonoBehaviour:
189187
type: 3}
190188
SourceHashToOverride: 0
191189
OverridingTargetPrefab: {fileID: 0}
192-
TickRate: 30
190+
ReceiveTickrate: 64
191+
NetworkTickIntervalSec: 0.05
192+
MaxReceiveEventsPerTickRate: 500
193+
EventTickrate: 64
193194
ClientConnectionBufferTimeout: 10
194195
ConnectionApproval: 0
195196
ConnectionData:
196197
EnableTimeResync: 0
197198
TimeResyncInterval: 30
199+
EnableNetworkVariable: 1
198200
EnsureNetworkVariableLengthSafety: 0
199201
EnableSceneManagement: 1
200202
ForceSamePrefabs: 1
201203
RecycleNetworkIds: 1
202204
NetworkIdRecycleDelay: 120
203205
RpcHashSize: 0
204206
LoadSceneTimeOut: 120
207+
EnableMessageBuffering: 1
205208
MessageBufferTimeout: 20
206209
EnableNetworkLogs: 1
207210
--- !u!4 &57527693
File renamed without changes.

0 commit comments

Comments
 (0)