diff --git a/Assets/Scenes/Korea_Branch.unity b/Assets/Scenes/Korea_Branch.unity index d87b2ee..4467196 100644 --- a/Assets/Scenes/Korea_Branch.unity +++ b/Assets/Scenes/Korea_Branch.unity @@ -2343,6 +2343,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 8583927892100435330, guid: 6535f238e92e81c4d934c4a414fe5096, type: 3} m_PrefabInstance: {fileID: 323239172} m_PrefabAsset: {fileID: 0} +--- !u!1001 &324208185 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 870361928} + m_Modifications: + - target: {fileID: 1027022590515020957, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_Name + value: TourController + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalPosition.x + value: -162.5 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalPosition.y + value: 54.5 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} +--- !u!4 &324208186 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1044392038990520754, guid: 9cf2fa96eedea3a42bbc877e757b393a, type: 3} + m_PrefabInstance: {fileID: 324208185} + m_PrefabAsset: {fileID: 0} --- !u!4 &331017335 stripped Transform: m_CorrespondingSourceObject: {fileID: 7687484947460450499, guid: 052dd0409e874c741837bf855836543a, type: 3} @@ -5819,7 +5881,7 @@ Transform: - {fileID: 1947455907} - {fileID: 1961870953} - {fileID: 565704846} - - {fileID: 7104301584933412447} + - {fileID: 324208186} - {fileID: 962773769} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17712,63 +17774,6 @@ Transform: m_Children: [] m_Father: {fileID: 543450652766612212} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3733150788954161450 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 870361928} - m_Modifications: - - target: {fileID: 1027022590515020957, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_Name - value: TourController - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalPosition.x - value: -162.5 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalPosition.y - value: 54.5 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalPosition.z - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} --- !u!23 &3785636190765833547 MeshRenderer: m_ObjectHideFlags: 0 @@ -21193,11 +21198,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640968861120466094} m_Mesh: {fileID: -5969300685047527259, guid: d5f1ee60f6a31fc419986cc9e217c503, type: 3} ---- !u!4 &7104301584933412447 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1044392038990520754, guid: e9d66b2df23e371409a593f7b8eee2e4, type: 3} - m_PrefabInstance: {fileID: 3733150788954161450} - m_PrefabAsset: {fileID: 0} --- !u!1 &7157458017555242864 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs b/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs index 1588597..e6f4b6b 100644 --- a/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs +++ b/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs @@ -149,9 +149,6 @@ namespace Samkwang private void OnValueChangedRoofActiveToggle(bool isActive) { - if (!Toggle_RoofActive.interactable) - return; - var onText = Toggle_RoofActive.graphic.GetComponentInChildren(true); onText.gameObject.SetActive(isActive); @@ -226,6 +223,9 @@ namespace Samkwang } public void OnActiveRoof(bool isActive) { + if (!Toggle_RoofActive.interactable) + return; + Toggle_RoofActive.isOn = isActive; } }