From c1905ec33dab4c889007778d674ef6e1e67149c6 Mon Sep 17 00:00:00 2001 From: Kim Taebum Date: Tue, 16 Jul 2024 14:21:39 +0900 Subject: [PATCH] =?UTF-8?q?hotfix:=20MedKit=5FBandage=20=EB=B2=84=EA=B7=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkStation/MedKit_Bandage.prefab | 2 +- .../Prefabs/Systems/@GameSystem.prefab | 9 +- .../Scenes/TestScene/TestScene_SJ.unity | 126 +++++++++--------- 3 files changed, 69 insertions(+), 68 deletions(-) diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab index caacf5be6f..2ee666d9b4 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4979594052862338693, guid: 435e773138003d44889a52db8bfb50e4, type: 3} propertyPath: SortKey - value: 1904897812 + value: 422045260 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab index 0fcd5d5945..648cc1169c 100644 --- a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab +++ b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab @@ -102,7 +102,7 @@ MonoBehaviour: GlobalMinCount: 7 GlobalMaxCount: 7 MaxCountPerSector: 1 - - Prefab: {fileID: 1343902041442310, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + - Prefab: {fileID: 1343902041442310, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} GlobalMinCount: 7 GlobalMaxCount: 7 MaxCountPerSector: 1 @@ -152,11 +152,10 @@ MonoBehaviour: _KilledCrewNum: 0 _ShouldEndGame: 0 _DroppedCrewNum: 0 - _DroppedAlienNum: 0 _IsGameStarted: 0 - _KilledCrew: 0 - _DroppedCrew: 0 - _WinedCrew: 0 + _IsCrewKilled: 0 + _IsCrewDropped: 0 + _IsCrewWinning: 0 --- !u!114 &8210265563855654929 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity index 79c7f6acb0..0f64f17e7d 100644 --- a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity +++ b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity @@ -718,67 +718,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 651267bc0bc8c0a4fbf95c442517d389, type: 3} ---- !u!1001 &183473100 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1343902041442310, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_Name - value: MedKit_Bandage - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalPosition.x - value: 1.2881497 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalPosition.y - value: 0.50369143 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalPosition.z - value: -1.8 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6666183428592964458, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} - propertyPath: SortKey - value: 2531991717 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} --- !u!1001 &234444228 PrefabInstance: m_ObjectHideFlags: 0 @@ -5358,6 +5297,8 @@ MonoBehaviour: PrefabNum: 0 ReadySceneSpawnPosition: {x: 1.2, y: 0, z: 0} ReadySceneSpawnSector: 1 + TutorialSceneSpawnPosition: {x: 0, y: 0, z: 0} + TutorialSceneSpawnSector: 0 --- !u!114 &999382491 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6345,6 +6286,67 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1001 &1141957665 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1343902041442310, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_Name + value: MedKit_Bandage + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalPosition.x + value: 1.2586673 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalPosition.y + value: 0.50369155 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalPosition.z + value: -1.8 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6666183428592964458, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + propertyPath: SortKey + value: 1996720122 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} --- !u!1001 &1230568782 PrefabInstance: m_ObjectHideFlags: 0 @@ -11709,7 +11711,7 @@ SceneRoots: - {fileID: 702667825} - {fileID: 1230568782} - {fileID: 133869399} - - {fileID: 183473100} - {fileID: 2107820290} + - {fileID: 1141957665} - {fileID: 1712376117} - {fileID: 2100522929}