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

dev_chengFeng
gaoxin 2021-03-31 20:03:26 +08:00
commit 5847735f79
4 changed files with 30 additions and 14 deletions

View File

@ -4,7 +4,7 @@ local this = NotEnoughPopup
-- 跳转商店购买窗口物品id对应界面及参数
local _JumpConfig = {
[16] = 36010,
[16] = 36008,
--[15] = {36010},
--[16] = {36010},
}

View File

@ -76,7 +76,7 @@ function CumulativeSignInPage:BindEvent()
self.rewardPanel:GetComponent("RectTransform").localPosition = pos[i]
end)
else
Util.AddOnceClick(self.boxs[i],function()
Util.AddOnceClick(self.boxs[i].btnBox,function()
NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1)
self:RefreshBox()

View File

@ -153,7 +153,23 @@ function EveryDayGift:RefreshGiftData()
local callBack = function(index, item)
self:RefreshShowData(item, self.shopData[index],index)
end
local curindex = 0
self.scrollView:SetData(self.shopData, callBack)
for i = 1 ,#self.shopData do
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
for j = 1 , #DynamicActivityManager.selectIndex.goodsId do
if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then
curindex = i
break
end
end
end
if curindex ~= 0 then
break
end
end
LogGreen("curindex:"..curindex)
self.scrollView:SetIndex(curindex)
end
function EveryDayGift:isBought()

View File

@ -82,16 +82,6 @@ function GiftPre:InitComponent()
self.tip4_en = Util.GetGameObject(self.tipRoot,"tip4_en")
self.tip5 = Util.GetGameObject(self.tipRoot,"tip5")
self.tip5Text = Util.GetGameObject(self.tip5,"Text"):GetComponent("Text")
self.tipRoot:SetActive(false)
self.tip1:SetActive(false)
self.tip1_en:SetActive(false)
self.tip2:SetActive(false)
self.tip2_en:SetActive(false)
self.tip3:SetActive(false)
self.tip3_en:SetActive(false)
self.tip4:SetActive(false)
self.tip4_en:SetActive(false)
self.tip5:SetActive(false)
end
--绑定事件(用于子类重写)
@ -230,6 +220,16 @@ function GiftPre:SetContent1()
self.grid:GetComponent("RectTransform").anchoredPosition = offSetX[0].scroll
self.type1.gameObject:SetActive(false)
self.type2.gameObject:SetActive(false)
self.tipRoot:SetActive(false)
self.tip1:SetActive(false)
self.tip1_en:SetActive(false)
self.tip2:SetActive(false)
self.tip2_en:SetActive(false)
self.tip3:SetActive(false)
self.tip3_en:SetActive(false)
self.tip4:SetActive(false)
self.tip4_en:SetActive(false)
self.tip5:SetActive(false)
self.btnBuy:GetComponent("Image").sprite = Util.LoadSprite("s_slbz_1anniuhuangse")
if self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.DAILY_GIFT then
self.type2.gameObject:SetActive(true)
@ -299,10 +299,10 @@ function GiftPre:SetTip()
end
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then
self.tip5:SetActive(true)
self.tip5.text = "轩辕宝境必备特权每天增加2次免费次数6次额外购买次数"
self.tip5Text.text = "轩辕宝境必备特权每天增加2次免费次数6次额外购买次数"
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 7105 then
self.tip5:SetActive(true)
self.tip5.text = "每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!"
self.tip5Text.text = "每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!"
end
end