whitespace fixes

fernando-cortez · fernando-cortez · commit 7dce6f29cb6f · 2025-01-16T13:17:59.000-05:00
diff --git a/Assets/Scripts/Gameplay/Action/Input/AoeActionInput.cs b/Assets/Scripts/Gameplay/Action/Input/AoeActionInput.cs
@@ -19,7 +19,7 @@ public class AoeActionInput : BaseActionInput
 
         [SerializeField]
         GameObject m_OutOfRangeVisualization;
-        
+
         [SerializeField]
         InputActionReference m_PointAction;
 
@@ -82,6 +82,7 @@ void Update()
                     };
                     m_SendInput(data);
                 }
+
                 Destroy(gameObject);
                 return;
             }
diff --git a/Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs b/Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs
@@ -29,10 +29,10 @@ public class DebugCheatsManager : NetworkBehaviour
         [SerializeField]
         [Tooltip("Boss to spawn. Make sure this is included in the NetworkManager's list of prefabs!")]
         NetworkObject m_BossPrefab;
-        
+
         [SerializeField]
         InputActionReference m_ToggleCheatsAction;
-        
+
         SwitchedDoor m_SwitchedDoor;
 
         SwitchedDoor SwitchedDoor
@@ -43,6 +43,7 @@ SwitchedDoor SwitchedDoor
                 {
                     m_SwitchedDoor = FindAnyObjectByType<SwitchedDoor>();
                 }
+
                 return m_SwitchedDoor;
             }
         }
@@ -160,7 +161,6 @@ void ServerKillTargetRpc(RpcParams serverRpcParams = default)
                         UnityEngine.Debug.Log($"Target {targetId} has no IDamageable component or cannot be damaged.");
                     }
                 }
-
             }
         }
 
@@ -177,6 +177,7 @@ void ServerKillAllEnemiesRpc(RpcParams serverRpcParams = default)
                     }
                 }
             }
+
             PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillAllEnemies");
         }
 
@@ -211,6 +212,7 @@ void ServerHealPlayerRpc(RpcParams serverRpcParams = default)
                         damageable.ReceiveHP(null, baseHp);
                     }
                 }
+
                 PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "HealPlayer");
             }
         }
@@ -227,6 +229,7 @@ void ServerToggleSuperSpeedRpc(RpcParams serverRpcParams = default)
                     break;
                 }
             }
+
             PublishCheatUsedMessage(clientId, "ToggleSuperSpeed");
         }
 
@@ -242,6 +245,7 @@ void ServerToggleTeleportModeRpc(RpcParams serverRpcParams = default)
                     break;
                 }
             }
+
             PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode");
         }
 
diff --git a/Assets/Scripts/Gameplay/UI/HeroActionBar.cs b/Assets/Scripts/Gameplay/UI/HeroActionBar.cs
@@ -133,20 +133,23 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar)
             {
                 GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState1.actionID, out action1);
             }
+
             UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], action1);
 
             Action action2 = null;
             if (m_InputSender.actionState2 != null)
             {
                 GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState2.actionID, out action2);
             }
+
             UpdateActionButton(m_ButtonInfo[ActionButtonType.Special1], action2);
 
             Action action3 = null;
             if (m_InputSender.actionState3 != null)
             {
                 GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState3.actionID, out action3);
             }
+
             UpdateActionButton(m_ButtonInfo[ActionButtonType.Special2], action3);
         }
 
@@ -165,6 +168,7 @@ void DeregisterInputSender()
             {
                 m_InputSender.action1ModifiedCallback -= Action1ModifiedCallback;
             }
+
             m_InputSender = null;
         }
 
@@ -177,7 +181,7 @@ void Awake()
                 [ActionButtonType.Special2] = new ActionButtonInfo(ActionButtonType.Special2, m_SpecialAction2Button, this),
                 [ActionButtonType.EmoteBar] = new ActionButtonInfo(ActionButtonType.EmoteBar, m_EmoteBarButton, this),
             };
-            
+
             m_ToggleEmoteBarAction.action.performed += OnToggleEmoteBarPerformed;
 
             ClientPlayerAvatar.LocalClientSpawned += RegisterInputSender;
