From 6d551869be6d0ad13db3a84487e202301de11cbb Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 19 May 2021 15:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=96=B0=E5=86=85=E5=AD=98=E5=86=85=E5=AD=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Bag/BagPanel.lua | 4 ++-- .../~Lua/Modules/Battle/View/BattlePanel.lua | 2 +- .../DailyRecharge/DailyRechargePanel.lua | 8 +++---- .../FightLevel/FightLevelChapterPanel.lua | 4 ++-- .../FightLevel/FightLevelOpenChapterPopup.lua | 4 ++-- .../FightLevelSingleChapterPanel.lua | 4 ++-- .../FightLevelInfoPopup_AssistantLevel.lua | 12 +++++----- .../View/FightLevelInfoPopup_MainLevel.lua | 12 +++++----- .../FightLevelInfoPopup_MainLevelReward.lua | 6 +++-- .../FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 2 +- .../Modules/Guild/View/GuildMemberView.lua | 4 +++- .../LuckyTurnTable/LuckyTurnTablePanel.lua | 2 +- .../~Lua/Modules/Map/View/PointHandleView.lua | 2 +- .../Modules/NewActivity/CommonActPage.lua | 6 +++-- .../Modules/NewActivity/ConRechargePage.lua | 4 +++- .../~Lua/Modules/NewActivity/ExChangePage.lua | 3 +++ .../~Lua/Modules/NewActivity/ExpertPage.lua | 6 +++-- .../~Lua/Modules/NewActivity/ExpertPre.lua | 4 +++- .../~Lua/Modules/Operating/MissionPre.lua | 2 +- .../~Lua/Modules/Popup/RewardItemPopup.lua | 4 ++-- .../Popup/RewardItemSingleShowPopup.lua | 2 +- .../~Lua/Modules/Popup/TrialRewardPopup.lua | 4 ++-- .../View/GeneralPopup_XiuXingSelectHero.lua | 10 +++++---- .../Modules/Practice/PracticeImprintPanel.lua | 22 ++++++++++--------- .../~Lua/Modules/Practice/PracticePanel.lua | 4 +++- .../Modules/RoleInfo/RoleUpStarListPanel.lua | 2 +- .../~Lua/Modules/Story/StoryMapPanel.lua | 4 +++- .../TaSuiLingXiao/TaSuiLingXiaoPanel.lua | 6 +++-- .../ManagedResources/~Lua/View/ItemView.lua | 8 +++---- .../~Lua/View/ShopViewNew.lua | 10 +++++---- 30 files changed, 99 insertions(+), 68 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 142e17c98e..884ada1b0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -366,11 +366,11 @@ function this.SingleItemDataShow(_go, _itemData) elseif _itemData.itemConfig.ItemType == ItemType.heroDogFood then num:SetActive(true) num:GetComponent("Text").text = _itemData.num - frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(_itemData.itemConfig.Quantity)) + frameMask:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(_itemData.itemConfig.Quantity)) local propertyName = itemConfig[_itemData.itemConfig.Id].PropertyName if (propertyName ~= 0) then Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):SetActive(true) - Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(propertyName)) + Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(propertyName)) end talismanStar:SetActive(true) SetHeroStars(talismanStar, _itemData.itemConfig.HeroStar[1],1,Vector2.New(32.5,32.5),-15) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 9c1a4cc043..bde1d9e35a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -369,7 +369,7 @@ function this.InitPanelData() boxList2[index].obj.transform.localPosition = Vector3.zero boxList2[index].moved = false boxList2[index].obj:SetActive(false) - Util.GetGameObject(boxList2[index].obj,"iconRoot/icon"):GetComponent("Image").sprite = Util.LoadSprite(ArtResourcesConfig[boxs[i][2]].Name) + Util.GetGameObject(boxList2[index].obj,"iconRoot/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(ArtResourcesConfig[boxs[i][2]].Name) end if #boxList2 > 0 then boxList2[1].obj:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index a0c73a2a7a..377a23c11a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -25,9 +25,9 @@ function DailyRechargePanel:InitComponent() self.items[i].go = Util.GetGameObject(self.grid,"item"..i) self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Image") if MoneyUtil.MT == MoneyType.RMB then - self.selectIma.sprite = Util.LoadSprite(missionIndex[i].defaultImaRMB) + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[i].defaultImaRMB) else - self.selectIma.sprite = Util.LoadSprite(missionIndex[i].defaultIma) + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[i].defaultIma) end end @@ -167,9 +167,9 @@ function DailyRechargePanel:SetSelectBtn() self.select.transform:SetParent(self.items[index].go.transform) self.select.transform.localPosition = Vector3.zero if MoneyUtil.MT == MoneyType.RMB then - self.selectIma.sprite = Util.LoadSprite(missionIndex[index].selectImaRMB) + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[index].selectImaRMB) else - self.selectIma.sprite = Util.LoadSprite(missionIndex[index].selectIma) + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[index].selectIma) end end diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua index c50561fe5d..5359bb7385 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua @@ -80,8 +80,8 @@ function this.SingleChapterDataShow(go, data) open:SetActive(curChapterId > data.chapterId) lock:SetActive(curChapterId < data.chapterId) curIndexImage:SetActive(curChapterId >= data.chapterId) - curIndexImage:GetComponent("Image").sprite = Util.LoadSprite(data.config.BigNumber)--Util.LoadSprite(GetResourcePath(data.config.BigNumber)) - Util.GetGameObject(go, "chapterImage"):GetComponent("Image").sprite = Util.LoadSprite(data.config.Map) + curIndexImage:GetComponent("Image").sprite = this.spLoader:LoadSprite(data.config.BigNumber)--self.spLoader:LoadSprite(GetResourcePath(data.config.BigNumber)) + Util.GetGameObject(go, "chapterImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(data.config.Map) Util.GetGameObject(go, "star/starNum"):GetComponent("Text").text = data.stars.."/"..data.curMaxStarNum Util.GetGameObject(go, "chapterName"):GetComponent("Text").text = data.config.Name Util.SetGray(go, curChapterId < data.chapterId) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua index cb3e347b96..ff4c0df76b 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua @@ -34,9 +34,9 @@ function FightLevelOpenChapterPopup:OnShow() end function this.OnShowPanel() local config = ConfigManager.GetConfigData(ConfigName.HardStageChapter,chapterDataId) - this.titleImage.sprite = Util.LoadSprite("j_jsxgq_biaoti") + this.titleImage.sprite = this.spLoader:LoadSprite("j_jsxgq_biaoti") this.chapterName.text = config.Name - this.chapterImage.sprite = Util.LoadSprite(config.Map) + this.chapterImage.sprite = this.spLoader:LoadSprite(config.Map) end --界面关闭时调用(用于子类重写) function FightLevelOpenChapterPopup:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua index d56db35149..b9702e28f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua @@ -73,7 +73,7 @@ end function this.OnShowPanel() chapterData = FightLevelManager.GetChapterData(chapterId) this.chapterNameText.text = chapterData.config.Name - this.chapterNameImage.sprite = Util.LoadSprite(chapterData.config.BigNumber) + this.chapterNameImage.sprite = this.spLoader:LoadSprite(chapterData.config.BigNumber) if chapterData.node and LengthOfTable(chapterData.node) > 0 then local curchapterData = {} for key, value in pairs(chapterData.node) do @@ -183,7 +183,7 @@ function this.SetlevelBox(_rewardBoxDatas) for i, v in pairs(_rewardBoxDatas) do boxList[i]:SetActive(true) local missionConfigData = _rewardBoxDatas[i].config - boxList[i]:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(missionConfigData.RewardIcon)) + boxList[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(missionConfigData.RewardIcon)) Util.GetGameObject(boxList[i], "num"):GetComponent("Text").text = missionConfigData.Star Util.GetGameObject(boxList[i], "redPoint"):SetActive( _rewardBoxDatas[i].state == 0 and chapterData.stars > _rewardBoxDatas[i].config.Star) -- Util.GetGameObject(boxList[i], "UI_Effect_BaoXiang_KaiQi"):SetActive(v.state==SingleDailyMissionState.GetFinish) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua index c896fe2f51..2868e03136 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua @@ -16,6 +16,7 @@ local HardStageBuff = ConfigManager.GetConfig(ConfigName.HardStageBuff) local RewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup) local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) function this:InitComponent(gameObject) + this.spLoader = SpriteLoader.New() this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.tip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text") this.conditionInfoText=Util.GetGameObject(gameObject,"conditionInfoText") @@ -155,7 +156,7 @@ end --设置单个上阵英雄信息 function this.SetCardSingleData(o,monsterId, _pos) local curMonsterConfig = MonsterConfig[monsterId] - o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("t_chengyuankuang_kuang") + o.transform.parent:GetComponent("Image").sprite=this.spLoader:LoadSprite("t_chengyuankuang_kuang") local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, curMonsterConfig.MonsterId) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") @@ -187,16 +188,16 @@ function this.SetCardSingleData(o,monsterId, _pos) zs:SetActive(false) else zs:SetActive(true) - zs:GetComponent("Image").sprite = Util.LoadSprite(zsName) + zs:GetComponent("Image").sprite = this.spLoader:LoadSprite(zsName) end yuanImage:SetActive(false) lv.text=curMonsterConfig.level - bg.sprite = Util.LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star]) - fg.sprite = Util.LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star]) + bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star]) + fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star]) - pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) SetCardStars(starGrid,curMonsterConfig.Star) if curMonsterConfig.Star > 9 then Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true) @@ -236,6 +237,7 @@ function this:OnClose() end function this:OnDestroy() + this.spLoader:Destroy() heroListGo = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua index e393b9a5e9..8a71fd9e22 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua @@ -15,6 +15,7 @@ local HardStage = ConfigManager.GetConfig(ConfigName.HardStage) local HardStageCondition = ConfigManager.GetConfig(ConfigName.HardStageCondition) local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) function this:InitComponent(gameObject) + this.spLoader = SpriteLoader.New() this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.power = Util.GetGameObject(gameObject, "Power/Value"):GetComponent("Text") this.sureBtn=Util.GetGameObject(gameObject,"sureBtn") @@ -141,7 +142,7 @@ end --设置单个上阵英雄信息 function this.SetCardSingleData(o,monsterId, _pos) local curMonsterConfig = MonsterConfig[monsterId] - o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("t_chengyuankuang_kuang") + o.transform.parent:GetComponent("Image").sprite=this.spLoader:LoadSprite("t_chengyuankuang_kuang") local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, curMonsterConfig.MonsterId) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") @@ -168,16 +169,16 @@ function this.SetCardSingleData(o,monsterId, _pos) zs:SetActive(false) else zs:SetActive(true) - zs:GetComponent("Image").sprite = Util.LoadSprite(zsName) + zs:GetComponent("Image").sprite = this.spLoader:LoadSprite(zsName) end yuanImage:SetActive(false) lv.text=curMonsterConfig.Level - bg.sprite = Util.LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star]) - fg.sprite = Util.LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star]) + bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star]) + fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star]) - pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) SetCardStars(starGrid,curMonsterConfig.Star) if curMonsterConfig.Star > 9 then Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true) @@ -201,6 +202,7 @@ function this:OnClose() end function this:OnDestroy() + this.spLoader:Destroy() heroListGo = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua index 15ccc77cf0..f8f735ea65 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua @@ -13,6 +13,7 @@ local fun local RewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup) local HardStageCondition = ConfigManager.GetConfig(ConfigName.HardStageCondition) function this:InitComponent(gameObject) + this.spLoader = SpriteLoader.New() this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.tipText=Util.GetGameObject(gameObject,"tipText"):GetComponent("Text") this.backBtn=Util.GetGameObject(gameObject,"BackBtn") @@ -66,8 +67,8 @@ function this.SingleDataShow(_go,_rewardData,_index) local reward = RewardGroup[_rewardData].ShowItem Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text").text = index == 0 and "首通奖励" or HardStageCondition[fightLevelData.config.ConditionValue[index]].Describe Util.GetGameObject(_go, "titleImage/Text"):GetComponent("Text").text = index - Util.GetGameObject(_go, "okButton"):GetComponent("Image").sprite = Util.LoadSprite("g_ghhb_yidacheng_zh") - Util.GetGameObject(_go, "noButton"):GetComponent("Image").sprite = Util.LoadSprite("g_ghhb_weidacheng_zh") + Util.GetGameObject(_go, "okButton"):GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_yidacheng_zh") + Util.GetGameObject(_go, "noButton"):GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_weidacheng_zh") local noStarImage = Util.GetGameObject(_go, "noStarImage") local getStarImage = Util.GetGameObject(_go, "getStarImage") noStarImage:SetActive(not FightLevelManager.GetCurLevelStarState(fightLevelData.state,index) and index ~= 0) @@ -122,6 +123,7 @@ function this:OnClose() end function this:OnDestroy() + this.spLoader:Destroy() end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 88b04e87ab..9eb8b813b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -15,7 +15,7 @@ function FuXingGaoZhao:InitComponent() self.effect = Util.GetGameObject(self.gameObject,"Content/UI_effect_LuckyCatPanel_normal") self.time = Util.GetGameObject(self.gameObject,"Content/Time"):GetComponent("Text") self.price = Util.GetGameObject(self.gameObject,"Content/bg/zi/price"):GetComponent("Image") - self.price.sprite = Util.LoadSprite(ConfigManager.GetConfigData(ConfigName.SpecialConfig,114).Key) + self.price.sprite = this.spLoader:LoadSprite(ConfigManager.GetConfigData(ConfigName.SpecialConfig,114).Key) self.getBtn = Util.GetGameObject(self.gameObject,"Content/getBtn") FuXingGaoZhaoManager.InitRewardData() self.mid = Util.GetGameObject(self.gameObject,"Content/mid") diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua index 5522adfbb1..b0aed1841b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua @@ -8,6 +8,7 @@ function GuildMemberView.New(isSelf, curXY, name, gPos, sex, Ctrl) setmetatable(instance, GuildMemberView) instance.isSelf = isSelf + instance.spLoader = SpriteLoader.New() local u, v = GuildMap_Pos2UV(curXY) instance.posData = TileMapView.GetMapData():GetMapData(u, v) @@ -119,6 +120,7 @@ function GuildMemberView:PlayerIdle() end function GuildMemberView:Dispose() + self.spLoader:Destroy() self:RemoveListener() if self.mapNpc then poolManager:UnLoadLive(self.mapNpc, self.NpcGO) @@ -138,7 +140,7 @@ function GuildMemberView:SetGuildPos(gPos) self.guildPosIcon.gameObject:SetActive(false) else self.guildPosIcon.gameObject:SetActive(true) - self.guildPosIcon.sprite = Util.LoadSprite(GuildMemberView.GPosToSprite[gPos]) -- 无用的 + self.guildPosIcon.sprite = self.spLoader:LoadSprite(GuildMemberView.GPosToSprite[gPos]) -- 无用的 end end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index c284afd79c..9ffc4cf21a 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -574,7 +574,7 @@ function this.SetItemViewShow(data,func) local tab={LuckyTurnTableManager.dialRewardConfig[data[i].luckId].Reward[1],LuckyTurnTableManager.dialRewardConfig[data[i].luckId].Reward[2]} this.itemViewList[i]:OnOpen(false, {tab[1],tab[2]},1, false, false, false, sortingOrder) local qua= LuckyTurnTableManager.dialRewardConfig[data[i].luckId].Rare - this.itemQuality[i].sprite = Util.LoadSprite(quaImage[qua]) + this.itemQuality[i].sprite = this.spLoader:LoadSprite(quaImage[qua]) this.itemQuality[i]:SetNativeSize() if qua > 0 then this.itemQuality[i].gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua index 8ea3350b95..14ed9f4ad6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua @@ -298,7 +298,7 @@ function this.SetBlockIcon(pos) if not this.BlockPoint [pos] then local go = poolManager:LoadAsset("mapButtonPoint", PoolManager.AssetType.GameObject) go.transform:SetParent(Util.GetTransform(this.Ctrl, "uiObj#")) - go:GetComponent("Image").sprite = Util.LoadSprite("r_map_xiangzi") -- 无用的 + go:GetComponent("Image").sprite = self.spLoader:LoadSprite("r_map_xiangzi") -- 无用的 go:GetComponent("Image"):SetNativeSize() go.name = "blockPoint" go:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index d19ad996bc..d2c2980c65 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -31,6 +31,7 @@ function CommonActPage:RemoveListener() end function CommonActPage:InitComponent() + self.spLoader = SpriteLoader.New() self.bg = Util.GetGameObject(self.gameObject, "Bg/banner") self.titleBgIma = self.bg:GetComponent("Image") self.titleIma = Util.GetGameObject(self.bg,"titleIma"):GetComponent("Image") @@ -89,11 +90,11 @@ function CommonActPage:OnShow(_sortingOrder) end end if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then - self.titleBgIma.sprite = Util.LoadSprite(self.actConfig.Icon[3]) + self.titleBgIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[3]) end if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then self.titleIma.gameObject:SetActive(true) - self.titleIma.sprite = Util.LoadSprite(self.actConfig.Icon[4]) + self.titleIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[4]) self.titleIma:SetNativeSize() self.titleIma.transform.localPosition = Vector3.New(self.actConfig.TitleImapos[1],self.actConfig.TitleImapos[2],self.actConfig.TitleImapos[3]) else @@ -206,6 +207,7 @@ function CommonActPage:OnClose() end function CommonActPage:OnDestroy() + self.spLoader:Destroy() if self.localTimer then self.localTimer:Stop() self.localTimer = nil diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua index 934fbca93c..0c1e57ac67 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua @@ -26,6 +26,7 @@ end function ConRechargePage:InitComponent() + self.spLoader = SpriteLoader.New() self.sortingOrder = 0 self.Scroll = Util.GetGameObject(self.gameObject, "Content/Scroll") self.itemPre = Util.GetGameObject(self.gameObject, "itemPre") @@ -84,7 +85,7 @@ function ConRechargePage:OnShow(_sortingOrder) end end if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then - self.bg.sprite = Util.LoadSprite(self.actConfig.Icon[3]) + self.bg.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[3]) end self.title1.text = _MoneyConfig[MoneyUtil.MT] @@ -139,6 +140,7 @@ function ConRechargePage:OnClose() end function ConRechargePage:OnDestroy() + self.spLoader:Destroy() for k,v in pairs(self.ItemList) do SubUIManager.Close(v) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua index 9b3397c0b6..d768d0a855 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua @@ -11,6 +11,8 @@ end --初始化组件(用于子类重写) function ExChangePage:InitComponent() + self.spLoader = SpriteLoader.New() + self.exChangeInfoGrid = {}--限时兑换内容 self.heroConfig = {} self.itemList = {} --itemView优化 @@ -163,6 +165,7 @@ function ExChangePage:OnClose() end function ExChangePage:OnDestroy() + self.spLoader:Destroy() for k,v in pairs(self.itemList) do SubUIManager.Close(v) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index 66c689160b..104232c6c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -20,6 +20,7 @@ end function ExpertPage:InitComponent() + self.spLoader = SpriteLoader.New() self.bg = Util.GetGameObject(self.gameObject, "Bg/titleBg"):GetComponent("Image") self.titleIma = Util.GetGameObject(self.gameObject, "Bg/titleIma"):GetComponent("Image") self.titleTip = Util.GetGameObject(self.gameObject, "Bg/titleTip"):GetComponent("Text") @@ -79,12 +80,12 @@ function ExpertPage:OnShow(_sortingOrder) end end if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then - self.bg.sprite = Util.LoadSprite(self.actConfig.Icon[3]) + self.bg.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[3]) end if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then self.titleIma.gameObject:SetActive(true) - self.titleIma.sprite = Util.LoadSprite(self.actConfig.Icon[4]) + self.titleIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[4]) self.titleIma:SetNativeSize() self.titleIma.transform.localPosition = Vector3.New(self.actConfig.TitleImapos[1],self.actConfig.TitleImapos[2],self.actConfig.TitleImapos[3]) else @@ -200,6 +201,7 @@ function ExpertPage:OnClose() end function ExpertPage:OnDestroy() + self.spLoader:Destroy() if self.localTimer then self.localTimer:Stop() self.localTimer = nil diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua index ab03ef719d..ee63544598 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua @@ -17,6 +17,7 @@ local BtnState = { --初始化组件(用于子类重写) function ExpertPre:InitComponent() + self.spLoader = SpriteLoader.New() self.title = Util.GetGameObject(self.gameObject,"Content/title"):GetComponent("Text") self.info = Util.GetGameObject(self.gameObject,"Content/info"):GetComponent("Text") self.grid = Util.GetGameObject(self.gameObject,"Content/scrollView") @@ -68,7 +69,7 @@ end function ExpertPre:SetButton() local btnData = BtnState[self.data.otherData.state] - self.btnGet:GetComponent("Image").sprite = Util.LoadSprite(btnData.Img) + self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite(btnData.Img) Util.SetGray(self.btnGet,btnData.isGray) self.redPoint:SetActive(btnData.isRed) self.btnText.text = btnData.Text @@ -98,6 +99,7 @@ function ExpertPre:SetButton() end function ExpertPre:OnClose() + self.spLoader:Destroy() self.gridList = {} for k,v in pairs(self.itemList) do SubUIManager.Close(v) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index 949b42ebc0..ae7dc695eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -178,7 +178,7 @@ local type={ } function MissionPre:SetIcon1(_itemdata) Util.SetGray(self.btnGet,_itemdata.state == 2) - self.btnGet:GetComponent("Image").sprite = Util.LoadSprite(type[_itemdata.state].sprite) + self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite(type[_itemdata.state].sprite) self.redPoint.gameObject:SetActive(false) self.redPoint.gameObject:SetActive(_itemdata.state == 1) Util.SetGray(self.redPoint,false) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 19a4e3de6f..94db01095c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -291,9 +291,9 @@ function this.TaSuiLingXiaoShow() local b = curDmg > maxDmg or curDmg < maxDmg this.tasuilingxiao_State.gameObject:SetActive(b) if curDmg > maxDmg then - this.tasuilingxiao_State.sprite=Util.LoadSprite("r_hero_zhanlishangsheng_png") + this.tasuilingxiao_State.sprite=this.spLoader:LoadSprite("r_hero_zhanlishangsheng_png") elseif curDmg < maxDmg then - this.tasuilingxiao_State.sprite=Util.LoadSprite("r_hero_zhanlixiajiang_png") + this.tasuilingxiao_State.sprite=this.spLoader:LoadSprite("r_hero_zhanlixiajiang_png") end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index a19ceafd95..a38eb039bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -311,7 +311,7 @@ function RewardItemSingleShowPopup:OnShow() local propertyName=itemConfigData.PropertyName if(propertyName~=0) then this.fragmentIcon:SetActive(true) - this.fragmentIcon:GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(propertyName)) + this.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName)) end this.starGameobject:SetActive(true) local star = itemConfigData.HeroStar[1] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 5bfc411b41..5f2d33d4bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -177,9 +177,9 @@ function this.SetScrollPre2(root,data) end mask:SetActive(true) if data.state==0 then - mask:GetComponent("Image").sprite = Util.LoadSprite("g_ghhb_weidacheng_zh") + mask:GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_weidacheng_zh") elseif data.state==1 then - mask:GetComponent("Image").sprite = Util.LoadSprite("g_ghhb_yidacheng_zh") + mask:GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_yidacheng_zh") end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua index de2b86d5d9..636acf417c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua @@ -8,6 +8,7 @@ local func local data function this:InitComponent(gameObject) + self.spLoader = SpriteLoader.New() self.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") self.tip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text") self.scroll = Util.GetGameObject(gameObject, "Scroll") @@ -84,11 +85,11 @@ end function this:ShowSingleData(go,heroData,index) self.itemList[index] = go - Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) - Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) + Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) + Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.icon) Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv - Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) - Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) + Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.icon) + Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local starGrid = Util.GetGameObject(go, "star") local starPre = Util.GetGameObject(go, "starPre") self.maskList[index] = Util.GetGameObject(go, "choosed") @@ -117,6 +118,7 @@ function this:OnClose() end function this:OnDestroy() + self.spLoader:Destroy() self.itemList = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 664c405a43..77be742d6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -3,6 +3,7 @@ local orginLayer local curImprintData={} function PracticeImprint:InitComponent() + self.spLoader = SpriteLoader.New() self.backBtn = Util.GetGameObject(self.gameObject, "backBtn") self.Scroll = Util.GetGameObject(self.gameObject, "Scroll") self.ImprintPre = Util.GetGameObject(self.gameObject, "ImprintPre") @@ -88,7 +89,7 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId) if not serverData then--未解锁 stateImg.gameObject:SetActive(true) - stateImg.sprite = Util.LoadSprite("r_Dungeon_lockon") + stateImg.sprite = self.spLoader:LoadSprite("r_Dungeon_lockon") heroImg.gameObject:SetActive(false) else--已解锁 -- LogGreen(" _imprintId:"..tostring(_imprintId).." serverData.state:"..tostring(serverData.state)) @@ -97,16 +98,16 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId) -- heroImg.gameObject:SetActive(false) elseif serverData.state == 1 then--已使用 stateImg.gameObject:SetActive(true) - stateImg.sprite = Util.LoadSprite("t_tianshumijuan_yijihuo_zh") + stateImg.sprite = self.spLoader:LoadSprite("t_tianshumijuan_yijihuo_zh") end heroImg.gameObject:SetActive(serverData.subId ~= nil and serverData.subId ~= "" and serverData.subId ~= "nil") if serverData.subId ~= nil and serverData.subId ~= "" and serverData.subId ~= "nil" then -- LogRed("serverData.subId:"..tostring(serverData.subId)) -- LogGreen(HeroManager.GetSingleHeroData(tostring(serverData.subId)).id) - heroImg.sprite = Util.LoadSprite(GetSpriteNameByItemId(HeroManager.GetSingleHeroData(tostring(serverData.subId)).id)) + heroImg.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(HeroManager.GetSingleHeroData(tostring(serverData.subId)).id)) end end - icon.sprite = Util.LoadSprite(GetResourcePath(configData.Icon)) + icon.sprite = self.spLoader:LoadSprite(GetResourcePath(configData.Icon)) Util.AddOnceClick(maskBtn,function () @@ -183,19 +184,19 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData) self.Hero:SetActive(true) --英雄图标 heroData = HeroManager.GetSingleHeroData(tostring(_serverData.subId)) - frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) - icon.sprite = Util.LoadSprite(heroData.icon) + frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) + icon.sprite = self.spLoader:LoadSprite(heroData.icon) lv.text = heroData.lv - proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) + proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) SetHeroStars(starGrid, heroData.star) end Util.AddOnceClick(self.MaskBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.XiuXingSelectHero,_configData,function (_heroData) NetManager.PracticeImprintRequest(_configData.Id,_configData.Id,tostring(_heroData.dynamicId),function () - frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(_heroData.heroConfig.Quality,_heroData.star)) - icon.sprite = Util.LoadSprite(_heroData.icon) + frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(_heroData.heroConfig.Quality,_heroData.star)) + icon.sprite = self.spLoader:LoadSprite(_heroData.icon) lv.text = _heroData.lv - proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName)) + proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName)) SetHeroStars(starGrid, _heroData.star) --刷新 self:Refresh(true,true,function () @@ -214,6 +215,7 @@ function PracticeImprint:OnClose() end function PracticeImprint:OnDestroy() + self.spLoader:Destroy() end return PracticeImprint \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 11b6350a3d..41d52f071c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -7,6 +7,7 @@ local newPower = 0 local oldBigLevel = 0 function Practice:InitComponent() + self.spLoader = SpriteLoader.New() orginLayer = 0 if not self.playerInfoView then self.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, self.transform) @@ -159,7 +160,7 @@ function Practice:RefreshBtn() end local icon = Util.GetGameObject(self.itemList[i],"icon"):GetComponent("Image") local num = Util.GetGameObject(self.itemList[i],"num"):GetComponent("Text") - icon.sprite = Util.LoadSprite(GetSpriteNameByItemId(data[1])) + icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data[1])) num.text = data[2] if BagManager.GetTotalItemNum(data[1]) < data[2] then num.text = string.format("%s",data[2]) @@ -193,6 +194,7 @@ function Practice:OnClose() end function Practice:OnDestroy() + self.spLoader:Destroy() SubUIManager.Close(self.UpView) SubUIManager.Close(self.BtView) self.UpView = nil diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 03f164720e..24fe13b453 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -165,7 +165,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 end end end - Util.GetGameObject(go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon) + Util.GetGameObject(go.transform, "posIcon"):SetActive(false) local frame = Util.GetGameObject(go.transform, "frame"):GetComponent("Image") local lvGo = Util.GetGameObject(go.transform, "lv") local icon = Util.GetGameObject(go.transform, "icon"):GetComponent("Image") diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index 7a00218691..759aba6915 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -19,6 +19,7 @@ local isSkip = false local isFirstEnter = 1 --初始化组件(用于子类重写) function StoryMapPanel:InitComponent() + this.spLoader = SpriteLoader.New() this.map = Util.GetGameObject(self.gameObject,"bg/mapParent") this.mapPre = Util.GetGameObject(self.gameObject,"bg/mapPre") this.TT = Util.GetGameObject(self.gameObject,"bg/TT") @@ -130,7 +131,7 @@ function this.LoadMap() if not this.Maps[i] then this.Maps[i] = newObjToParent(this.mapPre,this.map) end - this.Maps[i]:GetComponent("Image").sprite = Util.LoadSprite(curGroupConfig.Map[i][1]) + this.Maps[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(curGroupConfig.Map[i][1]) this.Maps[i]:GetComponent("Image"):SetNativeSize() this.Maps[i].gameObject:SetActive(true) local vecs = string.split(curGroupConfig.Map[i][2],',') @@ -689,6 +690,7 @@ end --界面销毁时调用(用于子类重写) function StoryMapPanel:OnDestroy() + this.spLoader:Destroy() for k,v in pairs(this.PlayerGrouops) do SubUIManager.Close(v) end diff --git a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua index 3bf7a40a37..61c9bdafdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua @@ -5,6 +5,7 @@ local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) function TaSuiLingXiao:InitComponent() + self.spLoader = SpriteLoader.New() self.time = Util.GetGameObject(self.gameObject, "time"):GetComponent("Text") self.btnFight = Util.GetGameObject(self.gameObject, "btnFight") self.btnTeam = Util.GetGameObject(self.gameObject, "btnTeam") @@ -124,7 +125,7 @@ function TaSuiLingXiao:ShowSkillList() skillData = passiveSkillConfig[self.configData.Skill[i][2]] end local icon = Util.GetGameObject(self.itemList[i],"Image"):GetComponent("Image") - icon.sprite = Util.LoadSprite(artConfig[skillData.Icon].Name) + icon.sprite = self.spLoader:LoadSprite(artConfig[skillData.Icon].Name) self.itemList[i]:SetActive(true) ForceRebuildLayout(self.scrollItem.transform) @@ -172,7 +173,7 @@ function TaSuiLingXiao:ShowSlide() break end end - self.btnBox:GetComponent("Image").sprite = Util.LoadSprite(artConfig[boxId].Name) + self.btnBox:GetComponent("Image").sprite = self.spLoader:LoadSprite(artConfig[boxId].Name) self.progressNum.text = string.format("%s/%s",historyMax,curBoss) self.count.text = count self.slide.fillAmount = historyMax/curBoss @@ -186,6 +187,7 @@ end --界面销毁时调用(用于子类重写) function TaSuiLingXiao:OnDestroy() + self.spLoader:Destroy() if self.timer then self.timer:Stop() self.timer = nil diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index f7b4bcebf3..ba4ef7c0bd 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -244,7 +244,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) local propertyName=itemConfig[_itemData.backData.itemId].PropertyName if(propertyName~=0) then self.fragmentIcon:SetActive(true) - self.fragmentIcon:GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(propertyName)) + self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName)) end self.starGrid:SetActive(true) local star = _itemData.configData.HeroStar[1] @@ -586,12 +586,12 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) end) elseif itemDataConFig.ItemType == ItemType.heroDogFood then --狗粮 - self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) - self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) + self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) + self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) local propertyName=itemConfig[itemSId].PropertyName if(propertyName~=0) then self.fragmentIcon:SetActive(true) - self.fragmentIcon:GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(propertyName)) + self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName)) end self.starGrid:SetActive(true) local star = _reward[4] or itemConfig[itemSId].HeroStar[1] diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index a325ad08fc..5d177ea6c3 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -13,6 +13,7 @@ function ShopViewNew:New(gameObject) end --初始化组件(用于子类重写) function ShopViewNew:InitComponent() + self.spLoader = SpriteLoader.New() self.live = Util.GetGameObject(self.gameObject, "live") self.liveRoot = Util.GetGameObject(self.gameObject, "live/root") self.liveImg = Util.GetGameObject(self.gameObject, "live/img") @@ -291,7 +292,7 @@ function ShopViewNew:RefreshBase() -- 商店标题 if self.ShopConfig.Title and self.ShopConfig.Title ~= "" then - self.titleImg:GetComponent("Image").sprite = Util.LoadSprite(self.ShopConfig.Title) + self.titleImg:GetComponent("Image").sprite = self.spLoader:LoadSprite(self.ShopConfig.Title) end self.contentBg:SetActive(false) end @@ -386,7 +387,7 @@ function ShopViewNew:RechargeShopItemAdapter(shopItem, itemData) -- 计算数据 local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId) - icon.sprite = Util.LoadSprite(GetResourcePath(itemInfo.Resources)) + icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemInfo.Resources)) num.text = itemInfo.Name price.text = MoneyUtil.GetMoneyMark() .. MoneyUtil.GetMoney(itemInfo.Price) @@ -431,12 +432,12 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) -- 折扣 if price == 0 then discountbg:SetActive(true) - discountbg:GetComponent("Image").sprite = Util.LoadSprite("s_shop_zhekou_00") + discountbg:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_shop_zhekou_00") else local isDiscount = itemInfo.IsDiscount == 1 discountbg:SetActive(isDiscount) if isDiscount then - discountbg:GetComponent("Image").sprite = Util.LoadSprite("s_shop_zhekou_0" .. itemInfo.DiscountDegree) + discountbg:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_shop_zhekou_0" .. itemInfo.DiscountDegree) end end -- 消耗物品的信息 @@ -532,6 +533,7 @@ end --界面销毁时调用(用于子类重写) function ShopViewNew:OnDestroy() + self.spLoader:Destroy() -- 物品节点回收 if self._GoodsItemList then for _, item in pairs(self._GoodsItemList) do