Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions Basic/2DSpaceShooter/Assets/Prefabs/Asteroid.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GameObject:
- component: {fileID: 11400004}
- component: {fileID: 7964421087909880783}
- component: {fileID: 7837779245142776376}
- component: {fileID: -5324048342422335247}
m_Layer: 0
m_Name: Asteroid
m_TagString: Untagged
Expand Down Expand Up @@ -149,7 +150,7 @@ MonoBehaviour:
Size:
m_InternalValue: 4
m_NumCreates: 3
m_AsteroidPrefab: {fileID: 100000}
asteroidPrefab: {fileID: 0}
--- !u!114 &7964421087909880783
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -178,7 +179,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
Authority: 0
Channel: 0
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
SyncRotAngleX: 1
SyncRotAngleY: 1
SyncRotAngleZ: 1
SyncScaleX: 1
SyncScaleY: 1
SyncScaleZ: 1
PositionThreshold: 0.001
RotAngleThreshold: 0.01
ScaleThreshold: 0.01
InLocalSpace: 0
FixedSendsPerSecond: 20
Interpolate: 1
CanCommitToTransform: 0
--- !u!114 &-5324048342422335247
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: 80d7c879794dfda4687da0e400131852, type: 3}
m_Name:
m_EditorClassIdentifier:
39 changes: 28 additions & 11 deletions Basic/2DSpaceShooter/Assets/Prefabs/Bullet.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GameObject:
- component: {fileID: 11400004}
- component: {fileID: -4113703611147433057}
- component: {fileID: -2419440837048175228}
- component: {fileID: -7548598001898569089}
m_Layer: 0
m_Name: Bullet
m_TagString: Untagged
Expand Down Expand Up @@ -165,14 +166,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
TransformAuthority: 0
FixedSendsPerSecond: 20
InterpolatePosition: 1
SnapDistance: 10
InterpolateServer: 1
MinMeters: 0.15
MinDegrees: 1.5
MinSize: 0.15
Channel: 0
m_UseLocal:
m_InternalValue: 0
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
SyncRotAngleX: 1
SyncRotAngleY: 1
SyncRotAngleZ: 1
SyncScaleX: 1
SyncScaleY: 1
SyncScaleZ: 1
PositionThreshold: 0.001
RotAngleThreshold: 0.01
ScaleThreshold: 0.01
InLocalSpace: 0
Interpolate: 1
CanCommitToTransform: 0
--- !u!114 &-7548598001898569089
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: 80d7c879794dfda4687da0e400131852, type: 3}
m_Name:
m_EditorClassIdentifier:
74 changes: 62 additions & 12 deletions Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ GameObject:
- component: {fileID: 509584576524893815}
- component: {fileID: -360930162699739946}
- component: {fileID: 7678745961864154063}
- component: {fileID: -8406883944196582507}
m_Layer: 0
m_Name: Ship
m_TagString: Untagged
Expand Down Expand Up @@ -160,7 +161,40 @@ MonoBehaviour:
BounceTimer:
m_InternalValue: 0
PlayerName:
m_InternalValue: SomeGuy
m_InternalValue:
utf8LengthInBytes: 0
bytes:
offset0000:
byte0000: 0
byte0001: 0
byte0002: 0
byte0003: 0
byte0004: 0
byte0005: 0
byte0006: 0
byte0007: 0
byte0008: 0
byte0009: 0
byte0010: 0
byte0011: 0
byte0012: 0
byte0013: 0
byte0014: 0
byte0015: 0
byte0016: 0
byte0017: 0
byte0018: 0
byte0019: 0
byte0020: 0
byte0021: 0
byte0022: 0
byte0023: 0
byte0024: 0
byte0025: 0
byte0026: 0
byte0027: 0
byte0028: 0
byte0029: 0
m_Box: {fileID: 2800000, guid: 8e7a4402ab9f0ec4bbc0457c590caef2, type: 3}
friction: {fileID: 19800002}
thrust: {fileID: 19800000}
Expand Down Expand Up @@ -384,17 +418,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
TransformAuthority: 0
FixedSendsPerSecond: 30
InterpolatePosition: 1
SnapDistance: 10
InterpolateServer: 1
MinMeters: 0.15
MinDegrees: 1.5
MinSize: 0.15
Channel: 10
m_UseLocal:
m_InternalValue: 0
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
SyncRotAngleX: 1
SyncRotAngleY: 1
SyncRotAngleZ: 1
SyncScaleX: 1
SyncScaleY: 1
SyncScaleZ: 1
PositionThreshold: 0.001
RotAngleThreshold: 0.01
ScaleThreshold: 0.01
InLocalSpace: 0
Interpolate: 1
CanCommitToTransform: 0
--- !u!81 &7678745961864154063
AudioListener:
m_ObjectHideFlags: 0
Expand All @@ -403,6 +441,18 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 0
--- !u!114 &-8406883944196582507
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: 80d7c879794dfda4687da0e400131852, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
Expand Down
60 changes: 22 additions & 38 deletions Basic/2DSpaceShooter/Assets/Scenes/network.unity
Original file line number Diff line number Diff line change
Expand Up @@ -749,41 +749,16 @@ GameObject:
m_Component:
- component: {fileID: 872897449}
- component: {fileID: 872897446}
- component: {fileID: 872897444}
- component: {fileID: 872897445}
- component: {fileID: 872897447}
- component: {fileID: 872897448}
m_Layer: 0
m_Name: NetworkManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &872897444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 872897443}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b84c2d8dfe509a34fb59e2b81f8e1319, type: 3}
m_Name:
m_EditorClassIdentifier:
MessageBufferSize: 5120
MaxConnections: 100
MaxSentMessageQueueSize: 128
ConnectAddress: 127.0.0.1
ConnectPort: 7777
ServerListenPort: 7777
ServerWebsocketListenPort: 8887
SupportWebsocket: 0
Channels: []
UseMLAPIRelay: 0
MLAPIRelayAddress: 184.72.104.138
MLAPIRelayPort: 8888
MessageSendMode: 0
--- !u!114 &872897445
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -797,7 +772,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
DrawOffset: {x: 10, y: 10}
LabelColor: {r: 0, g: 0, b: 0, a: 1}
LabelColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &872897446
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -815,10 +790,7 @@ MonoBehaviour:
LogLevel: 1
NetworkConfig:
ProtocolVersion: 0
NetworkTransport: {fileID: 872897444}
RegisteredScenes:
- network
AllowRuntimeSceneChanges: 0
NetworkTransport: {fileID: 872897448}
PlayerPrefab: {fileID: 100000, guid: c2549a141109b1c49b41b054580f950e, type: 3}
NetworkPrefabs:
- Override: 0
Expand Down Expand Up @@ -848,7 +820,6 @@ MonoBehaviour:
ConnectionData:
EnableTimeResync: 0
TimeResyncInterval: 30
EnableNetworkVariable: 1
EnsureNetworkVariableLengthSafety: 0
EnableSceneManagement: 1
ForceSamePrefabs: 1
Expand All @@ -858,12 +829,6 @@ MonoBehaviour:
LoadSceneTimeOut: 120
MessageBufferTimeout: 20
EnableNetworkLogs: 1
references:
version: 1
00000000:
type: {class: NullableBoolSerializable, ns: MLAPI.Configuration, asm: Unity.Multiplayer.MLAPI.Runtime}
data:
Value: 14735065859013011121
--- !u!114 &872897447
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -881,6 +846,25 @@ MonoBehaviour:
- {x: 18, y: 12, z: 0}
- {x: 33, y: -32, z: 0}
- {x: 9, y: -25, z: 0}
--- !u!114 &872897448
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 872897443}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ProtocolType: 0
m_MaximumPacketSize: 1400
m_MaxPacketQueueSize: 128
m_SendQueueBatchSize: 4096
ConnectionData:
Address: 127.0.0.1
Port: 7777
--- !u!4 &872897449
Transform:
m_ObjectHideFlags: 0
Expand Down
7 changes: 3 additions & 4 deletions Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using UnityEngine;
using MLAPI;
using MLAPI.NetworkVariable;
using Unity.Netcode;
using UnityEngine;
using UnityEngine.Assertions;

public class Asteroid : NetworkBehaviour
Expand All @@ -11,7 +10,7 @@ public class Asteroid : NetworkBehaviour

NetworkObjectPool m_ObjectPool;

public NetworkVariableInt Size = new NetworkVariableInt(4);
public NetworkVariable<int> Size = new NetworkVariable<int>(4);

[SerializeField]
private int m_NumCreates = 3;
Expand Down
2 changes: 1 addition & 1 deletion Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Unity.Netcode;
using UnityEngine;
using MLAPI;

public class Bullet : NetworkBehaviour
{
Expand Down
Loading