@@ -203,13 +207,13 @@ void OnDisable()
         void OnDestroy()
         {
             DeregisterInputSender();
-            
+
             m_ToggleEmoteBarAction.action.performed -= OnToggleEmoteBarPerformed;
 
             ClientPlayerAvatar.LocalClientSpawned -= RegisterInputSender;
             ClientPlayerAvatar.LocalClientDespawned -= DeregisterInputSender;
         }
-        
+
         void OnToggleEmoteBarPerformed(InputAction.CallbackContext obj)
         {
             if (obj.performed)
diff --git a/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs b/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs
@@ -18,7 +18,7 @@ public class UITooltipDetector : MonoBehaviour, IPointerEnterHandler, IPointerEx
     {
         [SerializeField]
         InputActionReference m_PointAction;
-        
+
         [SerializeField]
         [Tooltip("The actual Tooltip that should be triggered")]
         UITooltipPopup m_TooltipPopup;
diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
@@ -24,7 +24,7 @@ public class ClientInputSender : NetworkBehaviour
         //upstream network conservation. This matters when holding down your mouse button to move.
         const float k_MoveSendRateSeconds = 0.04f; //25 fps.
 
-        const float k_TargetMoveTimeout = 0.45f;  //prevent moves for this long after targeting someone (helps prevent walking to the guy you clicked).
+        const float k_TargetMoveTimeout = 0.45f; //prevent moves for this long after targeting someone (helps prevent walking to the guy you clicked).
 
         float m_LastSentMove;
 
@@ -75,12 +75,12 @@ public class ClientInputSender : NetworkBehaviour
         /// </summary>
         public enum SkillTriggerStyle
         {
-            None,        //no skill was triggered.
-            MouseClick,  //skill was triggered via mouse-click implying you should do a raycast from the mouse position to find a target.
-            Keyboard,    //skill was triggered via a Keyboard press, implying target should be taken from the active target.
+            None, //no skill was triggered.
+            MouseClick, //skill was triggered via mouse-click implying you should do a raycast from the mouse position to find a target.
+            Keyboard, //skill was triggered via a Keyboard press, implying target should be taken from the active target.
             KeyboardRelease, //represents a released key.
-            UI,          //skill was triggered from the UI, and similar to Keyboard, target should be inferred from the active target.
-            UIRelease,   //represents letting go of the mouse-button on a UI button
+            UI, //skill was triggered from the UI, and similar to Keyboard, target should be inferred from the active target.
+            UIRelease, //represents letting go of the mouse-button on a UI button
         }
 
         bool IsReleaseStyle(SkillTriggerStyle style)
@@ -150,6 +150,7 @@ public override void OnNetworkSpawn()
             if (!IsClient || !IsOwner)
             {
                 enabled = false;
+
                 // dont need to do anything else if not the owner
                 return;
             }
@@ -162,17 +163,19 @@ public override void OnNetworkSpawn()
             {
                 actionState1 = new ActionState() { actionID = action1.ActionID, selectable = true };
             }
+
             if (CharacterClass.Skill2 &&
                 GameDataSource.Instance.TryGetActionPrototypeByID(CharacterClass.Skill2.ActionID, out var action2))
             {
                 actionState2 = new ActionState() { actionID = action2.ActionID, selectable = true };
             }
+
             if (CharacterClass.Skill3 &&
                 GameDataSource.Instance.TryGetActionPrototypeByID(CharacterClass.Skill3.ActionID, out var action3))
             {
                 actionState3 = new ActionState() { actionID = action3.ActionID, selectable = true };
             }
-            
+
             m_Action1.action.started += OnAction1Started;
             m_Action1.action.canceled += OnAction1Canceled;
             m_Action2.action.started += OnAction2Started;
@@ -202,7 +205,7 @@ public override void OnNetworkDespawn()
             {
                 m_TargetServerCharacter.NetLifeState.LifeState.OnValueChanged -= OnTargetLifeStateChanged;
             }
-            
+
             m_Action1.action.started -= OnAction1Started;
             m_Action1.action.canceled -= OnAction1Canceled;
             m_Action2.action.started -= OnAction2Started;
@@ -468,7 +471,7 @@ void PopulateSkillRequest(Vector3 hitPoint, ActionID actionID, ref ActionRequest
             //there is a bug where the direction is flipped if the hitPos and current position are almost the same,
             //so we use the character's direction instead.
             float directionLength = offset.magnitude;
-            Vector3 direction = 1.0f/*epsilon*/ <= directionLength ? (offset / directionLength) : m_PhysicsWrapper.Transform.forward;
+            Vector3 direction = 1.0f /*epsilon*/ <= directionLength ? (offset / directionLength) : m_PhysicsWrapper.Transform.forward;
 
             switch (actionConfig.Logic)
             {
@@ -518,52 +521,52 @@ public void RequestAction(ActionID actionID, SkillTriggerStyle triggerStyle, ulo
                 m_ActionRequestCount++;
             }
         }
-        
+
         void OnAction1Started(InputAction.CallbackContext obj)
         {
             RequestAction(actionState1.actionID, SkillTriggerStyle.Keyboard);
         }
-        
+
         void OnAction1Canceled(InputAction.CallbackContext obj)
         {
             RequestAction(actionState1.actionID, SkillTriggerStyle.KeyboardRelease);
         }
-        
+
         void OnAction2Started(InputAction.CallbackContext obj)
         {
             RequestAction(actionState2.actionID, SkillTriggerStyle.Keyboard);
         }
-        
+
         void OnAction2Canceled(InputAction.CallbackContext obj)
         {
             RequestAction(actionState2.actionID, SkillTriggerStyle.KeyboardRelease);
         }
-        
+
         void OnAction3Started(InputAction.CallbackContext obj)
         {
             RequestAction(actionState3.actionID, SkillTriggerStyle.Keyboard);
         }
-        
+
         void OnAction3Canceled(InputAction.CallbackContext obj)
         {
             RequestAction(actionState3.actionID, SkillTriggerStyle.KeyboardRelease);
         }
-        
+
         void OnAction5Performed(InputAction.CallbackContext obj)
         {
             RequestAction(GameDataSource.Instance.Emote1ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);
         }
-        
+
         void OnAction6Performed(InputAction.CallbackContext obj)
         {
             RequestAction(GameDataSource.Instance.Emote2ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);
         }
-        
+
         void OnAction7Performed(InputAction.CallbackContext obj)
         {
             RequestAction(GameDataSource.Instance.Emote3ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);
         }
-        
+
         void OnAction8Performed(InputAction.CallbackContext obj)
         {
             RequestAction(GameDataSource.Instance.Emote4ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);
@@ -580,7 +583,7 @@ void Update()
                 {
                     RequestAction(CharacterClass.Skill1.ActionID, SkillTriggerStyle.MouseClick);
                 }
-                
+
                 if (m_TargetAction.action.WasPressedThisFrame())
                 {
                     RequestAction(GameDataSource.Instance.GeneralTargetActionPrototype.ActionID, SkillTriggerStyle.MouseClick);
@@ -609,19 +612,19 @@ void UpdateAction1()
                 actionState1.actionID = GameDataSource.Instance.DropActionPrototype.ActionID;
             }
             else if ((m_ServerCharacter.TargetId.Value != 0
-                    && selection != null
-                    && selection.TryGetComponent(out PickUpState pickUpState))
-               )
+                         && selection != null
+                         && selection.TryGetComponent(out PickUpState pickUpState))
+                    )
             {
                 // special case: targeting a pickup-able item or holding a pickup object
 
                 actionState1.actionID = GameDataSource.Instance.PickUpActionPrototype.ActionID;
             }
             else if (m_ServerCharacter.TargetId.Value != 0
-                && selection != null
-                && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId
-                && selection.TryGetComponent(out ServerCharacter charState)
-                && !charState.IsNpc)
+                     && selection != null
+                     && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId
+                     && selection.TryGetComponent(out ServerCharacter charState)
+                     && !charState.IsNpc)
             {
                 // special case: when we have a player selected, we change the meaning of the basic action
                 // we have another player selected! In that case we want to reflect that our basic Action is a Revive, not an attack!
diff --git a/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs b/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs
diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorCustomization.cs b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorCustomization.cs

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class AoeActionInput : BaseActionInput`
`19`	`19`
`20`	`20`	`[SerializeField]`
`21`	`21`	`GameObject m_OutOfRangeVisualization;`
`22`		`-`
	`22`	`+`
`23`	`23`	`[SerializeField]`
`24`	`24`	`InputActionReference m_PointAction;`
`25`	`25`
`@@ -82,6 +82,7 @@ void Update()`
`82`	`82`	`};`
`83`	`83`	`m_SendInput(data);`
`84`	`84`	`}`
	`85`	`+`
`85`	`86`	`Destroy(gameObject);`
`86`	`87`	`return;`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ public class DebugCheatsManager : NetworkBehaviour`
`29`	`29`	`[SerializeField]`
`30`	`30`	`[Tooltip("Boss to spawn. Make sure this is included in the NetworkManager's list of prefabs!")]`
`31`	`31`	`NetworkObject m_BossPrefab;`
`32`		`-`
	`32`	`+`
