From 280b0578fb2f6b5022c49c5a0b203a59fef33c19 Mon Sep 17 00:00:00 2001 From: kkilme <80762534+kkilme@users.noreply.github.com> Date: Thu, 9 May 2024 21:50:16 +0900 Subject: [PATCH] feat: sector tracking (#125) --- .../WorkStation/CargoPassageGate.prefab | 75 +++ .../Prefabs/Map/Components/Elevator.prefab | 67 ++ .../Assets/Resources/Prefabs/Map/Map.prefab | 4 - .../Prefabs/Map/{Sector => }/PanicRoom.prefab | 71 ++ .../Map/{Sector => }/PanicRoom.prefab.meta | 0 .../Map/Sector/1F_CargoControlRoom.prefab | 302 ++++++++- .../Sector/1F_ContainmentControlRoom.prefab | 235 ++++++- .../Map/Sector/1F_ContainmentRoom.prefab | 235 ++++++- .../Prefabs/Map/Sector/1F_Corridor_A.prefab | 243 ++++++- .../Prefabs/Map/Sector/1F_Corridor_B.prefab | 531 ++++++++++++++- .../Prefabs/Map/Sector/1F_Corridor_C.prefab | 318 ++++++++- .../Prefabs/Map/Sector/1F_Corridor_D.prefab | 389 ++++++++++- .../Prefabs/Map/Sector/1F_Corridor_E.prefab | 381 ++++++++++- .../Map/Sector/1F_ObservationRoom.prefab | 136 +++- .../Prefabs/Map/Sector/1F_PowerRoom.prefab | 239 ++++++- .../Prefabs/Map/Sector/1F_SampleRoom.prefab | 168 ++++- .../Prefabs/Map/Sector/1F_Storage.prefab | 239 ++++++- .../Prefabs/Map/Sector/2F_Cafeteria.prefab | 203 +++++- .../Map/Sector/2F_CentralControlRoom.prefab | 302 ++++++++- .../Prefabs/Map/Sector/2F_Corridor_A.prefab | 440 +++++++++++- .../Prefabs/Map/Sector/2F_Corridor_B.prefab | 235 ++++++- .../Prefabs/Map/Sector/2F_Corridor_C.prefab | 369 +++++++++- .../Prefabs/Map/Sector/2F_Corridor_D.prefab | 440 +++++++++++- .../Prefabs/Map/Sector/2F_Corridor_E.prefab | 637 +++++++++++++++++- .../Map/Sector/2F_DiningFacility.prefab | 203 +++++- .../Map/Sector/2F_DirectorOffice.prefab | 235 ++++++- .../Prefabs/Map/Sector/2F_Oratory.prefab | 168 ++++- .../Map/Sector/2F_StaffAccommodation.prefab | 235 ++++++- .../Prefabs/Map/Sector/2F_VisitingRoom.prefab | 168 ++++- .../Prefabs/Map/SectorEntrance.prefab | 68 ++ .../Prefabs/Map/SectorEntrance.prefab.meta | 7 + .../Prefabs/Systems/@GameSystem.prefab | 30 +- .../Prefabs/UI/Scene/UI_AlienIngame.prefab | 103 +++ .../Prefabs/UI/Scene/UI_CrewIngame.prefab | 185 +++-- .../Prefabs/UI/SubItem/UI_CrewPlan.prefab | 30 +- .../UI/SubItem/UI_CurrentSector.prefab | 185 +++++ .../UI/SubItem/UI_CurrentSector.prefab.meta | 7 + .../Scenes/TestScene/TestScene_SJ.unity | 263 ++------ Client/Assets/Scripts/Contents/Map/Sector.cs | 24 +- .../Scripts/Contents/Map/SectorEntrance.cs | 22 + .../Contents/Map/SectorEntrance.cs.meta | 11 + Client/Assets/Scripts/Creatures/Creature.cs | 10 + Client/Assets/Scripts/Systems/ItemSpawner.cs | 113 ++++ .../Scripts/Systems/ItemSpawner.cs.meta | 11 + Client/Assets/Scripts/Systems/MapSystem.cs | 108 +-- Client/Assets/Scripts/UI/Scene/UI_Ingame.cs | 3 + .../Scripts/UI/SubItem/UI_CurrentSector.cs | 44 ++ .../UI/SubItem/UI_CurrentSector.cs.meta | 11 + 48 files changed, 8023 insertions(+), 480 deletions(-) rename Client/Assets/Resources/Prefabs/Map/{Sector => }/PanicRoom.prefab (97%) rename Client/Assets/Resources/Prefabs/Map/{Sector => }/PanicRoom.prefab.meta (100%) create mode 100644 Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab create mode 100644 Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab.meta create mode 100644 Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab create mode 100644 Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab.meta create mode 100644 Client/Assets/Scripts/Contents/Map/SectorEntrance.cs create mode 100644 Client/Assets/Scripts/Contents/Map/SectorEntrance.cs.meta create mode 100644 Client/Assets/Scripts/Systems/ItemSpawner.cs create mode 100644 Client/Assets/Scripts/Systems/ItemSpawner.cs.meta create mode 100644 Client/Assets/Scripts/UI/SubItem/UI_CurrentSector.cs create mode 100644 Client/Assets/Scripts/UI/SubItem/UI_CurrentSector.cs.meta diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/CargoPassageGate.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/CargoPassageGate.prefab index 8d4e308017..4b7ec8cc96 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/CargoPassageGate.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/CargoPassageGate.prefab @@ -438,6 +438,7 @@ Transform: - {fileID: 817831902977619859} - {fileID: 2145783596903434262} - {fileID: 7158447810789029731} + - {fileID: 1006438731095480192} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: 0} --- !u!65 &7236642029869018556 @@ -1418,3 +1419,77 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &8425852480829879715 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7236642029869414185} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -3.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 1.194 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7072302 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7069834 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1006438731095480192 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8425852480829879715} + m_PrefabAsset: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab b/Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab index e2b4dfbdbd..5b104d8f31 100644 --- a/Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab @@ -31,6 +31,7 @@ Transform: m_Children: - {fileID: 3625144852868305021} - {fileID: 2187459321568614308} + - {fileID: 7776432145164884284} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4572832400089274880 @@ -356,3 +357,69 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300006, guid: 8b66229dafa1af54b9891753c44b7fb3, type: 3} +--- !u!1001 &1365256253729291039 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4845720123607770} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -1.236 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7776432145164884284 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1365256253729291039} + m_PrefabAsset: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Map/Map.prefab b/Client/Assets/Resources/Prefabs/Map/Map.prefab index bf47856f3e..f276124bcc 100644 --- a/Client/Assets/Resources/Prefabs/Map/Map.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Map.prefab @@ -3418,10 +3418,6 @@ PrefabInstance: propertyPath: m_Name value: 2F_Corridor_A objectReference: {fileID: 0} - - target: {fileID: 5437356930162733777, guid: 1772b9601cec99f4b9ced76f070ea5c2, type: 3} - propertyPath: m_Layer - value: 11 - objectReference: {fileID: 0} - target: {fileID: 7030881829091506616, guid: 1772b9601cec99f4b9ced76f070ea5c2, type: 3} propertyPath: m_LocalPosition.x value: -67.75 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/PanicRoom.prefab b/Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab similarity index 97% rename from Client/Assets/Resources/Prefabs/Map/Sector/PanicRoom.prefab rename to Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab index 2ae48a5524..67bc68a8a3 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/PanicRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab @@ -61,6 +61,7 @@ Transform: - {fileID: 3427984808010872066} - {fileID: 8279292000309835038} - {fileID: 1003253371487383772} + - {fileID: 315755944506526524} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &489300410941552733 @@ -2641,6 +2642,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 9156056671816854004, guid: 989def74dc5ff564c9b28a0d8e2a1743, type: 3} m_PrefabInstance: {fileID: 9009084661708608644} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9041249867981580575 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1865599408426144721} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000011920929 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &315755944506526524 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 9041249867981580575} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9115854997812072047 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/PanicRoom.prefab.meta b/Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab.meta similarity index 100% rename from Client/Assets/Resources/Prefabs/Map/Sector/PanicRoom.prefab.meta rename to Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab.meta diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_CargoControlRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_CargoControlRoom.prefab index a9b845fe53..c54e5bbf8c 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_CargoControlRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_CargoControlRoom.prefab @@ -38,6 +38,41 @@ Transform: - {fileID: 413536281664114081} m_Father: {fileID: 1467239175736487712} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3073469432648783373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8970529753438872166} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8970529753438872166 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3073469432648783373} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7038630261307800198} + - {fileID: 5248595838340821611} + - {fileID: 8799104378607120660} + - {fileID: 5042646542835414518} + m_Father: {fileID: 1467239175736487712} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6570896197976667944 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +192,7 @@ Transform: - {fileID: 8641735849944044618} - {fileID: 1747753422115585871} - {fileID: 178842071662480427} + - {fileID: 8970529753438872166} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4389737754511570637 @@ -171,7 +207,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 17 + _sectorName: 17 --- !u!1 &8460060867559769275 GameObject: m_ObjectHideFlags: 0 @@ -269,6 +305,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4206683368507738, guid: 190104e9bd5f8014eaf9a7f5f6f7a173, type: 3} m_PrefabInstance: {fileID: 113462516576022719} m_PrefabAsset: {fileID: 0} +--- !u!1001 &217721246453289783 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8970529753438872166} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -9.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8799104378607120660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 217721246453289783} + m_PrefabAsset: {fileID: 0} --- !u!1001 &307558087522211770 PrefabInstance: m_ObjectHideFlags: 0 @@ -1439,6 +1541,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1960395723308066859, guid: cda76614c4b6ac74cb9cf74140116cd7, type: 3} m_PrefabInstance: {fileID: 1722158209363594318} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1780908051042244773 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8970529753438872166} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7038630261307800198 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1780908051042244773} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1900842242167217518 PrefabInstance: m_ObjectHideFlags: 0 @@ -2185,6 +2353,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 3519431231126437897} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3589351975196856392 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8970529753438872166} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5248595838340821611 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3589351975196856392} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3604521355209985216 PrefabInstance: m_ObjectHideFlags: 0 @@ -2621,6 +2855,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1255733528897675498, guid: b0cd1269e7220cf4ab84b678a74f7188, type: 3} m_PrefabInstance: {fileID: 4229113322817069019} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4387111669174573013 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8970529753438872166} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5042646542835414518 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 4387111669174573013} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4396663400726576453 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentControlRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentControlRoom.prefab index 94f4a3c6b0..ccabab663d 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentControlRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentControlRoom.prefab @@ -34,6 +34,7 @@ Transform: - {fileID: 1724137360124929371} - {fileID: 5873106544828182461} - {fileID: 3987321664373365457} + - {fileID: 108812002044828214} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7714412186954451124 @@ -48,7 +49,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 13 + _sectorName: 13 --- !u!1 &1048813506201428469 GameObject: m_ObjectHideFlags: 0 @@ -143,6 +144,40 @@ Transform: - {fileID: 154712964622646772} m_Father: {fileID: 3728236945418208693} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6174020695689950374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 108812002044828214} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &108812002044828214 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6174020695689950374} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1053880063444364700} + - {fileID: 8622245997819667577} + - {fileID: 5952607721055387765} + m_Father: {fileID: 3728236945418208693} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6300410737327849755 GameObject: m_ObjectHideFlags: 0 @@ -625,6 +660,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4206683368507738, guid: 190104e9bd5f8014eaf9a7f5f6f7a173, type: 3} m_PrefabInstance: {fileID: 807707777071978450} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1058747837963191898 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 108812002044828214} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8622245997819667577 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1058747837963191898} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1321314846404969382 PrefabInstance: m_ObjectHideFlags: 0 @@ -1707,6 +1808,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4980840765074810, guid: 470decc259dc2954b84c55547f6c47fc, type: 3} m_PrefabInstance: {fileID: 2336364210663601093} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3135309834770997846 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 108812002044828214} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 7.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5952607721055387765 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3135309834770997846} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3343915837724096860 PrefabInstance: m_ObjectHideFlags: 0 @@ -3709,6 +3876,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4762855527793774, guid: 6e4838c593bfb3c43a2309aae3ada355, type: 3} m_PrefabInstance: {fileID: 8546052542789814098} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8626945066069839807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 108812002044828214} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1053880063444364700 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8626945066069839807} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9181536648412951093 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentRoom.prefab index d9b135ef32..0250bcd754 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentRoom.prefab @@ -1,5 +1,39 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &85670757596050045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2283512716443199713} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2283512716443199713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85670757596050045} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 542131405732545076} + - {fileID: 3348725471529687779} + - {fileID: 8366947309786530674} + m_Father: {fileID: 4038555205659425569} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &442989709188269675 GameObject: m_ObjectHideFlags: 0 @@ -75,6 +109,7 @@ Transform: - {fileID: 8726575996301775315} - {fileID: 8545582731422954077} - {fileID: 2599490500117736553} + - {fileID: 2283512716443199713} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-706391664523664545 @@ -89,7 +124,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 12 + _sectorName: 12 --- !u!1 &1850873555473414426 GameObject: m_ObjectHideFlags: 0 @@ -699,6 +734,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4911427546289957502, guid: c74af09555f19df4b8dec2dfb37ed825, type: 3} m_PrefabInstance: {fileID: 899737773551345457} m_PrefabAsset: {fileID: 0} +--- !u!1001 &937994187589935441 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2283512716443199713} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8366947309786530674 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 937994187589935441} + m_PrefabAsset: {fileID: 0} --- !u!1001 &939744994046209922 PrefabInstance: m_ObjectHideFlags: 0 @@ -4067,6 +4168,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4921465881555552, guid: 671d36a0712f1354b9465dae1a631e8e, type: 3} m_PrefabInstance: {fileID: 5889990219361011237} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6296070293991798976 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2283512716443199713} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3348725471529687779 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6296070293991798976} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6320332880639353942 PrefabInstance: m_ObjectHideFlags: 0 @@ -5313,3 +5480,69 @@ Transform: m_CorrespondingSourceObject: {fileID: 1200983841275418554, guid: 77fc8d974c2532545ba3ab92f1694bee, type: 3} m_PrefabInstance: {fileID: 8783988272357428403} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9124076403847127063 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2283512716443199713} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &542131405732545076 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 9124076403847127063} + m_PrefabAsset: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_A.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_A.prefab index 431cec547c..b09440fa24 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_A.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_A.prefab @@ -1,5 +1,39 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1181613536403713606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2188422999167821180} + m_Layer: 0 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2188422999167821180 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181613536403713606} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -82.61645, y: -20.60163, z: 5.170168} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3955103972425752985} + - {fileID: 8962739970642633304} + - {fileID: 6877880096386126983} + m_Father: {fileID: 5483986954472871317} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1514967192355926509 GameObject: m_ObjectHideFlags: 0 @@ -68,6 +102,7 @@ Transform: - {fileID: 1805408623975328842} - {fileID: 6240477934138047366} - {fileID: 420367368395996854} + - {fileID: 2188422999167821180} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1163707327067925220 @@ -82,7 +117,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 1 + _sectorName: 1 --- !u!1 &3707910854720015071 GameObject: m_ObjectHideFlags: 0 @@ -750,6 +785,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 5799464802957010726, guid: 63bc6bcba19d9eb4eac52c8d75e0ff7b, type: 3} m_PrefabInstance: {fileID: 219374691472014270} m_PrefabAsset: {fileID: 0} +--- !u!1001 &394977586654478459 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2188422999167821180} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 87.61645 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 20.60163 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -7.670168 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8962739970642633304 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 394977586654478459} + m_PrefabAsset: {fileID: 0} --- !u!1001 &466236929449925742 PrefabInstance: m_ObjectHideFlags: 0 @@ -1308,6 +1409,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 5799464802957010726, guid: 63bc6bcba19d9eb4eac52c8d75e0ff7b, type: 3} m_PrefabInstance: {fileID: 2253015035366869422} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2768043613446370980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2188422999167821180} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 77.61645 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 20.60163 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.670168 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &6877880096386126983 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2768043613446370980} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2871733323319118747 PrefabInstance: m_ObjectHideFlags: 0 @@ -2268,6 +2435,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 4762855527793774, guid: 6e4838c593bfb3c43a2309aae3ada355, type: 3} m_PrefabInstance: {fileID: 5396007854462988354} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5763033685431223226 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2188422999167821180} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 95.042 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 20.60163 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -5.170168 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3955103972425752985 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5763033685431223226} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6891169944539543044 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_B.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_B.prefab index 3cdce6297c..7f7b8e43d5 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_B.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_B.prefab @@ -150,6 +150,7 @@ Transform: m_Children: - {fileID: 3250455514945723398} - {fileID: 1369550514235033698} + - {fileID: 4386641638913950491} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-9139450609498887725 @@ -164,7 +165,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 2 + _sectorName: 2 +--- !u!1 &8099852200225230883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4386641638913950491} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4386641638913950491 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099852200225230883} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 796254221756629437} + - {fileID: 7483000334353669599} + - {fileID: 3526476398499193061} + - {fileID: 6432390993115786629} + - {fileID: 515982159197752732} + - {fileID: 7726435987241817690} + - {fileID: 3894820402166544173} + m_Father: {fileID: 1539154013082283473} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &380110774630171148 PrefabInstance: m_ObjectHideFlags: 0 @@ -483,6 +522,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 4813028603114374, guid: 7141b2263da1ed44bbbee0dff57c8354, type: 3} m_PrefabInstance: {fileID: 1071145985696790797} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1306292492995835001 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (6) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -1.89 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7726435987241817690 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1306292492995835001} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1401347211875223891 PrefabInstance: m_ObjectHideFlags: 0 @@ -811,6 +920,146 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 2048836016891585216} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2216272023290052604 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7483000334353669599 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2216272023290052604} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2332093878712651686 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &6432390993115786629 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2332093878712651686} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2616422537361669587 PrefabInstance: m_ObjectHideFlags: 0 @@ -2129,6 +2378,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 2016555102924241309, guid: 6eb58e86ad41bd843be5e88d1ebb5168, type: 3} m_PrefabInstance: {fileID: 5253885698678754102} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5325995946457596614 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (5) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3526476398499193061 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5325995946457596614} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5481971248618216092 PrefabInstance: m_ObjectHideFlags: 0 @@ -2453,6 +2776,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 5687514366158964430} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5698210235685393678 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 27.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3894820402166544173 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5698210235685393678} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5732751511583670199 PrefabInstance: m_ObjectHideFlags: 0 @@ -3885,6 +4274,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 2402143778542060652, guid: af7272102b2e7964fae460b1558eff02, type: 3} m_PrefabInstance: {fileID: 8128910306240749193} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8220738924199601054 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &796254221756629437 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8220738924199601054} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8379211645156933949 PrefabInstance: m_ObjectHideFlags: 0 @@ -4197,3 +4660,69 @@ Transform: m_CorrespondingSourceObject: {fileID: 6040010830984558432, guid: 1c001194c8d3af244addc9c662397067, type: 3} m_PrefabInstance: {fileID: 8976047004667117230} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9092786939647143871 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4386641638913950491} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &515982159197752732 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 9092786939647143871} + m_PrefabAsset: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_C.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_C.prefab index b5711cde18..217808cd45 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_C.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_C.prefab @@ -253,6 +253,7 @@ Transform: - {fileID: 4412533997172817224} - {fileID: 5786865750938846467} - {fileID: 4264412608841265380} + - {fileID: 1002529769190228842} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3685208642673534827 @@ -267,7 +268,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 3 + _sectorName: 3 --- !u!1 &4786620414879355003 GameObject: m_ObjectHideFlags: 0 @@ -773,6 +774,41 @@ Transform: - {fileID: 1252888387929432239} m_Father: {fileID: 434563601017453083} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7642642986773599202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1002529769190228842} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1002529769190228842 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7642642986773599202} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5041117788572931895} + - {fileID: 2342036937558261630} + - {fileID: 9045256529039426259} + - {fileID: 4039078697614898692} + m_Father: {fileID: 434563601017453083} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7643619355243551087 GameObject: m_ObjectHideFlags: 0 @@ -1005,6 +1041,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 3645622149409509074, guid: ea4c43db5dfbe084b9742d37494f05f0, type: 3} m_PrefabInstance: {fileID: 112367513582138029} m_PrefabAsset: {fileID: 0} +--- !u!1001 &332710441878610160 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1002529769190228842} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &9045256529039426259 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 332710441878610160} + m_PrefabAsset: {fileID: 0} --- !u!1001 &663866187286053539 PrefabInstance: m_ObjectHideFlags: 0 @@ -3069,6 +3171,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 4206683368507738, guid: 190104e9bd5f8014eaf9a7f5f6f7a173, type: 3} m_PrefabInstance: {fileID: 4213409358303394479} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4390050220656538900 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1002529769190228842} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -1.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5041117788572931895 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 4390050220656538900} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4454898879987815945 PrefabInstance: m_ObjectHideFlags: 0 @@ -3341,6 +3517,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 5799464802957010726, guid: 63bc6bcba19d9eb4eac52c8d75e0ff7b, type: 3} m_PrefabInstance: {fileID: 4674424339518855655} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4689516242082436135 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1002529769190228842} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &4039078697614898692 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 4689516242082436135} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4700446501762899099 PrefabInstance: m_ObjectHideFlags: 0 @@ -4389,6 +4631,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 4464434467987012, guid: 00624f6addabf9c459deef1f359a78ed, type: 3} m_PrefabInstance: {fileID: 6443049035116317607} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6456372609596628317 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1002529769190228842} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2342036937558261630 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6456372609596628317} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6456641745305984835 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_D.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_D.prefab index 6f7fd3bcf5..807bfaa247 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_D.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_D.prefab @@ -355,6 +355,42 @@ Transform: - {fileID: 8096793167616402476} m_Father: {fileID: 6540572320007147945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5695847491418193425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1894019413185132672} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1894019413185132672 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5695847491418193425} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2089423823383169131} + - {fileID: 4097074798779014252} + - {fileID: 8267644368624931851} + - {fileID: 1195542572454407394} + - {fileID: 5410720785548269963} + m_Father: {fileID: 6540572320007147945} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5819710226355710614 GameObject: m_ObjectHideFlags: 0 @@ -642,6 +678,7 @@ Transform: - {fileID: 1105747098644413586} - {fileID: 6228570090241072014} - {fileID: 6742098047072014690} + - {fileID: 1894019413185132672} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1197239026105620533 @@ -656,7 +693,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 4 + _sectorName: 4 --- !u!1 &8229530501981062239 GameObject: m_ObjectHideFlags: 0 @@ -1278,6 +1315,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 941173374225865888, guid: b42f4b60a68a70649965b83f691581db, type: 3} m_PrefabInstance: {fileID: 610951076232142439} m_PrefabAsset: {fileID: 0} +--- !u!1001 &839253094389036584 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1894019413185132672} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8267644368624931851 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 839253094389036584} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1012202176491681250 PrefabInstance: m_ObjectHideFlags: 0 @@ -3268,6 +3371,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1960395723308066859, guid: cda76614c4b6ac74cb9cf74140116cd7, type: 3} m_PrefabInstance: {fileID: 3472952065239389747} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3607259481374473128 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1894019413185132672} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5410720785548269963 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3607259481374473128} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3628729360987905692 PrefabInstance: m_ObjectHideFlags: 0 @@ -3824,6 +3993,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 4699742837224395116} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4738500749703315023 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1894019413185132672} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 27.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &4097074798779014252 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 4738500749703315023} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4814756927270909561 PrefabInstance: m_ObjectHideFlags: 0 @@ -5416,6 +5659,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 5253728413221134961, guid: af8f137b83894e143ac11c668e5a9798, type: 3} m_PrefabInstance: {fileID: 7293885474508487037} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7342606151461071432 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1894019413185132672} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2089423823383169131 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7342606151461071432} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7446349088214858237 PrefabInstance: m_ObjectHideFlags: 0 @@ -5568,6 +5885,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 7549752897305673512} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7606114829003198145 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1894019413185132672} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1195542572454407394 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7606114829003198145} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8037078790558537224 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_E.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_E.prefab index 3eecb51640..1c5de5c742 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_E.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_E.prefab @@ -34,6 +34,7 @@ Transform: - {fileID: 3484731627592440911} - {fileID: 4580561536240950722} - {fileID: 1658344083389206613} + - {fileID: 8166633002839587848} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-6117887515588094480 @@ -48,7 +49,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 5 + _sectorName: 5 --- !u!1 &4989426168452206454 GameObject: m_ObjectHideFlags: 0 @@ -195,6 +196,42 @@ Transform: - {fileID: 598059026635374198} m_Father: {fileID: 2108090175275196701} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7636938594711735672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8166633002839587848} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8166633002839587848 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7636938594711735672} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 579489752437583746} + - {fileID: 1283850459267828556} + - {fileID: 5323564020431644976} + - {fileID: 2348156981727257442} + - {fileID: 6625176206259135657} + m_Father: {fileID: 2108090175275196701} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8241262604278985113 GameObject: m_ObjectHideFlags: 0 @@ -1824,6 +1861,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 7362682301434748686, guid: dce244140559f6d43a53079249918af2, type: 3} m_PrefabInstance: {fileID: 2505966134263678023} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2515374919653738122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8166633002839587848} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 17.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &6625176206259135657 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2515374919653738122} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2668607895921947487 PrefabInstance: m_ObjectHideFlags: 0 @@ -2416,6 +2527,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 3645622149409509074, guid: ea4c43db5dfbe084b9742d37494f05f0, type: 3} m_PrefabInstance: {fileID: 3406515412358545593} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3528618431382391571 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8166633002839587848} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5323564020431644976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3528618431382391571} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3588829278580220245 PrefabInstance: m_ObjectHideFlags: 0 @@ -4724,6 +4901,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 4911427546289957502, guid: c74af09555f19df4b8dec2dfb37ed825, type: 3} m_PrefabInstance: {fileID: 6011894354263161641} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6453489854082023745 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8166633002839587848} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2348156981727257442 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6453489854082023745} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6480002217551125902 PrefabInstance: m_ObjectHideFlags: 0 @@ -5628,6 +5875,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8636164128015988429, guid: 5d4b4cf1484dbfd45a1f5f69d471ed71, type: 3} m_PrefabInstance: {fileID: 7501561242139820235} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7550308626178566511 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8166633002839587848} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1283850459267828556 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7550308626178566511} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7590031455781944109 PrefabInstance: m_ObjectHideFlags: 0 @@ -5924,6 +6237,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1396981801571505080, guid: 5f5deb8a730fa434d86fcfef00c868f6, type: 3} m_PrefabInstance: {fileID: 7904419173621068301} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8148120437152550305 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8166633002839587848} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &579489752437583746 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8148120437152550305} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8324011527113927727 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ObservationRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ObservationRoom.prefab index aed61656a8..a10f3172ef 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ObservationRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ObservationRoom.prefab @@ -135,6 +135,8 @@ Transform: - {fileID: 1124034612320796354} - {fileID: 2779954464645049251} - {fileID: 8872092738511255316} + - {fileID: 2202713339504621187} + - {fileID: 2685656189633463742} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2395563990540863053 @@ -149,7 +151,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 14 + _sectorName: 14 --- !u!1 &6508092328745485041 GameObject: m_ObjectHideFlags: 0 @@ -2473,6 +2475,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4621814934342584, guid: 9b0ca9f1b5530a940aa7ccc1d2209c30, type: 3} m_PrefabInstance: {fileID: 6605566133210185541} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6655313726847051677 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 47088702344998744} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 10.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2685656189633463742 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6655313726847051677} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6845503765006764455 PrefabInstance: m_ObjectHideFlags: 0 @@ -2691,6 +2759,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 265887436039566241, guid: c918e4d28be7eb943a1853122b10739a, type: 3} m_PrefabInstance: {fileID: 7011621674876417379} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7460404773712204960 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 47088702344998744} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2202713339504621187 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7460404773712204960} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7703124547934394975 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_PowerRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_PowerRoom.prefab index 253e8aaf4f..f8cf8f5495 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_PowerRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_PowerRoom.prefab @@ -414,6 +414,7 @@ Transform: - {fileID: 642361947239991429} - {fileID: 5855242680972562940} - {fileID: 8846636425987607749} + - {fileID: 2171044526783328650} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7282573960656174610 @@ -428,7 +429,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 16 + _sectorName: 16 +--- !u!1 &6554895101217101497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2171044526783328650} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2171044526783328650 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554895101217101497} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1908589465088647563} + - {fileID: 2004965753567169910} + - {fileID: 1459467743022580341} + m_Father: {fileID: 6973100691950037102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6781019787371818864 GameObject: m_ObjectHideFlags: 0 @@ -6598,6 +6633,138 @@ Transform: m_CorrespondingSourceObject: {fileID: 1960395723308066859, guid: cda76614c4b6ac74cb9cf74140116cd7, type: 3} m_PrefabInstance: {fileID: 7027690381368442116} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7118540897702162261 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2171044526783328650} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2004965753567169910 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7118540897702162261} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7162305056576373672 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2171044526783328650} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1908589465088647563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7162305056576373672} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7226641500730049151 PrefabInstance: m_ObjectHideFlags: 0 @@ -6866,6 +7033,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 1960395723308066859, guid: cda76614c4b6ac74cb9cf74140116cd7, type: 3} m_PrefabInstance: {fileID: 7753570938670276900} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7879083488347021398 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2171044526783328650} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -10.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1459467743022580341 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7879083488347021398} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7961359073265854699 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_SampleRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_SampleRoom.prefab index 4ec83b7d17..9a091578b8 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_SampleRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_SampleRoom.prefab @@ -513,6 +513,7 @@ Transform: - {fileID: 4482552114559021997} - {fileID: 4306624667714881604} - {fileID: 6793804939339705224} + - {fileID: 2637935253480723705} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4752318453568591736 @@ -527,7 +528,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 15 + _sectorName: 15 --- !u!1 &3408671366865387255 GameObject: m_ObjectHideFlags: 0 @@ -684,6 +685,39 @@ Transform: - {fileID: 1514025460894774901} m_Father: {fileID: 1525701424894010502} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4461809925948471123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2637935253480723705} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2637935253480723705 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4461809925948471123} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5526235064439417606} + - {fileID: 7365769580586640410} + m_Father: {fileID: 1525701424894010502} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &184493974872009826 PrefabInstance: m_ObjectHideFlags: 0 @@ -2906,6 +2940,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 2141437265222694650} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2243156456321828409 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2637935253480723705} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7365769580586640410 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2243156456321828409} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2253134776598127669 PrefabInstance: m_ObjectHideFlags: 0 @@ -4448,6 +4548,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 3833324388261816239} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3866361183563499813 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2637935253480723705} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -7.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5526235064439417606 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3866361183563499813} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3883282448816947880 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Storage.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Storage.prefab index 816530c9b8..fb68c093e1 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Storage.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Storage.prefab @@ -33,6 +33,7 @@ Transform: - {fileID: 7093098014455539274} - {fileID: 1072574357997112370} - {fileID: 3200912749152967766} + - {fileID: 7462118744174538556} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4098364029342259490 @@ -47,7 +48,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 11 + _sectorName: 11 --- !u!1 &7034409664483734270 GameObject: m_ObjectHideFlags: 0 @@ -265,6 +266,40 @@ MonoBehaviour: m_PointlightHDType: 0 m_SpotLightShape: 0 m_AreaLightShape: 0 +--- !u!1 &7397729906589757462 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7462118744174538556} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7462118744174538556 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7397729906589757462} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3070218761244554004} + - {fileID: 1999528718177180009} + - {fileID: 3792350566390149876} + m_Father: {fileID: 6824296167024321181} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7621415522230332831 GameObject: m_ObjectHideFlags: 0 @@ -3793,6 +3828,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 5251913883244989749} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5600243997994832087 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7462118744174538556} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -11.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3792350566390149876 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5600243997994832087} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5627177234611482571 PrefabInstance: m_ObjectHideFlags: 0 @@ -3921,6 +4026,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 5717828188542716827} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6017558091450143031 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7462118744174538556} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3070218761244554004 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6017558091450143031} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6094301794278216704 PrefabInstance: m_ObjectHideFlags: 0 @@ -4481,6 +4652,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 7064025889391365115} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7108635450951465802 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7462118744174538556} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1999528718177180009 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7108635450951465802} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7196696497033651859 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Cafeteria.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Cafeteria.prefab index 3f80460818..20b4e751e4 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Cafeteria.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Cafeteria.prefab @@ -155,6 +155,9 @@ Transform: - {fileID: 1917707531526486728} - {fileID: 3528094447379253239} - {fileID: 1647285790172997644} + - {fileID: 7370930053534155100} + - {fileID: 7430494891637725986} + - {fileID: 1352671450470640109} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1668749439530189463 @@ -169,7 +172,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 21 + _sectorName: 21 --- !u!1 &7195717526122597869 GameObject: m_ObjectHideFlags: 0 @@ -1391,6 +1394,138 @@ Transform: m_CorrespondingSourceObject: {fileID: 8746603792362125155, guid: 818f3877c11570b49a667803f5188e34, type: 3} m_PrefabInstance: {fileID: 2105704649116955198} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2163796267589351681 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4719762958569540117} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7430494891637725986 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2163796267589351681} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2257428580117439359 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4719762958569540117} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7370930053534155100 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2257428580117439359} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2307588886449627735 PrefabInstance: m_ObjectHideFlags: 0 @@ -4237,6 +4372,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 6379769790141532968, guid: 67c2397673479584496820e4da38baa8, type: 3} m_PrefabInstance: {fileID: 7761717934674034475} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7772250907949665230 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4719762958569540117} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -11.987 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1352671450470640109 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7772250907949665230} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7833060140884429316 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_CentralControlRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_CentralControlRoom.prefab index b27bcf7b5c..43cc2c6fd8 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_CentralControlRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_CentralControlRoom.prefab @@ -163,6 +163,41 @@ Transform: - {fileID: 7925925748082687839} m_Father: {fileID: 5659975225358758645} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7813593083529266464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4122773232124674516} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4122773232124674516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813593083529266464} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6878643691617535920} + - {fileID: 8530736610964946435} + - {fileID: 8849700390522381113} + - {fileID: 4504243943893326463} + m_Father: {fileID: 5659975225358758645} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8599170497088455527 GameObject: m_ObjectHideFlags: 0 @@ -197,6 +232,7 @@ Transform: - {fileID: 3427187296502901043} - {fileID: 7205706916635018561} - {fileID: 5086870413270965362} + - {fileID: 4122773232124674516} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7927289539655959873 @@ -211,7 +247,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 18 + _sectorName: 18 --- !u!1001 &64916856660398452 PrefabInstance: m_ObjectHideFlags: 0 @@ -344,6 +380,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8623956955956097110, guid: 7eeced1019e174746b70f6d231302092, type: 3} m_PrefabInstance: {fileID: 158789372393580464} m_PrefabAsset: {fileID: 0} +--- !u!1001 &272820857844891930 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4122773232124674516} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8849700390522381113 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 272820857844891930} + m_PrefabAsset: {fileID: 0} --- !u!1001 &354565620319075818 PrefabInstance: m_ObjectHideFlags: 0 @@ -710,6 +812,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 5321619860685055857, guid: a1daa1151c83c0940adb17206498cae7, type: 3} m_PrefabInstance: {fileID: 1106179983301972609} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1115328368937360416 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4122773232124674516} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8530736610964946435 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1115328368937360416} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1283421040619413632 PrefabInstance: m_ObjectHideFlags: 0 @@ -1602,6 +1770,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4206683368507738, guid: 190104e9bd5f8014eaf9a7f5f6f7a173, type: 3} m_PrefabInstance: {fileID: 2593113858492423633} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2768846805139006867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4122773232124674516} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -4.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &6878643691617535920 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2768846805139006867} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2847026849497376794 PrefabInstance: m_ObjectHideFlags: 0 @@ -4508,6 +4742,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8623956955956097110, guid: 7eeced1019e174746b70f6d231302092, type: 3} m_PrefabInstance: {fileID: 5092634083575858922} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5159850295138072668 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4122773232124674516} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -5.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -4.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &4504243943893326463 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5159850295138072668} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5178354038230777871 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab index d178f5d76d..4345ab3ba6 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab @@ -1,5 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2121798633141945671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4906831248869416068} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4906831248869416068 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2121798633141945671} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2871690151924706169} + - {fileID: 627316178277172214} + - {fileID: 1645983822323223813} + - {fileID: 3722254096035592780} + - {fileID: 5169100314836514156} + - {fileID: 5860583088710478835} + m_Father: {fileID: 7030881829091506616} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2466389582766669053 GameObject: m_ObjectHideFlags: 0 @@ -516,6 +553,7 @@ Transform: - {fileID: 4848048364834859171} - {fileID: 7543303181156465859} - {fileID: 4097611048824632125} + - {fileID: 4906831248869416068} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-2525122564263686767 @@ -530,7 +568,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 6 + _sectorName: 6 --- !u!1 &4849999044486617517 GameObject: m_ObjectHideFlags: 0 @@ -4742,6 +4780,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4403227958647314, guid: 5d25e0506da69a7439597dcbf0679992, type: 3} m_PrefabInstance: {fileID: 2835099630718894625} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2904201382861900240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4906831248869416068} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.3270035 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5860583088710478835 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2904201382861900240} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2925989616311270969 PrefabInstance: m_ObjectHideFlags: 0 @@ -6994,6 +7098,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4762855527793774, guid: 6e4838c593bfb3c43a2309aae3ada355, type: 3} m_PrefabInstance: {fileID: 4483067087994295840} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4514128381413021519 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4906831248869416068} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.3270035 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5169100314836514156 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 4514128381413021519} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4527317623193362941 PrefabInstance: m_ObjectHideFlags: 0 @@ -8474,6 +8644,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 5073119080776329634, guid: f275f8d58882a824985e40394b7d514b, type: 3} m_PrefabInstance: {fileID: 5328598286177343601} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5382127976439666799 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4906831248869416068} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (5) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7.376999 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3722254096035592780 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5382127976439666799} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5398245071682769501 PrefabInstance: m_ObjectHideFlags: 0 @@ -10662,6 +10902,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1109535223749527697, guid: f30d08c9479d5d3439e0b562a067db29, type: 3} m_PrefabInstance: {fileID: 6721846723859755124} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6828433932063918426 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4906831248869416068} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.3270035 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -15.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2871690151924706169 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6828433932063918426} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6883931716044475465 PrefabInstance: m_ObjectHideFlags: 0 @@ -11963,6 +12269,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4199916329550996, guid: 86b80002c35e25340ba30284fd29dfcc, type: 3} m_PrefabInstance: {fileID: 8025994728840152440} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8056525291386629926 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4906831248869416068} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7.376999 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1645983822323223813 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8056525291386629926} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8060332766303988176 PrefabInstance: m_ObjectHideFlags: 0 @@ -12033,6 +12405,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 3214364790916415859, guid: 362ac89037e36864cbd9e7722e16cfcd, type: 3} m_PrefabInstance: {fileID: 8060332766303988176} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8191377279645934037 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4906831248869416068} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.3270035 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &627316178277172214 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8191377279645934037} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8219335612892009616 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_B.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_B.prefab index ffa902e418..6f597b3ea0 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_B.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_B.prefab @@ -253,6 +253,40 @@ MonoBehaviour: m_PointlightHDType: 0 m_SpotLightShape: 0 m_AreaLightShape: 0 +--- !u!1 &3770266045915321571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4227651832194232843} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4227651832194232843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770266045915321571} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3318354211055034397} + - {fileID: 3163745380664738456} + - {fileID: 5106248038063860275} + m_Father: {fileID: 6572560661402770014} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6208686689887989248 GameObject: m_ObjectHideFlags: 0 @@ -505,6 +539,7 @@ Transform: - {fileID: 8771023244808667579} - {fileID: 1370281686095007714} - {fileID: 4850397611658819019} + - {fileID: 4227651832194232843} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7415935405905332431 @@ -519,7 +554,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 7 + _sectorName: 7 --- !u!1 &8232926710878765064 GameObject: m_ObjectHideFlags: 0 @@ -3360,6 +3395,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 7507489166190678863, guid: e184a306070986a4187bc706216a105e, type: 3} m_PrefabInstance: {fileID: 4495331137258178073} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4594862428143323152 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4227651832194232843} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -27 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5106248038063860275 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 4594862428143323152} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4998293340802013476 PrefabInstance: m_ObjectHideFlags: 0 @@ -3500,6 +3601,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 7252385066071721749, guid: 7df85ac1286578a4eba66148f84aa26e, type: 3} m_PrefabInstance: {fileID: 5306826456890137557} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5980449526779961531 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4227651832194232843} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3163745380664738456 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5980449526779961531} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6035393654899679187 PrefabInstance: m_ObjectHideFlags: 0 @@ -3780,6 +3947,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8636164128015988429, guid: 5d4b4cf1484dbfd45a1f5f69d471ed71, type: 3} m_PrefabInstance: {fileID: 6212310588656974432} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6274669949961765438 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4227651832194232843} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3318354211055034397 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6274669949961765438} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6556612686776719243 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_C.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_C.prefab index 13276eec98..ca3e99035f 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_C.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_C.prefab @@ -1,5 +1,41 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &324179270010359596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 180585117316501010} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &180585117316501010 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 324179270010359596} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5747754564241615667} + - {fileID: 7064961170474203395} + - {fileID: 8041003323243995905} + - {fileID: 6086004891970132352} + - {fileID: 2653192461372144532} + m_Father: {fileID: 8526681823817605822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2580729181858417355 GameObject: m_ObjectHideFlags: 0 @@ -35,6 +71,7 @@ Transform: - {fileID: 7854404588320239841} - {fileID: 8708445492229734261} - {fileID: 1875850117778268411} + - {fileID: 180585117316501010} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-6148775927861941732 @@ -49,7 +86,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 8 + _sectorName: 8 --- !u!1 &3971085310678949314 GameObject: m_ObjectHideFlags: 0 @@ -1584,6 +1621,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4762855527793774, guid: 6e4838c593bfb3c43a2309aae3ada355, type: 3} m_PrefabInstance: {fileID: 1586556453797899245} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1625328232962244898 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 180585117316501010} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8041003323243995905 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1625328232962244898} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1769553747262887127 PrefabInstance: m_ObjectHideFlags: 0 @@ -1728,6 +1831,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8636164128015988429, guid: 5d4b4cf1484dbfd45a1f5f69d471ed71, type: 3} m_PrefabInstance: {fileID: 1851748099631854256} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1950896746902821664 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 180585117316501010} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7064961170474203395 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1950896746902821664} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1954983428197628835 PrefabInstance: m_ObjectHideFlags: 0 @@ -3076,6 +3245,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8636164128015988429, guid: 5d4b4cf1484dbfd45a1f5f69d471ed71, type: 3} m_PrefabInstance: {fileID: 3233576427091752536} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3273245796882594723 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 180585117316501010} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &6086004891970132352 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3273245796882594723} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3307596826069162272 PrefabInstance: m_ObjectHideFlags: 0 @@ -3476,6 +3711,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4634420893798894, guid: 38d5fd6f5dff3db4db92338afb91813b, type: 3} m_PrefabInstance: {fileID: 3917234567340714827} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3953336746410838288 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 180585117316501010} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5747754564241615667 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3953336746410838288} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4098412807182128596 PrefabInstance: m_ObjectHideFlags: 0 @@ -4784,6 +5085,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 6718887225993151767} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6758560526152096183 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 180585117316501010} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2653192461372144532 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6758560526152096183} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6826207521207488273 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_D.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_D.prefab index cc9bcdc2dd..0175244bc4 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_D.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_D.prefab @@ -258,6 +258,43 @@ Transform: - {fileID: 7919217362589833650} m_Father: {fileID: 7916074991387379828} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2141004266282895592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3214344850479541438} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3214344850479541438 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141004266282895592} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2724815395889668039} + - {fileID: 4022946480297723533} + - {fileID: 8441758704938782860} + - {fileID: 8622053544234160084} + - {fileID: 8395081733544865328} + - {fileID: 5280464535755483309} + m_Father: {fileID: 7916074991387379828} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3947610435363865407 GameObject: m_ObjectHideFlags: 0 @@ -668,6 +705,7 @@ Transform: - {fileID: 7309908535691117150} - {fileID: 502876280356280878} - {fileID: 1009973490379413881} + - {fileID: 3214344850479541438} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5818788633809365256 @@ -682,7 +720,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 9 + _sectorName: 9 --- !u!1001 &3539183466752649 PrefabInstance: m_ObjectHideFlags: 0 @@ -1583,6 +1621,138 @@ Transform: m_CorrespondingSourceObject: {fileID: 1396981801571505080, guid: 5f5deb8a730fa434d86fcfef00c868f6, type: 3} m_PrefabInstance: {fileID: 745771338297333866} m_PrefabAsset: {fileID: 0} +--- !u!1001 &882164915838743215 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3214344850479541438} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 30.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8441758704938782860 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 882164915838743215} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &979639410299407379 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3214344850479541438} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (5) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8395081733544865328 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 979639410299407379} + m_PrefabAsset: {fileID: 0} --- !u!1001 &994875441671112518 PrefabInstance: m_ObjectHideFlags: 0 @@ -1649,6 +1819,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4370904986015425700, guid: 0d6d4e0a26a07a24091cae7e3134890f, type: 3} m_PrefabInstance: {fileID: 994875441671112518} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1062430072749223415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3214344850479541438} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8622053544234160084 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1062430072749223415} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1266369149056337941 PrefabInstance: m_ObjectHideFlags: 0 @@ -3945,6 +4181,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1960395723308066859, guid: cda76614c4b6ac74cb9cf74140116cd7, type: 3} m_PrefabInstance: {fileID: 3331804882234857260} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3485443086913473166 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3214344850479541438} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5280464535755483309 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3485443086913473166} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3542298357395946577 PrefabInstance: m_ObjectHideFlags: 0 @@ -5699,6 +6001,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 4973137022528687228, guid: 775c2b221bc9c31468e619cf8685f44f, type: 3} m_PrefabInstance: {fileID: 5612728360640472985} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5678284880608011438 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3214344850479541438} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8016925210136668112, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Size.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 25.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &4022946480297723533 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5678284880608011438} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5720717244693047806 PrefabInstance: m_ObjectHideFlags: 0 @@ -6307,6 +6679,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1960395723308066859, guid: cda76614c4b6ac74cb9cf74140116cd7, type: 3} m_PrefabInstance: {fileID: 6624134172899509995} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6685962719949340132 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3214344850479541438} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2724815395889668039 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6685962719949340132} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6688571687930846134 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_E.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_E.prefab index 1c754ead16..86156d108d 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_E.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_E.prefab @@ -478,6 +478,46 @@ Transform: - {fileID: 6515577324248042238} m_Father: {fileID: 7871300608111827072} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4896015604569315285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7075717613184243484} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7075717613184243484 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4896015604569315285} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1991123753413710451} + - {fileID: 2569771114852600032} + - {fileID: 2920953209216628551} + - {fileID: 1201308681550414244} + - {fileID: 7195785423010439761} + - {fileID: 7442583688089292708} + - {fileID: 5928569790503195147} + - {fileID: 6693609160068698132} + - {fileID: 7639943583713337866} + m_Father: {fileID: 7871300608111827072} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5676764174372770610 GameObject: m_ObjectHideFlags: 0 @@ -776,6 +816,7 @@ Transform: - {fileID: 2844514311041110616} - {fileID: 3217631232535698040} - {fileID: 8316656186227101622} + - {fileID: 7075717613184243484} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2182321055254443742 @@ -790,7 +831,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 10 + _sectorName: 10 --- !u!1 &8847917592352363721 GameObject: m_ObjectHideFlags: 0 @@ -2937,6 +2978,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 7507489166190678863, guid: e184a306070986a4187bc706216a105e, type: 3} m_PrefabInstance: {fileID: 1339195969713213163} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1378025310130487337 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -3.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7639943583713337866 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1378025310130487337} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1427429368234703153 PrefabInstance: m_ObjectHideFlags: 0 @@ -3499,6 +3606,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 1854264070442826822} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1929126369768882290 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (7) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -17.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7195785423010439761 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 1929126369768882290} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1941071931948071333 PrefabInstance: m_ObjectHideFlags: 0 @@ -3877,6 +4050,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4736912918157808, guid: d795df5828ab740498024803d1bab9d5, type: 3} m_PrefabInstance: {fileID: 2156551646837900512} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2184365594994584967 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &7442583688089292708 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2184365594994584967} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2192381184092654239 PrefabInstance: m_ObjectHideFlags: 0 @@ -4859,6 +5098,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 6873070352875678599, guid: c0702453784d8a3489180281adf6d1e1, type: 3} m_PrefabInstance: {fileID: 2729922811387878854} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2737423935676314167 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (4) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 15.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &6693609160068698132 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 2737423935676314167} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2753750681608860478 PrefabInstance: m_ObjectHideFlags: 0 @@ -5369,6 +5674,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1339839159376874833, guid: ad4b32e8b7d1a8445973167be01cc4fa, type: 3} m_PrefabInstance: {fileID: 3046279733688048982} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3125410531505041448 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (3) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 15.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5928569790503195147 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3125410531505041448} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3133258115007773609 PrefabInstance: m_ObjectHideFlags: 0 @@ -8533,6 +8904,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4911427546289957502, guid: c74af09555f19df4b8dec2dfb37ed825, type: 3} m_PrefabInstance: {fileID: 5770951344326502120} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5877336010147599716 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (5) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2920953209216628551 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5877336010147599716} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5892656881684921411 PrefabInstance: m_ObjectHideFlags: 0 @@ -9031,6 +9468,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3} m_PrefabInstance: {fileID: 6513727263284422204} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6534894270808599235 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (8) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -27 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2569771114852600032 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6534894270808599235} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6536400215835880018 PrefabInstance: m_ObjectHideFlags: 0 @@ -9915,6 +10418,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4911427546289957502, guid: c74af09555f19df4b8dec2dfb37ed825, type: 3} m_PrefabInstance: {fileID: 7104535850340615199} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7113670910753665104 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1991123753413710451 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7113670910753665104} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7237588192280731784 PrefabInstance: m_ObjectHideFlags: 0 @@ -10817,6 +11386,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4052524070656958, guid: a9f8c38b487c5434e8cb25b5ee8aad77, type: 3} m_PrefabInstance: {fileID: 7614989705302492612} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7616384530076050311 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7075717613184243484} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (6) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -12.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1201308681550414244 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7616384530076050311} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7647093684396464837 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_DiningFacility.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_DiningFacility.prefab index f125cbb528..59d53e1de1 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_DiningFacility.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_DiningFacility.prefab @@ -230,6 +230,9 @@ Transform: - {fileID: 6086775654141306116} - {fileID: 8385858882637398967} - {fileID: 3302065520905362182} + - {fileID: 8845616654724147569} + - {fileID: 2942272792196209430} + - {fileID: 9080451087695059798} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-6069848341049355073 @@ -244,7 +247,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 24 + _sectorName: 24 --- !u!1001 &57763203265101648 PrefabInstance: m_ObjectHideFlags: 0 @@ -562,6 +565,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4206683368507738, guid: 190104e9bd5f8014eaf9a7f5f6f7a173, type: 3} m_PrefabInstance: {fileID: 250464885010898452} m_PrefabAsset: {fileID: 0} +--- !u!1001 &277186858856598354 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2310662274663431021} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8845616654724147569 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 277186858856598354} + m_PrefabAsset: {fileID: 0} --- !u!1001 &337139348183564690 PrefabInstance: m_ObjectHideFlags: 0 @@ -702,6 +771,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 376990312512655879} m_PrefabAsset: {fileID: 0} +--- !u!1001 &512579842190801269 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2310662274663431021} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -4.75 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &9080451087695059798 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 512579842190801269} + m_PrefabAsset: {fileID: 0} --- !u!1001 &586444370335002059 PrefabInstance: m_ObjectHideFlags: 0 @@ -4782,6 +4917,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4464434467987012, guid: 00624f6addabf9c459deef1f359a78ed, type: 3} m_PrefabInstance: {fileID: 5687424208602296853} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5894155307285199157 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2310662274663431021} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2942272792196209430 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5894155307285199157} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5930531063524594029 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_DirectorOffice.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_DirectorOffice.prefab index 95d3390f27..2207542799 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_DirectorOffice.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_DirectorOffice.prefab @@ -135,6 +135,7 @@ Transform: - {fileID: 2231643247058121282} - {fileID: 7957336373857459762} - {fileID: 7784068170036377248} + - {fileID: 355951849073655636} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-8240646213642526433 @@ -149,7 +150,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 23 + _sectorName: 23 --- !u!1 &5436852434804807092 GameObject: m_ObjectHideFlags: 0 @@ -230,6 +231,40 @@ Transform: - {fileID: 8408292648158978990} m_Father: {fileID: 8401009046440917759} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8087633152454147212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 355951849073655636} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &355951849073655636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8087633152454147212} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1809218670365738604} + - {fileID: 5191960743508675807} + - {fileID: 2007972862589009830} + m_Father: {fileID: 8401009046440917759} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &57839328849059153 PrefabInstance: m_ObjectHideFlags: 0 @@ -2400,6 +2435,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 627425291113218191, guid: 2fc7c5eb874d60f47944142826b300d6, type: 3} m_PrefabInstance: {fileID: 3465449592072816043} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3536660824947617532 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 355951849073655636} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &5191960743508675807 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 3536660824947617532} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3650870508488506129 PrefabInstance: m_ObjectHideFlags: 0 @@ -5624,6 +5725,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4206683368507738, guid: 190104e9bd5f8014eaf9a7f5f6f7a173, type: 3} m_PrefabInstance: {fileID: 6886505132196489030} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6918250627088180303 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 355951849073655636} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &1809218670365738604 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6918250627088180303} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6962366228322274235 PrefabInstance: m_ObjectHideFlags: 0 @@ -5760,6 +5927,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 999086274591328610, guid: 1295290b41ef3e448a2f350337a44cb5, type: 3} m_PrefabInstance: {fileID: 7038003576141067135} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7117079598984895877 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 355951849073655636} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -12.5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2007972862589009830 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 7117079598984895877} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7138697970478216226 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Oratory.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Oratory.prefab index 5b46ed671e..ebdf548c04 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Oratory.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Oratory.prefab @@ -107,6 +107,7 @@ Transform: - {fileID: 3004056753852639565} - {fileID: 6798207261400008944} - {fileID: 6346831998735135326} + - {fileID: 1575188553496214028} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-4016203353068395172 @@ -121,7 +122,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 19 + _sectorName: 19 --- !u!1 &2433728755940253049 GameObject: m_ObjectHideFlags: 0 @@ -159,6 +160,39 @@ Transform: - {fileID: 4037753113487534669} m_Father: {fileID: 6371369268462498005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3372925705836487871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575188553496214028} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1575188553496214028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372925705836487871} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 753088015553868740} + - {fileID: 3256393231310201352} + m_Father: {fileID: 6371369268462498005} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4403967852139933779 GameObject: m_ObjectHideFlags: 0 @@ -2665,6 +2699,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 7102179874826322983, guid: ac6e75c448fc84244a8f3e965173d2ed, type: 3} m_PrefabInstance: {fileID: 5824993552073552415} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6064161657631424555 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1575188553496214028} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &3256393231310201352 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6064161657631424555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6315066883139144646 PrefabInstance: m_ObjectHideFlags: 0 @@ -3713,6 +3813,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 5672197393015624759, guid: 43423153196010c40b4b15b455a1aab3, type: 3} m_PrefabInstance: {fileID: 8194417331818919521} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8316656537240097255 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1575188553496214028} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &753088015553868740 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 8316656537240097255} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8400260465552675104 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_StaffAccommodation.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_StaffAccommodation.prefab index e90ed020e2..0eb219e6a6 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_StaffAccommodation.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_StaffAccommodation.prefab @@ -1,5 +1,39 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &410934435731279671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2631969266223666432} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2631969266223666432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410934435731279671} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2947427363595469185} + - {fileID: 2467239279537659384} + - {fileID: 2672802247313168457} + m_Father: {fileID: 5924877612862293565} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3505096717644258544 GameObject: m_ObjectHideFlags: 0 @@ -73,6 +107,7 @@ Transform: - {fileID: 3599829620388061786} - {fileID: 3424229378863905345} - {fileID: 428096928676532664} + - {fileID: 2631969266223666432} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7910627269282053107 @@ -87,7 +122,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 20 + _sectorName: 20 --- !u!1 &5735916510823790369 GameObject: m_ObjectHideFlags: 0 @@ -3312,6 +3347,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4671321187302846, guid: ba42fc954ba33914eb8e2b1cca437221, type: 3} m_PrefabInstance: {fileID: 5905042136022793209} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5908281892021380002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2631969266223666432} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7.3897514 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: -0.006308794 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 15.146366 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2947427363595469185 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 5908281892021380002} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6050209572204609259 PrefabInstance: m_ObjectHideFlags: 0 @@ -3896,6 +3997,138 @@ Transform: m_CorrespondingSourceObject: {fileID: 8916193673112932664, guid: e20cbc2615d7fc3409590989c7a38a8e, type: 3} m_PrefabInstance: {fileID: 6564026918087245619} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6567470417536810971 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2631969266223666432} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7.3897514 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: -0.006308794 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 5.146366 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2467239279537659384 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6567470417536810971} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6633382213639928426 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2631969266223666432} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (2) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -5.1397514 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: -0.006308794 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: -1.9540005 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &2672802247313168457 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 6633382213639928426} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6818594174844656463 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_VisitingRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_VisitingRoom.prefab index b5c8a19082..38dfc3b324 100644 --- a/Client/Assets/Resources/Prefabs/Map/Sector/2F_VisitingRoom.prefab +++ b/Client/Assets/Resources/Prefabs/Map/Sector/2F_VisitingRoom.prefab @@ -1,5 +1,38 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1186944842661276238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6010169332255234581} + m_Layer: 11 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6010169332255234581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186944842661276238} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8123603656191848846} + - {fileID: 545699350037221484} + m_Father: {fileID: 6012059497310523681} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3933186621286012526 GameObject: m_ObjectHideFlags: 0 @@ -71,6 +104,7 @@ Transform: - {fileID: 6474080531349287071} - {fileID: 1696465050933001017} - {fileID: 3674345850370954774} + - {fileID: 6010169332255234581} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7310682375787876138 @@ -85,7 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a2b6f88f3b3b2847819ca908b010363, type: 3} m_Name: m_EditorClassIdentifier: - sectorName: 22 + _sectorName: 22 --- !u!1 &5224220058592922590 GameObject: m_ObjectHideFlags: 0 @@ -518,6 +552,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 4883056544900360, guid: a44bd4942a331ad47867181330dd2448, type: 3} m_PrefabInstance: {fileID: 462348472342162340} m_PrefabAsset: {fileID: 0} +--- !u!1001 &695213496835527597 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6010169332255234581} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &8123603656191848846 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 695213496835527597} + m_PrefabAsset: {fileID: 0} --- !u!1001 &870728113144501295 PrefabInstance: m_ObjectHideFlags: 0 @@ -3906,6 +4006,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8582311793541677496, guid: 5db94a8dc53db0043b0e5e0c56f52a69, type: 3} m_PrefabInstance: {fileID: 8914563876553687598} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9118527191157584463 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6010169332255234581} + m_Modifications: + - target: {fileID: 1366310567346357768, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_Name + value: SectorEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 5677113733257874154, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: _sectorName + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.x + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} +--- !u!4 &545699350037221484 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8726061286910157347, guid: cac5023e26240ff4eb213c3a515f2125, type: 3} + m_PrefabInstance: {fileID: 9118527191157584463} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9164749705541175980 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab b/Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab new file mode 100644 index 0000000000..ceef9d0e8a --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1366310567346357768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8726061286910157347} + - component: {fileID: 8016925210136668112} + - component: {fileID: 5677113733257874154} + m_Layer: 0 + m_Name: SectorEntrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8726061286910157347 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366310567346357768} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8016925210136668112 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366310567346357768} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 3, z: 0.25} + m_Center: {x: 0, y: 1.5, z: 0} +--- !u!114 &5677113733257874154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366310567346357768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd44deb43c680c24c93655e774f82b53, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab.meta b/Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab.meta new file mode 100644 index 0000000000..c2cde0a4e2 --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Map/SectorEntrance.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cac5023e26240ff4eb213c3a515f2125 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab index 59f035b053..52dfb1b9d8 100644 --- a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab +++ b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 516434508644561993} - component: {fileID: 7207966761359428766} - component: {fileID: 3003123320743294143} + - component: {fileID: 4704297354454387191} - component: {fileID: 7456184101988879778} - component: {fileID: 7673804491711146235} m_Layer: 0 @@ -54,6 +55,7 @@ MonoBehaviour: NestedObjects: [] NetworkedBehaviours: - {fileID: 3003123320743294143} + - {fileID: 4704297354454387191} - {fileID: 7456184101988879778} - {fileID: 7673804491711146235} - {fileID: 3928836982233390386} @@ -69,9 +71,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d6991fad599db5a41a0b4c49e1eb61e3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4704297354454387191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6419352827352035619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffc228bebe0243e459c3ada1e2be34bc, type: 3} + m_Name: + m_EditorClassIdentifier: _totalItemCount: 10 _itemSpawnDatas: - - Prefab: {fileID: 1120575333297816, guid: e33450eb92498084b835521234b119fc, type: 3} + - Prefab: {fileID: 2456343074442511123, guid: 651267bc0bc8c0a4fbf95c442517d389, type: 3} GlobalMinCount: 10 GlobalMaxCount: 10 MaxCountPerSector: 10 @@ -87,18 +101,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c160b5c6947d1e34ea6fe249fb97cea6, type: 3} m_Name: m_EditorClassIdentifier: - _batteryChargers: [] - _centralControlComputers: [] - _elevatorControlComputers: [] - _cargoPassageControlComputers: [] - _elevatorKeypads: [] - _cargoPassageGates: - - {fileID: 0} _BatteryChargeCount: 0 _USBKeyInsertCount: 0 _IsCardkeyUsed: _value: 0 - _IsCargoPassageUnlocked: + _IsCentralComputerWorkFinished: + _value: 0 + _IsCargoPassageOpen: _value: 0 --- !u!114 &7673804491711146235 MonoBehaviour: @@ -112,7 +121,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9636914bd642a5f46b72ec251efe930c, type: 3} m_Name: m_EditorClassIdentifier: - DeathCount: 0 + _CrewNum: 1 + _KilledCrewNum: 0 --- !u!1 &7900258476493451640 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/UI/Scene/UI_AlienIngame.prefab b/Client/Assets/Resources/Prefabs/UI/Scene/UI_AlienIngame.prefab index 37fe4b4272..886dc0ab6c 100644 --- a/Client/Assets/Resources/Prefabs/UI/Scene/UI_AlienIngame.prefab +++ b/Client/Assets/Resources/Prefabs/UI/Scene/UI_AlienIngame.prefab @@ -32,6 +32,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 900606130089702867} - {fileID: 277740841914005403} - {fileID: 8967625498928899649} - {fileID: 2118461260201502109} @@ -221,6 +222,108 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2819248160265837892, guid: 42404a70a901c9e42bfccd821b84e2f8, type: 3} m_PrefabInstance: {fileID: 2649594948293716703} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3125607831451510935 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6576529410540298847} + m_Modifications: + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5535641532313121958, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_Name + value: UI_CurrentSector + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} +--- !u!224 &900606130089702867 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + m_PrefabInstance: {fileID: 3125607831451510935} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3198614262795951832 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefabs/UI/Scene/UI_CrewIngame.prefab b/Client/Assets/Resources/Prefabs/UI/Scene/UI_CrewIngame.prefab index c881a573a4..ef7d9e282d 100644 --- a/Client/Assets/Resources/Prefabs/UI/Scene/UI_CrewIngame.prefab +++ b/Client/Assets/Resources/Prefabs/UI/Scene/UI_CrewIngame.prefab @@ -39,6 +39,7 @@ RectTransform: - {fileID: 1988208827705264256} - {fileID: 8131873568155602163} - {fileID: 4974979279444273646} + - {fileID: 112829885067428608} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -429,7 +430,7 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2819248160265837892, guid: 42404a70a901c9e42bfccd821b84e2f8, type: 3} m_PrefabInstance: {fileID: 2005551405941948915} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4872872506620933043 +--- !u!1001 &2778476247233044036 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -437,62 +438,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6576529410540298847} m_Modifications: - - target: {fileID: 723519569180281266, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_SizeDelta.x - value: 85 + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_Pivot.x + value: 1 objectReference: {fileID: 0} - - target: {fileID: 723519569180281266, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 57.5 + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_Pivot.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1525063773675177364, guid: 7fb321c109484244da959fcbb55237a5, type: 3} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1525063773675177364, guid: 7fb321c109484244da959fcbb55237a5, type: 3} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1525063773675177364, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1525063773675177364, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1963603420777180691, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_text - value: Complete Any Plan To Escape! + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1963603420777180691, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_fontSize - value: 36 + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1963603420777180691, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_fontSizeBase - value: 36 + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1963603420777180691, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_HorizontalAlignment + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3011784763188807690, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMax.y + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3011784763188807690, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMin.y + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3011784763188807690, guid: 7fb321c109484244da959fcbb55237a5, type: 3} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3011784763188807690, guid: 7fb321c109484244da959fcbb55237a5, type: 3} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5535641532313121958, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + propertyPath: m_Name + value: UI_CurrentSector + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} +--- !u!224 &112829885067428608 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2819248160265837892, guid: f4fc435ce66a331409e18366c360e9b9, type: 3} + m_PrefabInstance: {fileID: 2778476247233044036} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4872872506620933043 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6576529410540298847} + m_Modifications: - target: {fileID: 3532383360142801733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} propertyPath: m_Pivot.x value: 0 @@ -519,7 +566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3532383360142801733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} propertyPath: m_SizeDelta.x - value: 500 + value: 600 objectReference: {fileID: 0} - target: {fileID: 3532383360142801733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} propertyPath: m_SizeDelta.y @@ -573,82 +620,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4108862584015617289, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_SizeDelta.x - value: 85 - objectReference: {fileID: 0} - - target: {fileID: 4108862584015617289, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 57.5 - objectReference: {fileID: 0} - target: {fileID: 6098284639046046349, guid: 7fb321c109484244da959fcbb55237a5, type: 3} propertyPath: m_Name value: UI_CrewPlan objectReference: {fileID: 0} - - target: {fileID: 6354848574217046198, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_SizeDelta.x - value: 85 - objectReference: {fileID: 0} - - target: {fileID: 6354848574217046198, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 57.5 - objectReference: {fileID: 0} - - target: {fileID: 6821180697496733372, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6821180697496733372, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6821180697496733372, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6821180697496733372, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7623851190638782733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7623851190638782733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7623851190638782733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7623851190638782733, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8018147644187815082, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_SizeDelta.x - value: 85 - objectReference: {fileID: 0} - - target: {fileID: 8018147644187815082, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 57.5 - objectReference: {fileID: 0} - - target: {fileID: 8874926850589015463, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8874926850589015463, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8874926850589015463, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8874926850589015463, guid: 7fb321c109484244da959fcbb55237a5, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CrewPlan.prefab b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CrewPlan.prefab index 502ddf4a14..e06958bde3 100644 --- a/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CrewPlan.prefab +++ b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CrewPlan.prefab @@ -110,7 +110,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 80} + m_SizeDelta: {x: 600, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3530782654657067108 GameObject: @@ -416,8 +416,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 47.5, y: 0} - m_SizeDelta: {x: 65, y: 80} + m_AnchoredPosition: {x: 7.5, y: 0} + m_SizeDelta: {x: -15, y: 80} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7983847557767919412 CanvasRenderer: @@ -492,7 +492,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 45} + m_SizeDelta: {x: 600, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7099174253948241357 CanvasRenderer: @@ -549,8 +549,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -761,8 +761,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 47.5, y: 0} - m_SizeDelta: {x: 65, y: 80} + m_AnchoredPosition: {x: 7.5, y: 0} + m_SizeDelta: {x: -15, y: 80} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1654516281435233889 CanvasRenderer: @@ -987,7 +987,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 80} + m_SizeDelta: {x: 600, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5676609914032324711 GameObject: @@ -1159,8 +1159,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 47.5, y: 0} - m_SizeDelta: {x: 65, y: 80} + m_AnchoredPosition: {x: 7.5, y: 0} + m_SizeDelta: {x: -15, y: 80} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4350685224303230770 CanvasRenderer: @@ -1316,8 +1316,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 47.5, y: 0} - m_SizeDelta: {x: 65, y: 80} + m_AnchoredPosition: {x: 7.5, y: 0} + m_SizeDelta: {x: -15, y: 80} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2203569006632266092 CanvasRenderer: @@ -1601,7 +1601,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 80} + m_SizeDelta: {x: 600, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8096845043480073182 GameObject: @@ -1638,7 +1638,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 80} + m_SizeDelta: {x: 600, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8214970937103507610 GameObject: diff --git a/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab new file mode 100644 index 0000000000..ff1410fd9c --- /dev/null +++ b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab @@ -0,0 +1,185 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2798048529529009595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 895488936325197187} + - component: {fileID: 7994184316931076239} + - component: {fileID: 1762371908497907153} + m_Layer: 5 + m_Name: SectorName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &895488936325197187 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2798048529529009595} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2819248160265837892} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -30} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 1, y: 1} +--- !u!222 &7994184316931076239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2798048529529009595} + m_CullTransparentMesh: 1 +--- !u!114 &1762371908497907153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2798048529529009595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Current Sector + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2} + m_sharedMaterial: {fileID: 21148088844906328, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5535641532313121958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2819248160265837892} + - component: {fileID: 6043246950878767426} + m_Layer: 5 + m_Name: UI_CurrentSector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2819248160265837892 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5535641532313121958} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 895488936325197187} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &6043246950878767426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5535641532313121958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f235a713455eee4e97aa8d37b831518, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab.meta b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab.meta new file mode 100644 index 0000000000..bdd867a5ae --- /dev/null +++ b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CurrentSector.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4fc435ce66a331409e18366c360e9b9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity index 14127e45e6..c30709cc45 100644 --- a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity +++ b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity @@ -184,71 +184,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} ---- !u!1001 &61245165 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 109093547010764863, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: SortKey - value: 2836494454 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3968574085925093168, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_Name - value: '@PlanSystem' - objectReference: {fileID: 0} - - target: {fileID: 3968574085925093168, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4e42a1703c8eeac428705ce64d5632e2, type: 3} --- !u!1 &118287624 GameObject: m_ObjectHideFlags: 0 @@ -5667,7 +5602,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlayerName: Player DefaultRoomName: TestMapScene2 - Creature: 2 + Creature: 1 PrefabNum: 0 PlayerSpawnPosition: {x: 0, y: 0.15, z: 0} --- !u!114 &999382491 @@ -7198,83 +7133,6 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 ---- !u!1001 &1334898364 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 14220058542274128, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1501787418130949391, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: _totalItemCount - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 1501787418130949391, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: _itemSpawnDatas.Array.data[0].GlobalMaxCount - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 1501787418130949391, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: _itemSpawnDatas.Array.data[0].GlobalMinCount - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3213453872573541556, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: SortKey - value: 3792160944 - objectReference: {fileID: 0} - - target: {fileID: 6805510342841796365, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_Name - value: '@MapSystem' - objectReference: {fileID: 0} - - target: {fileID: 6805510342841796365, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} --- !u!1 &1337331063 GameObject: m_ObjectHideFlags: 0 @@ -10244,6 +10102,28 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1741809153} m_CullTransparentMesh: 1 +--- !u!114 &1758233478 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7673804491711146235, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + m_PrefabInstance: {fileID: 2981817491508463974} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9636914bd642a5f46b72ec251efe930c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1758233479 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7456184101988879778, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + m_PrefabInstance: {fileID: 2981817491508463974} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c160b5c6947d1e34ea6fe249fb97cea6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1759275590 PrefabInstance: m_ObjectHideFlags: 0 @@ -10839,71 +10719,6 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} ---- !u!1001 &1848051247 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 109093547010764863, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: SortKey - value: 1241572990 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2098150709535362845, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3968574085925093168, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_Name - value: '@GameEndSystem' - objectReference: {fileID: 0} - - target: {fileID: 3968574085925093168, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6ff224c9f8db3f341bd72003f6177ed2, type: 3} --- !u!1 &1869801921 GameObject: m_ObjectHideFlags: 0 @@ -12221,15 +12036,38 @@ PrefabInstance: propertyPath: SortKey value: 2076527104 objectReference: {fileID: 0} - - target: {fileID: 7456184101988879778, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} - propertyPath: _cargoPassageGates.Array.data[0] - value: + - target: {fileID: 7207966761359428766, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + propertyPath: NetworkedBehaviours.Array.size + value: 5 objectReference: {fileID: 0} + - target: {fileID: 7207966761359428766, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + propertyPath: NetworkedBehaviours.Array.data[1] + value: + objectReference: {fileID: 2981817491508463975} + - target: {fileID: 7207966761359428766, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + propertyPath: NetworkedBehaviours.Array.data[2] + value: + objectReference: {fileID: 1758233479} + - target: {fileID: 7207966761359428766, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + propertyPath: NetworkedBehaviours.Array.data[3] + value: + objectReference: {fileID: 1758233478} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} +--- !u!114 &2981817491508463975 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4704297354454387191, guid: 8c3e932a4b53f7b438cd670dfcf114e6, type: 3} + m_PrefabInstance: {fileID: 2981817491508463974} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffc228bebe0243e459c3ada1e2be34bc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5681859300517041321 PrefabInstance: m_ObjectHideFlags: 0 @@ -12385,10 +12223,7 @@ SceneRoots: - {fileID: 999382492} - {fileID: 778957063} - {fileID: 2981817491508463974} - - {fileID: 61245165} - {fileID: 1516046508} - - {fileID: 1334898364} - - {fileID: 1848051247} - {fileID: 5681859300517041321} - {fileID: 653778741} - {fileID: 1629368059} diff --git a/Client/Assets/Scripts/Contents/Map/Sector.cs b/Client/Assets/Scripts/Contents/Map/Sector.cs index 82ad4649f9..e5d159bada 100644 --- a/Client/Assets/Scripts/Contents/Map/Sector.cs +++ b/Client/Assets/Scripts/Contents/Map/Sector.cs @@ -7,8 +7,9 @@ public class Sector : MonoBehaviour { - [SerializeField] - public Define.SectorName sectorName; + [SerializeField] // 인스펙터 창에서 지정을 위해 필요 + private Define.SectorName _sectorName; + public Define.SectorName SectorName => _sectorName; private List _itemSpawnPoints = new(); private Transform _itemParent; @@ -31,7 +32,6 @@ public bool SpawnItem(GameObject go) Transform spawnPoint = _itemSpawnPoints[Random.Range(0, _itemSpawnPoints.Count)]; NetworkObject no = Managers.NetworkMng.Runner.Spawn(go, spawnPoint.position, spawnPoint.rotation); - //no.transform.SetParent(Managers.GameMng.MapSystem.gameObject.transform); no.transform.SetParent(_itemParent); BaseItemObject item = no.GetComponent(); @@ -43,4 +43,22 @@ public bool SpawnItem(GameObject go) return true; } + + public void OnCreatureEnter(Creature creature) + { + Debug.Log($"{SectorName}: OnCreatureEnter"); + if (creature is Crew) + { + // TODO: 전역효과 효과 적용 등 + } + } + + public void OnCreatureExit(Creature creature) + { + Debug.Log($"{SectorName}: OnCreatureExit"); + if (creature is Crew) + { + // TODO: 전역효과 효과 해제 등 + } + } } diff --git a/Client/Assets/Scripts/Contents/Map/SectorEntrance.cs b/Client/Assets/Scripts/Contents/Map/SectorEntrance.cs new file mode 100644 index 0000000000..f3a3cee564 --- /dev/null +++ b/Client/Assets/Scripts/Contents/Map/SectorEntrance.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SectorEntrance : MonoBehaviour +{ + [SerializeField] private Define.SectorName _sectorName; + + private void OnTriggerExit(Collider other) + { + if (other.TryGetComponent(out var creature)) + { + if (creature.CurrentSector != _sectorName) + { + if (creature.CurrentSector != Define.SectorName.None) Managers.GameMng.MapSystem.Sectors[creature.CurrentSector].OnCreatureExit(creature); + creature.CurrentSector = _sectorName; + if (_sectorName != Define.SectorName.None) Managers.GameMng.MapSystem.Sectors[_sectorName].OnCreatureEnter(creature); + } + } + } +} diff --git a/Client/Assets/Scripts/Contents/Map/SectorEntrance.cs.meta b/Client/Assets/Scripts/Contents/Map/SectorEntrance.cs.meta new file mode 100644 index 0000000000..ebae0204a8 --- /dev/null +++ b/Client/Assets/Scripts/Contents/Map/SectorEntrance.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd44deb43c680c24c93655e774f82b53 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scripts/Creatures/Creature.cs b/Client/Assets/Scripts/Creatures/Creature.cs index 56dd1a723e..29d16a0f17 100644 --- a/Client/Assets/Scripts/Creatures/Creature.cs +++ b/Client/Assets/Scripts/Creatures/Creature.cs @@ -64,6 +64,16 @@ public Define.CreaturePose CreaturePose public BaseSoundController BaseSoundController { get; protected set; } public UI_Ingame IngameUI { get; set; } + private Define.SectorName _currentSector = Define.SectorName.F1_Corridor_A; // TODO: 임시 초기값 + public Define.SectorName CurrentSector + { + get => _currentSector; + set + { + _currentSector = value; + IngameUI.CurrentSectorUI.SetSector(value); + } + } public GameObject Head { get; protected set; } public CreatureCamera CreatureCamera { get; protected set; } diff --git a/Client/Assets/Scripts/Systems/ItemSpawner.cs b/Client/Assets/Scripts/Systems/ItemSpawner.cs new file mode 100644 index 0000000000..14ed2a6f7d --- /dev/null +++ b/Client/Assets/Scripts/Systems/ItemSpawner.cs @@ -0,0 +1,113 @@ +using Fusion; +using System.Collections.Generic; +using UnityEngine; +using Random = UnityEngine.Random; + +public class ItemSpawner : NetworkBehaviour +{ + private Dictionary Sectors => Managers.GameMng.MapSystem.Sectors; + + [Header("Item Spawn")] + [SerializeField] private int _totalItemCount; + [SerializeField] private List _itemSpawnDatas; + + public void SpawnItems() + { + if(!Runner.IsSharedModeMasterClient) return; + + int totalCount = 0; + Dictionary totalItemCount = new(); + Dictionary> itemPerSectorCount = new(); + List availableSectors = new(Sectors.Keys); + List itemSpawnData = new(_itemSpawnDatas); + + foreach (var key in itemSpawnData) + { + totalItemCount.Add(key, 0); + } + + foreach (var sector in availableSectors) + { + Dictionary itemSpawnDataCount = new(); + foreach (var data in itemSpawnData) + { + itemSpawnDataCount[data] = 0; + } + itemPerSectorCount.Add(sector, itemSpawnDataCount); + } + + // 아이템별 최소 개수 충족시키기 + List itemSpawnDataCopy = new(itemSpawnData); // 아이템 생성 중 itemSpawnData리스트에서 요소가 Remove될 수 있기 때문에 foreach문을 위해 Copy된 리스트 사용 + foreach (var data in itemSpawnDataCopy) + { + // 데이터 검증도 동시에 함 + if (!data.Validate()) + { + itemSpawnData.Remove(data); + continue; + } + + int cnt = 0; + + while (cnt < data.GlobalMinCount && totalCount < _totalItemCount) + { + if(!TrySpawnItem(data)) return; + cnt++; + } + } + + // 총 아이템 수에 맞춰 아이템 배치 + while (itemSpawnData.Count != 0 && totalCount < _totalItemCount) + { + var selected = itemSpawnData[Random.Range(0, itemSpawnData.Count)]; + if (!TrySpawnItem(selected)) return; + } + + return; + + bool TrySpawnItem(ItemSpawnData data) + { + if(!TrySelectSector(data, out Define.SectorName selectedSector)) return false; + + while (!Sectors[selectedSector].SpawnItem(data.Prefab)) + { + availableSectors.Remove(selectedSector); + if (availableSectors.Count == 0) + { + Debug.LogWarning("Cannot spawn more items: no more available sectors"); + return false; + } + if (!TrySelectSector(data, out selectedSector)) return false; + } + + totalItemCount[data]++; + itemPerSectorCount[selectedSector][data]++; + totalCount++; + + if (data.GlobalMaxCount == totalItemCount[data]) itemSpawnData.Remove(data); + + return true; + } + + bool TrySelectSector(ItemSpawnData data, out Define.SectorName selectedSector) + { + List availableSectorsCopy = new(availableSectors); + + selectedSector = Define.SectorName.None; + + // Item의 섹터 당 개수 제한을 고려하여 섹터 선택 + while (availableSectorsCopy.Count > 0) + { + selectedSector = availableSectorsCopy[Random.Range(0, availableSectorsCopy.Count)]; + if (itemPerSectorCount[selectedSector][data] < data.MaxCountPerSector) + { + return true; + } + + availableSectorsCopy.Remove(selectedSector); + } + Debug.LogWarning($"{data.Prefab.name}: Could not select sector!"); + return false; + } + } +} diff --git a/Client/Assets/Scripts/Systems/ItemSpawner.cs.meta b/Client/Assets/Scripts/Systems/ItemSpawner.cs.meta new file mode 100644 index 0000000000..5a3e010e76 --- /dev/null +++ b/Client/Assets/Scripts/Systems/ItemSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ffc228bebe0243e459c3ada1e2be34bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scripts/Systems/MapSystem.cs b/Client/Assets/Scripts/Systems/MapSystem.cs index 163803545d..9ce3cf9684 100644 --- a/Client/Assets/Scripts/Systems/MapSystem.cs +++ b/Client/Assets/Scripts/Systems/MapSystem.cs @@ -7,15 +7,11 @@ public class MapSystem : NetworkBehaviour { public Dictionary Sectors { get; set; } = new(); - [Header("Item Spawn")] - [SerializeField] private int _totalItemCount; - [SerializeField] private List _itemSpawnDatas; - public void Init() { Managers.GameMng.MapSystem = this; AssignSector(); - SpawnItems(); + GetComponent().SpawnItems(); } private void AssignSector() @@ -25,108 +21,10 @@ private void AssignSector() foreach (Sector s in sectors) { s.Init(); - if (!Sectors.TryAdd(s.sectorName, s)) + if (!Sectors.TryAdd(s.SectorName, s)) { - Debug.LogError($"Duplicate sector name detected!: {s.sectorName}"); - } - } - } - - private void SpawnItems() - { - if(!Runner.IsSharedModeMasterClient) return; - - int totalCount = 0; - Dictionary totalItemCount = new(); - Dictionary> itemPerSectorCount = new(); - List availableSectors = new(Sectors.Keys); - List itemSpawnData = new(_itemSpawnDatas); - - foreach (var key in itemSpawnData) - { - totalItemCount.Add(key, 0); - } - - foreach (var sector in availableSectors) - { - Dictionary itemSpawnDataCount = new(); - foreach (var data in itemSpawnData) - { - itemSpawnDataCount[data] = 0; - } - itemPerSectorCount.Add(sector, itemSpawnDataCount); - } - - // 아이템별 최소 개수 충족시키기 - List itemSpawnDataCopy = new(itemSpawnData); // 아이템 생성 중 itemSpawnData리스트에서 요소가 Remove될 수 있기 때문에 foreach문을 위해 Copy된 리스트 사용 - foreach (var data in itemSpawnDataCopy) - { - // 데이터 검증도 동시에 함 - if (!data.Validate()) - { - itemSpawnData.Remove(data); - continue; - } - - int cnt = 0; - - while (cnt < data.GlobalMinCount && totalCount < _totalItemCount) - { - if(!TrySpawnItem(data)) return; - cnt++; - } - } - - // 총 아이템 수에 맞춰 아이템 배치 - while (itemSpawnData.Count != 0 && totalCount < _totalItemCount) - { - var selected = itemSpawnData[Random.Range(0, itemSpawnData.Count)]; - if (!TrySpawnItem(selected)) return; - } - - return; - - bool TrySpawnItem(ItemSpawnData data) - { - if(!TrySelectSector(data, out Define.SectorName selectedSector)) return false; - - while (!Sectors[selectedSector].SpawnItem(data.Prefab)) - { - availableSectors.Remove(selectedSector); - if (availableSectors.Count == 0) - { - Debug.LogWarning("Cannot spawn more items: no more available sectors"); - return false; - } - if (!TrySelectSector(data, out selectedSector)) return false; - } - - totalItemCount[data]++; - itemPerSectorCount[selectedSector][data]++; - totalCount++; - if (data.GlobalMaxCount == totalItemCount[data]) itemSpawnData.Remove(data); - return true; - } - - bool TrySelectSector(ItemSpawnData data, out Define.SectorName selectedSector) - { - List availableSectorsCopy = new(availableSectors); - - selectedSector = Define.SectorName.None; - - // Item의 섹터 당 개수 제한을 고려하여 섹터 선택 - while (availableSectorsCopy.Count > 0) - { - selectedSector = availableSectorsCopy[Random.Range(0, availableSectorsCopy.Count)]; - if (itemPerSectorCount[selectedSector][data] < data.MaxCountPerSector) - { - return true; - } - - availableSectorsCopy.Remove(selectedSector); + Debug.LogError($"Duplicate sector name detected!: {s.SectorName}"); } - Debug.LogWarning($"{data.Prefab.name}: Could not select sector!"); - return false; } } } diff --git a/Client/Assets/Scripts/UI/Scene/UI_Ingame.cs b/Client/Assets/Scripts/UI/Scene/UI_Ingame.cs index 20659ca15d..86f46588f3 100644 --- a/Client/Assets/Scripts/UI/Scene/UI_Ingame.cs +++ b/Client/Assets/Scripts/UI/Scene/UI_Ingame.cs @@ -10,12 +10,14 @@ public class UI_Ingame : UI_Scene public UI_WorkProgressBar WorkProgressBarUI { get; private set; } public UI_InteractInfo InteractInfoUI { get; private set; } public UI_ErrorText ErrorTextUI { get; private set; } + public UI_CurrentSector CurrentSectorUI { get; private set; } protected enum SubItemUIs { UI_WorkProgressBar, UI_InteractInfo, UI_ErrorText, + UI_CurrentSector, } public override bool Init() @@ -27,6 +29,7 @@ public override bool Init() WorkProgressBarUI = Get(SubItemUIs.UI_WorkProgressBar) as UI_WorkProgressBar; InteractInfoUI = Get(SubItemUIs.UI_InteractInfo) as UI_InteractInfo; ErrorTextUI = Get(SubItemUIs.UI_ErrorText) as UI_ErrorText; + CurrentSectorUI = Get(SubItemUIs.UI_CurrentSector) as UI_CurrentSector; return true; } diff --git a/Client/Assets/Scripts/UI/SubItem/UI_CurrentSector.cs b/Client/Assets/Scripts/UI/SubItem/UI_CurrentSector.cs new file mode 100644 index 0000000000..43fbe59625 --- /dev/null +++ b/Client/Assets/Scripts/UI/SubItem/UI_CurrentSector.cs @@ -0,0 +1,44 @@ +using System.Text.RegularExpressions; +using TMPro; + +public class UI_CurrentSector : UI_Base +{ + enum Texts + { + SectorName + } + + public override bool Init() + { + if (base.Init() == false) + return false; + + Bind(typeof(Texts)); + + return true; + } + + public void SetSector(Define.SectorName sector) + { + GetText(Texts.SectorName).text = SectorNameEnumToString(sector); + } + + private static string SectorNameEnumToString(Define.SectorName sector) + { + if (sector == Define.SectorName.None) return ""; + + string text = sector.ToString(); + + // 언더바 제거 + text = text.Replace("_", ""); + + + // 대문자 앞에 띄어쓰기 추가 (첫 글자 제외) + text = Regex.Replace(text, "(?