Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-04-27 14:42:23 +08:00
commit d610d44c0f
2 changed files with 17 additions and 10 deletions

View File

@ -31,8 +31,13 @@ end
function MonthRewardPreviewPopup:OnOpen(type, goodType)
local data = OperatingManager.GetPanelShowReward(type, true,false)
local getDays = OperatingManager.GetRewardDay(goodType)
-- Log("领取天数" .. getDays)
local getDays = 0
local canBuyNum = OperatingManager.GetLeftBuyTime(goodType, type)
if canBuyNum and canBuyNum <= 0 then
getDays = OperatingManager.GetRewardDay(goodType)
else
getDays = 0
end
for i = 1, #data do
if not this.rewardList[i] then
this.rewardList[i] = {}

View File

@ -103,6 +103,16 @@ function RewardBoxPanel:OnOpen(...)
this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = #this.rewardGroup ~= 1 and Vector2.New(0, 376) or Vector2.New(0, 444)
this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 830) or Vector2.New(940, 900)
end
-- 打开,重新打开时回调
function RewardBoxPanel:OnShow()
this.name.text = GetLanguageStrById(itemConfig[this.itemId].Name)
itemList={}
curId = nil
tagNum = 1
--刷新按钮亮光
this.selectList ={}
for n = 1, this.selectBar.transform.childCount-1 do--设置当前页签
table.insert(this.selectList,this.selectBar.transform:GetChild(n).gameObject)
@ -121,14 +131,6 @@ function RewardBoxPanel:OnOpen(...)
end)
end
end
-- 打开,重新打开时回调
function RewardBoxPanel:OnShow()
this.name.text = GetLanguageStrById(itemConfig[this.itemId].Name)
itemList={}
curId = nil
tagNum = 1
self:RefreshData()
end