【删除活动类型43】
parent
cb331c612e
commit
a8f666e901
|
@ -1330,7 +1330,7 @@ ActivityTypeDef = {
|
||||||
XunBaoMiZong = 82, --寻宝迷踪
|
XunBaoMiZong = 82, --寻宝迷踪
|
||||||
|
|
||||||
--主题活动
|
--主题活动
|
||||||
FindFairy=43,--限时招募
|
-- FindFairy=43,--限时招募
|
||||||
QianKunBox = 44,--乾坤宝囊
|
QianKunBox = 44,--乾坤宝囊
|
||||||
DynamicAct_recharge = 58,--主题活动累充
|
DynamicAct_recharge = 58,--主题活动累充
|
||||||
DynamicAct = 20000,--主题活动任务
|
DynamicAct = 20000,--主题活动任务
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
----- 易经宝库奖励预览弹窗 -----
|
----- 固定活动抽卡详情 -----
|
||||||
local this = {}
|
local this = {}
|
||||||
--传入父脚本模块
|
--传入父脚本模块
|
||||||
local parent
|
local parent
|
||||||
|
@ -15,6 +15,7 @@ function this:InitComponent(gameObject)
|
||||||
this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
||||||
this.itemGrid=Util.GetGameObject(gameObject,"panel/itemGrid")
|
this.itemGrid=Util.GetGameObject(gameObject,"panel/itemGrid")
|
||||||
this.LookDetailBtn=Util.GetGameObject(gameObject,"panel/Image3/updetail")
|
this.LookDetailBtn=Util.GetGameObject(gameObject,"panel/Image3/updetail")
|
||||||
|
this.LookDetailBtn:SetActive(false)
|
||||||
this.content=Util.GetGameObject(gameObject,"panel/content/grid/Text"):GetComponent("Text")
|
this.content=Util.GetGameObject(gameObject,"panel/content/grid/Text"):GetComponent("Text")
|
||||||
this.time=Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
this.time=Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
||||||
this.grid = Util.GetGameObject(gameObject,"panel/rate/grid")
|
this.grid = Util.GetGameObject(gameObject,"panel/rate/grid")
|
||||||
|
@ -31,16 +32,6 @@ function this:InitComponent(gameObject)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:BindEvent()
|
function this:BindEvent()
|
||||||
Util.AddClick(this.LookDetailBtn,function()
|
|
||||||
this:LookDetailBtnAction()
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
function this:LookDetailBtnAction()
|
|
||||||
if activityType == ActivityTypeDef.FindFairy then
|
|
||||||
UIManager.OpenPanel(UIName.HeroPreviewPanel,true,false)
|
|
||||||
else
|
|
||||||
LogPurple("打开魂印奖励预览")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
function this:AddListener()
|
function this:AddListener()
|
||||||
|
|
||||||
|
@ -63,11 +54,6 @@ function this:OnShow(_parent,_Data)
|
||||||
|
|
||||||
activityType = args[2]
|
activityType = args[2]
|
||||||
local str2 = ActivityGiftManager.GetTimeStartToEnd(activityType)
|
local str2 = ActivityGiftManager.GetTimeStartToEnd(activityType)
|
||||||
if activityType == ActivityTypeDef.FindFairy then
|
|
||||||
this.LookDetailBtn.gameObject:SetActive(true)
|
|
||||||
else
|
|
||||||
this.LookDetailBtn.gameObject:SetActive(false)
|
|
||||||
end
|
|
||||||
this.time.text="概率有效期:"..str2
|
this.time.text="概率有效期:"..str2
|
||||||
|
|
||||||
local poolUpType = args[3] or 0
|
local poolUpType = args[3] or 0
|
||||||
|
@ -167,10 +153,7 @@ local hero
|
||||||
function this:BuildRateData(actType,UpItem,upItemList)
|
function this:BuildRateData(actType,UpItem,upItemList)
|
||||||
local rateList = {}
|
local rateList = {}
|
||||||
local _upRateList = {}
|
local _upRateList = {}
|
||||||
if actType == ActivityTypeDef.FindFairy then
|
if actType == ActivityTypeDef.QianKunBox then
|
||||||
_upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"5星UP!",ConfigName.HeroConfig)
|
|
||||||
rateList = this:RefreshHeroRate(UpItem,_upRateList)
|
|
||||||
elseif actType == ActivityTypeDef.QianKunBox then
|
|
||||||
_upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"魂印UP!",ConfigName.EquipConfig)
|
_upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"魂印UP!",ConfigName.EquipConfig)
|
||||||
rateList = this:RefreshSoulRate(UpItem,_upRateList)
|
rateList = this:RefreshSoulRate(UpItem,_upRateList)
|
||||||
elseif actType == ActivityTypeDef.LingShouBaoGe then
|
elseif actType == ActivityTypeDef.LingShouBaoGe then
|
||||||
|
|
|
@ -612,21 +612,21 @@ function this.IsGiftBuyActive()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function this.GetTimeLimitRedPointStatus()
|
-- function this.GetTimeLimitRedPointStatus()
|
||||||
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
-- local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
-- local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||||
if not activityId then
|
-- if not activityId then
|
||||||
return false
|
-- return false
|
||||||
end
|
-- end
|
||||||
local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1)
|
-- local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1)
|
||||||
local freeTimesId=lotterySetting[array.Id].FreeTimes
|
-- local freeTimesId=lotterySetting[array.Id].FreeTimes
|
||||||
local freeTime= 0
|
-- local freeTime= 0
|
||||||
if freeTimesId>0 then
|
-- if freeTimesId>0 then
|
||||||
freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
-- freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||||
RecruitManager.freeUseTimeList[freeTimesId]=freeTime
|
-- RecruitManager.freeUseTimeList[freeTimesId]=freeTime
|
||||||
return freeTime and freeTime >= 1
|
-- return freeTime and freeTime >= 1
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
|
|
||||||
--检测心愿抽卡活动红点
|
--检测心愿抽卡活动红点
|
||||||
function this.GetWishDrawRedPointStatus()
|
function this.GetWishDrawRedPointStatus()
|
||||||
|
|
|
@ -494,7 +494,7 @@ function this.RegisterRedCheckFunc()
|
||||||
--天宫秘宝
|
--天宫秘宝
|
||||||
RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint)
|
RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint)
|
||||||
--主题活动
|
--主题活动
|
||||||
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
-- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus)
|
RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
|
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed)
|
RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed)
|
||||||
|
|
|
@ -81,15 +81,7 @@ function this:OnShow(_parent,...)
|
||||||
local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1])
|
local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1])
|
||||||
local activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId)
|
local activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId)
|
||||||
if data.LotteryType == 3 then--限时招募
|
if data.LotteryType == 3 then--限时招募
|
||||||
if activityData.Type == ActivityTypeDef.FindFairy then
|
if activityData.Type == ActivityTypeDef.QianKunBox then--乾坤宝盒
|
||||||
var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen
|
|
||||||
local d = RecruitManager.GetExpendData(data.Id)
|
|
||||||
if data.PerCount == 1 then
|
|
||||||
this.rootText.text = string.format(Language[11596],d[2])
|
|
||||||
else
|
|
||||||
this.rootText.text = string.format(Language[11597],d[2])
|
|
||||||
end
|
|
||||||
elseif activityData.Type == ActivityTypeDef.QianKunBox then--乾坤宝盒
|
|
||||||
var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen
|
var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen
|
||||||
local d=RecruitManager.GetExpendData(data.Id)
|
local d=RecruitManager.GetExpendData(data.Id)
|
||||||
if data.PerCount == 1 then
|
if data.PerCount == 1 then
|
||||||
|
|
|
@ -19,7 +19,7 @@ local dataType={
|
||||||
[1]=PRE_REWARD_POOL_TYPE.RECRUIT,
|
[1]=PRE_REWARD_POOL_TYPE.RECRUIT,
|
||||||
[2]=PRE_REWARD_POOL_TYPE.FRIEND,
|
[2]=PRE_REWARD_POOL_TYPE.FRIEND,
|
||||||
[3]=PRE_REWARD_POOL_TYPE.NORMAL,
|
[3]=PRE_REWARD_POOL_TYPE.NORMAL,
|
||||||
[4]=PRE_REWARD_POOL_TYPE.TIME_LIMITED,
|
[4]=PRE_REWARD_POOL_TYPE.TIME_LIMITED_NEW_UP,
|
||||||
}
|
}
|
||||||
local itemList={}
|
local itemList={}
|
||||||
function HeroPreviewPanel:InitComponent()
|
function HeroPreviewPanel:InitComponent()
|
||||||
|
|
|
@ -244,9 +244,7 @@ function this.GetRewardPreviewData(type)
|
||||||
return this.previewNormalData
|
return this.previewNormalData
|
||||||
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU then--常驻
|
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU then--常驻
|
||||||
return this.previewLingShou
|
return this.previewLingShou
|
||||||
elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED--限时招募--开启时间有限制的
|
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒
|
||||||
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP--限时招募UP
|
|
||||||
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒
|
|
||||||
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP--乾坤宝盒UP
|
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP--乾坤宝盒UP
|
||||||
or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP
|
or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP
|
||||||
or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP
|
or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP
|
||||||
|
@ -284,10 +282,7 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览
|
||||||
local previewData = {}
|
local previewData = {}
|
||||||
-- 根据当前期获取卡池信息
|
-- 根据当前期获取卡池信息
|
||||||
local curActivityId = nil
|
local curActivityId = nil
|
||||||
if type==PRE_REWARD_POOL_TYPE.TIME_LIMITED
|
if type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
|
||||||
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP then
|
|
||||||
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
|
||||||
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
|
|
||||||
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
|
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
|
||||||
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||||
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP then
|
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP then
|
||||||
|
@ -304,9 +299,9 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览
|
||||||
end
|
end
|
||||||
local poolId = nil
|
local poolId = nil
|
||||||
if data ~= nil then
|
if data ~= nil then
|
||||||
if type == PRE_REWARD_POOL_TYPE.TIME_LIMITED or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒
|
if type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒
|
||||||
poolId = data.DiamondBoxContain[1][1]
|
poolId = data.DiamondBoxContain[1][1]
|
||||||
elseif type == PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP,乾坤宝盒UP
|
elseif type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP,乾坤宝盒UP
|
||||||
data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool)
|
data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool)
|
||||||
poolId = data.pool_id
|
poolId = data.pool_id
|
||||||
elseif type == PRE_REWARD_POOL_TYPE.LING_SHOU_UP or type == PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--灵兽宝阁,降妖夺宝
|
elseif type == PRE_REWARD_POOL_TYPE.LING_SHOU_UP or type == PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--灵兽宝阁,降妖夺宝
|
||||||
|
|
Loading…
Reference in New Issue