`33`	`33`	`[SerializeField]`
`34`	`34`	`InputActionReference m_ToggleCheatsAction;`
`35`		`-`
	`35`	`+`
`36`	`36`	`SwitchedDoor m_SwitchedDoor;`
`37`	`37`
`38`	`38`	`SwitchedDoor SwitchedDoor`
`@@ -43,6 +43,7 @@ SwitchedDoor SwitchedDoor`
`43`	`43`	`{`
`44`	`44`	`m_SwitchedDoor = FindAnyObjectByType<SwitchedDoor>();`
`45`	`45`	`}`
	`46`	`+`
`46`	`47`	`return m_SwitchedDoor;`
`47`	`48`	`}`
`48`	`49`	`}`
`@@ -160,7 +161,6 @@ void ServerKillTargetRpc(RpcParams serverRpcParams = default)`
`160`	`161`	`UnityEngine.Debug.Log($"Target {targetId} has no IDamageable component or cannot be damaged.");`
`161`	`162`	`}`
`162`	`163`	`}`
`163`		`-`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`@@ -177,6 +177,7 @@ void ServerKillAllEnemiesRpc(RpcParams serverRpcParams = default)`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+`
`180`	`181`	`PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillAllEnemies");`
`181`	`182`	`}`
`182`	`183`
`@@ -211,6 +212,7 @@ void ServerHealPlayerRpc(RpcParams serverRpcParams = default)`
`211`	`212`	`damageable.ReceiveHP(null, baseHp);`
`212`	`213`	`}`
`213`	`214`	`}`
	`215`	`+`
