From 11495d10763dcaa2e9bf121efb341460625c5ec6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 6 Sep 2021 11:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7?= =?UTF-8?q?=E5=9B=BE=E3=80=91=E4=BF=AE=E5=A4=8D=E5=A5=96=E5=8A=B1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua | 4 ++-- .../FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua | 4 +++- .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua index 0e23e1a998..8ac26a1feb 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua @@ -78,7 +78,7 @@ function this:OnShow(_parent,...) fightLevelData = args[1] --条件组数据 - condition = fightLevelData.config.ConditionValue + condition = fightLevelData.config.ConditionValue or {} this:FormationAdapter() this:ShoeCondition() @@ -89,7 +89,7 @@ function this.MainLevelInfoRefresh() if curChapterData then fightLevelData = curChapterData.node[fightLevelData.config.Id] --条件组数据 - condition = fightLevelData.config.ConditionValue + condition = fightLevelData.config.ConditionValue or {} this:FormationAdapter() this:ShoeCondition() diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua index 3dbcde1803..0b2399c795 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua @@ -65,7 +65,9 @@ end function this.SingleDataShow(_go,_rewardData,_index) local index = _index - 1 local reward = RewardGroup[_rewardData].ShowItem - Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text").text = index == 0 and "首通奖励" or HardStageCondition[fightLevelData.config.ConditionValue[index]].Describe + local condition = fightLevelData.config.ConditionValue or {} + local des = condition and HardStageCondition[condition[index]].Describe or "" + Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text").text = index == 0 and "首通奖励" or des Util.GetGameObject(_go, "titleImage/Text"):GetComponent("Text").text = index 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") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 0655268b88..75048e9316 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -318,7 +318,7 @@ function this.FightLevelShow() local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg() local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData() local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId) - local condition = curBattlefightLevelData.config.ConditionValue + local condition = curBattlefightLevelData.config.ConditionValue or {} this.isFirstEffect:SetActive(HardStageFightResponseMsg.currentIsHonour) if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do