Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-07-14 11:43:46 +08:00
commit 6d3faec09e
1 changed files with 8 additions and 3 deletions

View File

@ -777,7 +777,6 @@ function this.CutUpLineUpdateOnLineData(msg)
end
end
---关卡通关豪礼相关---
--根据当前关数 获取最近下一关卡橙色角色
function this.GetNextHeroInfo()
@ -790,7 +789,10 @@ function this.GetNextHeroInfo()
--活动表处于开始结束索引之间的全部数据
for i = startIndex, endIndex do
table.insert(allData,ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,i))
local reward = ConfigManager.TryGetConfigData(ConfigName.ActivityRewardConfig,i)
if reward then
table.insert(allData, reward)
end
end
--输出ActivityRewardConfig里下一关的索引
@ -805,7 +807,10 @@ function this.GetNextHeroInfo()
--剩余数据
local residueData={}
for i = index, endIndex do
table.insert(residueData,ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,i))
local reward = ConfigManager.TryGetConfigData(ConfigName.ActivityRewardConfig,i)
if reward then
table.insert(residueData, reward)
end
end
--剩余数据中将立绘数据存入