Skip to content

Commit b3def02

Browse files
feat: OnNetworkPostSpawn usage, fixing animation bug on downed players on late joins [MTTB-1512] (#925)
* syncing state for downed player on spawn, using onnetworkpostspawn to remove UI race conditions * changelog addition * code standard pass
1 parent f27526c commit b3def02

24 files changed

+411
-229
lines changed

Assets/Models/Animation Controllers/CharacterSetController.controller

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,11 +3481,11 @@ AnimatorStateTransition:
34813481
m_Mute: 0
34823482
m_IsExit: 0
34833483
serializedVersion: 3
3484-
m_TransitionDuration: 0.25
3484+
m_TransitionDuration: 0
34853485
m_TransitionOffset: 0
3486-
m_ExitTime: 0.75
3486+
m_ExitTime: 0
34873487
m_HasExitTime: 0
3488-
m_HasFixedDuration: 1
3488+
m_HasFixedDuration: 0
34893489
m_InterruptionSource: 0
34903490
m_OrderedInterruption: 1
34913491
m_CanTransitionToSelf: 1

Assets/Prefabs/Character/Character.prefab

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ GameObject:
2121
- component: {fileID: 4309865414312164521}
2222
- component: {fileID: 753347877357705413}
2323
- component: {fileID: -2014321709067566591}
24-
- component: {fileID: 3884788294438199994}
2524
m_Layer: 3
2625
m_Name: Character
2726
m_TagString: Player
@@ -36,13 +35,13 @@ Transform:
3635
m_PrefabInstance: {fileID: 0}
3736
m_PrefabAsset: {fileID: 0}
3837
m_GameObject: {fileID: 4600110157238723781}
38+
serializedVersion: 2
3939
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4040
m_LocalPosition: {x: 0, y: 0, z: 0}
4141
m_LocalScale: {x: 1, y: 1, z: 1}
4242
m_ConstrainProportionsScale: 0
4343
m_Children: []
4444
m_Father: {fileID: 0}
45-
m_RootOrder: 0
4645
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4746
--- !u!114 &4600110157238723790
4847
MonoBehaviour:
@@ -56,13 +55,19 @@ MonoBehaviour:
5655
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
5756
m_Name:
5857
m_EditorClassIdentifier:
59-
GlobalObjectIdHash: 951099334
58+
GlobalObjectIdHash: 3952140259
59+
InScenePlacedSourceGlobalObjectIdHash: 0
60+
DeferredDespawnTick: 0
61+
Ownership: 0
6062
AlwaysReplicateAsRoot: 0
6163
SynchronizeTransform: 1
6264
ActiveSceneSynchronization: 0
6365
SceneMigrationSynchronization: 1
66+
SpawnWithObservers: 1
6467
DontDestroyWithOwner: 0
6568
AutoObjectParentSync: 1
69+
SyncOwnerTransformWhenParented: 1
70+
AllowOwnerToParent: 0
6671
--- !u!114 &514105321093282895
6772
MonoBehaviour:
6873
m_ObjectHideFlags: 0
@@ -75,6 +80,7 @@ MonoBehaviour:
7580
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
7681
m_Name:
7782
m_EditorClassIdentifier:
83+
ShowTopMostFoldoutHeaderGroup: 1
7884
HitPoints:
7985
m_InternalValue: 0
8086
--- !u!114 &-5107732197415868221
@@ -89,6 +95,7 @@ MonoBehaviour:
8995
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
9096
m_Name:
9197
m_EditorClassIdentifier:
98+
ShowTopMostFoldoutHeaderGroup: 1
9299
m_LifeState:
93100
m_InternalValue: 0
94101
--- !u!114 &7420593339233078707
@@ -103,6 +110,7 @@ MonoBehaviour:
103110
m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
104111
m_Name:
105112
m_EditorClassIdentifier:
113+
ShowTopMostFoldoutHeaderGroup: 1
106114
m_ClientCharacter: {fileID: 0}
107115
m_CharacterClass: {fileID: 0}
108116
m_BrainEnabled: 1
@@ -124,6 +132,7 @@ MonoBehaviour:
124132
m_Script: {fileID: 11500000, guid: bc85fa0320dca1545a3e037ee46391cf, type: 3}
125133
m_Name:
126134
m_EditorClassIdentifier:
135+
ShowTopMostFoldoutHeaderGroup: 1
127136
m_Transform: {fileID: 4600110157238723791}
128137
m_DamageCollider: {fileID: 7679526581544062779}
129138
--- !u!114 &350177175035117514
@@ -138,6 +147,7 @@ MonoBehaviour:
138147
m_Script: {fileID: 11500000, guid: 162844b92fe5b9a469bf0cd049b43138, type: 3}
139148
m_Name:
140149
m_EditorClassIdentifier:
150+
ShowTopMostFoldoutHeaderGroup: 1
141151
m_NetworkAnimator: {fileID: 0}
142152
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
143153
m_NetworkLifeState: {fileID: -5107732197415868221}
@@ -148,10 +158,21 @@ Rigidbody:
148158
m_PrefabInstance: {fileID: 0}
149159
m_PrefabAsset: {fileID: 0}
150160
m_GameObject: {fileID: 4600110157238723781}
151-
serializedVersion: 2
161+
serializedVersion: 4
152162
m_Mass: 1
153163
m_Drag: 0
154164
m_AngularDrag: 0.05
165+
m_CenterOfMass: {x: 0, y: 0, z: 0}
166+
m_InertiaTensor: {x: 1, y: 1, z: 1}
167+
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
168+
m_IncludeLayers:
169+
serializedVersion: 2
170+
m_Bits: 0
171+
m_ExcludeLayers:
172+
serializedVersion: 2
173+
m_Bits: 0
174+
m_ImplicitCom: 1
175+
m_ImplicitTensor: 1
155176
m_UseGravity: 0
156177
m_IsKinematic: 1
157178
m_Interpolate: 0
@@ -187,8 +208,17 @@ CapsuleCollider:
187208
m_PrefabAsset: {fileID: 0}
188209
m_GameObject: {fileID: 4600110157238723781}
189210
m_Material: {fileID: 0}
211+
m_IncludeLayers:
212+
serializedVersion: 2
213+
m_Bits: 0
214+
m_ExcludeLayers:
215+
serializedVersion: 2
216+
m_Bits: 0
217+
m_LayerOverridePriority: 0
190218
m_IsTrigger: 0
219+
m_ProvidesContacts: 0
191220
m_Enabled: 1
221+
serializedVersion: 2
192222
m_Radius: 0.5
193223
m_Height: 2
194224
m_Direction: 1
@@ -205,6 +235,7 @@ MonoBehaviour:
205235
m_Script: {fileID: 11500000, guid: fdad0914904cc1e47933ecd7a58514ac, type: 3}
206236
m_Name:
207237
m_EditorClassIdentifier:
238+
ShowTopMostFoldoutHeaderGroup: 1
208239
m_NavMeshAgent: {fileID: 745390554272530562}
209240
m_Rigidbody: {fileID: 3375535791397456380}
210241
m_CharLogic: {fileID: 7420593339233078707}
@@ -220,6 +251,7 @@ MonoBehaviour:
220251
m_Script: {fileID: 11500000, guid: 1da3998b52020a949af0999ab7ea2d14, type: 3}
221252
m_Name:
222253
m_EditorClassIdentifier:
254+
ShowTopMostFoldoutHeaderGroup: 1
223255
m_NetworkLifeState: {fileID: -5107732197415868221}
224256
--- !u!114 &-2014321709067566591
225257
MonoBehaviour:
@@ -233,6 +265,21 @@ MonoBehaviour:
233265
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
234266
m_Name:
235267
m_EditorClassIdentifier:
268+
ShowTopMostFoldoutHeaderGroup: 1
269+
NetworkTransformExpanded: 0
270+
AutoOwnerAuthorityTickOffset: 1
271+
PositionInterpolationType: 0
272+
RotationInterpolationType: 0
273+
ScaleInterpolationType: 0
274+
PositionLerpSmoothing: 1
275+
PositionMaxInterpolationTime: 0.1
276+
RotationLerpSmoothing: 1
277+
RotationMaxInterpolationTime: 0.1
278+
ScaleLerpSmoothing: 1
279+
ScaleMaxInterpolationTime: 0.1
280+
AuthorityMode: 0
281+
TickSyncChildren: 0
282+
UseUnreliableDeltas: 0
236283
SyncPositionX: 1
237284
SyncPositionY: 0
238285
SyncPositionZ: 1
@@ -249,18 +296,6 @@ MonoBehaviour:
249296
UseQuaternionCompression: 0
250297
UseHalfFloatPrecision: 1
251298
InLocalSpace: 0
299+
SwitchTransformSpaceWhenParented: 0
252300
Interpolate: 1
253301
SlerpPosition: 0
254-
--- !u!114 &3884788294438199994
255-
MonoBehaviour:
256-
m_ObjectHideFlags: 0
257-
m_CorrespondingSourceObject: {fileID: 0}
258-
m_PrefabInstance: {fileID: 0}
259-
m_PrefabAsset: {fileID: 0}
260-
m_GameObject: {fileID: 4600110157238723781}
261-
m_Enabled: 1
262-
m_EditorHideFlags: 0
263-
m_Script: {fileID: 11500000, guid: ebe9bfd21e47445488dfd84b4e0c9884, type: 3}
264-
m_Name:
265-
m_EditorClassIdentifier:
266-
m_AvatarRegistry: {fileID: 11400000, guid: 48d17d764bff6c643a3dc035fb71c979, type: 2}

Assets/Prefabs/Character/Enemy.prefab

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 4600110157238723777, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
@@ -25,7 +26,7 @@ PrefabInstance:
2526
objectReference: {fileID: 0}
2627
- target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
2728
propertyPath: GlobalObjectIdHash
28-
value: 951099334
29+
value: 3885025524
2930
objectReference: {fileID: 0}
3031
- target: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
3132
propertyPath: m_RootOrder
@@ -77,4 +78,7 @@ PrefabInstance:
7778
objectReference: {fileID: 0}
7879
m_RemovedComponents:
7980
- {fileID: 4600110157238723776, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
81+
m_RemovedGameObjects: []
82+
m_AddedGameObjects: []
83+
m_AddedComponents: []
8084
m_SourcePrefab: {fileID: 100100000, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}

Assets/Prefabs/Character/Imp.prefab

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 3713729372785093434}
910
m_Modifications:
1011
- target: {fileID: 234724737205816310, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
1112
propertyPath: m_Controller
1213
value:
1314
objectReference: {fileID: 22100000, guid: 0406729e6e1c12e4d99fd34970073cd0, type: 2}
15+
- target: {fileID: 2663813019036984750, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
16+
propertyPath: m_ServerCharacter
17+
value:
18+
objectReference: {fileID: 7684320411818213958}
1419
- target: {fileID: 3687104631385136546, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
1520
propertyPath: m_LocalEulerAnglesHint.x
1621
value: 90
@@ -63,11 +68,21 @@ PrefabInstance:
6368
propertyPath: m_Name
6469
value: ImpGraphics
6570
objectReference: {fileID: 0}
71+
- target: {fileID: 8005647249789065143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
72+
propertyPath: m_ClientCharacter
73+
value:
74+
objectReference: {fileID: 3121817358174221070}
6675
- target: {fileID: 8005647249789065143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
6776
propertyPath: m_ClientCharacterVisualization
6877
value:
6978
objectReference: {fileID: 3121817358174221070}
7079
m_RemovedComponents: []
80+
m_RemovedGameObjects: []
81+
m_AddedGameObjects: []
82+
m_AddedComponents:
83+
- targetCorrespondingSourceObject: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
84+
insertIndex: -1
85+
addedObject: {fileID: 5401475423617019972}
7186
m_SourcePrefab: {fileID: 100100000, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
7287
--- !u!95 &929086692793228630 stripped
7388
Animator:
@@ -102,6 +117,8 @@ MonoBehaviour:
102117
m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3}
103118
m_Name:
104119
m_EditorClassIdentifier:
120+
ShowTopMostFoldoutHeaderGroup: 1
121+
TransitionStateInfoList: []
105122
m_Animator: {fileID: 929086692793228630}
106123
--- !u!4 &6486568539699693356 stripped
107124
Transform:
@@ -113,6 +130,7 @@ PrefabInstance:
113130
m_ObjectHideFlags: 0
114131
serializedVersion: 2
115132
m_Modification:
133+
serializedVersion: 3
116134
m_TransformParent: {fileID: 0}
117135
m_Modifications:
118136
- target: {fileID: 1632591904850424414, guid: 64cfd098f62285f42918875fef849e88, type: 3}
@@ -145,7 +163,7 @@ PrefabInstance:
145163
objectReference: {fileID: 0}
146164
- target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3}
147165
propertyPath: GlobalObjectIdHash
148-
value: 951099334
166+
value: 36723199
149167
objectReference: {fileID: 0}
150168
- target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3}
151169
propertyPath: PrefabHashGenerator
@@ -251,6 +269,10 @@ PrefabInstance:
251269
propertyPath: m_CharacterClass
252270
value:
253271
objectReference: {fileID: 11400000, guid: fa81aca63f2fce545a3b9e046b6e42e7, type: 2}
272+
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
273+
propertyPath: m_ClientCharacter
274+
value:
275+
objectReference: {fileID: 3121817358174221070}
254276
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
255277
propertyPath: m_ClientVisualization
256278
value:
@@ -272,6 +294,15 @@ PrefabInstance:
272294
value: 0.8
273295
objectReference: {fileID: 0}
274296
m_RemovedComponents: []
297+
m_RemovedGameObjects: []
298+
m_AddedGameObjects:
299+
- targetCorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3}
300+
insertIndex: -1
301+
addedObject: {fileID: 6486568539699693356}
302+
m_AddedComponents:
303+
- targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3}
304+
insertIndex: -1
305+
addedObject: {fileID: -4570750241117365215}
275306
m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3}
276307
--- !u!114 &827948680237315002 stripped
277308
MonoBehaviour:
@@ -301,12 +332,12 @@ MonoBehaviour:
301332
m_Script: {fileID: 11500000, guid: cead4253912fb1241be383143c5f3b59, type: 3}
302333
m_Name:
303334
m_EditorClassIdentifier:
335+
ShowTopMostFoldoutHeaderGroup: 1
304336
m_DisplayHealth: 1
305337
m_DisplayName: 0
306338
m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3}
307-
m_NetworkNameState: {fileID: 0}
308339
m_NetworkHealthState: {fileID: 827948680237315002}
309-
m_ServerCharacter: {fileID: 0}
340+
m_NetworkNameState: {fileID: 0}
310341
m_BaseHP: {fileID: 11400000, guid: 95633dc134a4e654f863831b22b5681a, type: 2}
311342
m_TransformToTrack: {fileID: 6486568539699693356}
312343
m_VerticalWorldOffset: 2.2
@@ -327,3 +358,14 @@ MonoBehaviour:
327358
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
328359
m_Name:
329360
m_EditorClassIdentifier:
361+
--- !u!114 &7684320411818213958 stripped
362+
MonoBehaviour:
363+
m_CorrespondingSourceObject: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
364+
m_PrefabInstance: {fileID: 2173896227866280545}
365+
m_PrefabAsset: {fileID: 0}
366+
m_GameObject: {fileID: 3713729372785093424}
367+
m_Enabled: 1
368+
m_EditorHideFlags: 0
369+
m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
370+
m_Name:
371+
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)