From fb04ae9fc9bcd4b3068900c80433a8e71d9ab58e Mon Sep 17 00:00:00 2001 From: hyeon Date: Tue, 22 Oct 2024 16:50:42 +0900 Subject: [PATCH] MedalId moved into ArenaSheet --- .../DataRendering/BattleArenaData.cs | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/NineChronicles.DataProvider/DataRendering/BattleArenaData.cs b/NineChronicles.DataProvider/DataRendering/BattleArenaData.cs index 2474bd35..67382a08 100644 --- a/NineChronicles.DataProvider/DataRendering/BattleArenaData.cs +++ b/NineChronicles.DataProvider/DataRendering/BattleArenaData.cs @@ -4,14 +4,11 @@ namespace NineChronicles.DataProvider.DataRendering using Libplanet.Action.State; using Libplanet.Crypto; using Libplanet.Types.Assets; - using Nekoyume.Arena; - using Nekoyume.Extensions; using Nekoyume.Model.Arena; using Nekoyume.Model.EnumType; using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; - using Nekoyume.TableData.Rune; using NineChronicles.DataProvider.Store.Models; public static class BattleArenaData @@ -43,21 +40,6 @@ DateTimeOffset blockTime signer, ncgCurrency); var burntNCG = prevNCGBalance - outputNCGBalance; - int ticketCount = ticket; - var sheets = previousStates.GetSheets( - sheetTypes: new[] - { - typeof(ArenaSheet), - typeof(ItemRequirementSheet), - typeof(EquipmentItemRecipeSheet), - typeof(EquipmentItemSubRecipeSheetV2), - typeof(EquipmentItemOptionSheet), - typeof(MaterialItemSheet), - typeof(CharacterSheet), - typeof(CostumeStatSheet), - typeof(RuneListSheet), - typeof(RuneOptionSheet), - }); var arenaSheet = outputStates.GetSheet(); var arenaData = arenaSheet.GetRoundByBlockIndex(blockIndex); var arenaInformationAdr = @@ -66,15 +48,9 @@ DateTimeOffset blockTime outputStates.TryGetArenaInformation(arenaInformationAdr, out var currentArenaInformation); var winCount = currentArenaInformation.Win - previousArenaInformation.Win; var medalCount = 0; - if (arenaData.ArenaType != ArenaType.OffSeason && - winCount > 0) + if (arenaData.ArenaType != ArenaType.OffSeason && winCount > 0) { - var materialSheet = sheets.GetSheet(); - var medal = ArenaHelper.GetMedal(championshipId, round, materialSheet); - if (medal != null) - { - medalCount += winCount; - } + medalCount += winCount; } var battleArenaModel = new BattleArenaModel() @@ -87,7 +63,7 @@ DateTimeOffset blockTime EnemyAvatarAddress = enemyAvatarAddress.ToString(), ChampionshipId = championshipId, Round = round, - TicketCount = ticketCount, + TicketCount = ticket, BurntNCG = Convert.ToDecimal(burntNCG.GetQuantityString()), Victory = currentArenaScore.Score > previousArenaScore.Score, MedalCount = medalCount,