Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
f27300721a
File diff suppressed because it is too large
Load Diff
|
@ -103,6 +103,20 @@ GetHeroCardQuantityImage = {
|
|||
[3] = "r_tongyong_lanse",
|
||||
[4] = "r_tongyong_zise",
|
||||
[5] = "r_tongyong_jinse",
|
||||
[10] = "r_tongyong_hongse",
|
||||
[11] = "r_tongyong_zhuanshi",
|
||||
}
|
||||
|
||||
GetHeroCardStarImage = {
|
||||
[1] = "r_tongyong_duiwudi",
|
||||
[2] = "r_tongyong_duiwudihong",
|
||||
[3] = "r_tongyong_duiwudizhuanshi",
|
||||
}
|
||||
|
||||
GetHeroStarImage = {
|
||||
[1] = "ui_1xing",
|
||||
[2] = "ui_1yue",
|
||||
[3] = "t_zhandoukuang_zhuangshixx",
|
||||
}
|
||||
|
||||
--Hero大卡背景
|
||||
|
|
|
@ -198,6 +198,7 @@ function this:OnSortingOrderChange()
|
|||
end
|
||||
|
||||
function this:OnOpen(_panelType,...)
|
||||
-- tempPowerNum=0
|
||||
this.selectBtn:SetActive(false)
|
||||
this.passBattle0:SetActive(false)
|
||||
this.passBattle1:SetActive(false)
|
||||
|
@ -227,6 +228,8 @@ end
|
|||
|
||||
function this:OnClose()
|
||||
tempPowerNum = 0
|
||||
this.formationPower = 0
|
||||
oldPowerNum = 0
|
||||
proId=0--面板关闭时 重置筛选按钮为全部
|
||||
for i = 1, #this.choosedList do
|
||||
local pos=this.choosedList[i].position
|
||||
|
@ -288,7 +291,6 @@ function this.SetCardsData()
|
|||
this.InitArmPos()
|
||||
this.InitArmData()
|
||||
|
||||
LogRed(#this.choosedList)
|
||||
--编队为0显示0战力
|
||||
if #this.choosedList<=0 then
|
||||
this.formationPower=0
|
||||
|
|
|
@ -2120,6 +2120,9 @@ function this.GetHeroReturnItems(selectHeroData, type)
|
|||
pId
|
||||
)
|
||||
local rewardShowStr1 = {}
|
||||
if not heroReturnConfig then
|
||||
LogRed("pId:"..pId.." curHeroData.breakId:"..curHeroData.breakId.." curHeroData.id:"..curHeroData.id)
|
||||
else
|
||||
ShowItemlist[heroReturnConfig.HeroId] = {heroReturnConfig.HeroId,1,curHeroData.star}
|
||||
rewardShowStr1 = heroReturnConfig.RankupReturn
|
||||
if rewardShowStr1 then
|
||||
|
@ -2133,6 +2136,7 @@ function this.GetHeroReturnItems(selectHeroData, type)
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
rewardShowStr1 = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, v.lv).SumConsume
|
||||
if rewardShowStr1 then
|
||||
for k,v in ipairs(rewardShowStr1) do
|
||||
|
|
|
@ -180,7 +180,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
end
|
||||
local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",pId)
|
||||
if not heroReturnConfig then
|
||||
LogRed("HeroId"..curHeroData.id.."Star"..pId)
|
||||
LogRed("HeroId"..curHeroData.id.." Star"..pId.." curHeroData.breakId"..curHeroData.breakId)
|
||||
heroUseCount= 50
|
||||
heroUseItemId = 16
|
||||
else
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue