分解、重置相关功能修改
parent
f654f744a6
commit
6ff6b5315b
|
@ -253,7 +253,7 @@ function this.GetHeroDataByHeroSIdAndMinSortId(_heroSId)
|
|||
return heroData
|
||||
end
|
||||
--获取所有英雄信息(分解 回溯用 )
|
||||
function this.GetAllHeroDataMsinusUpWar(_sortTypeId) --0全部 1-6属性 7-9 3、4、5星
|
||||
function this.GetAllHeroDataMsinusUpWar(_sortTypeId,type) --0全部 1-6属性 7-9 3、4、5星
|
||||
local heros = {}
|
||||
local heros2 = {}
|
||||
for i, v in pairs(heroDatas) do
|
||||
|
@ -288,8 +288,8 @@ function this.GetAllHeroDataMsinusUpWar(_sortTypeId) --0全部 1-6属性 7-9 3
|
|||
end
|
||||
--筛选
|
||||
if heros and LengthOfTable(heros) > 0 then
|
||||
for i, v in pairs(heros) do
|
||||
if v.lv > 1 then
|
||||
for i, v in pairs(heros) do
|
||||
if (v.lv > 1 and type == 1) or (v.lv > 0 and type == 2) then
|
||||
if _sortTypeId == 0 then
|
||||
table.insert(heros2, v)
|
||||
-- elseif _sortTypeId >= 7 then
|
||||
|
|
|
@ -199,8 +199,10 @@ function TimeLimitedCall:RefreshNextLevelReward()
|
|||
end
|
||||
|
||||
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(curActivityId)
|
||||
--LogBlue(ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count)
|
||||
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count - reMaintimes
|
||||
if reMaintimes == 0 then
|
||||
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count
|
||||
end
|
||||
--LogBlue("reMaintimes:"..reMaintimes)
|
||||
self.recruitTimesUpdate.text = string.format(Language[12229],reMaintimes)
|
||||
|
||||
|
@ -240,7 +242,8 @@ function TimeLimitedCall:RefreshGetHeroTimes()
|
|||
self.upper.text= Language[12185]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限
|
||||
local freeTime= 0
|
||||
if freeTimesId>0 then
|
||||
freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||
freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||
LogBlue("freeTime:"..freeTime)
|
||||
RecruitManager.freeUseTimeList[freeTimesId]=freeTime
|
||||
end
|
||||
--按钮赋值
|
||||
|
|
|
@ -65,6 +65,7 @@ function RewardEquipSingleShowPopup:BindEvent()
|
|||
--数量大于1 ,弹选择框
|
||||
if BagManager.GetItemCountById(equipData.id) > 1 then
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.EquipSingleSell,equipData,func)
|
||||
this:ClosePanel()
|
||||
elseif BagManager.GetItemCountById(equipData.id) == 1 then
|
||||
--只有一个,分解品质大于4, 弹框
|
||||
if equipData.itemConfig.Quantity>=4 then
|
||||
|
|
|
@ -48,10 +48,10 @@ function this.SendBackResolveReCallBack(drop)
|
|||
else
|
||||
BagManager.OnShowTipDropNumZero(drop)
|
||||
end
|
||||
parent:ClosePanel()
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
this:ClosePanel()
|
||||
end
|
||||
|
||||
function this:BindEvent()
|
||||
|
@ -121,6 +121,8 @@ function this:OnClose()
|
|||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
itemList = {}
|
||||
count = 0
|
||||
end
|
||||
|
||||
return this
|
|
@ -21,7 +21,6 @@ local sartTextStringSeting = {
|
|||
[3] = {name = Language[12177], defaultState = false},
|
||||
[4] = {name = Language[12175], defaultState = false},
|
||||
[5] = {name = Language[12173], defaultState = false},
|
||||
--[6] = {name = "6星", defaultState = false}
|
||||
}
|
||||
--初始化组件(用于子类重写)
|
||||
function EquipSellSelectPopup:InitComponent()
|
||||
|
|
|
@ -74,7 +74,7 @@ end
|
|||
function this.SortTypeClick(_sortType)
|
||||
tabSortType=_sortType
|
||||
selectHeroData={}
|
||||
tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType)
|
||||
tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2)
|
||||
this.selectText.text = Language[11775].."0/"..#tarHero
|
||||
this.noSelectBtn.gameObject:SetActive(false)
|
||||
this.SortHeroDatas(tarHero)
|
||||
|
|
|
@ -96,7 +96,7 @@ end
|
|||
--获取筛选后的英雄数据
|
||||
function this.GetHeroData(_sortType)
|
||||
local tempHeros={}
|
||||
local data=HeroManager.GetAllHeroDataMsinusUpWar(_sortType)
|
||||
local data=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,1)
|
||||
for n=1,#data do
|
||||
tempHeros[#tempHeros+1]=data[n]
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue