commit
parent
e4a9c5c614
commit
22de98dc18
|
@ -33322,8 +33322,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 294.40002, y: -351.95496}
|
m_AnchoredPosition: {x: 294.40002, y: -42.7}
|
||||||
m_SizeDelta: {x: 1080, y: 192.67}
|
m_SizeDelta: {x: 1080, y: 51.9}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5897560853818070714
|
--- !u!222 &5897560853818070714
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -1019,7 +1019,7 @@ ActivityTypeDef = {
|
||||||
OpenSeverWelfare=55,--开服福利
|
OpenSeverWelfare=55,--开服福利
|
||||||
EightDayGift = 56,--八日登陆
|
EightDayGift = 56,--八日登陆
|
||||||
SignInfo = 57,--三日七日签到
|
SignInfo = 57,--三日七日签到
|
||||||
pozhenzhuxian_task = 2000,--破阵诛仙任务
|
pozhenzhuxian_task = 20000,--破阵诛仙任务
|
||||||
pozhenzhuxian_recharge = 58,--破阵诛仙累充
|
pozhenzhuxian_recharge = 58,--破阵诛仙累充
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -725,12 +725,17 @@ this.TimeLimitedTimes = 0
|
||||||
this.allData = {}
|
this.allData = {}
|
||||||
function this.InitPoZhenZhuXianData()
|
function this.InitPoZhenZhuXianData()
|
||||||
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task)
|
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task)
|
||||||
if not ActivityGiftManager.IsActivityTypeOpen(id) then
|
if (not id) or id == 0 then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_task) then
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
this.allData = {}
|
this.allData = {}
|
||||||
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id)
|
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id)
|
||||||
local allMissionData = ActivityGiftManager.GetActivityTypeInfo(id).mission
|
LogBlue("#allListData:"..#allListData)
|
||||||
|
local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_task).mission
|
||||||
|
LogBlue("#allMissionData"..#allMissionData)
|
||||||
for i=1,#allListData do
|
for i=1,#allListData do
|
||||||
for j=1,#allMissionData do
|
for j=1,#allMissionData do
|
||||||
if allListData[i].Id == allMissionData[j].missionId then
|
if allListData[i].Id == allMissionData[j].missionId then
|
||||||
|
|
|
@ -104,9 +104,14 @@ function PrayMainPanel:BindEvent()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(self.extraRewardBtn, function()
|
Util.AddClick(self.extraRewardBtn, function()
|
||||||
--累计奖励
|
--累计奖励
|
||||||
for i = 1, #PrayManager.extraRewardData do
|
for i = 1, 6 do
|
||||||
local patyRewardData = PrayManager.extraRewardData[i]
|
if i <= #PrayManager.extraRewardData then
|
||||||
this:ShowSingleExtraRewardData(false,extraRewardParentGrid[i],extraRewardItemGrid[i],patyRewardData)
|
extraRewardParentGrid[i]:SetActive(true)
|
||||||
|
local patyRewardData = PrayManager.extraRewardData[i]
|
||||||
|
this:ShowSingleExtraRewardData(false,extraRewardParentGrid[i],extraRewardItemGrid[i],patyRewardData)
|
||||||
|
else
|
||||||
|
extraRewardParentGrid[i]:SetActive(false)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
self.extraRewardLayout:SetActive(true)
|
self.extraRewardLayout:SetActive(true)
|
||||||
end)
|
end)
|
||||||
|
@ -385,7 +390,7 @@ end
|
||||||
function PrayMainPanel:ShowSingleExtraRewardData(_isGet,_parentGo,_go,patyRewardData)
|
function PrayMainPanel:ShowSingleExtraRewardData(_isGet,_parentGo,_go,patyRewardData)
|
||||||
local numText = Util.GetGameObject(_parentGo.transform, "numText/Text"):GetComponent("Text")
|
local numText = Util.GetGameObject(_parentGo.transform, "numText/Text"):GetComponent("Text")
|
||||||
local _reward = {patyRewardData.itemId,patyRewardData.num}
|
local _reward = {patyRewardData.itemId,patyRewardData.num}
|
||||||
_go:OnOpen(_isGet,_reward,1)
|
_go:OnOpen(_isGet,_reward,0.9)
|
||||||
numText.text = patyRewardData.extraRewardCount
|
numText.text = patyRewardData.extraRewardCount
|
||||||
end
|
end
|
||||||
--刷新按钮事件
|
--刷新按钮事件
|
||||||
|
|
Loading…
Reference in New Issue