From b1bc2d352a330c7c56d349825a3f2e5d964852a3 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 21 一月 2019 15:05:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into JadeDynastyBoss

---
 UI/Common/UIRoot.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/UI/Common/UIRoot.cs b/UI/Common/UIRoot.cs
index 269e6c0..eb48852 100644
--- a/UI/Common/UIRoot.cs
+++ b/UI/Common/UIRoot.cs
@@ -70,7 +70,8 @@
 
             if (StageManager.Instance.CurrentStage != null)
             {
-                if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj)
+                if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj
+                 && SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Js)
                 {
                     if (Input.GetKeyDown(KeyCode.Escape))
                     {

--
Gitblit v1.8.0