충돌 해결
This commit is contained in:
@@ -45,7 +45,10 @@ namespace CHN
|
|||||||
topCanvas.panel_toptoolbar.onClickAssemblyProgress += popupCanvas.panel_assemblyproduction.Open;
|
topCanvas.panel_toptoolbar.onClickAssemblyProgress += popupCanvas.panel_assemblyproduction.Open;
|
||||||
topCanvas.panel_toptoolbar.onClickSetting += popupCanvas.panel_menu.Open;
|
topCanvas.panel_toptoolbar.onClickSetting += popupCanvas.panel_menu.Open;
|
||||||
|
|
||||||
rightCanvas.panel_floorcontrol.onValueChanged += building.SetTopFloor;
|
topCanvas.panel_toolbar.onClickMiniMap += popupCanvas.panel_minimap.SetActive;
|
||||||
|
|
||||||
|
rightCanvas.panel_floorcontrol.onValueChanged += building.SetTopFloor;
|
||||||
|
rightCanvas.panel_floorcontrol.onValueChanged += popupCanvas.panel_minimap.ChangeMiniMapFloor;
|
||||||
|
|
||||||
popupCanvas.panel_library.onClickLabelButton += libraryManager.LibraryFiltering;
|
popupCanvas.panel_library.onClickLabelButton += libraryManager.LibraryFiltering;
|
||||||
popupCanvas.panel_protocolsetting.onUpdateMachine += libraryManager.MatchingMachine;
|
popupCanvas.panel_protocolsetting.onUpdateMachine += libraryManager.MatchingMachine;
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ public class Panel_ToolBar : PanelBase
|
|||||||
|
|
||||||
private CaptureBase capture;
|
private CaptureBase capture;
|
||||||
|
|
||||||
|
public Action onClickMiniMap;
|
||||||
|
|
||||||
public Action onClickDashBoard;
|
public Action onClickDashBoard;
|
||||||
public Action<ViewMode> onClickCameraView;
|
public Action<ViewMode> onClickCameraView;
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
@@ -116,7 +118,7 @@ public class Panel_ToolBar : PanelBase
|
|||||||
|
|
||||||
private void OnClickMinimap()
|
private void OnClickMinimap()
|
||||||
{
|
{
|
||||||
Debug.Log("MiniMap");
|
onClickMiniMap?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnClickCustomView()
|
private void OnClickCustomView()
|
||||||
|
|||||||
Reference in New Issue
Block a user