From 87e1f93f69e64d31c2f2fd22e2b71d668c33ffa5 Mon Sep 17 00:00:00 2001
From: tengge1 <930372551@qq.com>
Date: Mon, 12 Aug 2019 22:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=90=E8=B4=A8=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShadowEditor.Web/lang/zh-CN.js                            | 6 +++++-
 .../src/editor2/component/MaterialComponent.jsx           | 8 ++++----
 ShadowEditor.Web/src/language/Language.js                 | 4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ShadowEditor.Web/lang/zh-CN.js b/ShadowEditor.Web/lang/zh-CN.js
index 2e1bc8d0..0930e4bd 100644
--- a/ShadowEditor.Web/lang/zh-CN.js
+++ b/ShadowEditor.Web/lang/zh-CN.js
@@ -640,4 +640,8 @@ L_CLOSE = '关闭';
 L_WAITING = '请稍后...';
 L_LOADING = '加载中...';
 L_WIREFRAME_WIDTH = '线框粗细';
-L_IS_EXPORTING = '正在导出...';
\ No newline at end of file
+L_IS_EXPORTING = '正在导出...';
+L_REFLECTIVITY = '反射率';
+L_BUMP_SCALE = '凹凸纹理比例';
+L_DISPLACEMENT_SCALE = '位移纹理比例';
+L_AO_SCALE = '遮挡纹理比例';
\ No newline at end of file
diff --git a/ShadowEditor.Web/src/editor2/component/MaterialComponent.jsx b/ShadowEditor.Web/src/editor2/component/MaterialComponent.jsx
index f0331124..799630ff 100644
--- a/ShadowEditor.Web/src/editor2/component/MaterialComponent.jsx
+++ b/ShadowEditor.Web/src/editor2/component/MaterialComponent.jsx
@@ -233,18 +233,18 @@ class MaterialComponent extends React.Component {
             <TextureProperty label={L_TEXTURE} name={'map'} value={map} show={showMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_ALPHA_MAP} name={'alphaMap'} value={alphaMap} show={showAlphaMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_BUMP_MAP} name={'bumpMap'} value={bumpMap} show={showBumpMap} onChange={this.handleChange}></TextureProperty>
-            <NumberProperty label={'Bump Scale'} name={'bumpScale'} value={bumpScale} onChange={this.handleChange}></NumberProperty>
+            <NumberProperty label={L_BUMP_SCALE} name={'bumpScale'} value={bumpScale} show={showBumpMap} onChange={this.handleChange}></NumberProperty>
             <TextureProperty label={L_NORMAL_MAP} name={'normalMap'} value={normalMap} show={showNormalMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_DISPLACEMENT_MAP} name={'displacementMap'} value={displacementMap} show={showDisplacementMap} onChange={this.handleChange}></TextureProperty>
-            <NumberProperty label={'Displace Scale'} name={'displacementScale'} value={displacementScale} onChange={this.handleChange}></NumberProperty>
+            <NumberProperty label={L_DISPLACEMENT_SCALE} name={'displacementScale'} value={displacementScale} show={showDisplacementMap} onChange={this.handleChange}></NumberProperty>
             <TextureProperty label={L_ROUGHNESS_MAP} name={'roughnessMap'} value={roughnessMap} show={showRoughnessMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_METALNESS_MAP} name={'metalnessMap'} value={metalnessMap} show={showMetalnessMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_SPECULAR_MAP} name={'specularMap'} value={specularMap} show={showSpecularMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_ENV_MAP} name={'envMap'} value={envMap} show={showEnvMap} onChange={this.handleChange}></TextureProperty>
-            <NumberProperty label={'Reflectivity'} name={'reflectivity'} value={reflectivity} onChange={this.handleChange}></NumberProperty>
+            <NumberProperty label={L_REFLECTIVITY} name={'reflectivity'} value={reflectivity} show={showEnvMap} onChange={this.handleChange}></NumberProperty>
             <TextureProperty label={L_LIGHT_MAP} name={'lightMap'} value={lightMap} show={showLightMap} onChange={this.handleChange}></TextureProperty>
             <TextureProperty label={L_AO_MAP} name={'aoMap'} value={aoMap} show={showAoMap} onChange={this.handleChange}></TextureProperty>
-            <NumberProperty label={'Ao Scale'} name={'aoScale'} value={aoScale} onChange={this.handleChange}></NumberProperty>
+            <NumberProperty label={L_AO_SCALE} name={'aoScale'} value={aoScale} show={showAoMap} onChange={this.handleChange}></NumberProperty>
             <TextureProperty label={L_EMISSIVE_MAP} name={'emissiveMap'} value={emissiveMap} show={showEmissiveMap} onChange={this.handleChange}></TextureProperty>
             <SelectProperty label={L_SIDE} options={this.side} name={'side'} value={side} onChange={this.handleChange}></SelectProperty>
             <CheckBoxProperty label={L_FLAT_SHADING} name={'flatShading'} value={flatShading} onChange={this.handleChange}></CheckBoxProperty>
diff --git a/ShadowEditor.Web/src/language/Language.js b/ShadowEditor.Web/src/language/Language.js
index 13b0a4cc..8214b858 100644
--- a/ShadowEditor.Web/src/language/Language.js
+++ b/ShadowEditor.Web/src/language/Language.js
@@ -639,4 +639,8 @@ Object.assign(window, {
     L_LOADING: 'Loading...',
     L_WIREFRAME_WIDTH: 'WireWidth',
     L_IS_EXPORTING: 'Exporting...',
+    L_REFLECTIVITY: 'Reflectivity',
+    L_BUMP_SCALE: 'Bump Scale',
+    L_DISPLACEMENT_SCALE: 'Displace Scale',
+    L_AO_SCALE: 'Ao Scale',
 });
\ No newline at end of file