`214`	`216`	`PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "HealPlayer");`
`215`	`217`	`}`
`216`	`218`	`}`
`@@ -227,6 +229,7 @@ void ServerToggleSuperSpeedRpc(RpcParams serverRpcParams = default)`
`227`	`229`	`break;`
`228`	`230`	`}`
`229`	`231`	`}`
	`232`	`+`
`230`	`233`	`PublishCheatUsedMessage(clientId, "ToggleSuperSpeed");`
`231`	`234`	`}`
`232`	`235`
`@@ -242,6 +245,7 @@ void ServerToggleTeleportModeRpc(RpcParams serverRpcParams = default)`
`242`	`245`	`break;`
`243`	`246`	`}`
`244`	`247`	`}`
	`248`	`+`
`245`	`249`	`PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode");`
`246`	`250`	`}`
`247`	`251`
Original file line number	Diff line number	Diff line change
`@@ -133,20 +133,23 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar)`
`133`	`133`	`{`
`134`	`134`	`GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState1.actionID, out action1);`
`135`	`135`	`}`
	`136`	`+`
`136`	`137`	`UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], action1);`
`137`	`138`
`138`	`139`	`Action action2 = null;`
`139`	`140`	`if (m_InputSender.actionState2 != null)`
`140`	`141`	`{`
`141`	`142`	`GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState2.actionID, out action2);`
`142`	`143`	`}`
	`144`	`+`
`143`	`145`	`UpdateActionButton(m_ButtonInfo[ActionButtonType.Special1], action2);`
`144`	`146`
`145`	`147`	`Action action3 = null;`
`146`	`148`	`if (m_InputSender.actionState3 != null)`
`147`	`149`	`{`
`148`	`150`	`GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState3.actionID, out action3);`
`149`	`151`	`}`
	`152`	`+`
`150`	`153`	`UpdateActionButton(m_ButtonInfo[ActionButtonType.Special2], action3);`
`151`	`154`	`}`
`152`	`155`
`@@ -165,6 +168,7 @@ void DeregisterInputSender()`
`165`	`168`	`{`
`166`	`169`	`m_InputSender.action1ModifiedCallback -= Action1ModifiedCallback;`
`167`	`170`	`}`
	`171`	`+`
