diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 20404b10f2..72419834ac 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -8,7 +8,6 @@ -- 启用功能引导 ENABLE_FUNC_GUIDE = 1 --0关闭1开启 RECHARGEABLE = true --false不可充值 true可充值 -IS_PLAY_VOICE = false -- 是否开启游戏内的语音 -- 引导类型 GuideType = { diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 7bd86cfb58..4fc3fdef17 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -5,14 +5,17 @@ local _ActiveCode = 26 -- 激活版本 ServerConfigManager.SettingConfig = { ServerVersion = "ServerVersion", -- 用于切换正式服和提审服 ThinkAnalysis_GetDeviceID = "ThinkAnalysis_GetDeviceID", -- 数数获取DeviceID方法 - LayoutBuilderWrap = "LayoutBuilderWrap", -- 强制刷新layout组件大小的方法修改到lua中调用 - LanguagePackager = "LanguagePackager", -- 本地化处理 - UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 本地化处理 + LayoutBuilderWrap = "LayoutBuilderWrap", -- 强制刷新layout组件大小的方法修改到lua中调用 + LanguagePackager = "LanguagePackager", -- 本地化处理 + UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 屏幕适配 + IS_PLAY_VOICE = "IS_PLAY_VOICE", -- 是否播放游戏内语音 + IS_SHOW_HEALTH_TIP = "IS_SHOW_HEALTH_TIP", -- 是否显示健康提示 } function ServerConfigManager.Initialize() - + IS_PLAY_VOICE = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_PLAY_VOICE) -- 是否开启游戏内的语音 + IS_SHOW_HEALTH_TIP = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_SHOW_HEALTH_TIP) -- 是否开启游戏内的语音 end -- 判断设置是否激活 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index e594b35000..45fb1228d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -60,6 +60,9 @@ function this:InitComponent() this.logo = Util.GetGameObject(this.gameObject, "logo") this.logo:GetComponent("Image"):SetNativeSize() -- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo) + + this.healthTip = Util.GetGameObject(this.gameObject, "healthTip") + this.healthTip:SetActive(IS_SHOW_HEALTH_TIP) end --绑定事件(用于子类重写)