diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index c6373459..5ff1a4a4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -2019,66 +2019,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3664916832844628215} m_Modifications: - - target: {fileID: 137127162547959670, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127162547959670, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_characterSpacing - value: 3 - objectReference: {fileID: 0} - target: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_Name @@ -2189,11 +2129,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 137127164258565651, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} --- !u!224 &3664916834242367713 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 09a665c1..5781dc4f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 137127162501263390} - component: {fileID: 137127162501263385} - component: {fileID: 137127162501263384} - - component: {fileID: 6001645693166704829} m_Layer: 5 m_Name: Button_setting m_TagString: Untagged @@ -119,19 +118,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &6001645693166704829 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 137127162501263386} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d98a3722b2a5d49c28715cd9366799c3, type: 3} - m_Name: - m_EditorClassIdentifier: - debugOptionButton: {fileID: 137127162501263384} --- !u!1 &137127162547959665 GameObject: m_ObjectHideFlags: 0 @@ -773,6 +759,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 137127163878687691} + - component: {fileID: 252357910248425631} + - component: {fileID: 3928365105026016678} m_Layer: 5 m_Name: Header m_TagString: Untagged @@ -802,6 +790,34 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &252357910248425631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127163878687690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b717b0dc2b6a43acbc198782b772556f, type: 3} + m_Name: + m_EditorClassIdentifier: + settingButton: {fileID: 137127162501263384} + missionButton: {fileID: 7425175309417248097} + informationButton: {fileID: 137127164298331678} +--- !u!114 &3928365105026016678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127163878687690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d98a3722b2a5d49c28715cd9366799c3, type: 3} + m_Name: + m_EditorClassIdentifier: + debugOptionButton: {fileID: 137127162501263384} --- !u!1 &137127164225778479 GameObject: m_ObjectHideFlags: 0 @@ -1251,7 +1267,6 @@ GameObject: - component: {fileID: 3270954252519000258} - component: {fileID: 8472443207940590385} - component: {fileID: 7425175309417248097} - - component: {fileID: 6683803422636821158} m_Layer: 5 m_Name: Button_mission m_TagString: Untagged @@ -1358,16 +1373,3 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &6683803422636821158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5097575317734896701} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d98a3722b2a5d49c28715cd9366799c3, type: 3} - m_Name: - m_EditorClassIdentifier: - debugOptionButton: {fileID: 7425175309417248097} diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs new file mode 100644 index 00000000..1c9b73c4 --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs @@ -0,0 +1,25 @@ +using System; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class HeaderManager : MonoBehaviour +{ + [SerializeField] private Button settingButton; + [SerializeField] private Button missionButton; + [SerializeField] private Button informationButton; + + private void Start() + { + settingButton.OnClickAsObservable().Subscribe(_ => + { + }); + missionButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.LoadSceneAdditive(GameScenes.Mission); + }); + informationButton.OnClickAsObservable().Subscribe(_ => + { + }); + } +} diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs.meta b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs.meta new file mode 100644 index 00000000..3372e479 --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b717b0dc2b6a43acbc198782b772556f +timeCreated: 1632982824 \ No newline at end of file