merge
This commit is contained in:
@@ -359,7 +359,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Text_Name: {fileID: 0}
|
||||
Image_Thumbnail: {fileID: 0}
|
||||
Text_CreateDate: {fileID: 0}
|
||||
Text_LastRevisionDate: {fileID: 0}
|
||||
Text_UploadDate: {fileID: 0}
|
||||
|
||||
@@ -114,15 +114,15 @@ namespace XED.Manage
|
||||
canvas_static.panel_toolbar.onClickAGVMode += () => statusPanel.SetMode(ModePanel.ProgramMode.AGVPathDrawing);
|
||||
canvas_static.panel_toolbar.onClickStartDrawWall += ()=>statusPanel.SetMode(ModePanel.ProgramMode.WallDrawing);
|
||||
|
||||
canvas_Windows.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Windows.panel_assetproperties.Open);
|
||||
canvas_Windows.panel_assetlibrary.scrollView.onHover.AddListener(canvas_Popup.panel_thumbnail.HandleOpenClose);
|
||||
canvas_Windows.panel_assetlibrary.scrollRect.onExit.AddListener(canvas_Popup.panel_thumbnail.HandleOpenClose);
|
||||
|
||||
canvas_Windows.panel_assetproperties.onClickPreview += canvas_Windows.panel_predefinedtype.Open;
|
||||
canvas_Windows.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData;
|
||||
canvas_Popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Popup.panel_assetproperties.Open);
|
||||
canvas_Popup.panel_assetlibrary.scrollView.onHover.AddListener(canvas_Popup.panel_thumbnail.HandleOpenClose);
|
||||
canvas_Popup.panel_assetlibrary.scrollRect.onExit.AddListener(canvas_Popup.panel_thumbnail.HandleOpenClose);
|
||||
|
||||
canvas_Popup.panel_assetproperties.onClickPreview += canvas_Popup.panel_predefinedtype.Open;
|
||||
canvas_Popup.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData;
|
||||
|
||||
canvas_Popup.panel_thumbnail.onOpen += saveLoadFBXData.GetCustomAssetData;
|
||||
canvas_Popup.panel_thumbnail.onGetPosition += canvas_Windows.panel_assetlibrary.GetPositionX;
|
||||
canvas_Popup.panel_thumbnail.onGetPosition += canvas_Popup.panel_assetlibrary.GetPositionX;
|
||||
}
|
||||
|
||||
void StatusConnection()
|
||||
|
||||
Reference in New Issue
Block a user