主界面修改提交

dev_chengFeng
jiaoyangna 2021-03-17 11:07:47 +08:00
parent 5d89fe2a79
commit a7c5bcce1a
2 changed files with 76 additions and 70 deletions

View File

@ -187,6 +187,7 @@ ConfigName = {
HongmengUp = "HongmengUp",
NewHeroConfig = "NewHeroConfig",
MainLevelBossConfig = "MainLevelBoss",
ActivityGroups = "ActivityGroups",
}
require "Framework/GameDataBase"

View File

@ -28,6 +28,7 @@ local isFirstOpen = 0
local isUpperMonthCardTimeShow = true
local activitys = {}
local activityTabs = {}
local moveSceneList = {
[1] = 0,
[2] = 0.02,
@ -225,6 +226,9 @@ function this:InitComponent()
--挑战关卡快速升级提示
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[10610]
this.activityTabPrefab = Util.GetGameObject(self.gameObject, "activityTabPrefab")
this.RightUp = Util.GetGameObject(self.gameObject, "RightUp")
end
function this:SetPosFunc(v2)
@ -651,21 +655,22 @@ end
function this.CreatActivity()
for k,v in ipairs(activitys) do
if not activityTabs[k] then
activityTabs[k] = newObjToParent(this.activityTabPrefab,this.RightUp)
activityTabs[k] = {}
activityTabs[k].go = newObjToParent(this.activityTabPrefab,this.RightUp)
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1")
activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text")
activityTabs[k].redpot = Util.GetGameObject(activityTabs[k].go, "redPoint")
end
activityTabs[k].gameObject:SetActive(false)
local img = Util.GetGameObject(activityTabs[k], "icon"):GetComponent("Image")
local timeImg = Util.GetGameObject(activityTabs[k], "Image_1")
local timeText = Util.GetGameObject(timeImg, "time"):GetComponent("Text")
local redpot = Util.GetGameObject(activityTabs[k], "redPoint")
activityTabs[k].go.gameObject:SetActive(false)
if v.ShowTime == 0 then
timeImg.gameObject:SetActive(false)
activityTabs[k].timeImg.gameObject:SetActive(false)
else
timeImg.gameObject:SetActive(true)
activityTabs[k].timeImg.gameObject:SetActive(true)
end
if v.RpType > 0 then
--绑定新的红点
BindRedPointObject(v.RpType,redpot)
BindRedPointObject(v.RpType,activityTabs[k].redpot)
end
if v.ActiveType > 0 then
@ -673,18 +678,18 @@ function this.CreatActivity()
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then
local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0)
if tempConfig then
img.sprite = Util.LoadSprite(tempConfig.Icon[1])
activityTabs[k].img.sprite = Util.LoadSprite(tempConfig.Icon[1])
else
img.sprite = Util.LoadSprite(v.Icon[1])
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end
else
img.sprite = Util.LoadSprite(v.Icon[1])
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end
else
img.sprite = Util.LoadSprite(v.Icon[1])
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end
img:SetNativeSize()
Util.AddOnceClick(activityTabs[k],function()
activityTabs[k].img:SetNativeSize()
Util.AddOnceClick(activityTabs[k].go,function()
if v.ActiveType > 0 then
this:TabBtnAction(v.ActiveType,1,v)
elseif v.FunType > 0 then
@ -951,19 +956,19 @@ function this.TimeFormat()
local time = giftList[1].endTime - GetTimeStamp()
if time < 1 then
OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, giftList[1].goodsId)
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
else
activityTabs[k].gameObject:SetActive(true)
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToHMS(time)
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = TimeToHMS(time)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.ActId == 668 then
--超值基金
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
activityTabs[k].gameObject:SetActive(isOpen_128 or isOpen_328)
activityTabs[k].go.gameObject:SetActive(isOpen_128 or isOpen_328)
local cardType = nil
if isOpen_328 then
cardType = GoodsTypeDef.MONTHCARD_328
@ -976,13 +981,13 @@ function this.TimeFormat()
if data then
local time = data.endTime - PlayerManager.serverTime
if time < 1 then
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
else
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
if time >= 86400 then
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToDH(time)
activityTabs[k].timeText.text = TimeToDH(time)
else
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToHMS(time)
activityTabs[k].timeText.text = TimeToHMS(time)
end
end
end
@ -991,12 +996,12 @@ function this.TimeFormat()
local limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList()
local time = limitSkinGift.endTime - GetTimeStamp()
if limitSkinGift and time > 0 then
activityTabs[k].gameObject:SetActive(true)
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToHMS(time)
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = TimeToHMS(time)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.ShowTime == 1 and activityTabs[k].gameObject.activeSelf then
elseif v.ShowTime == 1 and activityTabs[k].go.gameObject.activeSelf then
if v.ActiveType > 0 then
local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if QingLong and QingLong > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
@ -1006,15 +1011,15 @@ function this.TimeFormat()
if endTime - PlayerManager.serverTime > 0 then
local time = endTime - PlayerManager.serverTime
if time>= 86400 then
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToDH(time)
activityTabs[k].timeText.text = TimeToDH(time)
else
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToHMS(time)
activityTabs[k].timeText.text = TimeToHMS(time)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
supremHadSet = true
end
else
@ -1025,55 +1030,55 @@ function this.TimeFormat()
end
local tempTime = info.endTime - GetTimeStamp() - extraTime
if tempTime > 86400 then
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToDH(tempTime)
activityTabs[k].timeText.text = TimeToDH(tempTime)
elseif tempTime > 0 then
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = TimeToHMS(tempTime)
activityTabs[k].timeText.text = TimeToHMS(tempTime)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.FunType == FUNCTION_OPEN_TYPE.ARENA then
local isOpen = ActTimeCtrlManager.SingleFuncState(v.FunType)
local baseInfo = ArenaTopMatchManager.GetBaseData()
if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then
local startTime = ArenaTopMatchManager.GetTopMatchTime()
local tempTime = startTime - PlayerManager.serverTime
-- 当日五点开始显示
if tempTime > 0 and tempTime < 16 * 60 * 60 then
activityTabs[k].gameObject:SetActive(true)
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = "距开始\n"..TimeToHMS(tempTime)
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = "距开始\n"..TimeToHMS(tempTime)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
else
activityTabs[k].gameObject:SetActive(true)
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = "鏖战中"
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = "鏖战中"
end
elseif v.FunType == 72 then
local status = DeathPosManager.GetStatus()
local endTime = DeathPosManager.GetOverTime()
if not status or status == DeathPosStatus.Close or status == DeathPosStatus.Belated or status == DeathPosStatus.Reward then
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
else
if endTime then
local tempTime = endTime - PlayerManager.serverTime
if tempTime and tempTime > 0 then
Util.GetGameObject(activityTabs[k], "time"):GetComponent("Text").text = "距闯阵结束\n"..TimeToHMS(tempTime)
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].timeText.text = "距闯阵结束\n"..TimeToHMS(tempTime)
activityTabs[k].go.gameObject:SetActive(true)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
end
end
@ -1090,8 +1095,8 @@ end
function this:OnDestroy()
for k,v in ipairs(activitys) do
if v.RpType > 0 then
ClearRedPointObject(v.RpType,Util.GetGameObject(activityTabs[k], "redPoint"))
activityTabs[k].gameObject:SetActive(false)
ClearRedPointObject(v.RpType,activityTabs[k].redpot)
activityTabs[k].go.gameObject:SetActive(false)
end
end
activitys = {}
@ -1131,7 +1136,7 @@ function this.RefreshGiftBtnShow()
if v.ActId == 668 then
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
activityTabs[k].gameObject:SetActive(isOpen_128 or isOpen_328)
activityTabs[k].go.gameObject:SetActive(isOpen_128 or isOpen_328)
end
end
end
@ -1142,15 +1147,15 @@ function this.RefreshActivityBtn(context)
if v.ActiveType > 0 and v.ActiveType == context.type then
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.FunType > 0 and v.FunType == context.type then
if ActTimeCtrlManager.SingleFuncState(v.FunType) then
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
end
end
@ -1166,23 +1171,23 @@ function this.RefreshActivityShow()
if v.ActId == 666 then
--限时折扣
local giftList = {}
giftList = this:GetInfoList()
giftList = OperatingManager.GetInfoList()
if #giftList > 0 then
local time = giftList[1].endTime - GetTimeStamp()
if time < 1 then
OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, giftList[1].goodsId)
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
else
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.ActId == 668 then
--超值基金
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
activityTabs[k].gameObject:SetActive(isOpen_128 or isOpen_328)
activityTabs[k].go.gameObject:SetActive(isOpen_128 or isOpen_328)
local cardType = nil
if isOpen_328 then
cardType = GoodsTypeDef.MONTHCARD_328
@ -1195,9 +1200,9 @@ function this.RefreshActivityShow()
if data then
local time = data.endTime - PlayerManager.serverTime
if time < 1 then
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
else
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
end
end
end
@ -1209,27 +1214,27 @@ function this.RefreshActivityShow()
if ActivityGiftManager.GetRewardState(42) ~= 3 then
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
if endTime - PlayerManager.serverTime > 0 then
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
else
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.FunType > 0 then
if ActTimeCtrlManager.SingleFuncState(v.FunType) then
activityTabs[k].gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(true)
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
else
activityTabs[k].gameObject:SetActive(false)
activityTabs[k].go.gameObject:SetActive(false)
end
end
end