|
@@ -16,24 +16,28 @@ namespace GFGGame
|
|
{
|
|
{
|
|
bonusList.AddRange(bonusData.bonusOnce);
|
|
bonusList.AddRange(bonusData.bonusOnce);
|
|
}
|
|
}
|
|
- if (bonusData.bonusBase != null)
|
|
|
|
- {
|
|
|
|
- bonusList.AddRange(bonusData.bonusBase);
|
|
|
|
- }
|
|
|
|
- if (bonusData.bonusRandom != null && bonusData.bonusRandom.Count > 0)
|
|
|
|
|
|
+ else
|
|
{
|
|
{
|
|
- if (doRandom)
|
|
|
|
- {
|
|
|
|
- StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
|
|
|
|
- StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
|
|
- List<ItemData> randomList = DropOutDataCache.GetDropItemDatas(fightCfg.bonusRandomArr, true);
|
|
|
|
- bonusList.AddRange(randomList);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
|
|
+ if (bonusData.bonusRandom != null && bonusData.bonusRandom.Count > 0)
|
|
{
|
|
{
|
|
- bonusList.AddRange(bonusData.bonusRandom);
|
|
|
|
|
|
+ if (doRandom)
|
|
|
|
+ {
|
|
|
|
+ StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
|
|
|
|
+ StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
|
|
+ List<ItemData> randomList = DropOutDataCache.GetDropItemDatas(fightCfg.bonusRandomArr, true);
|
|
|
|
+ bonusList.AddRange(randomList);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ bonusList.AddRange(bonusData.bonusRandom);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (bonusData.bonusBase != null)
|
|
|
|
+ {
|
|
|
|
+ bonusList.AddRange(bonusData.bonusBase);
|
|
|
|
+ }
|
|
|
|
+
|
|
return bonusList;
|
|
return bonusList;
|
|
}
|
|
}
|
|
|
|
|