StarRailPS/DanhengServer-OpenSource
1
0
Fork 0
mirror of https://github.com/EggLinks/DanhengServer-OpenSource.git synced 2026-01-02 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: the exceptional titan bless select

Browse Source
This commit is contained in:
StopWuyu
2025-05-30 20:33:21 +08:00
parent 0d25080640
commit 92e7353f6e
2 changed files with 15 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GameServer/Game/RogueTourn/RogueTournInstance.cs
View File

@@ -157,7 +157,7 @@ public class RogueTournInstance : BaseRogueInstance
#region Titan
public RogueTitanCategoryEnum TitanCategory { get; set; } = RogueTitanCategoryEnum.None;
public RogueTitanTypeEnum TitanType { get; set; } = RogueTitanTypeEnum.None;
public RogueTitanBlessInstance RogueTitanBlessInstance { get; set; } = new();
public async ValueTask RollTitanBless(int amount, bool selectType)
@@ -190,9 +190,8 @@ public class RogueTournInstance : BaseRogueInstance
if (action.RogueTitanBlessSelectMenu.TypeSelect)
{
RogueTitanBlessInstance.BlessTypeExcel.Add(bless);
TitanCategory =
GameData.RogueTournTitanTypeData.GetValueOrDefault(bless.TitanType)?.RogueTitanCategory ??
RogueTitanCategoryEnum.Day;
TitanType =
GameData.RogueTournTitanTypeData.GetValueOrDefault(bless.TitanType)?.RogueTitanType ?? RogueTitanTypeEnum.None;
}
else
{
@@ -410,7 +409,7 @@ public class RogueTournInstance : BaseRogueInstance
{
ENNPJGLCBEM = new FKOCBOOCDNL
{
POIIAIAKILF = (uint)TitanCategory
POIIAIAKILF = (uint)TitanType
}
}
};

51
GameServer/Game/RogueTourn/Titan/RogueTitanBlessSelectMenu.cs
View File

@@ -16,8 +16,8 @@ public class RogueTitanBlessSelectMenu(RogueTournInstance rogue)
public void RollTitanBless(int count = 3, bool typeSelect = false)
{
var list = GameData.RogueTournTitanBlessData.Values.Where(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
rogue.TitanCategory)
x.TitanType == rogue.TitanType && x.TitanBlessLevel ==
(rogue.RogueTitanBlessInstance.EnhanceBlessList.Count(j => j.TitanType == rogue.TitanType) < 2 ? 2 : 3))
.ToList();
if (typeSelect)
@@ -25,45 +25,16 @@ public class RogueTitanBlessSelectMenu(RogueTournInstance rogue)
list = [];
TypeSelect = true;
// random 2 types
if (rogue.TitanCategory != RogueTitanCategoryEnum.Night)
{
var night = GameData.RogueTournTitanBlessData.Values.Where(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
RogueTitanCategoryEnum.Night && x.TitanBlessLevel == 1).ToList().RandomElement();
list.Add(night);
}
else if (rogue.TitanCategory == RogueTitanCategoryEnum.Day)
{
var bless = rogue.RogueTitanBlessInstance.BlessTypeExcel.LastOrDefault(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
RogueTitanCategoryEnum.Day);
if (bless != null)
{
var targetBless = GameData.RogueTournTitanBlessData.Values.FirstOrDefault(x =>
x.TitanType == bless.TitanType && x.TitanBlessLevel == bless.TitanBlessLevel + 1);
if (targetBless != null) list.Add(targetBless);
}
}
var night = GameData.RogueTournTitanBlessData.Values.Where(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
RogueTitanCategoryEnum.Night && x.TitanBlessLevel == 1 && !rogue.RogueTitanBlessInstance.BlessTypeExcel.Contains(x)).ToList().RandomElement();
if (rogue.TitanCategory != RogueTitanCategoryEnum.Day)
{
var day = GameData.RogueTournTitanBlessData.Values.Where(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
RogueTitanCategoryEnum.Day && x.TitanBlessLevel == 1).ToList().RandomElement();
list.Add(day);
}
else if (rogue.TitanCategory == RogueTitanCategoryEnum.Night)
{
var bless = rogue.RogueTitanBlessInstance.BlessTypeExcel.LastOrDefault(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
RogueTitanCategoryEnum.Night);
if (bless != null)
{
var targetBless = GameData.RogueTournTitanBlessData.Values.FirstOrDefault(x =>
x.TitanType == bless.TitanType && x.TitanBlessLevel == bless.TitanBlessLevel + 1);
if (targetBless != null) list.Add(targetBless);
}
}
var day = GameData.RogueTournTitanBlessData.Values.Where(x =>
GameData.RogueTournTitanTypeData.GetValueOrDefault(x.TitanType)?.RogueTitanCategory ==
RogueTitanCategoryEnum.Day && x.TitanBlessLevel == 1 && !rogue.RogueTitanBlessInstance.BlessTypeExcel.Contains(x)).ToList().RandomElement();
list.Add(day);
list.Add(night);
}
if (list.Count == 0) return;