Merge branch 'china/dev' into china/test

dev_chengFeng hotfix/mht_china/xq/cdn_xq_test/0.1.64
JieLing 2021-07-26 16:26:41 +08:00
commit a371c2d7ff
8 changed files with 28 additions and 14 deletions

View File

@ -472,6 +472,7 @@ GameEvent = {
RechargeQinglongSerectSuccess = "EndLess.RechargeQinglongSerectSuccess",
RefreshHeroData = "EndLess.RefreshHeroData",
GuidePanel = "EndLess.GuidePanel",
QinglongSerectRefresh = "EndLess.QinglongSerectRefresh",
},
--山河社稷图
FightLevel={

View File

@ -1375,7 +1375,8 @@ function this.CheckRedpointUpperMonthCard(red)
if not actInfo then
return false
end
if actInfo.value ~= 1 then
LogGreen("actInfo.value:"..actInfo.value)
if actInfo.value ~= 2 then
return false
end
for i = 1,#actInfo.mission do

View File

@ -227,8 +227,7 @@ function EndLessMapView:BindEvent()
return
end
if not this:CanClick() then return end
local data = EndLessMapManager.treasureData
UIManager.OpenPanel(UIName.EndLessTreasurePanel,data)
UIManager.OpenPanel(UIName.EndLessTreasurePanel)
end)
Util.AddClick(this.btnFormat, function ()

View File

@ -145,7 +145,10 @@ function this.EenlessTreasureRefreshIndication(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.EndlessTreasureInfoResponse()
msg:ParseFromString(data)
local num = BagManager.GetItemCountById(EndLessMapManager.scoreValueId)
BagManager.HeroLvUpUpdateItemsNum(EndLessMapManager.scoreValueId, num)
EndLessMapManager.InitTreasureData(msg)
Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.QinglongSerectRefresh)
end
--后端推送福利红包数据

View File

@ -226,7 +226,7 @@ function CommonActPage:RefreshTime()
local freshTime
if self.actType == ActivityTypeDef.AccumulativeRechargeExper then
freshTime = CalculateSecondsNowTo_N_OClock(24)
elseif self.actConfig.ActiveType == ActivityTypeDef.DynamicAct then
elseif self.actConfig.ActiveType == ActivityTypeDef.DynamicAct and self.actConfig.Sort == 2 then
if (self.ActData.endTime - GetTimeStamp()) <= 86280 then
freshTime = CalculateSecondsNowTo_N_OClock(24) - 120
else

View File

@ -224,7 +224,7 @@ end
function this.InitTaskData(curData,taskType,configName)
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
local allMissionData = TaskManager.GetTypeTaskList(taskType)
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
Log("this.DynamicActType:"..this.DynamicActType)
for i=1,#allListData do
for j=1,#allMissionData do
-- LogGreen("this.DynamicActType:"..this.DynamicActType)

View File

@ -44,21 +44,23 @@ end
--添加事件监听(用于子类重写)
function EndLessTreasurePanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.EndLess.RechargeQinglongSerectSuccess, self.refresh,self)
Game.GlobalEvent:AddEvent(GameEvent.EndLess.QinglongSerectRefresh, self.OnShow,self)
end
--移除事件监听(用于子类重写)
function EndLessTreasurePanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.EndLess.RechargeQinglongSerectSuccess, self.refresh,self)
Game.GlobalEvent:AddEvent(GameEvent.EndLess.QinglongSerectRefresh, self.OnShow,self)
end
--界面打开时调用(用于子类重写)
function EndLessTreasurePanel:OnOpen(...)
local args = {...}
self.treasureData = args[1]
end
-- 打开,重新打开时回调
function EndLessTreasurePanel:OnShow()
self.treasureData = EndLessMapManager.treasureData
self.tips.text = self.treasureData.tip
--self.time.gameObject:SetActive(false)
self.time.text = "重置时间:"..TimeToDHMS(self.treasureData.resetTime - GetTimeStamp())
@ -243,8 +245,10 @@ function EndLessTreasurePanel:ShowTime()
self.localTimer = Timer.New(function()
time = time - 1
if time <= 0 then
self.treasureState = 0
self.ScrollView:SetIndex(1)
self.time.text = "重置时间:"..TimeToDHMS(0)
self.localTimer:Stop()
self.localTimer = nil
return
end
self.time.text = "重置时间:"..TimeToDHMS(time)
end,1,-1,true)

View File

@ -1,5 +1,6 @@

local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig)
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
-- 通用得商店逻辑
local ShopViewNew = {}
local sortingOrder = 0
@ -148,15 +149,19 @@ function ShopViewNew:OnShow(_sortingOrder)
LogGreen("id:"..id)
if id and id > 0 then
self.actId = id
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id)
if config then
self.actConfig = config
local actConfig
local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType)
if not actConfig then
actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType)
end
if actConfig then
self.actConfig = actConfig
end
end
end
end
end
self.ShopType = self.actConfig.ShopData[1][1]
-- LogYellow("self.ShopType:"..tostring(self.ShopType))
LogYellow("self.ShopType:"..tostring(self.ShopType))
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then
self.parent.tabbox.gameObject:SetActive(false)
else
@ -172,6 +177,7 @@ function ShopViewNew:ShowShop()
end)
-- 红点销毁
self.refreshRedpot:SetActive(false)
LogYellow("self.ShopType:"..tostring(self.ShopType))
self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id
self.ShopConfig = _ShopTypeConfig[self.ShopId]
-- 显示帮助按钮