摘星阁修改,备战阵营图标显示修改
parent
5afe0f400b
commit
2ed317bc2c
|
@ -559,7 +559,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
|||
|
||||
|
||||
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroData.star])
|
||||
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
|
||||
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property))
|
||||
local star,starType = heroData.GetStar()
|
||||
if starType == 3 then
|
||||
if heroData.star>11 then
|
||||
|
@ -726,8 +726,8 @@ function this.NaturalSort(isNature,a,b)
|
|||
if a.lv == b.lv then
|
||||
if a.warPower == b.warPower then
|
||||
if a.id == b.id then
|
||||
if a.changeProId==b.changeProId then
|
||||
return a.changeProId<b.changeProId
|
||||
if a.property==b.property then
|
||||
return a.property<b.property
|
||||
else
|
||||
return a.sortId > b.sortId
|
||||
end
|
||||
|
@ -815,7 +815,14 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
else
|
||||
redPot.gameObject:SetActive(false)
|
||||
end
|
||||
changeProBtn:SetActive(_heroData.changeProId>=5)
|
||||
if _heroData.property then
|
||||
changeProBtn:SetActive(_heroData.property>=5)
|
||||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property))
|
||||
else
|
||||
changeProBtn:SetActive(false)
|
||||
LogError("+++++++")
|
||||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||
end
|
||||
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
icon.sprite=this.spLoader:LoadSprite(heroData.icon)
|
||||
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
|
||||
|
@ -828,7 +835,7 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
lv.text=heroData.lv
|
||||
end
|
||||
|
||||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
|
||||
|
||||
pos.sprite = this.spLoader:LoadSprite(heroData.professionIcon)
|
||||
local star,starType = heroData.GetStar(1)
|
||||
local starSize = Vector2.New(30,30)
|
||||
|
@ -924,7 +931,7 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
end
|
||||
-- 点击事件
|
||||
Util.AddOnceClick(go, function()
|
||||
if heroData.changeProId>=5 then
|
||||
if heroData.property and heroData.property>=5 then
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChangeHeroPro,heroData,function()
|
||||
LogError("刷新界面数据")
|
||||
this.RefreshShow(false,false)
|
||||
|
@ -1269,7 +1276,7 @@ function this.SetOneKeyGo()
|
|||
end
|
||||
for k, v in ipairs(heros) do
|
||||
local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId)
|
||||
if curSingleherodata.changeProId~=5 then
|
||||
if curSingleherodata.property~=5 then
|
||||
if not upHeroSidTable[curSingleherodata.id] then
|
||||
if #this.choosedList < 6 then
|
||||
for n = 1, #posArr do
|
||||
|
|
|
@ -187,7 +187,8 @@ Hero_Prop_Func = {
|
|||
addAllProVal[id] = value
|
||||
end
|
||||
if propertyConfig[id].Style == 1 and curEquip.homeEquipLv then--摘星阁加持
|
||||
addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position)/100)
|
||||
--LogError("addlevel=="..HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position))
|
||||
addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position)/10000)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -334,7 +334,7 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
|
||||
if proConfigData and proConfigData.Style == 1 then
|
||||
local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position)
|
||||
local power = math.ceil(prop[2]*(num/100))
|
||||
local power = math.ceil(prop[2]*(num/10000))
|
||||
if not _homeProList[index] then
|
||||
_homeProList[index] = newObjToParent(self.homeProPre, self.homeProGrid)
|
||||
end
|
||||
|
@ -342,7 +342,7 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
_homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
|
||||
local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text")
|
||||
sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power)
|
||||
Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(%s",num).."%)"--摘星阁加持文字显示位置
|
||||
Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(%s",num/100).."%)"--摘星阁加持文字显示位置
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue