From 006467062157a42ed24554c5c64eca2573446f9e Mon Sep 17 00:00:00 2001 From: JieLing Date: Wed, 30 Sep 2020 10:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=B4=E9=80=89=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 +-- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 1 + Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index ff48766576..bb783e5c69 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -4,9 +4,8 @@ * @Date 2019/5/9 13:56 * @Created by MagicianJoker --]] - SERVER_VERSION = 0 - +SERVER_VERSION = 1 -- 0 正式服 1 提审服 -- 启用功能引导 ENABLE_FUNC_GUIDE = 1 --0关闭1开启 RECHARGEABLE = true --false不可充值 true可充值 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 71ec362c82..11bd03d258 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -7,6 +7,7 @@ this.LoginWay = { Account = 0, WeChat = 1 } local ServerVersion = SERVER_VERSION local IsShowNotice = false +local IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin local IsDevelopLogin = true diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua index 2466e1fc8e..58f254f71e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua @@ -103,7 +103,7 @@ function SettingInfo:RemoveListener() end --界面打开时调用(用于子类重写) function SettingInfo:OnOpen() - + this.cdKey:SetActive(SERVER_VERSION == 0) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写)