Merge pull request '상단 로고 클릭 시 초기화면으로 이동' (#202) from pgd/20250714_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/202
This commit was merged in pull request #202.
This commit is contained in:
@@ -1284,6 +1284,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 7f6987e1739948249a379338af8a6cbc, type: 3}
|
m_Script: {fileID: 11500000, guid: 7f6987e1739948249a379338af8a6cbc, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
Button_Logo: {fileID: 0}
|
||||||
Button_NewProject: {fileID: 0}
|
Button_NewProject: {fileID: 0}
|
||||||
Button_OpenProject: {fileID: 0}
|
Button_OpenProject: {fileID: 0}
|
||||||
Button_SaveProject: {fileID: 0}
|
Button_SaveProject: {fileID: 0}
|
||||||
@@ -9568,8 +9569,11 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4829137962280313475}
|
- component: {fileID: 4829137962280313475}
|
||||||
|
- component: {fileID: 852701277637592919}
|
||||||
|
- component: {fileID: 4018498675555493210}
|
||||||
|
- component: {fileID: 7470335573224555696}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: GameObject
|
m_Name: Button_Logo
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@@ -9596,6 +9600,88 @@ RectTransform:
|
|||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 262, y: 75}
|
m_SizeDelta: {x: 262, y: 75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &852701277637592919
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6972710070263793744}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &4018498675555493210
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6972710070263793744}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &7470335573224555696
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6972710070263793744}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 4018498675555493210}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
--- !u!1 &7006570658832356554
|
--- !u!1 &7006570658832356554
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using Studio.Manage;
|
|||||||
using System;
|
using System;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using XRLib.UI;
|
using XRLib.UI;
|
||||||
|
|
||||||
@@ -9,6 +10,8 @@ namespace Studio.UI
|
|||||||
{
|
{
|
||||||
public class Panel_StudioTopBar : PanelBase
|
public class Panel_StudioTopBar : PanelBase
|
||||||
{
|
{
|
||||||
|
public Button Button_Logo;
|
||||||
|
|
||||||
/*File*/
|
/*File*/
|
||||||
public Button Button_NewProject;
|
public Button Button_NewProject;
|
||||||
public Button Button_OpenProject;
|
public Button Button_OpenProject;
|
||||||
@@ -60,6 +63,8 @@ namespace Studio.UI
|
|||||||
|
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
{
|
{
|
||||||
|
Button_Logo.onClick.AddListener(OnClickLogo);
|
||||||
|
|
||||||
Button_NewProject.onClick.AddListener(OnClickNewProject);
|
Button_NewProject.onClick.AddListener(OnClickNewProject);
|
||||||
Button_OpenProject.onClick.AddListener(OnClickOpenProject);
|
Button_OpenProject.onClick.AddListener(OnClickOpenProject);
|
||||||
Button_Exit.onClick.AddListener(OnClickExit);
|
Button_Exit.onClick.AddListener(OnClickExit);
|
||||||
@@ -85,6 +90,12 @@ namespace Studio.UI
|
|||||||
Button_Close.onClick.AddListener(OnClickClose);
|
Button_Close.onClick.AddListener(OnClickClose);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnClickLogo()
|
||||||
|
{
|
||||||
|
Debug.Log("On TopMenu Click Logo");
|
||||||
|
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
|
||||||
|
}
|
||||||
|
|
||||||
private void OnClickMQTTSetting()
|
private void OnClickMQTTSetting()
|
||||||
{
|
{
|
||||||
Debug.Log("On TopMenu Click MQTT Setting");
|
Debug.Log("On TopMenu Click MQTT Setting");
|
||||||
|
|||||||
Reference in New Issue
Block a user