【踏碎凌霄】引导增加活动是否开启检测

dev_chengFeng
ZhangBiao 2021-05-29 15:39:21 +08:00
parent ee90abf1b4
commit 2a552d0730
6 changed files with 12 additions and 6 deletions

View File

@ -11,7 +11,7 @@ end
function this.MakeAEmptyTeam(teamId) function this.MakeAEmptyTeam(teamId)
local oTeam = {} local oTeam = {}
Log("TeamId" .. teamId) -- Log("TeamId" .. teamId)
oTeam.teamId = teamId oTeam.teamId = teamId
if teamId < FormationTypeDef.FORMATION_ARENA_DEFEND then if teamId < FormationTypeDef.FORMATION_ARENA_DEFEND then
oTeam.teamName = Language[10676]--Language[10677] .. tostring(teamId) oTeam.teamName = Language[10676]--Language[10677] .. tostring(teamId)

View File

@ -71,6 +71,12 @@ function this.OnFunctionOpen(funcId)
end end
--LogGreen(tostring(AppConst.isGuide)) --LogGreen(tostring(AppConst.isGuide))
local guideId = GlobalSystemConfig[funcId].GuideId local guideId = GlobalSystemConfig[funcId].GuideId
if GuideConfig[guideId].IsOpen > 0 then
if not ActivityGiftManager.IsActivityTypeOpen(ActivityGiftManager.GetActivityTypeFromId(GuideConfig[guideId].IsOpen)) then
Log("活动:"..tostring(GuideConfig[guideId].IsOpen).."未开启引导Id:"..guideId.."未执行!")
return
end
end
if guideId and guideId ~= 0 and not funcDic[guideId] then if guideId and guideId ~= 0 and not funcDic[guideId] then
table.insert(_FuncGuideList, guideId) table.insert(_FuncGuideList, guideId)
end end

View File

@ -72,7 +72,7 @@ function this.InitHeroData(_msgHeroList)
this.heroResolveLicence[tonumber(hero_resolve_licence[i])] = tonumber(hero_resolve_licence[i]) this.heroResolveLicence[tonumber(hero_resolve_licence[i])] = tonumber(hero_resolve_licence[i])
end end
this.UpdateHeroLvEnd() this.UpdateHeroLvEnd()
Log("服务端推送英雄数量:" .. #_msgHeroList) -- Log("服务端推送英雄数量:" .. #_msgHeroList)
for i = 1, #_msgHeroList do for i = 1, #_msgHeroList do
this.UpdateHeroDatas(_msgHeroList[i], true) this.UpdateHeroDatas(_msgHeroList[i], true)
end end
@ -2599,7 +2599,7 @@ function this.GetHeroReturnItems2(ShowItemlist, allRewardData)
local curReward = {} local curReward = {}
curReward.id = ShowItemlist[i][1] curReward.id = ShowItemlist[i][1]
curReward.num = ShowItemlist[i][2] curReward.num = ShowItemlist[i][2]
LogBlue("curReward.id"..curReward.id.." curReward.num"..curReward.num) -- LogBlue("curReward.id"..curReward.id.." curReward.num"..curReward.num)
curReward.itemConfig = itemConfig[curReward.id] curReward.itemConfig = itemConfig[curReward.id]
if allRewardData[curReward.id] == nil then if allRewardData[curReward.id] == nil then
allRewardData[curReward.id] = curReward allRewardData[curReward.id] = curReward

View File

@ -630,7 +630,7 @@ end
-----------++++++++++++++++++++++++++++++++++++++++ socket +++++++++++++++++++++++++++++ -----------++++++++++++++++++++++++++++++++++++++++ socket +++++++++++++++++++++++++++++
-- 请求连接socket -- 请求连接socket
function this.RequestSocketLogin() function this.RequestSocketLogin()
LogRed("请求连接Socket") Log("请求连接Socket")
RequestPanel.Show(Language[11143]) RequestPanel.Show(Language[11143])
SocketManager.Disconnect(SocketType.LOGIN) SocketManager.Disconnect(SocketType.LOGIN)
SocketManager.AddNetwork(SocketType.LOGIN, LoginManager.SocketAddress, LoginManager.SocketPort) SocketManager.AddNetwork(SocketType.LOGIN, LoginManager.SocketAddress, LoginManager.SocketPort)

View File

@ -115,7 +115,7 @@ function this.PlayerInfoRequest(func)
PlayerManager.userCreateTime = msg.userCreateTime PlayerManager.userCreateTime = msg.userCreateTime
PatFaceManager.SetisFirstLogVal(msg.isDayFirst) PatFaceManager.SetisFirstLogVal(msg.isDayFirst)
SoulPrintManager.soulEquipPool = msg.SoulEquipPool SoulPrintManager.soulEquipPool = msg.SoulEquipPool
LogBlue("msg.player.designation "..msg.player.designation.." msg.player.decrotion "..msg.player.decrotion.." msg.player.ride "..msg.player.ride) Log("msg.player.designation "..msg.player.designation.." msg.player.decrotion "..msg.player.decrotion.." msg.player.ride "..msg.player.ride)
PlayerManager.designation = msg.player.designation--称号 PlayerManager.designation = msg.player.designation--称号
PlayerManager.skin = msg.player.decrotion--皮肤 PlayerManager.skin = msg.player.decrotion--皮肤
PlayerManager.ride = msg.player.ride--坐骑 PlayerManager.ride = msg.player.ride--坐骑

View File

@ -105,7 +105,7 @@ function TenRecruitPanel:OnOpen(...)
for i = 1, #_roleDatas do for i = 1, #_roleDatas do
cardList[i]:OnOpen(_roleDatas[i].id,false,false,-1,self.sortingOrder) cardList[i]:OnOpen(_roleDatas[i].id,false,false,-1,self.sortingOrder)
local heorConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,_roleDatas[i].heroId) local heorConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,_roleDatas[i].heroId)
LogBlue("heorConfig.Star:"..heorConfig.Star) -- LogBlue("heorConfig.Star:"..heorConfig.Star)
if heorConfig and heorConfig.Star >= 5 then if heorConfig and heorConfig.Star >= 5 then
HeroManager.DetectionOpenFiveStarActivity(heorConfig.Star) HeroManager.DetectionOpenFiveStarActivity(heorConfig.Star)
end end