From 50f10993c4004afbacb2c713d4b1e358304ef11f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 4 Jun 2021 11:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8C=85=E9=85=8D=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E5=8C=85=E5=90=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/PackageManager.lua | 9 ++++++++- .../~Lua/Framework/Manager/ServerConfigManager.lua | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index 709cc45661..379685345e 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -6,9 +6,16 @@ function PackageManager.Initialize() this.PackageName = AndroidDeviceInfo.Instance:GetPackageName() end LogGreen("当前包名为:"..this.PackageName) + + -- 获取当前包配置名,没有就按本地配置 + this.ConfigName = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.PACKAGE_CONFIG) + if this.ConfigName then + this.ConfigName = "LOCAL" + end + local PackagerConfig = ConfigManager.GetConfig(ConfigName.PackageConfig) for _, config in ConfigPairs(PackagerConfig) do - if config.PackageName == this.PackageName then + if config.ConfigName == this.ConfigName then this.config = config break end diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 228a2f9611..25a28a6af9 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -15,6 +15,7 @@ ServerConfigManager.SettingConfig = { SPRITE_LOADER = "SPRITE_LOADER", -- 资源加载器是否可以使用 IS_TITLE_EFFECT_SCALE = "IS_TITLE_EFFECT_SCALE", -- 判断 IS_PLAY_LOGIN_VIDEO = "IS_PLAY_LOGIN_VIDEO", -- 判断是否可以播放登录视频 + PACKAGE_CONFIG = "PACKAGE_CONFIG", -- 包配置 }