Skip to content

Commit 9f80359

Browse files
fernando-cortezfernando-cortez
committed
code standard pass
1 parent 71d9ddf commit 9f80359

File tree

5 files changed

+45
-34
lines changed

5 files changed

+45
-34
lines changed

‎Assets/Scripts/Gameplay/GameState/ServerBossRoomState.cs‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using UnityEngine;
1515
using UnityEngine.Assertions;
1616
using UnityEngine.SceneManagement;
17-
using UnityEngine.Serialization;
1817
using VContainer;
1918
using Random = UnityEngine.Random;
2019

@@ -28,10 +27,6 @@ public class ServerBossRoomState : GameStateBehaviour
2827
{
2928
[SerializeField]
3029
AvatarRegistry m_AvatarRegistry;
31-
32-
[FormerlySerializedAs("m_NetworkWinState")]
33-
[SerializeField]
34-
PersistentGameState persistentGameState;
3530

3631
[SerializeField]
3732
NetcodeHooks m_NetcodeHooks;
@@ -46,7 +41,7 @@ public class ServerBossRoomState : GameStateBehaviour
4641

4742
private List<Transform> m_PlayerSpawnPointsList = null;
4843

49-
public override GameState ActiveState { get { return GameState.BossRoom; } }
44+
public override GameState ActiveState => GameState.BossRoom;
5045

5146
// Wait time constants for switching to post game after the game is won or lost
5247
private const float k_WinDelay = 7.0f;
@@ -80,6 +75,7 @@ void OnNetworkSpawn()
8075
enabled = false;
8176
return;
8277
}
78+
8379
m_PersistentGameState.Reset();
8480
m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);
8581

@@ -130,7 +126,8 @@ void OnSynchronizeComplete(ulong clientId)
130126
}
131127
}
132128

