diff --git a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab index f1a59448..998b6194 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab @@ -1148,8 +1148,8 @@ MonoBehaviour: m_EditorClassIdentifier: trapPrefabs: - {fileID: 6097000079642511365, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} - - {fileID: 7646078152559978388, guid: 40bc1f37707e62f4297f85bf5c7b01b4, type: 3} - {fileID: 6762149095286452822, guid: d7c2a5ac1f23afe428f872343ed56d71, type: 3} + - {fileID: 7646078152559978388, guid: 40bc1f37707e62f4297f85bf5c7b01b4, type: 3} --- !u!1 &4171805761210331374 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab index 7af96f36..8a37b5b9 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab @@ -44,6 +44,7 @@ GameObject: - component: {fileID: 5795171091198292367} - component: {fileID: -203823895052494} - component: {fileID: 35751912918643136} + - component: {fileID: 7871202529601744935} m_Layer: 0 m_Name: crossbow_down_prefab m_TagString: trap @@ -192,5 +193,49 @@ MonoBehaviour: m_EditorClassIdentifier: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} firePoint: {fileID: 281168768424784037} - fireRate: 1 arrowDirection: {x: 0, y: -1, z: 0} +--- !u!61 &7871202529601744935 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.02706647, y: 0.046013117} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.8484273, y: 0.90797377} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_side_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_side_prefab.prefab index ef30eeb8..2d7217ae 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_side_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_side_prefab.prefab @@ -45,6 +45,7 @@ GameObject: - component: {fileID: 676389503062817133} - component: {fileID: 5286258800020939821} - component: {fileID: 8832289385422847377} + - component: {fileID: 6359678448919576393} m_Layer: 0 m_Name: crossbow_side_prefab m_TagString: trap @@ -229,4 +230,49 @@ MonoBehaviour: m_EditorClassIdentifier: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} firePoint: {fileID: 3203241062154977645} - arrowDirection: {x: 1, y: 0, z: 0} + arrowDirection: {x: -1, y: 0, z: 0} +--- !u!61 &6359678448919576393 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0053215027, y: 0.023946047} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.9255028, y: 0.9521079} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab index 587f0b71..12a27369 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab @@ -14,9 +14,10 @@ GameObject: - component: {fileID: 6986723495591371066} - component: {fileID: 5634049128496068952} - component: {fileID: 7794495536740116109} + - component: {fileID: 1962896055783386486} m_Layer: 0 m_Name: crossbow_up_prefab - m_TagString: Untagged + m_TagString: trap m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -199,6 +200,51 @@ MonoBehaviour: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} firePoint: {fileID: 6072291834429057557} arrowDirection: {x: 0, y: 1, z: 0} +--- !u!61 &1962896055783386486 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6762149095286452822} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.02851978, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.87958354, y: 1} + m_EdgeRadius: 0 --- !u!1 &7709142573957286560 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Trap/TrapManager.cs b/Assets/Scripts/Trap/TrapManager.cs index 297e31f6..0c5962ed 100644 --- a/Assets/Scripts/Trap/TrapManager.cs +++ b/Assets/Scripts/Trap/TrapManager.cs @@ -31,7 +31,6 @@ async void Start() clientSocket = SocketManager.Instance.ClientSocket; - // Start processing the placement queue StartCoroutine(ProcessPlacementQueue()); await clientSocket.EmitAsync("traps:reload"); @@ -91,7 +90,7 @@ private void SpawnTrapAtPosition(int x, int y, string trapType) { // Instantiate the prefab at the calculated position - Vector3 spawnPosition = new Vector3(x, y, 0); + Vector3 spawnPosition = new Vector3(x + 0.5f, y - 0.25f, 0); GameObject spawnedTrap = Instantiate(prefabToSpawn, spawnPosition, Quaternion.identity); // Mark the grid spot as occupied