`168`	`172`	`m_InputSender = null;`
`169`	`173`	`}`
`170`	`174`
`@@ -177,7 +181,7 @@ void Awake()`
`177`	`181`	`[ActionButtonType.Special2] = new ActionButtonInfo(ActionButtonType.Special2, m_SpecialAction2Button, this),`
`178`	`182`	`[ActionButtonType.EmoteBar] = new ActionButtonInfo(ActionButtonType.EmoteBar, m_EmoteBarButton, this),`
`179`	`183`	`};`
`180`		`-`
	`184`	`+`
`181`	`185`	`m_ToggleEmoteBarAction.action.performed += OnToggleEmoteBarPerformed;`
`182`	`186`
`183`	`187`	`ClientPlayerAvatar.LocalClientSpawned += RegisterInputSender;`
`@@ -203,13 +207,13 @@ void OnDisable()`
`203`	`207`	`void OnDestroy()`
`204`	`208`	`{`
`205`	`209`	`DeregisterInputSender();`
`206`		`-`
	`210`	`+`
`207`	`211`	`m_ToggleEmoteBarAction.action.performed -= OnToggleEmoteBarPerformed;`
`208`	`212`
`209`	`213`	`ClientPlayerAvatar.LocalClientSpawned -= RegisterInputSender;`
`210`	`214`	`ClientPlayerAvatar.LocalClientDespawned -= DeregisterInputSender;`
`211`	`215`	`}`
`212`		`-`
	`216`	`+`
`213`	`217`	`void OnToggleEmoteBarPerformed(InputAction.CallbackContext obj)`
`214`	`218`	`{`
`215`	`219`	`if (obj.performed)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class UITooltipDetector : MonoBehaviour, IPointerEnterHandler, IPointerEx`
`18`	`18`	`{`
`19`	`19`	`[SerializeField]`
`20`	`20`	`InputActionReference m_PointAction;`
`21`		`-`
	`21`	`+`
`22`	`22`	`[SerializeField]`
`23`	`23`	`[Tooltip("The actual Tooltip that should be triggered")]`
`24`	`24`	`UITooltipPopup m_TooltipPopup;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class ClientInputSender : NetworkBehaviour`
`24`	`24`	`//upstream network conservation. This matters when holding down your mouse button to move.`
`25`	`25`	`const float k_MoveSendRateSeconds = 0.04f; //25 fps.`
`26`	`26`
`27`		`- const float k_TargetMoveTimeout = 0.45f; //prevent moves for this long after targeting someone (helps prevent walking to the guy you clicked).`
	`27`	`+ const float k_TargetMoveTimeout = 0.45f; //prevent moves for this long after targeting someone (helps prevent walking to the guy you clicked).`
`28`	`28`
`29`	`29`	`float m_LastSentMove;`
`30`	`30`
`@@ -75,12 +75,12 @@ public class ClientInputSender : NetworkBehaviour`
`75`	`75`	`/// </summary>`
`76`	`76`	`public enum SkillTriggerStyle`
`77`	`77`	`{`
`78`		`- None, //no skill was triggered.`
`79`		`- MouseClick, //skill was triggered via mouse-click implying you should do a raycast from the mouse position to find a target.`
`80`		`- Keyboard, //skill was triggered via a Keyboard press, implying target should be taken from the active target.`
	`78`	`+ None, //no skill was triggered.`
	`79`	`+ MouseClick, //skill was triggered via mouse-click implying you should do a raycast from the mouse position to find a target.`
	`80`	`+ Keyboard, //skill was triggered via a Keyboard press, implying target should be taken from the active target.`
`81`	`81`	`KeyboardRelease, //represents a released key.`
`82`		`- UI, //skill was triggered from the UI, and similar to Keyboard, target should be inferred from the active target.`
`83`		`- UIRelease, //represents letting go of the mouse-button on a UI button`
	`82`	`+ UI, //skill was triggered from the UI, and similar to Keyboard, target should be inferred from the active target.`
	`83`	`+ UIRelease, //represents letting go of the mouse-button on a UI button`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`bool IsReleaseStyle(SkillTriggerStyle style)`