133-
void OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted, List<ulong> clientsTimedOut)
129+
void OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted,
130+
List<ulong> clientsTimedOut)
134131
{
135132
if (!InitialSpawnDone && loadSceneMode == LoadSceneMode.Single)
136133
{
@@ -200,13 +197,13 @@ void SpawnPlayer(ulong clientId, bool lateJoin)
200197

201198
Assert.IsTrue(networkAvatarGuidStateExists,
202199
$"NetworkCharacterGuidState not found on PersistentPlayer!");
203-
200+
204201
var newPlayerNetworkAvatarExists =
205202
newPlayer.TryGetComponent(out ClientPlayerAvatarNetworkAnimator clientPlayerAvatarNetworkAnimator);
206203

207204
Assert.IsTrue(newPlayerNetworkAvatarExists,
208205
$"ClientPlayerAvatarNetworkAnimator not found on PlayerAvatar!");
209-
206+
210207
// if reconnecting, set the player's position and rotation to its previous state
211208
// instantiate new NetworkVariables above with a default value to ensure they're ready for use on OnNetworkSpawn
212209
if (lateJoin)
@@ -216,14 +213,15 @@ void SpawnPlayer(ulong clientId, bool lateJoin)
216213
{
217214
if (sessionPlayerData.Value.HasCharacterSpawned)
218215
{
219-
physicsTransform.SetPositionAndRotation(sessionPlayerData.Value.PlayerPosition, sessionPlayerData.Value.PlayerRotation);
216+
physicsTransform.SetPositionAndRotation(sessionPlayerData.Value.PlayerPosition,
217+
sessionPlayerData.Value.PlayerRotation);
220218
networkAvatarGuidState.AvatarGuid = clientPlayerAvatarNetworkAnimator.AvatarGuid =
221219
new NetworkVariable<NetworkGuid>(sessionPlayerData.Value.AvatarNetworkGuid);
222220
}
223221
else
224222
{
225223
var randomAvatar = m_AvatarRegistry.GetRandomAvatar().Guid.ToNetworkGuid();
226-
networkAvatarGuidState.AvatarGuid = clientPlayerAvatarNetworkAnimator.AvatarGuid =
224+
networkAvatarGuidState.AvatarGuid = clientPlayerAvatarNetworkAnimator.AvatarGuid =
227225
new NetworkVariable<NetworkGuid>(randomAvatar);
228226
var playerData = sessionPlayerData.Value;
229227
playerData.AvatarNetworkGuid = networkAvatarGuidState.AvatarGuid.Value;
@@ -233,13 +231,15 @@ void SpawnPlayer(ulong clientId, bool lateJoin)
233231
}
234232
else
235233
{
236-
clientPlayerAvatarNetworkAnimator.AvatarGuid = new NetworkVariable<NetworkGuid>(persistentPlayer.NetworkAvatarGuidState.AvatarGuid.Value);
234+
clientPlayerAvatarNetworkAnimator.AvatarGuid =
235+
new NetworkVariable<NetworkGuid>(persistentPlayer.NetworkAvatarGuidState.AvatarGuid.Value);
237236
}
238237

239238
// pass name from persistent player to avatar
240239
if (newPlayer.TryGetComponent(out NetworkNameState networkNameState))
241240
{
242-
networkNameState.Name = new NetworkVariable<FixedPlayerName>(persistentPlayer.NetworkNameState.Name.Value);
241+
networkNameState.Name =
242+
new NetworkVariable<FixedPlayerName>(persistentPlayer.NetworkNameState.Name.Value);
243243
}
244244

245245
// spawn players characters with destroyWithScene = true
@@ -266,6 +266,7 @@ void OnLifeStateChangedEventMessage(LifeStateChangedEventMessage message)
266266
{
267267
BossDefeated();
268268
}
269+
269270
break;
270271
default:
271272
throw new ArgumentOutOfRangeException();

‎Assets/Scripts/Gameplay/GameplayObjects/Character/ClientPlayerAvatar.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ClientPlayerAvatar : NetworkBehaviour
1010
ClientPlayerAvatarRuntimeCollection m_PlayerAvatars;
1111

1212
public static event Action<ClientPlayerAvatar> LocalClientSpawned;
13-
13+
1414
public static event Action<ClientPlayerAvatar> LocalClientPostSpawned;
1515

1616
public static event Action LocalClientDespawned;

‎Assets/Scripts/Gameplay/GameplayObjects/Character/ClientPlayerAvatarNetworkAnimator.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ public class ClientPlayerAvatarNetworkAnimator : NetworkAnimator
1919
{
2020
[HideInInspector]
2121
public NetworkVariable<NetworkGuid> AvatarGuid = new NetworkVariable<NetworkGuid>();
22-
22+
2323
bool m_AvatarInstantiated;
24-
25-
[SerializeField]
26-
AvatarRegistry m_AvatarRegistry;
24+
25+
[SerializeField] AvatarRegistry m_AvatarRegistry;
2726

2827
Avatar m_Avatar;
2928

@@ -39,7 +38,7 @@ public Avatar RegisteredAvatar
3938
return m_Avatar;
4039
}
4140
}
42-
41+
4342
public override void OnNetworkSpawn()
4443
{
4544
base.OnNetworkSpawn();

‎Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,16 @@ void Awake()
135135
public override void OnNetworkSpawn()
136136
{
137137
base.OnNetworkSpawn();
138-
138+
139139
if (m_CharacterClass == null)
140140
{
141141
m_CharacterClass = GetComponent<ClientPlayerAvatarNetworkAnimator>().RegisteredAvatar.CharacterClass;
142142
}
143-
144-
if (!IsServer) { enabled = false; }
143+
144+
if (!IsServer)
145+
{
146+
enabled = false;
147+
}
145148
else
146149
{
147150
NetLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
@@ -159,6 +162,7 @@ public override void OnNetworkSpawn()
159162
var startingAction = new ActionRequestData() { ActionID = m_StartingAction.ActionID };
160163
PlayAction(ref startingAction);
161164
}
165+
162166
InitializeHitPoints();
163167
}
164168
}
@@ -233,7 +237,8 @@ void InitializeHitPoints()
233237
{
234238
if (!IsNpc)
235239
{
236-
SessionPlayerData? sessionPlayerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(OwnerClientId);
240+
SessionPlayerData? sessionPlayerData =
241+
SessionManager<SessionPlayerData>.Instance.GetPlayerData(OwnerClientId);
237242
if (sessionPlayerData is { HasCharacterSpawned: true })
238243
{
239244
HitPoints = sessionPlayerData.Value.CurrentHitPoints;
@@ -244,7 +249,7 @@ void InitializeHitPoints()
244249
}
245250
}
246251
}
247-
252+
248253
HitPoints = CharacterClass.BaseHP.Value;
249254
LifeState = LifeState.Alive;
250255
}
@@ -396,7 +401,6 @@ int GetTotalDamage()
396401
/// <summary>
397402
/// This character's AIBrain. Will be null if this is not an NPC.
398403
/// </summary>
399-
public AIBrain AIBrain { get { return m_AIBrain; } }
400-
404+
public AIBrain AIBrain => m_AIBrain;
401405
}
402406
}

