公会红点显示,
parent
15dd908ace
commit
798c730f56
|
@ -45,6 +45,7 @@ function MyGuildManager.SetMyGuildInfo(msg)
|
||||||
-- 公会信息
|
-- 公会信息
|
||||||
this.MyGuildInfo = msg.familyBaseInfo
|
this.MyGuildInfo = msg.familyBaseInfo
|
||||||
this.MyFeteInfo.score= this.MyGuildInfo.fete --登录时的奖励进度信息 后续数据刷新由MyGuildManager.MyFeteInfo.score操作
|
this.MyFeteInfo.score= this.MyGuildInfo.fete --登录时的奖励进度信息 后续数据刷新由MyGuildManager.MyFeteInfo.score操作
|
||||||
|
LogBlue("this.MyGuildInfo.id:"..this.MyGuildInfo.id)
|
||||||
if this.MyGuildInfo.id then
|
if this.MyGuildInfo.id then
|
||||||
PlayerManager.familyId = this.MyGuildInfo.id
|
PlayerManager.familyId = this.MyGuildInfo.id
|
||||||
end
|
end
|
||||||
|
@ -600,7 +601,7 @@ function MyGuildManager.CheckGuildFeteRedPoint()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if this.MyFeteInfo.lastFeteType==0 then --未祭祀
|
if this.MyFeteInfo.lastFeteType==0 then --未祭祀
|
||||||
return false
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
local d={}--进度条可领取
|
local d={}--进度条可领取
|
||||||
|
@ -662,7 +663,7 @@ function MyGuildManager.SetAllGuildHelpInfo(msg)
|
||||||
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogRed(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid)
|
LogRed(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid)
|
||||||
this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo
|
this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -681,19 +682,19 @@ function MyGuildManager.DelSingleGuildHelpInfo(Deluid)
|
||||||
end
|
end
|
||||||
--推送更新工会援助信息
|
--推送更新工会援助信息
|
||||||
function MyGuildManager.SetSingleGuildHelpInfo(msg)
|
function MyGuildManager.SetSingleGuildHelpInfo(msg)
|
||||||
-- LogGreen("msg.uid "..msg.uid)
|
LogGreen("msg.uid "..msg.uid)
|
||||||
-- LogGreen("#this.allGuildHelpInfo "..LengthOfTable(this.allGuildHelpInfo))
|
LogGreen("#this.allGuildHelpInfo "..LengthOfTable(this.allGuildHelpInfo))
|
||||||
local isStarAdd = true
|
local isStarAdd = true
|
||||||
for uid, value in pairs(this.allGuildHelpInfo) do
|
for uid, value in pairs(this.allGuildHelpInfo) do
|
||||||
-- LogGreen("uid "..uid.." "..msg.uid)
|
LogGreen("uid "..uid.." "..msg.uid)
|
||||||
if uid == msg.uid then
|
if uid == msg.uid then
|
||||||
isStarAdd = false
|
isStarAdd = false
|
||||||
this.allGuildHelpInfo[uid].uid = msg.uid
|
this.allGuildHelpInfo[uid].uid = msg.uid
|
||||||
this.allGuildHelpInfo[uid].name = msg.name
|
this.allGuildHelpInfo[uid].name = msg.name
|
||||||
this.allGuildHelpInfo[uid].guildHelpInfo = {}
|
this.allGuildHelpInfo[uid].guildHelpInfo = {}
|
||||||
-- LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
||||||
for j = 1, #msg.guildHelpInfo do
|
for j = 1, #msg.guildHelpInfo do
|
||||||
-- LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type.." "..msg.guildHelpInfo[j].num.." "..msg.guildHelpInfo[j].hadtakenum)
|
LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type.." "..msg.guildHelpInfo[j].num.." "..msg.guildHelpInfo[j].hadtakenum)
|
||||||
if msg.guildHelpInfo[j].num ~= -1 then
|
if msg.guildHelpInfo[j].num ~= -1 then
|
||||||
table.insert(this.allGuildHelpInfo[uid].guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
table.insert(this.allGuildHelpInfo[uid].guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
||||||
num = msg.guildHelpInfo[j].num,--总获得数量
|
num = msg.guildHelpInfo[j].num,--总获得数量
|
||||||
|
@ -721,7 +722,7 @@ function MyGuildManager.SetSingleGuildHelpInfo(msg)
|
||||||
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogRed(" msg.uid ".. msg.uid)
|
LogRed(" msg.uid ".. msg.uid)
|
||||||
this.allGuildHelpInfo[msg.uid] = singleHelpInfo
|
this.allGuildHelpInfo[msg.uid] = singleHelpInfo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -764,9 +765,9 @@ function MyGuildManager.SetGuildHelpCDTimeData()
|
||||||
end
|
end
|
||||||
function MyGuildManager.GetAllGuildHelpInfo()
|
function MyGuildManager.GetAllGuildHelpInfo()
|
||||||
local curAllGuildHelpInfo = {}
|
local curAllGuildHelpInfo = {}
|
||||||
-- LogGreen("this.allGuildHelpInfo "..LengthOfTable(this.allGuildHelpInfo))
|
LogGreen("this.allGuildHelpInfo "..LengthOfTable(this.allGuildHelpInfo))
|
||||||
for key, value in pairs(this.allGuildHelpInfo) do
|
for key, value in pairs(this.allGuildHelpInfo) do
|
||||||
-- LogGreen("value.guildHelpInfo "..#value.guildHelpInfo)
|
LogGreen("value.guildHelpInfo "..#value.guildHelpInfo)
|
||||||
for j = 1, #value.guildHelpInfo do
|
for j = 1, #value.guildHelpInfo do
|
||||||
local aidMaxNum = 5
|
local aidMaxNum = 5
|
||||||
for k = 1, #guildHelpConfig[1].RecourseReward do
|
for k = 1, #guildHelpConfig[1].RecourseReward do
|
||||||
|
@ -774,7 +775,7 @@ function MyGuildManager.GetAllGuildHelpInfo()
|
||||||
aidMaxNum = guildHelpConfig[1].RecourseReward[k][3]
|
aidMaxNum = guildHelpConfig[1].RecourseReward[k][3]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogGreen("aidMaxNum "..aidMaxNum .." ".. value.guildHelpInfo[j].num .." "..value.uid .." ".. PlayerManager.uid)
|
LogGreen("aidMaxNum "..aidMaxNum .." ".. value.guildHelpInfo[j].num .." "..value.uid .." ".. PlayerManager.uid)
|
||||||
if aidMaxNum ~= value.guildHelpInfo[j].num and value.uid ~= PlayerManager.uid then
|
if aidMaxNum ~= value.guildHelpInfo[j].num and value.uid ~= PlayerManager.uid then
|
||||||
table.insert(curAllGuildHelpInfo,{type = value.guildHelpInfo[j].type,--碎片id
|
table.insert(curAllGuildHelpInfo,{type = value.guildHelpInfo[j].type,--碎片id
|
||||||
num = value.guildHelpInfo[j].num,--总获得数量
|
num = value.guildHelpInfo[j].num,--总获得数量
|
||||||
|
@ -785,7 +786,7 @@ function MyGuildManager.GetAllGuildHelpInfo()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogGreen("curAllGuildHelpInfo "..#curAllGuildHelpInfo)
|
LogGreen("curAllGuildHelpInfo "..#curAllGuildHelpInfo)
|
||||||
return curAllGuildHelpInfo
|
return curAllGuildHelpInfo
|
||||||
end
|
end
|
||||||
this.allGuildHelpRecordInfo = {}--援助 公会援助记录所有信息
|
this.allGuildHelpRecordInfo = {}--援助 公会援助记录所有信息
|
||||||
|
@ -808,10 +809,26 @@ function MyGuildManager.GetMyGuildHelpRedPoint()
|
||||||
end
|
end
|
||||||
--获取公会军团援助红点
|
--获取公会军团援助红点
|
||||||
function MyGuildManager.GetMyAidOtherGuildHelpRedPoint()
|
function MyGuildManager.GetMyAidOtherGuildHelpRedPoint()
|
||||||
if not PlayerManager.familyId or PlayerManager.familyId == 0 then return false end
|
if not PlayerManager.familyId or PlayerManager.familyId == 0 or LengthOfTable(this.allGuildHelpInfo) < 1 then return false end
|
||||||
for key, value in pairs(this.allGuildHelpInfo) do
|
for key, value in pairs(this.allGuildHelpInfo) do
|
||||||
if value.uid ~= PlayerManager.uid and this.MyFeteInfo.guildHelpTime < ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).HelpTime[1] then
|
LogBlue(LengthOfTable(this.allGuildHelpInfo))
|
||||||
return true
|
LogBlue("key:"..key.." value"..value.uid)
|
||||||
|
LogBlue("value.guildHelpInfo:"..LengthOfTable(value.guildHelpInfo))
|
||||||
|
if value.uid ~= PlayerManager.uid and this.MyFeteInfo.guildHelpTime < ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).HelpTime[1]
|
||||||
|
and LengthOfTable(value.guildHelpInfo) > 0 then
|
||||||
|
for j = 1, #value.guildHelpInfo do
|
||||||
|
local aidMaxNum = 5
|
||||||
|
for k = 1, #guildHelpConfig[1].RecourseReward do
|
||||||
|
if guildHelpConfig[1].RecourseReward[k][2] == value.guildHelpInfo[j].type then
|
||||||
|
aidMaxNum = guildHelpConfig[1].RecourseReward[k][3]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
LogGreen("aidMaxNum "..aidMaxNum .." ".. value.guildHelpInfo[j].num .." "..value.uid .." ".. PlayerManager.uid)
|
||||||
|
if aidMaxNum > value.guildHelpInfo[j].num then
|
||||||
|
LogBlue("MyGuildManager.GetMyAidOtherGuildHelpRedPoint返回true")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -178,7 +178,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
for k,v in pairs(selectHeroData) do
|
for k,v in pairs(selectHeroData) do
|
||||||
local curHeroData =HeroManager.GetSingleHeroData(v.dynamicId)
|
local curHeroData =HeroManager.GetSingleHeroData(v.dynamicId)
|
||||||
if not curHeroData then return end
|
if not curHeroData then return end
|
||||||
local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",curHeroData.star)
|
local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",curHeroData.breakId)
|
||||||
heroUseCount= heroReturnConfig.ReturnConsume[1][2]
|
heroUseCount= heroReturnConfig.ReturnConsume[1][2]
|
||||||
heroUseItemId = heroReturnConfig.ReturnConsume[1][1]
|
heroUseItemId = heroReturnConfig.ReturnConsume[1][1]
|
||||||
break
|
break
|
||||||
|
|
|
@ -176,6 +176,9 @@ function this.GetAllTabletTreasuresByRace(_index)
|
||||||
table.sort(
|
table.sort(
|
||||||
list,
|
list,
|
||||||
function(a, b)
|
function(a, b)
|
||||||
|
if a.race == b.race then
|
||||||
|
return a.Id < b.Id
|
||||||
|
end
|
||||||
return a.race < b.race
|
return a.race < b.race
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue