Merge branch 'china/test' into china/xq

dev_chengFeng
zhangshanxue 2021-09-06 11:47:33 +08:00
commit 54cae546af
3 changed files with 6 additions and 4 deletions

View File

@ -78,7 +78,7 @@ function this:OnShow(_parent,...)
fightLevelData = args[1] fightLevelData = args[1]
--条件组数据 --条件组数据
condition = fightLevelData.config.ConditionValue condition = fightLevelData.config.ConditionValue or {}
this:FormationAdapter() this:FormationAdapter()
this:ShoeCondition() this:ShoeCondition()
@ -89,7 +89,7 @@ function this.MainLevelInfoRefresh()
if curChapterData then if curChapterData then
fightLevelData = curChapterData.node[fightLevelData.config.Id] fightLevelData = curChapterData.node[fightLevelData.config.Id]
--条件组数据 --条件组数据
condition = fightLevelData.config.ConditionValue condition = fightLevelData.config.ConditionValue or {}
this:FormationAdapter() this:FormationAdapter()
this:ShoeCondition() this:ShoeCondition()

View File

@ -65,7 +65,9 @@ end
function this.SingleDataShow(_go,_rewardData,_index) function this.SingleDataShow(_go,_rewardData,_index)
local index = _index - 1 local index = _index - 1
local reward = RewardGroup[_rewardData].ShowItem 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, "titleImage/Text"):GetComponent("Text").text = index
Util.GetGameObject(_go, "okButton"):GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_yidacheng_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") Util.GetGameObject(_go, "noButton"):GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_weidacheng_zh")

View File

@ -340,7 +340,7 @@ function this.FightLevelShow()
local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg() local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg()
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData() local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId) 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) this.isFirstEffect:SetActive(HardStageFightResponseMsg.currentIsHonour)
if starListEffect and #starListEffect > 0 then if starListEffect and #starListEffect > 0 then
for i=1,#starListEffect do for i=1,#starListEffect do