대시 보드이외의 영역 클릭 시 꺼지는 기능을 대시보드 버튼을 누를 때 꺼지도록 기능 개선
This commit is contained in:
@@ -238661,7 +238661,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &964127729
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace CHN
|
||||
building.onChangeFloor += viewManager.ChangeViewWithFloorControl;
|
||||
|
||||
topCanvas.panel_toolbar.onClickCameraView += viewManager.ChangeViewWithButtonClick;
|
||||
topCanvas.panel_toolbar.onClickDashBoard += popupCanvas.panel_dashboard.Open;
|
||||
topCanvas.panel_toolbar.onClickDashBoard += popupCanvas.panel_dashboard.ActiveDashBoard;
|
||||
topCanvas.panel_toolbar.onClickCustomView += controller.SaveTargetPosition;
|
||||
topCanvas.panel_toolbar.onClickMiniMap += popupCanvas.panel_minimap.SetActive;
|
||||
topCanvas.panel_toolbar.onClickFloorControl += rightCanvas.panel_floorcontrol.SetActive;
|
||||
@@ -55,8 +55,6 @@ namespace CHN
|
||||
rightCanvas.panel_floorcontrol.onValueChanged += building.SetTopFloor;
|
||||
rightCanvas.panel_floorcontrol.onValueChanged += popupCanvas.panel_minimap.ChangeMiniMapFloor;
|
||||
|
||||
popupCanvas.panel_dashboard.dashBoardCheckListBox.onCloseDashboard += topCanvas.panel_toolbar.SetDashboard;
|
||||
|
||||
popupCanvas.panel_library.onClickLabelButton += libraryManager.LibraryFiltering;
|
||||
popupCanvas.panel_protocolsetting.onUpdateMachine += libraryManager.MatchingMachine;
|
||||
popupCanvas.panel_library.onClickLibraryButton += popupCanvas.MachineDashBoardOpen;
|
||||
|
||||
@@ -46,9 +46,9 @@ namespace CHN
|
||||
|
||||
dashBoardCheckListBox.Init(dashboardItem);
|
||||
}
|
||||
public void Open()
|
||||
public void ActiveDashBoard(bool isActive)
|
||||
{
|
||||
SetActive(true);
|
||||
SetActive(isActive);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ public class Panel_ToolBar : PanelBase
|
||||
private CaptureBase capture;
|
||||
|
||||
public Action<ViewMode> onClickCameraView;
|
||||
public Action onClickDashBoard;
|
||||
public Action<bool> onClickDashBoard;
|
||||
|
||||
public Action<int> onClickCustomView;
|
||||
public Action onClickMiniMap;
|
||||
@@ -153,12 +153,10 @@ public class Panel_ToolBar : PanelBase
|
||||
|
||||
private void OnClickDashBoard()
|
||||
{
|
||||
Image_DashboardActive.gameObject.SetActive(true);
|
||||
onClickDashBoard?.Invoke();
|
||||
}
|
||||
public void SetDashboard()
|
||||
{
|
||||
Image_DashboardActive.gameObject.SetActive(false);
|
||||
var isActive = Image_DashboardActive.gameObject.activeSelf ? false : true;
|
||||
Image_DashboardActive.gameObject.SetActive(isActive);
|
||||
|
||||
onClickDashBoard?.Invoke(isActive);
|
||||
}
|
||||
|
||||
private void OnClickShoulderView()
|
||||
|
||||
@@ -51,17 +51,6 @@ namespace CHN
|
||||
item.transform.localScale = Vector3.one;
|
||||
return item;
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (Input.GetMouseButtonDown(0))
|
||||
{
|
||||
if (EventSystem.current.currentSelectedGameObject != null)
|
||||
return;
|
||||
transform.parent.gameObject.SetActive(false);
|
||||
onCloseDashboard?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user