Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Invaders to use Netcode For Gameobject 1.8.1 [MTT-8503] #172

Merged
merged 9 commits into from
May 29, 2024
Merged

Upgrade Invaders to use Netcode For Gameobject 1.8.1 [MTT-8503] #172

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d52696
Upgraded NGO to 1.8.1 in manifest and readme.
bastienunity May 2, 2024
c23603e
Changed ClientRpc and ServerRpc attributes to the new RpcAttribute
bastienunity May 2, 2024
fde047c
Changed OnClientConnectedCallback registration to use the new OnConne…
bastienunity May 2, 2024
6ed4a49
Changing spawn methods to use InstantiateAndSpawn
bastienunity May 2, 2024
ac62665
Added changelog entry.
bastienunity May 6, 2024
1c9ea1e
Renamed Rpc methods properly.
bastienunity May 13, 2024
696a1bd
ConnectionEvent renaming to make it clear it is executed only on the …
bastienunity May 17, 2024
876e786
Merge branch 'develop' into feature/invaders-ngo-1.8.1
bastienunity May 17, 2024
5210dc6
merge develop
fernando-cortez May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 33 additions & 23 deletions Basic/Invaders/Assets/Prefabs/Invaders Game Manager.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4266113290039088506}
- component: {fileID: 4266113290039088507}
- component: {fileID: 2756959678467573149}
- component: {fileID: 4266113290039088507}
m_Layer: 0
m_Name: Invaders Game Manager
m_TagString: Untagged
Expand All @@ -25,14 +25,35 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4266113290039088508}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2756959678467573149
MonoBehaviour:
bastienunity marked this conversation as resolved.
Show resolved Hide resolved
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4266113290039088508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 2783302607
InScenePlacedSourceGlobalObjectIdHash: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &4266113290039088507
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -45,11 +66,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d643b609c6a71c54984c1ad454faa28b, type: 3}
m_Name:
m_EditorClassIdentifier:
enemy1Prefab: {fileID: 100000, guid: 43ae6ad1bdadd0747811bb7a00740c2c, type: 3}
enemy2Prefab: {fileID: 100000, guid: 38a8441efb2d6d245adbf08f08705374, type: 3}
enemy3Prefab: {fileID: 100000, guid: aa50d36274d0dfc4faff2c69820b3711, type: 3}
superEnemyPrefab: {fileID: 100000, guid: e811e4fb062e31444aaf36dbec5de77c, type: 3}
shieldPrefab: {fileID: 100000, guid: b990a6e6dcf54b646a7397028fed6045, type: 3}
enemy1Prefab: {fileID: 2037077820506562951, guid: 43ae6ad1bdadd0747811bb7a00740c2c,
type: 3}
enemy2Prefab: {fileID: 1361474663871475650, guid: 38a8441efb2d6d245adbf08f08705374,
type: 3}
enemy3Prefab: {fileID: 7651551376209856180, guid: aa50d36274d0dfc4faff2c69820b3711,
type: 3}
superEnemyPrefab: {fileID: 3955316467729786863, guid: e811e4fb062e31444aaf36dbec5de77c,
type: 3}
shieldPrefab: {fileID: 6564576217164106930, guid: b990a6e6dcf54b646a7397028fed6045,
type: 3}
gameTimerText: {fileID: 0}
scoreText: {fileID: 0}
livesText: {fileID: 0}
Expand All @@ -61,19 +87,3 @@ MonoBehaviour:
m_EnemyMovingDirection:
m_InternalValue: 0.3
m_RandomThresholdForSaucerCreation: 0.92
--- !u!114 &2756959678467573149
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4266113290039088508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
75 changes: 55 additions & 20 deletions Basic/Invaders/Assets/Prefabs/enemy1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ GameObject:
m_Component:
- component: {fileID: 400000}
- component: {fileID: 21200000}
- component: {fileID: 2037077820506562951}
- component: {fileID: 11400000}
- component: {fileID: 6100000}
- component: {fileID: 5000000}
- component: {fileID: 4223722966607089368}
- component: {fileID: 2037077820506562951}
m_Layer: 0
m_Name: enemy1
m_TagString: Untagged
Expand All @@ -29,13 +29,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.521718, y: 0.97297525, z: 2.9156828}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &21200000
SpriteRenderer:
Expand Down Expand Up @@ -89,6 +89,27 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &2037077820506562951
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 416377817
InScenePlacedSourceGlobalObjectIdHash: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -102,7 +123,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
score: 10
bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
bulletPrefab: {fileID: 2336033219118315817, guid: ac6ffb0923d0f7448852a32312a0263c,
type: 3}
GraceShootingPeriod: 1
--- !u!61 &6100000
BoxCollider2D:
Expand All @@ -114,6 +136,25 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
Expand Down Expand Up @@ -147,6 +188,12 @@ Rigidbody2D:
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
Expand All @@ -163,6 +210,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
UseUnreliableDeltas: 0
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
Expand All @@ -175,22 +223,9 @@ MonoBehaviour:
PositionThreshold: 0
RotAngleThreshold: 0
ScaleThreshold: 0
UseQuaternionSynchronization: 0
UseQuaternionCompression: 0
UseHalfFloatPrecision: 0
InLocalSpace: 0
Interpolate: 1
CanCommitToTransform: 0
--- !u!114 &2037077820506562951
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SlerpPosition: 0
45 changes: 41 additions & 4 deletions Basic/Invaders/Assets/Prefabs/enemy2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.3369913, y: 1.6158211, z: 5.338147}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &21200000
SpriteRenderer:
Expand All @@ -47,6 +48,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
Expand Down Expand Up @@ -100,7 +102,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
score: 20
bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
bulletPrefab: {fileID: 2336033219118315817, guid: ac6ffb0923d0f7448852a32312a0263c,
type: 3}
GraceShootingPeriod: 1
--- !u!61 &6100000
BoxCollider2D:
Expand All @@ -112,6 +115,25 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
Expand Down Expand Up @@ -145,6 +167,12 @@ Rigidbody2D:
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
Expand All @@ -161,6 +189,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
UseUnreliableDeltas: 0
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
Expand All @@ -173,9 +202,12 @@ MonoBehaviour:
PositionThreshold: 0
RotAngleThreshold: 0
ScaleThreshold: 0
UseQuaternionSynchronization: 0
UseQuaternionCompression: 0
UseHalfFloatPrecision: 0
InLocalSpace: 0
Interpolate: 1
CanCommitToTransform: 0
SlerpPosition: 0
--- !u!114 &1361474663871475650
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -188,7 +220,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 3854485402
InScenePlacedSourceGlobalObjectIdHash: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1