@@ -260,13 +260,11 @@ void DelayedSpawnAction(Stream continuationStream)
260
260
}
261
261
}
262
262
263
- bool destroyWithScene = continuationReader . ReadBool ( ) ;
264
-
265
263
Vector3 pos = new Vector3 ( continuationReader . ReadSinglePacked ( ) , continuationReader . ReadSinglePacked ( ) , continuationReader . ReadSinglePacked ( ) ) ;
266
264
Quaternion rot = Quaternion . Euler ( continuationReader . ReadSinglePacked ( ) , continuationReader . ReadSinglePacked ( ) , continuationReader . ReadSinglePacked ( ) ) ;
267
265
268
266
NetworkedObject netObject = SpawnManager . CreateLocalNetworkedObject ( softSync , instanceId , prefabHash , pos , rot ) ;
269
- SpawnManager . SpawnNetworkedObjectLocally ( netObject , networkId , softSync , isPlayerObject , ownerId , continuationStream , false , 0 , true , destroyWithScene ) ;
267
+ SpawnManager . SpawnNetworkedObjectLocally ( netObject , networkId , softSync , isPlayerObject , ownerId , continuationStream , false , 0 , true , false ) ;
270
268
}
271
269
272
270
NetworkingManager . Singleton . IsConnectedClient = true ;
@@ -336,21 +334,14 @@ internal static void HandleAddObject(ulong clientId, Stream stream)
336
334
}
337
335
}
338
336
339
- bool destroyWithScene = reader . ReadBool ( ) ;
340
-
341
337
Vector3 pos = new Vector3 ( reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) ) ;
342
338
Quaternion rot = Quaternion . Euler ( reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) ) ;
343
339
344
340
bool hasPayload = reader . ReadBool ( ) ;
345
341
int payLoadLength = hasPayload ? reader . ReadInt32Packed ( ) : 0 ;
346
342
347
343
NetworkedObject netObject = SpawnManager . CreateLocalNetworkedObject ( softSync , instanceId , prefabHash , pos , rot ) ;
348
- SpawnManager . SpawnNetworkedObjectLocally ( netObject , networkId , softSync , isPlayerObject , ownerId , stream , hasPayload , payLoadLength , true , destroyWithScene ) ;
349
-
350
- /*
351
- NetworkedObject netObject = SpawnManager.CreateSpawnedObject(SpawnManager.GetNetworkedPrefabIndexOfHash(prefabHash), networkId, ownerId, isPlayerObject,
352
- sceneSpawnedInIndex, sceneDelayedSpawn, destroyWithScene, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), true, stream, hasPayload, payLoadLength, true);
353
- */
344
+ SpawnManager . SpawnNetworkedObjectLocally ( netObject , networkId , softSync , isPlayerObject , ownerId , stream , hasPayload , payLoadLength , true , false ) ;
354
345
}
355
346
}
356
347
@@ -443,19 +434,12 @@ internal static void HandleAddObjects(ulong clientId, Stream stream)
443
434
instanceId = 0 ;
444
435
}
445
436
}
446
-
447
- bool destroyWithScene = reader . ReadBool ( ) ;
448
437
449
438
Vector3 pos = new Vector3 ( reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) ) ;
450
439
Quaternion rot = Quaternion . Euler ( reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) , reader . ReadSinglePacked ( ) ) ;
451
440
452
- /*
453
- NetworkedObject netObject = SpawnManager.CreateSpawnedObject(SpawnManager.GetNetworkedPrefabIndexOfHash(prefabHash), networkId, ownerId, isPlayerObject,
454
- sceneSpawnedInIndex, sceneDelayedSpawn, destroyWithScene, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), true, stream, false, 0, true);
455
- */
456
-
457
441
NetworkedObject netObject = SpawnManager . CreateLocalNetworkedObject ( softSync , instanceId , prefabHash , pos , rot ) ;
458
- SpawnManager . SpawnNetworkedObjectLocally ( netObject , networkId , softSync , isPlayerObject , ownerId , stream , false , 0 , true , destroyWithScene ) ;
442
+ SpawnManager . SpawnNetworkedObjectLocally ( netObject , networkId , softSync , isPlayerObject , ownerId , stream , false , 0 , true , false ) ;
459
443
}
460
444
}
461
445
}
0 commit comments