Merge branch 'china/dev' into china/dev-c
# Conflicts: # Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua # Assets/ManagedResources/~Lua/Framework/Manager/UIManager.luadev_chengFeng
commit
6308f73308
|
@ -16,6 +16,7 @@ ServerConfigManager.SettingConfig = {
|
|||
IS_TITLE_EFFECT_SCALE = "IS_TITLE_EFFECT_SCALE", -- 判断
|
||||
IS_PLAY_LOGIN_VIDEO = "IS_PLAY_LOGIN_VIDEO", -- 判断是否可以播放登录视频
|
||||
PACKAGE_CONFIG = "PACKAGE_CONFIG", -- 包配置
|
||||
IS_NO_TALKING = "IS_NO_TALKING", -- 禁言
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -657,6 +657,18 @@ function UIManager.DoLanguageCheck(spLoader, gameObject)
|
|||
if not spLoader then
|
||||
return
|
||||
end
|
||||
|
||||
-- 开启禁言
|
||||
if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_NO_TALKING)
|
||||
and gameObject.name ~= "LoginPanel"
|
||||
and gameObject.name ~= "GMPanel"
|
||||
and gameObject.name ~= "CDKeyExchangePanel"
|
||||
then
|
||||
local tfArr =gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.InputField),true);
|
||||
for i = 0, tfArr.Length -1 do
|
||||
tfArr[i].readOnly = true
|
||||
end
|
||||
end
|
||||
-- 判断是否需要翻译
|
||||
if table.indexof(ExceptPrefabList, gameObject.name) then
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue