feat(svc): Retire + Finish + RecordBattleResult
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -139,6 +139,7 @@ public class ArenaTwoPickService : IArenaTwoPickService
|
||||
.Include(v => v.Degrees)
|
||||
.Include(v => v.LeaderSkins)
|
||||
.Include(v => v.MyPageBackgrounds)
|
||||
.Include(v => v.Classes).ThenInclude(c => c.Class)
|
||||
.AsSplitQuery()
|
||||
.FirstAsync(v => v.Id == viewerId);
|
||||
}
|
||||
@@ -218,9 +219,111 @@ public class ArenaTwoPickService : IArenaTwoPickService
|
||||
}).ToList(),
|
||||
};
|
||||
}
|
||||
public Task<FinishResponseDto> RetireAsync(long viewerId) => throw new NotImplementedException();
|
||||
public Task<FinishResponseDto> FinishAsync(long viewerId) => throw new NotImplementedException();
|
||||
public Task<BattleFinishResultDto> RecordBattleResultAsync(long viewerId, bool isWin) => throw new NotImplementedException();
|
||||
public Task<FinishResponseDto> RetireAsync(long viewerId) => GrantRunRewardsAndDeleteAsync(viewerId, requireComplete: false);
|
||||
|
||||
public Task<FinishResponseDto> FinishAsync(long viewerId) => GrantRunRewardsAndDeleteAsync(viewerId, requireComplete: true);
|
||||
|
||||
private async Task<FinishResponseDto> GrantRunRewardsAndDeleteAsync(long viewerId, bool requireComplete)
|
||||
{
|
||||
var run = await _runs.GetByViewerIdAsync(viewerId)
|
||||
?? throw new ArenaTwoPickException("arena_two_pick_no_active_run");
|
||||
|
||||
var maxWins = await _rewards.GetMaxWinCountAsync();
|
||||
var aCfg = _config.Get<SVSim.Database.Models.Config.ArenaTwoPickConfig>();
|
||||
bool runOver = run.WinCount >= maxWins || run.LossCount >= aCfg.MaxLosses;
|
||||
if (requireComplete && !runOver)
|
||||
throw new ArenaTwoPickException("arena_two_pick_run_not_complete");
|
||||
|
||||
var rewardRows = await _rewards.GetRewardsByWinCountAsync(run.WinCount);
|
||||
var viewer = await LoadViewerForGrantsAsync(viewerId);
|
||||
|
||||
var deltas = new List<RewardEntryDto>();
|
||||
foreach (var r in rewardRows)
|
||||
{
|
||||
var goodsType = (SVSim.Database.Enums.UserGoodsType)r.RewardType;
|
||||
await _grants.ApplyAsync(viewer, goodsType, r.RewardId, r.RewardNum);
|
||||
// Rewards = deltas (per-grant amounts), not post-state totals.
|
||||
deltas.Add(new RewardEntryDto { RewardType = r.RewardType, RewardId = r.RewardId, RewardNum = r.RewardNum });
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
var postStates = ComputePostStateRewardList(rewardRows, viewer);
|
||||
|
||||
await _runs.DeleteAsync(viewerId);
|
||||
return new FinishResponseDto { Rewards = deltas, RewardList = postStates };
|
||||
}
|
||||
|
||||
private static List<RewardEntryDto> ComputePostStateRewardList(
|
||||
IReadOnlyList<SVSim.Database.Models.ArenaTwoPickReward> rows, SVSim.Database.Models.Viewer viewer)
|
||||
{
|
||||
var entries = new List<RewardEntryDto>();
|
||||
foreach (var r in rows)
|
||||
{
|
||||
int postState = r.RewardType switch
|
||||
{
|
||||
(int)SVSim.Database.Enums.UserGoodsType.Rupy => (int)viewer.Currency!.Rupees,
|
||||
(int)SVSim.Database.Enums.UserGoodsType.Crystal => (int)viewer.Currency!.Crystals,
|
||||
(int)SVSim.Database.Enums.UserGoodsType.RedEther => (int)viewer.Currency!.RedEther,
|
||||
(int)SVSim.Database.Enums.UserGoodsType.Item => viewer.Items.FirstOrDefault(i => i.Item.Id == (int)r.RewardId)?.Count ?? r.RewardNum,
|
||||
_ => r.RewardNum,
|
||||
};
|
||||
entries.Add(new RewardEntryDto { RewardType = r.RewardType, RewardId = r.RewardId, RewardNum = postState });
|
||||
}
|
||||
return entries;
|
||||
}
|
||||
|
||||
public async Task<BattleFinishResultDto> RecordBattleResultAsync(long viewerId, bool isWin)
|
||||
{
|
||||
var run = await _runs.GetByViewerIdAsync(viewerId)
|
||||
?? throw new ArenaTwoPickException("arena_two_pick_no_active_run");
|
||||
|
||||
var aCfg = _config.Get<SVSim.Database.Models.Config.ArenaTwoPickConfig>();
|
||||
var results = JsonSerializer.Deserialize<List<bool>>(run.ResultListJson) ?? new();
|
||||
results.Add(isWin);
|
||||
run.ResultListJson = JsonSerializer.Serialize(results);
|
||||
if (isWin) run.WinCount += 1; else run.LossCount += 1;
|
||||
|
||||
// Mark run complete if max losses reached (win-cap is handled by Finish/Retire).
|
||||
if (run.LossCount >= aCfg.MaxLosses)
|
||||
run.IsSelectCompleted = true;
|
||||
|
||||
await _runs.UpsertAsync(run);
|
||||
|
||||
var viewer = await LoadViewerForGrantsAsync(viewerId);
|
||||
int before = (int)(viewer.Currency?.SpotPoints ?? 0);
|
||||
|
||||
int newClassXp = GrantClassXp(viewer, run.ClassId, aCfg.ClassXpPerBattle);
|
||||
int classLevel = ResolveClassLevel(viewer, run.ClassId);
|
||||
|
||||
viewer.Currency!.SpotPoints += (ulong)aCfg.SpotPointsPerBattle;
|
||||
int after = (int)viewer.Currency.SpotPoints;
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return new BattleFinishResultDto
|
||||
{
|
||||
BattleResult = isWin ? 1 : 0,
|
||||
GetClassExperience = aCfg.ClassXpPerBattle,
|
||||
ClassExperience = newClassXp,
|
||||
ClassLevel = classLevel,
|
||||
BeforeSpotPoint = before,
|
||||
AddSpotPoint = aCfg.SpotPointsPerBattle,
|
||||
AfterSpotPoint = after,
|
||||
};
|
||||
}
|
||||
|
||||
private static int GrantClassXp(SVSim.Database.Models.Viewer viewer, int classId, int xp)
|
||||
{
|
||||
var row = viewer.Classes.FirstOrDefault(c => c.Class.Id == classId);
|
||||
if (row is null) return 0;
|
||||
row.Exp += xp;
|
||||
return row.Exp;
|
||||
}
|
||||
|
||||
private static int ResolveClassLevel(SVSim.Database.Models.Viewer viewer, int classId)
|
||||
{
|
||||
var row = viewer.Classes.FirstOrDefault(c => c.Class.Id == classId);
|
||||
return row is null ? 1 : row.Level;
|
||||
}
|
||||
|
||||
// --- projection helpers (kept internal so test subclasses could exercise if needed) ---
|
||||
|
||||
|
||||
Reference in New Issue
Block a user