Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
ab93491cfe
|
@ -47,10 +47,10 @@ function GuildCarDelayLootRecordPopup:OnShow()
|
|||
local timeStr = os.date("%Y%m%d",carChallengeItem.carChallengeItem[i].time)
|
||||
if not curallLootRecordData[timeStr] then
|
||||
curallLootRecordData[timeStr] = {}
|
||||
LogError("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
|
||||
-- LogError("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
|
||||
table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i])
|
||||
else
|
||||
LogError("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
|
||||
-- LogError("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
|
||||
table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -51,11 +51,7 @@ function RoleTalentPopup:GetTalentDataShow()
|
|||
upStarSkillDataList = {}
|
||||
if heroConfig.OpenPassiveSkillRules then
|
||||
for i = 1, #heroConfig.OpenPassiveSkillRules do
|
||||
--LogError("i "..i)
|
||||
if heroConfig.OpenPassiveSkillRules[i][1] == 1 then--突破
|
||||
local singSkillData = {}
|
||||
singSkillData.passiveSkillConfig = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]]
|
||||
singSkillData.OpenPassiveSkillRules = heroConfig.OpenPassiveSkillRules[i]
|
||||
local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11864]
|
||||
local curBreakId = heroConfig.OpenPassiveSkillRules[i][2]
|
||||
if breakId >= curBreakId then
|
||||
|
@ -72,16 +68,22 @@ function RoleTalentPopup:GetTalentDataShow()
|
|||
end
|
||||
end
|
||||
else--升星
|
||||
local singSkillData = {}
|
||||
singSkillData.passiveSkillConfig = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]]
|
||||
singSkillData.OpenPassiveSkillRules = heroConfig.OpenPassiveSkillRules[i]
|
||||
singSkillData.titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11865]
|
||||
if upStarId >= heroConfig.OpenPassiveSkillRules[i][2] then
|
||||
singSkillData.isOpen = true
|
||||
local curUpStarId = heroConfig.OpenPassiveSkillRules[i][2]
|
||||
local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11865]
|
||||
local _passiveSkillId = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Id
|
||||
if upStarId >= curUpStarId then
|
||||
if upStarSkillDataList[curUpStarId] then
|
||||
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. " <color=#66FF00>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
|
||||
else
|
||||
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#66FF00>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
|
||||
end
|
||||
else
|
||||
singSkillData.isOpen = false
|
||||
if upStarSkillDataList[curUpStarId] then
|
||||
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =upStarSkillDataList[curUpStarId].str .. " <color=#B9AC97>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
|
||||
else
|
||||
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#B9AC97>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
|
||||
end
|
||||
end
|
||||
table.insert(upStarSkillDataList,singSkillData)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -106,8 +108,12 @@ function RoleTalentPopup:GetTalentDataShow()
|
|||
go.gameObject:SetActive(true)
|
||||
go:GetComponent("Text").text = breakSkillDataList2[i].str
|
||||
end
|
||||
|
||||
for i = 1, math.max(#upStarSkillDataList, #self.upStarSkillGoList) do
|
||||
local upStarSkillDataList2 = {}
|
||||
for i, v in pairs(upStarSkillDataList) do
|
||||
table.insert(upStarSkillDataList2,v)
|
||||
end
|
||||
table.sort(upStarSkillDataList2, function(a,b) return a.index<b.index end)
|
||||
for i = 1, math.max(#upStarSkillDataList2, #self.upStarSkillGoList) do
|
||||
local go = self.upStarSkillGoList[i]
|
||||
if not go then
|
||||
go = newObject(self.upStarSkillTextPre)
|
||||
|
@ -118,22 +124,17 @@ function RoleTalentPopup:GetTalentDataShow()
|
|||
end
|
||||
go.gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #upStarSkillDataList do
|
||||
for i = 1, #upStarSkillDataList2 do
|
||||
local go = self.upStarSkillGoList[i]
|
||||
go.gameObject:SetActive(true)
|
||||
|
||||
local kongStr = ""
|
||||
if passiveSkillLogicConfig[upStarSkillDataList[i].passiveSkillConfig.Id].Judge == 1 then
|
||||
if passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1 then
|
||||
kongStr = " "
|
||||
else
|
||||
kongStr = ""
|
||||
end
|
||||
if upStarSkillDataList[i].isOpen then
|
||||
go:GetComponent("Text").text = kongStr.."<color=#66FF00>"..upStarSkillDataList[i].titleStr..upStarSkillDataList[i].passiveSkillConfig.Desc.."</color>"
|
||||
else
|
||||
go:GetComponent("Text").text = kongStr.."<color=#B9AC97>"..upStarSkillDataList[i].titleStr..upStarSkillDataList[i].passiveSkillConfig.Desc.."</color>"
|
||||
end
|
||||
Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList[i].passiveSkillConfig.Id].Judge == 1)
|
||||
Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1)
|
||||
go:GetComponent("Text").text = kongStr .. upStarSkillDataList2[i].str
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue