Skip to content

Commit 9f183e9

Browse files
feat: bump to pre.8 and fix compile issues [MTT-3413] (#631)
1 parent 8fb3fe2 commit 9f183e9

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

Assets/BossRoom/Scripts/Shared/Game/GameEventMessage.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1+
using System;
12
using Unity.Collections;
3+
using Unity.Netcode;
24

35
namespace Unity.Multiplayer.Samples.BossRoom
46
{
5-
public struct LifeStateChangedEventMessage
7+
public struct LifeStateChangedEventMessage : INetworkSerializeByMemcpy
68
{
79
public LifeState NewLifeState;
8-
public FixedPlayerName CharacterName;
910
public CharacterTypeEnum CharacterType;
11+
public FixedPlayerName CharacterName;
1012
}
1113

12-
public struct DoorStateChangedEventMessage
14+
public struct DoorStateChangedEventMessage : INetworkSerializeByMemcpy
1315
{
1416
public bool IsDoorOpen;
1517
}
1618

17-
public struct ConnectionEventMessage
19+
public struct ConnectionEventMessage : INetworkSerializeByMemcpy
1820
{
1921
public ConnectStatus ConnectStatus;
2022
public FixedPlayerName PlayerName;
2123
}
2224

2325

2426
#if UNITY_EDITOR || DEVELOPMENT_BUILD
25-
public struct CheatUsedMessage
27+
public struct CheatUsedMessage : INetworkSerializeByMemcpy
2628
{
2729
FixedString32Bytes m_CheatUsed;
2830
FixedPlayerName m_CheaterName;

Assets/BossRoom/Scripts/Shared/Infrastructure/PubSub/MessageChannelDIExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using Unity.Netcode;
23

34
namespace Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure
45
{
@@ -8,7 +9,7 @@ public static void BindMessageChannelInstance<TMessage>(this DIScope scope)
89
{
910
scope.BindInstanceAsSingle<MessageChannel<TMessage>, IPublisher<TMessage>, ISubscriber<TMessage>, IMessageChannel<TMessage>>(new MessageChannel<TMessage>());
1011
}
11-
public static void BindNetworkedMessageChannelInstance<TMessage>(this DIScope scope) where TMessage : unmanaged, IComparable, IConvertible, IComparable<TMessage>, IEquatable<TMessage>
12+
public static void BindNetworkedMessageChannelInstance<TMessage>(this DIScope scope) where TMessage : unmanaged, INetworkSerializeByMemcpy
1213
{
1314
scope.BindInstanceAsSingle<NetworkedMessageChannel<TMessage>, IPublisher<TMessage>, ISubscriber<TMessage>, IMessageChannel<TMessage>>(new NetworkedMessageChannel<TMessage>());
1415
}

Assets/BossRoom/Scripts/Shared/Infrastructure/PubSub/NetworkedMessageChannel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure
1212
/// subscribing will be required each time a new session starts.
1313
/// </summary>
1414
/// <typeparam name="T"></typeparam>
15-
public class NetworkedMessageChannel<T> : MessageChannel<T> where T : unmanaged, IComparable, IConvertible, IComparable<T>, IEquatable<T>
15+
public class NetworkedMessageChannel<T> : MessageChannel<T> where T : unmanaged, INetworkSerializeByMemcpy
1616
{
1717
string m_Name;
1818

Assets/BossRoom/Scripts/Shared/NetworkNameState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
2727

2828
public override string ToString()
2929
{
30-
return m_Name.ToString();
30+
return m_Name.Value.ToString();
3131
}
3232

3333
public static implicit operator string(FixedPlayerName s) => s.ToString();

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"com.unity.learn.iet-framework": "2.1.1",
1111
"com.unity.memoryprofiler": "0.5.0-preview.1",
1212
"com.unity.multiplayer.tools": "1.0.0-pre.6",
13-
"com.unity.netcode.gameobjects": "1.0.0-pre.7",
13+
"com.unity.netcode.gameobjects": "1.0.0-pre.8",
1414
"com.unity.postprocessing": "3.1.1",
1515
"com.unity.render-pipelines.universal": "10.8.1",
1616
"com.unity.services.authentication": "1.0.0-pre.4",

Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"url": "https://packages.unity.com"
142142
},
143143
"com.unity.netcode.gameobjects": {
144-
"version": "1.0.0-pre.7",
144+
"version": "1.0.0-pre.8",
145145
"depth": 0,
146146
"source": "registry",
147147
"dependencies": {

0 commit comments

Comments
 (0)