From 5c25e63bbab7cce16ae5f196ec3ff29fda960751 Mon Sep 17 00:00:00 2001
From: tengge1 <930372551@qq.com>
Date: Tue, 31 Dec 2019 21:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ShadowEditor.Web/locales/zh-CN.json | 6 +++---
ShadowEditor.Web/src/editor/menu/EditorMenuBar.jsx | 4 ++--
.../src/editor/menu/{GeometryMenu.jsx => ObjectMenu.jsx} | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
rename ShadowEditor.Web/src/editor/menu/{GeometryMenu.jsx => ObjectMenu.jsx} (98%)
diff --git a/ShadowEditor.Web/locales/zh-CN.json b/ShadowEditor.Web/locales/zh-CN.json
index d1bc0e1e..e98b08c9 100644
--- a/ShadowEditor.Web/locales/zh-CN.json
+++ b/ShadowEditor.Web/locales/zh-CN.json
@@ -128,14 +128,14 @@
"HeightCoef": "高度系数",
"Vertex Colors": "顶点颜色",
"Camera": "相机",
- "Object": "物体数",
+ "Object": "物体",
"PosX": "x轴正向",
"MaxAge": "持续时长",
"Visual": "可视化",
"Vertex Shader": "顶点着色器",
"Please click the audio in the Audio Panel.": "请点击音频面板中的音频!",
"Filter": "滤镜",
- "Vertex": "顶点数",
+ "Vertex": "顶点",
"ThetaLength": "转过纬度",
"Listen to mousewheel event": "监听鼠标滚轮事件",
"ShaderInfo": "着色器信息",
@@ -353,7 +353,7 @@
"Draw Pologon": "画面",
"Line": "线条",
"Texture": "纹理",
- "Triangle": "三角形数",
+ "Triangle": "三角形",
"AudioListener": "音频监听器",
"GroundColor": "地面颜色",
"Scale(R)": "缩放(R)",
diff --git a/ShadowEditor.Web/src/editor/menu/EditorMenuBar.jsx b/ShadowEditor.Web/src/editor/menu/EditorMenuBar.jsx
index 4f96d830..c0e6afcf 100644
--- a/ShadowEditor.Web/src/editor/menu/EditorMenuBar.jsx
+++ b/ShadowEditor.Web/src/editor/menu/EditorMenuBar.jsx
@@ -2,7 +2,7 @@ import { classNames, MenuBar, MenuBarFiller, MenuItemSeparator } from '../../thi
import SceneMenu from './SceneMenu.jsx';
import EditMenu from './EditMenu.jsx';
import TwoDMenu from './TwoDMenu.jsx';
-import GeometryMenu from './GeometryMenu.jsx';
+import ObjectMenu from './ObjectMenu.jsx';
import LightMenu from './LightMenu.jsx';
import AssetsMenu from './AssetsMenu.jsx';
import ComponentMenu from './ComponentMenu.jsx';
@@ -29,7 +29,7 @@ class EditorMenuBar extends React.Component {
{!enableAuthority || isLogin ? : null}
{!enableAuthority || isLogin ? : null}
{/* {!enableAuthority || isLogin ? : null} */}
- {!enableAuthority || isLogin ? : null}
+ {!enableAuthority || isLogin ? : null}
{!enableAuthority || isLogin ? : null}
{!enableAuthority || isLogin ? : null}
{!enableAuthority || isLogin ? : null}
diff --git a/ShadowEditor.Web/src/editor/menu/GeometryMenu.jsx b/ShadowEditor.Web/src/editor/menu/ObjectMenu.jsx
similarity index 98%
rename from ShadowEditor.Web/src/editor/menu/GeometryMenu.jsx
rename to ShadowEditor.Web/src/editor/menu/ObjectMenu.jsx
index 8e64bd35..74388461 100644
--- a/ShadowEditor.Web/src/editor/menu/GeometryMenu.jsx
+++ b/ShadowEditor.Web/src/editor/menu/ObjectMenu.jsx
@@ -22,10 +22,10 @@ import CubicBezierCurve from '../../object/line/CubicBezierCurve';
import EllipseCurve from '../../object/line/EllipseCurve';
/**
- * 几何体菜单
+ * 物体菜单
* @author tengge / https://github.com/tengge1
*/
-class GeometryMenu extends React.Component {
+class ObjectMenu extends React.Component {
constructor(props) {
super(props);
@@ -50,7 +50,7 @@ class GeometryMenu extends React.Component {
}
render() {
- return