From bacb82174215005862e82232c97f3764987a6b56 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 21 Jun 2024 15:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=A5=96=E5=8A=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B0=8F=E5=85=B5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Fight/FightAreaRewardPopup.lua | 7 ++++--- .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index bc38aa7b6c..490830949d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -6,6 +6,7 @@ local _ProductList = {} local _ItemList = {} local _RewardList = {} local _ExtraRewardList = {} + --初始化组件(用于子类重写) function FightAreaRewardPopup:InitComponent() this.spLoader = SpriteLoader.New() @@ -133,14 +134,14 @@ function FightAreaRewardPopup:OnShow() local config =ConfigManager.GetConfigData(ConfigName.SoldierStageConfig,FightPointPassManager.soldierLayerId) local mainLvConfig=ConfigManager.GetConfigData(ConfigName.MainLevelConfig, curFightId) - if config then + if mainLvConfig then --LogError("config.id============================"..config.Id) - if not config.RewardShowMin or #config.RewardShowMin < 1 then + if not mainLvConfig.RewardShowMin or #mainLvConfig.RewardShowMin < 1 then this.itemRoot.gameObject:SetActive(false) else this.itemRoot.gameObject:SetActive(true) -- 固定奖励 - for index, item in ipairs(config.RewardShowMin) do + for index, item in ipairs(mainLvConfig.RewardShowMin) do if not _ProductList[index] then _ProductList[index] = newObjToParent(this.item, this.itemGrid.transform) end diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 34963d7811..50ec0e9f36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -925,7 +925,7 @@ function this.BattleLogic() this.battleTimer:Start() if PlayerPrefs.GetInt("SmallSoldierFailed"..PlayerManager.uid)~=FightPointPassManager.soldierLayerId then if not GuideManager.IsInMainGuide() then - UIManager.OpenPanel(UIName.SmallSoldierFailPop) + --UIManager.OpenPanel(UIName.SmallSoldierFailPop) end PlayerPrefs.SetInt("SmallSoldierFailed"..PlayerManager.uid,FightPointPassManager.soldierLayerId) end @@ -968,7 +968,7 @@ function this.BattleLogic() --PopupTipPanel.ShowTip("服务器战斗验证失败") if PlayerPrefs.GetInt("SmallSoldierFailed"..PlayerManager.uid)~=FightPointPassManager.soldierLayerId then if not GuideManager.IsInMainGuide() then - UIManager.OpenPanel(UIName.SmallSoldierFailPop) + --UIManager.OpenPanel(UIName.SmallSoldierFailPop) end PlayerPrefs.SetInt("SmallSoldierFailed"..PlayerManager.uid,FightPointPassManager.soldierLayerId) end