Skip to content

Commit ca65e29

Browse files
committed
fixing conflict
1 parent 1af220c commit ca65e29

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

Assets/BossRoom/Scripts/Shared/ApplicationController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ private void Awake()
5757
scope.BindMessageChannelInstance<DoorStateChangedEventMessage>();
5858

5959
//this message channel is essential and persists for the lifetime of the lobby and relay services
60-
scope.BindNetworkedMessageChannelInstance<LifeStateChangedEventMessage>(LifeStateChangedEventMessage.Size);
60+
scope.BindNetworkedMessageChannelInstance<LifeStateChangedEventMessage>();
6161

6262
//this message channel is essential and persists for the lifetime of the lobby and relay services
63-
scope.BindNetworkedMessageChannelInstance<ConnectionEventMessage>(ConnectionEventMessage.Size);
63+
scope.BindNetworkedMessageChannelInstance<ConnectionEventMessage>();
6464

6565
//buffered message channels hold the latest received message in buffer and pass to any new subscribers
6666
scope.BindBufferedMessageChannelInstance<LobbyListFetchedMessage>();

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,16 @@ public struct LifeStateChangedEventMessage
55
public LifeState NewLifeState;
66
public FixedPlayerName CharacterName;
77
public CharacterTypeEnum CharacterType;
8-
9-
public static int Size => sizeof(LifeState) + FixedPlayerName.Size + sizeof(CharacterTypeEnum);
108
}
119

1210
public struct DoorStateChangedEventMessage
1311
{
1412
public bool IsDoorOpen;
15-
16-
public static int Size => sizeof(bool);
1713
}
1814

1915
public struct ConnectionEventMessage
2016
{
2117
public ConnectStatus ConnectStatus;
2218
public FixedPlayerName PlayerName;
23-
24-
public static int Size => sizeof(ConnectStatus) + FixedPlayerName.Size;
2519
}
2620
}

Assets/BossRoom/Scripts/Shared/NetworkNameState.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ public struct FixedPlayerName : INetworkSerializable
2020
{
2121
private FixedString32Bytes m_Name;
2222

23-
public static int Size => 32;
24-
2523
public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
2624
{
2725
serializer.SerializeValue(ref m_Name);

0 commit comments

Comments
 (0)