From 9cce82f0173db84ca9f0338ff8bf1ec8f5549520 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 May 2021 14:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90SpriteLoader=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BD=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=80=81=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/define.lua | 4 +--- .../~Lua/Framework/Manager/ServerConfigManager.lua | 1 + .../ManagedResources/~Lua/Modules/Common/SpriteLoader.lua | 7 +++++++ Assets/ManagedResources/~Lua/PreLoad.lua | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/define.lua b/Assets/ManagedResources/~Lua/Common/define.lua index c395d804a7..d3fe6c01b9 100644 --- a/Assets/ManagedResources/~Lua/Common/define.lua +++ b/Assets/ManagedResources/~Lua/Common/define.lua @@ -66,6 +66,4 @@ AppConst.UmengChannleId = "App Store" AppConst.Bugly_IosAppId = "c07e578650" AppConst.Bugly_AndroidAppId = "9b909facba" -AppConst.LaQi_JoinRoom_Url = "com.doudou.dwc://data/openwith?" - -SpriteLoader = require("Modules.Common.SpriteLoader") \ No newline at end of file +AppConst.LaQi_JoinRoom_Url = "com.doudou.dwc://data/openwith?" \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 388b104f8b..f218d144fd 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -12,6 +12,7 @@ ServerConfigManager.SettingConfig = { IS_SHOW_HEALTH_TIP = "IS_SHOW_HEALTH_TIP", -- 是否显示健康提示 NOTICE_CHANNEL = "NOTICE_CHANNEL", -- 公告号 PACKAGE_CC_CODE = "PACKAGE_CC_CODE", -- CC号 + SPRITE_LOADER = "SPRITE_LOADER", -- 资源加载器是否可以使用 } diff --git a/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua b/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua index ed2fd8890c..3b2312b112 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua @@ -1,6 +1,7 @@ local SpriteLoaderPool = {} local SpriteLoader = {} local spLoaderIndex = 0 +local IsActive = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.SPRITE_LOADER) -- 调用此方法创建一个管理器 function SpriteLoader.New() @@ -19,6 +20,9 @@ function SpriteLoader.New() end function SpriteLoader:LoadSprite(name) + if not IsActive then + return Util.LoadSprite(name) + end local transName = GetTranslateSpriteName(name) local sp = resMgr:LoadSpriteAsset(transName) if sp then @@ -54,6 +58,9 @@ end -- 销毁loader function SpriteLoader:Destroy() + if not IsActive then + return + end coroutine.start(function() coroutine.wait(2) self:UnLoadSprite() diff --git a/Assets/ManagedResources/~Lua/PreLoad.lua b/Assets/ManagedResources/~Lua/PreLoad.lua index b3d2da0641..a019ec29ad 100644 --- a/Assets/ManagedResources/~Lua/PreLoad.lua +++ b/Assets/ManagedResources/~Lua/PreLoad.lua @@ -22,3 +22,5 @@ U3d=UnityEngine WWW = UnityEngine.WWW; GameEventHandler=GameLogic.GameEventHandler UpdateManager=GameLogic.UpdateManager + +SpriteLoader = require("Modules.Common.SpriteLoader") \ No newline at end of file