【社稷大典】提交6

ZhangBiao 2020-10-24 16:18:57 +08:00
parent 01cbb3fba0
commit 0bf6e05add
8 changed files with 14642 additions and 13548 deletions

File diff suppressed because it is too large Load Diff

View File

@ -624,6 +624,7 @@ RedPointType = {
DynamicActRecharge = 20172,--破阵诛仙累充
WeekGiftPage = 2018, -- 每周礼包
MonthGiftPage = 2019, -- 每月礼包
Celebration = 2020,--社稷大典
---聊天相关-----
Chat = 207,
Chat_Friend = 2070,

View File

@ -403,6 +403,7 @@ GameEvent = {
},
DynamicTask={
OnMissionChange = "DynamicTask.MissionChange",
OnGetReward = "DynamicTask.OnGetReward",
},
XiaoYao={
StartXiaoYao="XiaoYao.StartXiaoYao",--执行逍遥游跑图

View File

@ -1,6 +1,8 @@
DynamicActivityManager = {}
local this = DynamicActivityManager
this.curLevel = 0
function this.Initialize()
end
@ -14,4 +16,42 @@ function this.SheJiGetRankData(type,activityId,fun)
end,activityId)
end
function this.SetCurLevel(level)
this.curLevel = level
end
function this.SheJiCheckRedPoint()
local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据
local canGetRewardList={}
local curScore = ActInfo.mission[1].progress
local actReward = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActInfo.activityId)
local setting = ConfigManager.GetConfigDataByKey(ConfigName.GodSacrificeSetting,"ActivityId",ActInfo.activityId)
--检测宝箱是否有可领取
for i = 1, #ActInfo.mission do
local curLevel = curScore/actReward[1].Values[2][1]
if ActInfo.mission[i].state == 0 and curLevel >= i then
table.insert(canGetRewardList,ActInfo.mission[i])
end
end
local canGet = false
--检测中央大锅是否可领取
if GetTimeStamp() > ActInfo.value and GetTimeStamp() < (ActInfo.value + setting.LastTime * 60) then
--领过--进入倒计时
canGet = false
elseif GetTimeStamp() > ActInfo.value and GetTimeStamp() > (ActInfo.value + setting.LastTime * 60) then
--没到时间--进入倒计时
canGet = false
else
--可领取
canGet = true
end
if #canGetRewardList > 0 or canGet then
return true
else
return false
end
end
return this

View File

@ -47,27 +47,35 @@ local tabs = {
default = "s_shibukedang_bicon1", lock = "s_shibukedang_bicon1", select = "s_shibukedang_bicon2",
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
},
[11] = { --限时召唤
[11] = { --社稷大典
default = "r_guanka_sheji_anniu_02", lock = "r_guanka_sheji_anniu_02", select = "r_guanka_sheji_anniu_01",
rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration
},
[12] = { --限时召唤
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy
},
[12] = { --乾坤宝盒
[13] = { --乾坤宝盒
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox
},
[13] = { --珍奇礼包
[14] = { --珍奇礼包
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure
},
[14] = { --累计充值
[15] = { --累计充值 一天一刷
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.AccumulativeRechargeExper
},
[16] = { --累计充值 一周一刷
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge
},
[15] = { --限时商市
[17] = { --限时商市
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop
},
[16] = { --限时兑换
[18] = { --限时兑换
default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange
},
@ -88,7 +96,9 @@ local _PageInfo = {--后期可以做成tableInserticon名字都去读表
[13] = 4,
[14] = 5,
[15] = 6,
[16] = 7,
[16] = 6,
[17] = 7,
[18] = 8,
}
local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall")
@ -97,6 +107,7 @@ local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage")
local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage")
local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage")
local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi")
local SheJiDaDian=require("Modules/DynamicActivity/SheJiDaDian")
local XianShiDuiHuan=require("Modules/Expert/DynamicActivityExChange")
--初始化组件(用于子类重写)
@ -108,12 +119,13 @@ function DynamicActivityPanel:InitComponent()
this.PageList = {
[1] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
[3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
[5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
[6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
[7] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
[2] = SheJiDaDian.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_8")),
[3] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
[4] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[5] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
[6] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
[7] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
[8] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
}
-- 上部货币显示
@ -204,6 +216,17 @@ function this.PageTabAdapter(tab, index, status)
if GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then
tab.gameObject:SetActive(GlobalActConfig[id].ShowArt ~= 1)
end
--累计充值特殊处理
if GlobalActConfig[id].Type == ActivityTypeDef.AccumulativeRechargeExper then
if GlobalActConfig[id] and GlobalActConfig[id].ShowArt ~= 1 then
tab.gameObject:SetActive(true)
else
tab.gameObject:SetActive(false)
end
elseif GlobalActConfig[id].Type == ActivityTypeDef.DynamicAct_recharge then
tab.gameObject:SetActive(true)
end
else
tab.gameObject:SetActive(false)
end
@ -224,7 +247,7 @@ function this.OnPageTabChange(index)
this.PageList[i].gameObject:SetActive(false)
end
end
this.PageList[_PageInfo[index]]:OnShow(this.sortingOrder,this)
this.PageList[_PageInfo[index]]:OnShow(this.sortingOrder,this,tabs[index].ActType)
this.PageList[_PageInfo[index]].gameObject:SetActive(true)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = tabs[index].panelType })
end

View File

@ -281,6 +281,7 @@ function GuildMainCityPanel:OnShow()
CheckRedPointStatus(RedPointType.Guild_AidGuild)
CheckRedPointStatus(RedPointType.Guild_AidMy)
CheckRedPointStatus(RedPointType.Guild_Transcript)
CheckRedPointStatus(RedPointType.Celebration)
if not PlayerManager.familyId or PlayerManager.familyId == 0 then
this:ClosePanel()
Log(Language[10405])

View File

@ -189,11 +189,13 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.WeekGiftPage, RedPointType.Operating)
RPData:SetParent(RedPointType.MonthGiftPage, RedPointType.Operating)
--RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
--24暂时关闭放开这里就行
--主题活动
RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.DynamicActTask, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.DynamicActRecharge, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.Celebration, RedPointType.DynamicActivity)
-- 好友红点
RPData:SetParent(RedPointType.Friend_GetAllReward, RedPointType.Friend_Reward)
@ -403,11 +405,12 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.Achievement_Main,TaskManager.GetAchievementState)
--天宫秘宝
RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint)
--限时招募
--主题活动
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed)
RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
RPData:AddCheckFunc(RedPointType.Celebration, DynamicActivityManager.SheJiCheckRedPoint)
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck)
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck)

View File

@ -114,7 +114,7 @@ end
---设置排名信息
function this.SetRankingInfo()
local rankingData,myRankData=RankingManager.GetRankingInfo()
LogGreen("#rankingData "..#rankingData)
-- LogGreen("#rankingData "..#rankingData)
this.noneImage:SetActive(#rankingData==0)
this.firsthead:SetActive(#rankingData~=0)
this.scrollParentView:SetActive(#rankingData~=0)
@ -321,7 +321,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
trial:SetActive(false)
goldExper:SetActive(false)
arenaScore:SetActive(false)
LogGreen("rankType "..rankType)
-- LogGreen("rankType "..rankType)
if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then
LogGreen("data.rankInfo.param1 "..data.rankInfo.param1)
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then