Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test
commit
ce14511e3c
File diff suppressed because it is too large
Load Diff
|
@ -1363,7 +1363,7 @@ end
|
|||
|
||||
--- 获取玩家头像框资源
|
||||
function GetPlayerHeadFrameSprite(frameId)
|
||||
if frameId == 0 then frameId = 80001 end
|
||||
if frameId == 0 then frameId = 80000 end
|
||||
local frame = ConfigManager.GetConfigData(ConfigName.ItemConfig, frameId)
|
||||
return Util.LoadSprite(GetResourcePath(frame.ResourceID))
|
||||
end
|
||||
|
|
|
@ -484,13 +484,14 @@ end
|
|||
|
||||
-- 检测进度
|
||||
function this.CheckMoneyProgress(v)
|
||||
if v.activityId == ActivityTypeDef.FirstRecharge
|
||||
or v.activityId == ActivityTypeDef.LuckyCat
|
||||
or v.activityId == ActivityTypeDef.DailyRecharge
|
||||
local type = ConfigManager.GetConfigData(ConfigName.GlobalActivity,v.activityId).Type
|
||||
if type == ActivityTypeDef.FirstRecharge
|
||||
or type == ActivityTypeDef.LuckyCat
|
||||
or type == ActivityTypeDef.DailyRecharge
|
||||
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
||||
or v.activityId == ActivityTypeDef.AccumulativeRechargeExper
|
||||
or v.activityId == ActivityTypeDef.pozhenzhuxian_recharge
|
||||
or v.activityId == ActivityTypeDef.FindFairyCeremony then
|
||||
or type == ActivityTypeDef.AccumulativeRechargeExper
|
||||
or type == ActivityTypeDef.DynamicAct_recharge
|
||||
or type == ActivityTypeDef.FindFairyCeremony then
|
||||
|
||||
for n, m in ipairs(v.mission) do
|
||||
m.progress = m.progress / 1000
|
||||
|
@ -540,6 +541,7 @@ function this.RefreshActivityRedPoint()
|
|||
CheckRedPointStatus(RedPointType.Expert_Talisman)
|
||||
CheckRedPointStatus(RedPointType.Expert_SoulPrint)
|
||||
CheckRedPointStatus(RedPointType.Expert_AccumulativeRecharge)
|
||||
CheckRedPointStatus(RedPointType.DynamicActRecharge)
|
||||
CheckRedPointStatus(RedPointType.CourtesyDress_SevenDay)
|
||||
CheckRedPointStatus(RedPointType.LuckyCat_GetReward)
|
||||
CheckRedPointStatus(RedPointType.Expert_LuckyTurn)
|
||||
|
@ -553,7 +555,7 @@ function this.RefreshActivityRedPoint()
|
|||
CheckRedPointStatus(RedPointType.FindFairy_OneView)
|
||||
CheckRedPointStatus(RedPointType.FindFairy_ThreeView)
|
||||
CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
||||
CheckRedPointStatus(RedPointType.pozhenzhuxianTask)
|
||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
end
|
||||
|
||||
|
|
|
@ -49,6 +49,7 @@ local GiftBuy = require("Modules/Expert/GiftBuy") --限时抢购
|
|||
|
||||
local diffMonsterBuyData = {}--异妖直购数据
|
||||
local rechargeCommodityConfig
|
||||
local GlobalActivityConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
|
||||
|
||||
local cursortingOrder
|
||||
|
@ -107,7 +108,8 @@ function ExpertPanel:BindEvent()
|
|||
Util.AddClick(self.btnBack, function()
|
||||
--self:ClosePanel()
|
||||
if this.isPlayingLackCatAni == false then
|
||||
UIManager.OpenPanel(UIName.MainPanel)
|
||||
-- UIManager.OpenPanel(UIName.MainPanel)
|
||||
self:ClosePanel()
|
||||
end
|
||||
end)
|
||||
for i = 1, allActivityNum do
|
||||
|
@ -486,6 +488,7 @@ function ExpertPanel:OnDestroy()
|
|||
this.luckyCatPanel.OnDestroy()
|
||||
-- this.heroStarGift:OnDestroy()
|
||||
this.upLvRewardGrid:OnDestroy()
|
||||
this.exChange.OnDestroy()
|
||||
SubUIManager.Close(this.UpView)
|
||||
end
|
||||
--获取开启的活动 和 隐藏显示按钮
|
||||
|
@ -588,8 +591,12 @@ function ExpertPanel:SetOpenActiveBtn()
|
|||
end
|
||||
end
|
||||
--限时兑换
|
||||
local num = 1
|
||||
local LimitExchange = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LimitExchange)
|
||||
if LimitExchange then
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange) then
|
||||
num = GlobalActivityConfig[ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange)].ShowArt
|
||||
end
|
||||
if LimitExchange and num == 1 then
|
||||
if LimitExchange.endTime - GetTimeStamp() <= 0 then
|
||||
tabBtns[ExperType.ExChange]:SetActive(false)
|
||||
else
|
||||
|
|
|
@ -185,7 +185,7 @@ function ElementDrawCardPanel:BindEvent()
|
|||
this.getCardPanel4:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
this.effect:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_syz)
|
||||
-- SoundManager.PlaySound(SoundConfig.Sound_syz)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_syz_loop)
|
||||
end)
|
||||
-- Util.AddClick(this.itemBtn5, function ()
|
||||
|
|
Loading…
Reference in New Issue