神印红点修改提交
parent
a53c0446b8
commit
9716d0d90e
|
|
@ -162,6 +162,7 @@ function GodPrintPanel:OnShow()
|
|||
this.leftBtn.gameObject:SetActive(#heroDatas>1)
|
||||
this.rightBtn.gameObject:SetActive(#heroDatas>1)
|
||||
this.RefreshShow()
|
||||
|
||||
end
|
||||
|
||||
function GodPrintPanel:OnClose()
|
||||
|
|
@ -246,7 +247,7 @@ function this.SetLoopUI()
|
|||
end
|
||||
|
||||
--数据赋值
|
||||
LogError("#curHeroData.godPrintList=="..#curHeroData.godPrintList)
|
||||
--LogError("#curHeroData.godPrintList=="..#curHeroData.godPrintList)
|
||||
for k=1,#curHeroData.godPrintList do
|
||||
local index=curHeroData.godPrintList[k].position
|
||||
this.SetLoopPre(loopList[index],3,index,curHeroData.godPrintList[k])
|
||||
|
|
@ -326,7 +327,6 @@ end
|
|||
|
||||
--设置魂印列表滚动条
|
||||
function this.SetScrollData()
|
||||
LogError("update scroll")
|
||||
local data =GodPrintManager.GetAllSoulPrint(isShow,curHeroData.id,curHeroData.dynamicId,curHeroData)
|
||||
this.empty:SetActive(#data==0)
|
||||
this.ShowRedPotDataAndSort(data)
|
||||
|
|
@ -433,7 +433,7 @@ function this.ShowRedPotDataAndSort(allData)
|
|||
for i = 1, #curHeroData.godPrintList do
|
||||
local equip=equipConfig[curHeroData.godPrintList[i].equipId]
|
||||
-- allUpSoulPrint[curHeroData.godPrintList[i].equipId] = equip --curHeroData.godPrintList[i]
|
||||
LogError("equip.SuiteID=="..equip.SuiteID)
|
||||
--LogError("equip.SuiteID=="..equip.SuiteID)
|
||||
table.insert(allUpSoulPrint, equip.SuiteID)
|
||||
end
|
||||
end
|
||||
|
|
@ -459,8 +459,9 @@ function this.ShowRedPotDataAndSort(allData)
|
|||
end
|
||||
end
|
||||
local isHaveCurHeroid = HeroManager.CheckHeroIsCanAddGodPrint(equipConfig[allData[i].id].ProfessionLimit,curHeroData)
|
||||
|
||||
if not isHave and isHaveCurHeroid and allData[i].upHero == "" and not haveRedPointSid[suitId] then
|
||||
local allNum,open=HeroManager.GetGodPrintLoopUIMaxData(curHeroData.star)
|
||||
--LogError("#curHeroData.godPrintList=="..#curHeroData.godPrintList.." open=="..open.." curHeroData.star=="..curHeroData.star)
|
||||
if not isHave and isHaveCurHeroid and allData[i].upHero == "" and not haveRedPointSid[suitId] and #curHeroData.godPrintList<open then
|
||||
allData[i].isShowRedPot = 1--有空位可以穿戴
|
||||
haveRedPointSid[suitId] = suitId
|
||||
|
||||
|
|
|
|||
|
|
@ -3198,6 +3198,7 @@ function this.GetFormationHeroRedPoint()
|
|||
#this.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or
|
||||
this.GetIsShowSoulPrintRedPoint(curHeroData) or
|
||||
this.GetIsShowTalismanRedPoint(curHeroData) or
|
||||
this.GetIsShowGodPrintRedPoint(curHeroData) or
|
||||
(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0) or
|
||||
HeroManager.CheckIsUpTreasure(curHeroData.jewels[1],0) or
|
||||
HeroManager.CheckIsUpTreasure(curHeroData.jewels[2],0) or
|
||||
|
|
@ -3247,7 +3248,8 @@ function this.GetCurHeroIsShowRedPoint(curHeroData)
|
|||
this.IsShowUpStarRedPoint(curHeroData) or
|
||||
#this.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or
|
||||
this.GetIsShowSoulPrintRedPoint(curHeroData) or
|
||||
this.GetIsShowTalismanRedPoint(curHeroData) or
|
||||
this.GetIsShowTalismanRedPoint(curHeroData) or
|
||||
this.GetIsShowGodPrintRedPoint(curHeroData) or
|
||||
(#this.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0 and isCanUpEquipTreasure) or
|
||||
HeroManager.CheckIsUpTreasure(curHeroData.jewels[1],0) or
|
||||
HeroManager.CheckIsUpTreasure(curHeroData.jewels[2],0) or
|
||||
|
|
@ -3704,29 +3706,19 @@ end
|
|||
--获取魂印环形布局数据 didMaxLen最大槽位数量 didLen可装备槽位数量 didLv最大动态等级 maxLv配置最大等级
|
||||
function this.GetGodPrintLoopUIMaxData(star)
|
||||
local d = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 149).Value, "#")
|
||||
local _d = {}
|
||||
for n = 1, #d do
|
||||
local v = d[n]
|
||||
if star >= tonumber(v) then
|
||||
table.insert(_d, v)
|
||||
end
|
||||
local allNum=0
|
||||
local openNum=0
|
||||
if d then
|
||||
allNum=#d
|
||||
for i = 1, allNum do
|
||||
local curStar=tonumber(d[i])
|
||||
if curStar<=star then
|
||||
openNum=openNum+1
|
||||
end
|
||||
end
|
||||
end
|
||||
--当前动态最大等级
|
||||
local didLv = 0
|
||||
--最大槽位数量
|
||||
local didMaxLen = 0
|
||||
--可装备槽位数量(与是否装备英雄无关)
|
||||
local didLen = 0
|
||||
if #_d < #d then --未达到最大等级 +1显示锁定
|
||||
didMaxLen = #_d + 1
|
||||
else
|
||||
didMaxLen = #_d
|
||||
end
|
||||
didLv = tonumber(d[didMaxLen])
|
||||
didLen = #_d
|
||||
local maxLv = tonumber(d[#d])
|
||||
|
||||
return didMaxLen, didLen, didLv, maxLv
|
||||
return allNum,openNum
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -3776,6 +3768,11 @@ function this.GetIsShowGodPrintRedPoint(curHeroData)
|
|||
if curHeroData.godPrintList and #curHeroData.godPrintList >= 3 then
|
||||
return false --空位置 已装满
|
||||
end
|
||||
local allNum,openNum=this.GetGodPrintLoopUIMaxData(curHeroData.star)
|
||||
--LogError("openNum=="..openNum.." curHeroData.star=="..curHeroData.star)
|
||||
if openNum~=0 and #curHeroData.godPrintList==openNum then
|
||||
return false
|
||||
end
|
||||
local allUpSoulPrint = {}
|
||||
if curHeroData.godPrintList then
|
||||
for i = 1, #curHeroData.godPrintList do
|
||||
|
|
|
|||
|
|
@ -704,7 +704,6 @@ function this:UpdateHeroInfoData()
|
|||
end
|
||||
elseif _CurPageIndex == RoleInfoPanelIndex.feiSheng then
|
||||
if curHeroData.heroConfig.MaxRank <= 11 or curHeroData.star == 14 then
|
||||
LogError("*********/////////////////")
|
||||
_CurPageIndex=RoleInfoPanelIndex.qingbao
|
||||
else
|
||||
LogError("*********/////////////////222222")
|
||||
|
|
|
|||
Loading…
Reference in New Issue