From cce77097060868f67bc11ea405f31bfde705625c Mon Sep 17 00:00:00 2001
From: vcicii <1376667970@qq.com>
Date: Fri, 26 Nov 2021 15:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B9=8B=E5=89=8D=E5=88=A0?=
 =?UTF-8?q?=E6=8E=89=E7=9A=84=E4=B8=80=E4=BA=9B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/editor/menu/EditorMenuBar.jsx | 3 +++
 web/src/editor/menu/ObjectMenu.jsx    | 2 ++
 web/src/editor/menu/ToolMenu.jsx      | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/src/editor/menu/EditorMenuBar.jsx b/web/src/editor/menu/EditorMenuBar.jsx
index 6287f59e..f5d8c18b 100644
--- a/web/src/editor/menu/EditorMenuBar.jsx
+++ b/web/src/editor/menu/EditorMenuBar.jsx
@@ -69,6 +69,9 @@ class EditorMenuBar extends React.Component {
                 {/*播放(P)*/}
                 <PlayMenu/>
 
+                {/*工具*/}
+                <ToolMenu/>
+
 
 
 
diff --git a/web/src/editor/menu/ObjectMenu.jsx b/web/src/editor/menu/ObjectMenu.jsx
index cc5cff02..bfa7c273 100644
--- a/web/src/editor/menu/ObjectMenu.jsx
+++ b/web/src/editor/menu/ObjectMenu.jsx
@@ -36,6 +36,7 @@ import PointMarkTool from '../tools/PointMarkTool';
 import Sprite from '../../object/geometry/Sprite';
 import global from '../../global';
 import LightMenu from "./LightMenu.jsx";
+import ComponentMenu from "./ComponentMenu.jsx";
 
 /**
  * 物体菜单
@@ -89,6 +90,7 @@ class ObjectMenu extends React.Component {
                 onClick={this.handleAddGroup}
             />
             <MenuItemSeparator />
+            <ComponentMenu />
             <LightMenu />
             <MenuItem title={_t('Basic Geometry')}>
                 <MenuItem title={_t('Plane')}
diff --git a/web/src/editor/menu/ToolMenu.jsx b/web/src/editor/menu/ToolMenu.jsx
index 7b1e62b9..0b00db4a 100644
--- a/web/src/editor/menu/ToolMenu.jsx
+++ b/web/src/editor/menu/ToolMenu.jsx
@@ -14,6 +14,7 @@ import TypefaceConverterWindow from './window/TypefaceConverterWindow.jsx';
 // import CleanUpScenesWindow from './window/CleanUpScenesWindow.jsx';
 import PluginsWindow from './window/PluginsWindow.jsx';
 import global from '../../global';
+import OptionsMenu from "./OptionsMenu.jsx";
 
 /**
  * 工具菜单
@@ -38,7 +39,7 @@ class ToolMenu extends React.Component {
     }
 
     render() {
-        return <MenuItem title={_t('Tool')}>
+        return <MenuItem title={_t('工具(T)')} style={{padding:"2px 20px"}}>
             <MenuItem title={_t('Texture Generator')}
                 onClick={this.handleTextureGenerator}
             />
@@ -62,6 +63,8 @@ class ToolMenu extends React.Component {
             <MenuItem title={_t('Export Examples')}
                 onClick={this.handleExportExamples}
             />
+
+            <OptionsMenu />
         </MenuItem>;
     }
 
-- 
Gitee