`@@ -150,6 +150,7 @@ public override void OnNetworkSpawn()`
`150`	`150`	`if (!IsClient \|\| !IsOwner)`
`151`	`151`	`{`
`152`	`152`	`enabled = false;`
	`153`	`+`
`153`	`154`	`// dont need to do anything else if not the owner`
`154`	`155`	`return;`
`155`	`156`	`}`
`@@ -162,17 +163,19 @@ public override void OnNetworkSpawn()`
`162`	`163`	`{`
`163`	`164`	`actionState1 = new ActionState() { actionID = action1.ActionID, selectable = true };`
`164`	`165`	`}`
	`166`	`+`
`165`	`167`	`if (CharacterClass.Skill2 &&`
`166`	`168`	`GameDataSource.Instance.TryGetActionPrototypeByID(CharacterClass.Skill2.ActionID, out var action2))`
`167`	`169`	`{`
`168`	`170`	`actionState2 = new ActionState() { actionID = action2.ActionID, selectable = true };`
`169`	`171`	`}`
	`172`	`+`
`170`	`173`	`if (CharacterClass.Skill3 &&`
`171`	`174`	`GameDataSource.Instance.TryGetActionPrototypeByID(CharacterClass.Skill3.ActionID, out var action3))`
`172`	`175`	`{`
`173`	`176`	`actionState3 = new ActionState() { actionID = action3.ActionID, selectable = true };`
`174`	`177`	`}`
`175`		`-`
	`178`	`+`
`176`	`179`	`m_Action1.action.started += OnAction1Started;`
`177`	`180`	`m_Action1.action.canceled += OnAction1Canceled;`
`178`	`181`	`m_Action2.action.started += OnAction2Started;`
`@@ -202,7 +205,7 @@ public override void OnNetworkDespawn()`
`202`	`205`	`{`
`203`	`206`	`m_TargetServerCharacter.NetLifeState.LifeState.OnValueChanged -= OnTargetLifeStateChanged;`
`204`	`207`	`}`
`205`		`-`
	`208`	`+`
`206`	`209`	`m_Action1.action.started -= OnAction1Started;`
`207`	`210`	`m_Action1.action.canceled -= OnAction1Canceled;`
`208`	`211`	`m_Action2.action.started -= OnAction2Started;`
`@@ -468,7 +471,7 @@ void PopulateSkillRequest(Vector3 hitPoint, ActionID actionID, ref ActionRequest`
`468`	`471`	`//there is a bug where the direction is flipped if the hitPos and current position are almost the same,`
`469`	`472`	`//so we use the character's direction instead.`
`470`	`473`	`float directionLength = offset.magnitude;`
`471`		`- Vector3 direction = 1.0f/epsilon/ <= directionLength ? (offset / directionLength) : m_PhysicsWrapper.Transform.forward;`
	`474`	`+ Vector3 direction = 1.0f /epsilon/ <= directionLength ? (offset / directionLength) : m_PhysicsWrapper.Transform.forward;`
`472`	`475`
`473`	`476`	`switch (actionConfig.Logic)`
`474`	`477`	`{`
`@@ -518,52 +521,52 @@ public void RequestAction(ActionID actionID, SkillTriggerStyle triggerStyle, ulo`
`518`	`521`	`m_ActionRequestCount++;`
`519`	`522`	`}`
`520`	`523`	`}`
`521`		`-`
	`524`	`+`
`522`	`525`	`void OnAction1Started(InputAction.CallbackContext obj)`
`523`	`526`	`{`
`524`	`527`	`RequestAction(actionState1.actionID, SkillTriggerStyle.Keyboard);`
`525`	`528`	`}`
`526`		`-`
	`529`	`+`
`527`	`530`	`void OnAction1Canceled(InputAction.CallbackContext obj)`
`528`	`531`	`{`
`529`	`532`	`RequestAction(actionState1.actionID, SkillTriggerStyle.KeyboardRelease);`
`530`	`533`	`}`
`531`		`-`
	`534`	`+`
`532`	`535`	`void OnAction2Started(InputAction.CallbackContext obj)`
`533`	`536`	`{`
`534`	`537`	`RequestAction(actionState2.actionID, SkillTriggerStyle.Keyboard);`
`535`	`538`	`}`
`536`		`-`
	`539`	`+`
