Revert "天地洪炉心愿修改提交"

This reverts commit 8d196f6759.
dev_chengFeng
zhangshanxue 2022-02-15 17:24:10 +08:00
parent 41cf1cd8d5
commit fc88c51a15
2 changed files with 2 additions and 36 deletions

View File

@ -35,7 +35,6 @@ function this:RemoveListener()
end
function this:OnShow(_parent)
RecruitManager.GetIsUpTailsManSoulChip()
parent=_parent
sortingOrder = _parent.sortingOrder
self.selectData = RecruitManager.GetWishTailsManSoulChips()
@ -93,15 +92,11 @@ function this:RefreshData()
this:RefreshData()
end, "取消", "确认", "提示",false,"")
end)
local isShow = false
--除了要判断是否up 以外还要判断是否在奖池里面
for j = 1,math.max(#itemList[i].items, #self.curData[i].trumpChipList) do
if not self.curData[i].trumpChipList[j] or not self.curData[i].trumpList[j].config.CanUp or self.curData[i].trumpList[j].config.CanUp == 0 then
itemList[i].items[j].go.gameObject:SetActive(false)
elseif not RecruitManager.CheckIsUpTailsManSoulChip(self.curData[i].trumpChipList[j]) then
itemList[i].items[j].go.gameObject:SetActive(false)
else
isShow = true
if not itemList[i].items[j] then
itemList[i].items[j] = {}
itemList[i].items[j].go = newObjToParent(itemList[i].items[1].go,itemList[i].itemGrid)
@ -134,12 +129,7 @@ function this:RefreshData()
end
end)
end
end
if isShow then
itemList[i].go.gameObject:SetActive(true)
else
itemList[i].go.gameObject:SetActive(false)
end
end
end
end
end

View File

@ -54,30 +54,6 @@ function this.GetWishTailsManSoulChips()
return datas
end
function this.CheckIsUpTailsManSoulChip(id)
if this.upTailsManSoulChip[id] then
return true
else
return false
end
end
function this.GetIsUpTailsManSoulChip()
this.upTailsManSoulChip = {}
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.tiandihonglu)
if not id or id < 1 then
return
end
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",id)
local singleRecruit = array[1]
local poolId = singleRecruit.DiamondBoxContain[1][1]
local configs = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",poolId)
local poolItemIds = {}
for k,v in ipairs(configs) do
this.upTailsManSoulChip[v.Reward[1]] = v.Reward[2]
end
end
--请求抽卡 1抽卡类型 2回调 3特权id
function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum)
local itemId = 0