From 2b0784f4db58463c2c4797b9c559e9e0159e7693 Mon Sep 17 00:00:00 2001 From: Mikhail Tyukin Date: Wed, 25 Jun 2025 11:21:22 +0400 Subject: [PATCH] fix bonus reward --- EpinelPS/LobbyServer/Intercept/InterceptClear.cs | 1 + EpinelPS/Utils/InterceptionHelper.cs | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/EpinelPS/LobbyServer/Intercept/InterceptClear.cs b/EpinelPS/LobbyServer/Intercept/InterceptClear.cs index fd24f2a..27d00de 100644 --- a/EpinelPS/LobbyServer/Intercept/InterceptClear.cs +++ b/EpinelPS/LobbyServer/Intercept/InterceptClear.cs @@ -27,6 +27,7 @@ namespace EpinelPS.LobbyServer.Intercept TicketCount = user.ResetableData.InterceptionTickets, MaxTicketCount = JsonDb.Instance.MaxInterceptionCount, NormalReward = sRes.NormalReward, + BonusReward = sRes.BonusReward }; user.AddTrigger(Data.TriggerType.InterceptClear, 1); diff --git a/EpinelPS/Utils/InterceptionHelper.cs b/EpinelPS/Utils/InterceptionHelper.cs index 2db2291..392b2b1 100644 --- a/EpinelPS/Utils/InterceptionHelper.cs +++ b/EpinelPS/Utils/InterceptionHelper.cs @@ -28,12 +28,7 @@ namespace EpinelPS.Utils var percentReward = GameData.Instance.GetConditionReward(record.percent_condition_reward_group, damage); if (percentReward != 0) { - var r = RewardUtils.RegisterRewardsForUser(user, normReward); - response.NormalReward = NetUtils.MergeRewards([response.NormalReward, r], user); - } - else - { - Logging.WriteLine($"unable to find reward which meets condition of damage {damage} and group {record.condition_reward_group}"); + response.BonusReward = RewardUtils.RegisterRewardsForUser(user, percentReward); } JsonDb.Save(); @@ -45,5 +40,6 @@ namespace EpinelPS.Utils public class InterceptionClearResult { public NetRewardData NormalReward = new(); + public NetRewardData BonusReward = new(); } }