‎Assets/Scripts/Gameplay/UI/HeroActionBar.cs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar)
122122

123123
if (m_InputSender != null)
124124
{
125-
Debug.LogWarning($"Multiple ClientInputSenders in scene? Discarding sender belonging to {m_InputSender.gameObject.name} and adding it for {inputSender.gameObject.name} ");
125+
Debug.LogWarning(
126+
$"Multiple ClientInputSenders in scene? Discarding sender belonging to {m_InputSender.gameObject.name} and adding it for {inputSender.gameObject.name} ");
126127
}
127128

128129
m_InputSender = inputSender;
@@ -132,27 +133,30 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar)
132133
{
133134
Debug.LogError("ServerCharacter not found on ClientPlayerAvatar!", clientPlayerAvatar);
134135
}
135-
136+
136137
Action action1 = null;
137138
if (serverCharacter.CharacterClass.Skill1)
138139
{
139-
GameDataSource.Instance.TryGetActionPrototypeByID(serverCharacter.CharacterClass.Skill1.ActionID, out action1);
140+
GameDataSource.Instance.TryGetActionPrototypeByID(serverCharacter.CharacterClass.Skill1.ActionID,
141+
out action1);
140142
}
141143

142144
UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], action1);
143145

144146
Action action2 = null;
145147
if (serverCharacter.CharacterClass.Skill2)
146148
{
147-
GameDataSource.Instance.TryGetActionPrototypeByID(serverCharacter.CharacterClass.Skill2.ActionID, out action2);
149+
GameDataSource.Instance.TryGetActionPrototypeByID(serverCharacter.CharacterClass.Skill2.ActionID,
150+
out action2);
148151
}
149152

150153
UpdateActionButton(m_ButtonInfo[ActionButtonType.Special1], action2);
151154

152155
Action action3 = null;
153156
if (serverCharacter.CharacterClass.Skill3)
154157
{
155-
GameDataSource.Instance.TryGetActionPrototypeByID(serverCharacter.CharacterClass.Skill3.ActionID, out action3);
158+
GameDataSource.Instance.TryGetActionPrototypeByID(serverCharacter.CharacterClass.Skill3.ActionID,
159+
out action3);
156160
}
157161

158162
UpdateActionButton(m_ButtonInfo[ActionButtonType.Special2], action3);
@@ -181,9 +185,12 @@ void Awake()
181185
{
182186
m_ButtonInfo = new Dictionary<ActionButtonType, ActionButtonInfo>()
183187
{
184-
[ActionButtonType.BasicAction] = new ActionButtonInfo(ActionButtonType.BasicAction, m_BasicActionButton, this),
185-
[ActionButtonType.Special1] = new ActionButtonInfo(ActionButtonType.Special1, m_SpecialAction1Button, this),
186-
[ActionButtonType.Special2] = new ActionButtonInfo(ActionButtonType.Special2, m_SpecialAction2Button, this),
188+
[ActionButtonType.BasicAction] =
189+
new ActionButtonInfo(ActionButtonType.BasicAction, m_BasicActionButton, this),
190+
[ActionButtonType.Special1] =
191+
new ActionButtonInfo(ActionButtonType.Special1, m_SpecialAction1Button, this),
192+
[ActionButtonType.Special2] =
193+
new ActionButtonInfo(ActionButtonType.Special2, m_SpecialAction2Button, this),
187194
[ActionButtonType.EmoteBar] = new ActionButtonInfo(ActionButtonType.EmoteBar, m_EmoteBarButton, this),
188195
};
189196

0 commit comments

Comments
 (0)