Merge branch 'dev-main' into dev-ali

Assets/GameData/Action/Abilities/The Executioner Ability.asset

@@ -22,4 +22,4 @@ MonoBehaviour:
   prefab: {fileID: 2026889198986879358, guid: cbe217685dd069b47ac56eefeb3f6cdc, type: 3}
   travelTime: 3
   spawnRadius: 30
-  warningTime: 3
+  warningTime: 5

Assets/Prefabs/Character/PlayerAvatar.prefab

@@ -277,81 +277,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 5073345019512663201, guid: 37e3c89fabd00354a819afc27d72585e, type: 3}
   m_PrefabInstance: {fileID: 1604529912481146835}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1850799117451267164
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 6009713983291384766}
-    m_Modifications:
-    - target: {fileID: 12893005758162758, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_Name
-      value: CrowNewModel
-      objectReference: {fileID: 0}
-    - target: {fileID: 12893005758162758, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1306469665054868494, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 3177087589
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
---- !u!4 &1353689370832875936 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 821377733219925500, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-  m_PrefabInstance: {fileID: 1850799117451267164}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &1838196400614501146 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 12893005758162758, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3}
-  m_PrefabInstance: {fileID: 1850799117451267164}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1972603737066914145
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -675,7 +600,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5109095020609682098, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3}
       propertyPath: GlobalObjectIdHash
-      value: 3177087589
+      value: 2459418115
       objectReference: {fileID: 0}
     - target: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3}
       propertyPath: m_Name
@@ -683,11 +608,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3}
       propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7760591836692130632, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 3177087589
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -699,6 +620,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3}
   m_PrefabInstance: {fileID: 4134200829793049931}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &7710689235683559329 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3}
+  m_PrefabInstance: {fileID: 4134200829793049931}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5104066587638591784
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -771,22 +697,6 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 198010905315165094, guid: ddc205c0c8c9eca43be1bdcb38ef42e7, type: 3}
-      propertyPath: playOnAwake
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 198097802458817804, guid: ddc205c0c8c9eca43be1bdcb38ef42e7, type: 3}
-      propertyPath: playOnAwake
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 198693709256649430, guid: ddc205c0c8c9eca43be1bdcb38ef42e7, type: 3}
-      propertyPath: playOnAwake
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 198732920456235744, guid: ddc205c0c8c9eca43be1bdcb38ef42e7, type: 3}
-      propertyPath: playOnAwake
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 199118148743193636, guid: ddc205c0c8c9eca43be1bdcb38ef42e7, type: 3}
       propertyPath: m_Materials.Array.size
       value: 1
@@ -872,7 +782,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       propertyPath: GlobalObjectIdHash
-      value: 3177087589
+      value: 2714313788
       objectReference: {fileID: 0}
     - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       propertyPath: PrefabHashGenerator
@@ -929,7 +839,7 @@ PrefabInstance:
     - target: {fileID: 7420593339233078707, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       propertyPath: crowModel
       value: 
-      objectReference: {fileID: 1838196400614501146}
+      objectReference: {fileID: 7710689235683559329}
     - target: {fileID: 7420593339233078707, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       propertyPath: LinePrefab
       value: 
@@ -965,9 +875,6 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       insertIndex: -1
       addedObject: {fileID: 2580402896402371906}
-    - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1353689370832875936}
     - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       insertIndex: -1
       addedObject: {fileID: 248483794971195069}

Assets/Scripts/Gameplay/ExecutionerBox.cs

@@ -2,6 +2,7 @@ using UnityEngine;
 using Unity.Netcode;
 using Unity.BossRoom.Gameplay.GameplayObjects.Character;
 using System.Collections;
+using System.Linq;
 using Unity.BossRoom.Gameplay.GameplayObjects;
 
 public class ExecutionerBox : NetworkBehaviour
@@ -23,6 +24,7 @@ public class ExecutionerBox : NetworkBehaviour
                 var abilitySystem = serverCharacter.GetComponent<AbilitySystem>();
                 if (abilitySystem != null)
                 {
+                    WarningPanel.Instance.ShowPanel(2f);
                     abilitySystem.InitiateGlobalCooldown(GameDataSource.Instance.TheExecutionerKey);
                 }
                 break; // Exit loop after finding the local player
@@ -46,9 +48,6 @@ public class ExecutionerBox : NetworkBehaviour
 
     private IEnumerator StartExecutionerSequence()
     {
-        // Show warning UI on all clients
-        // UIManager.Instance.ShowExecutionerWarning(_warningTime);
-        WarningPanel.Instance.ShowPanelForTime(_warningTime);
         // Wait for the warning time before moving
         yield return new WaitForSeconds(_warningTime);
         

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

@@ -573,6 +573,7 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character
         public override void OnNetworkSpawn()
         {
             CrowManager.Instance.OnPlayerSpawned(this);
+            crowModel.SetActive(false);
             if (!IsServer) { enabled = false; }
             else
             {
@@ -594,6 +595,7 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character
             }
         }
         
+        
         public override void OnNetworkDespawn()
         {
             CrowManager.Instance.OnPlayerDespawned(this);

Assets/Scripts/Gameplay/WarningPanel.cs

@@ -20,17 +20,7 @@ public class WarningPanel : NetworkBehaviour
             Destroy(gameObject);
         }
     }
-
-    public void ShowPanelForTime(float seconds)
-    {
-        if (IsServer) // Only the server should trigger this
-        {
-            ShowPanelClientRpc(seconds);
-        }
-    }
-
-    [ClientRpc]
-    private void ShowPanelClientRpc(float seconds)
+    public void ShowPanel(float seconds)
     {
         panel.SetActive(true);
         StartCoroutine(HidePanelAfterTime(seconds));