`537`	`540`	`void OnAction2Canceled(InputAction.CallbackContext obj)`
`538`	`541`	`{`
`539`	`542`	`RequestAction(actionState2.actionID, SkillTriggerStyle.KeyboardRelease);`
`540`	`543`	`}`
`541`		`-`
	`544`	`+`
`542`	`545`	`void OnAction3Started(InputAction.CallbackContext obj)`
`543`	`546`	`{`
`544`	`547`	`RequestAction(actionState3.actionID, SkillTriggerStyle.Keyboard);`
`545`	`548`	`}`
`546`		`-`
	`549`	`+`
`547`	`550`	`void OnAction3Canceled(InputAction.CallbackContext obj)`
`548`	`551`	`{`
`549`	`552`	`RequestAction(actionState3.actionID, SkillTriggerStyle.KeyboardRelease);`
`550`	`553`	`}`
`551`		`-`
	`554`	`+`
`552`	`555`	`void OnAction5Performed(InputAction.CallbackContext obj)`
`553`	`556`	`{`
`554`	`557`	`RequestAction(GameDataSource.Instance.Emote1ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);`
`555`	`558`	`}`
`556`		`-`
	`559`	`+`
`557`	`560`	`void OnAction6Performed(InputAction.CallbackContext obj)`
`558`	`561`	`{`
`559`	`562`	`RequestAction(GameDataSource.Instance.Emote2ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);`
`560`	`563`	`}`
`561`		`-`
	`564`	`+`
`562`	`565`	`void OnAction7Performed(InputAction.CallbackContext obj)`
`563`	`566`	`{`
`564`	`567`	`RequestAction(GameDataSource.Instance.Emote3ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);`
`565`	`568`	`}`
`566`		`-`
	`569`	`+`
`567`	`570`	`void OnAction8Performed(InputAction.CallbackContext obj)`
`568`	`571`	`{`
`569`	`572`	`RequestAction(GameDataSource.Instance.Emote4ActionPrototype.ActionID, SkillTriggerStyle.Keyboard);`
`@@ -580,7 +583,7 @@ void Update()`
`580`	`583`	`{`
`581`	`584`	`RequestAction(CharacterClass.Skill1.ActionID, SkillTriggerStyle.MouseClick);`
`582`	`585`	`}`
`583`		`-`
	`586`	`+`
`584`	`587`	`if (m_TargetAction.action.WasPressedThisFrame())`
`585`	`588`	`{`
`586`	`589`	`RequestAction(GameDataSource.Instance.GeneralTargetActionPrototype.ActionID, SkillTriggerStyle.MouseClick);`
`@@ -609,19 +612,19 @@ void UpdateAction1()`
`609`	`612`	`actionState1.actionID = GameDataSource.Instance.DropActionPrototype.ActionID;`
`610`	`613`	`}`
`611`	`614`	`else if ((m_ServerCharacter.TargetId.Value != 0`
`612`		`- && selection != null`
`613`		`- && selection.TryGetComponent(out PickUpState pickUpState))`
`614`		`- )`
	`615`	`+ && selection != null`
	`616`	`+ && selection.TryGetComponent(out PickUpState pickUpState))`
	`617`	`+ )`
`615`	`618`	`{`
`616`	`619`	`// special case: targeting a pickup-able item or holding a pickup object`
`617`	`620`
`618`	`621`	`actionState1.actionID = GameDataSource.Instance.PickUpActionPrototype.ActionID;`
`619`	`622`	`}`
`620`	`623`	`else if (m_ServerCharacter.TargetId.Value != 0`
`621`		`- && selection != null`
`622`		`- && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId`
`623`		`- && selection.TryGetComponent(out ServerCharacter charState)`
`624`		`- && !charState.IsNpc)`
	`624`	`+ && selection != null`
	`625`	`+ && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId`
	`626`	`+ && selection.TryGetComponent(out ServerCharacter charState)`
	`627`	`+ && !charState.IsNpc)`
`625`	`628`	`{`
`626`	`629`	`// special case: when we have a player selected, we change the meaning of the basic action`
`627`	`630`	`// we have another player selected! In that case we want to reflect that our basic Action is a Revive, not an attack!`