초기커밋
This commit is contained in:
218
GameServer/Contents/Calium/Action/CaliumConverterAction.cs
Normal file
218
GameServer/Contents/Calium/Action/CaliumConverterAction.cs
Normal file
@@ -0,0 +1,218 @@
|
||||
|
||||
using ServerCore;
|
||||
using ServerBase;
|
||||
using ServerCommon;
|
||||
|
||||
|
||||
namespace GameServer;
|
||||
|
||||
public class CaliumConverterAction : EntityActionBase
|
||||
{
|
||||
public CaliumConverterAction(Player owner) : base(owner)
|
||||
{
|
||||
}
|
||||
|
||||
public override async Task<Result> onInit() => await Task.FromResult(new Result());
|
||||
|
||||
public override void onClear()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
public async Task<(double calium, double currency)> calculationConvertCalium(Dictionary<int, int> useMaterials)
|
||||
{
|
||||
var total_fluxEtheron = 0.0;
|
||||
|
||||
// 1. 플럭스 에테론 변환 처리
|
||||
foreach (var material in useMaterials)
|
||||
{
|
||||
if (!MetaData.Instance._CaliumConverterMaterialTable.TryGetValue(material.Key, out var material_data)) continue;
|
||||
var fluxEtheron = material_data.Value * material.Value;
|
||||
|
||||
total_fluxEtheron = CaliumStorageHelper.AddDoubleByLong(total_fluxEtheron, fluxEtheron);
|
||||
}
|
||||
|
||||
// 2. calium 계산 : fluxEtheron * 기본 변환율 * 에너지 효율 / 소수점 버림 처리
|
||||
var calium_storage_entity = GameServerApp.getServerLogic().findGlobalEntity<CaliumStorageEntity>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_entity, () => $"calium_storage_entity is null !!! : {getOwner().toBasicString()}");
|
||||
|
||||
var calium_storage_action = calium_storage_entity.getEntityAction<CaliumStorageAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_action, () => $"calium_storage_action is null !!! : {getOwner().toBasicString()}");
|
||||
var efficiency = await calium_storage_action.getCaliumConverterEfficiency();
|
||||
|
||||
var calium = total_fluxEtheron * (double)MetaHelper.GameConfigMeta.CaliumConverterConversionRate * efficiency;
|
||||
calium = CaliumStorageHelper.roundDownDefaultDigitsFromDouble(calium);
|
||||
|
||||
// 3. 요구 재화 계산 : 소수점 올림 처리
|
||||
var currency = total_fluxEtheron * (double)ServerCommon.MetaHelper.GameConfigMeta.CaliumConverterCommissionRate;
|
||||
currency = Math.Ceiling(currency);
|
||||
|
||||
return (calium, currency);
|
||||
}
|
||||
|
||||
public Result checkConvertConditions(Dictionary<int, int> useMaterials, double convertCalium, double currency)
|
||||
{
|
||||
var server_logic = GameServerApp.getServerLogic();
|
||||
var player = getOwner() as Player;
|
||||
NullReferenceCheckHelper.throwIfNull(player, () => $"player is null !!!");
|
||||
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
|
||||
var calium_storage_entity = server_logic.findGlobalEntity<CaliumStorageEntity>();
|
||||
var calium_storage_action = calium_storage_entity?.getEntityAction<CaliumStorageAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_action, () => $"calium_storage_action is null !!!");
|
||||
|
||||
|
||||
// 1. Calium 총량 체크
|
||||
var total_calium = calium_storage_action.getTotalCalium(CaliumStorageType.Converter);
|
||||
if (total_calium < 0)
|
||||
{
|
||||
err_msg = $"fail to convert calium!!! : loading calium - {checkConvertConditions}";
|
||||
result.setFail(ServerErrorCode.FailToLoadCalium, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (convertCalium > total_calium)
|
||||
{
|
||||
err_msg = $"fail to convert calium!!! : lack of total calium - calium[{convertCalium}] / total[{total_calium}]";
|
||||
result.setFail(ServerErrorCode.LackOfTotalCalium, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 2. 1일 제한 용량 체크
|
||||
var user_calium_attribute = player.getEntityAttribute<CaliumAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_attribute, () => $"user_calium_attribute is null !!! - {player.toBasicString()}");
|
||||
|
||||
var daily_calium = CaliumStorageHelper.roundHalfUpDefaultDigitsFromDouble(user_calium_attribute.DailyCalium);
|
||||
if (convertCalium > daily_calium)
|
||||
{
|
||||
err_msg = $"fail to convert calium!!! : lack of daily calium - calium[{convertCalium}] / daily[{user_calium_attribute.DailyCalium}] / roundUp[{daily_calium}]";
|
||||
result.setFail(ServerErrorCode.LackOfDailyCalium, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 3. 재화 보유 체크
|
||||
if (! checkCurrencyForConvertCalium(currency))
|
||||
{
|
||||
err_msg = $"fail to convert calium!!! : lack of currency - currency[{currency}]";
|
||||
result.setFail(ServerErrorCode.LackOfCommissionCurrency, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 4. 아이템 보유 체크
|
||||
if (!checkItemForConvertCalium(useMaterials))
|
||||
{
|
||||
err_msg = $"fail to convert calium!!! : lack of meterial - useMaterials[{useMaterials}]";
|
||||
result.setFail(ServerErrorCode.LackOfCommissionMaterials, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
return result;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private bool checkCurrencyForConvertCalium(double currency)
|
||||
{
|
||||
var money_attribute = getOwner().getEntityAttribute<MoneyAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(money_attribute, () => $"money_attribute is null !!!");
|
||||
|
||||
var owner_currency = MetaHelper.GameConfigMeta.CaliumConverterCommissionType switch
|
||||
{
|
||||
CurrencyType.Gold => money_attribute.Gold,
|
||||
CurrencyType.Sapphire => money_attribute.Sapphire,
|
||||
CurrencyType.Ruby => money_attribute.Ruby,
|
||||
_ => 0.0
|
||||
};
|
||||
|
||||
return currency <= owner_currency;
|
||||
}
|
||||
|
||||
private bool checkItemForConvertCalium(Dictionary<int, int> useMaterials)
|
||||
{
|
||||
foreach (var material in useMaterials)
|
||||
{
|
||||
var inventory_action = getOwner().getEntityAction<InventoryActionBase>();
|
||||
if (!MetaData.Instance._CaliumConverterMaterialTable.TryGetValue(material.Key, out var material_data))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
NullReferenceCheckHelper.throwIfNull(inventory_action, () => $"inventory_action is null !!!");
|
||||
|
||||
var own_count = inventory_action.getItemStackCountAllByMetaId((uint)material_data.ItemId);
|
||||
if (material.Value > own_count) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<(Result result, IEnumerable<GameServer.Item>? items)> deleteMaterials(Dictionary<int, int> useMaterials)
|
||||
{
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
|
||||
var inventory_action = getOwner().getEntityAction<InventoryActionBase>();
|
||||
NullReferenceCheckHelper.throwIfNull(inventory_action, () => $"inventory_action is null !!!");
|
||||
|
||||
var items = new List<GameServer.Item>();
|
||||
|
||||
foreach (var material in useMaterials)
|
||||
{
|
||||
if (!MetaData.Instance._CaliumConverterMaterialTable.TryGetValue(material.Key, out var material_data))
|
||||
{
|
||||
err_msg = $"fail to convert calium !!! : invalid material slot id - input slotId[{material.Key}]";
|
||||
result.setFail(ServerErrorCode.InvalidMaterialSlotId, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
return (result, null);
|
||||
}
|
||||
|
||||
(result, var item) = await inventory_action.tryDeleteItemByMetaId((uint)material_data.ItemId, (ushort)material.Value);
|
||||
if (result.isFail())
|
||||
{
|
||||
err_msg = $"fail to convert calium !!! : lack of material count - input slotId[{material.Key}] / cout[{material.Value}]";
|
||||
result.setFail(ServerErrorCode.LackOfCommissionMaterials, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
return (result, null);
|
||||
}
|
||||
|
||||
items.AddRange(item);
|
||||
}
|
||||
|
||||
return (result, items);
|
||||
}
|
||||
|
||||
public async Task<Result> changeCurrency(double obtainCalium, CurrencyType currencyType, double spendCurrency)
|
||||
{
|
||||
var result = new Result();
|
||||
|
||||
var money_action = getOwner().getEntityAction<MoneyAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(money_action, () => $"money_action is null !!!");
|
||||
|
||||
// 1. calium 획득
|
||||
result = await money_action.changeMoney(CurrencyType.Calium, obtainCalium, useCaliumEvent: false);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 2. 변환을 위한 재화 소모
|
||||
result = await money_action.changeMoney(currencyType, -1 * spendCurrency, useCaliumEvent: false);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public Result changeDailyCalium(Player player, double calium)
|
||||
{
|
||||
var result = new Result();
|
||||
|
||||
// 1. 개인 daily calium 수량 수정
|
||||
var user_calium_attribute = player.getEntityAttribute<CaliumAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_attribute, () => $"user_calium_attribute is null !!! - calium:{calium} / {player.toBasicString()}");
|
||||
|
||||
user_calium_attribute.DailyCalium -= calium;
|
||||
user_calium_attribute.modifiedEntityAttribute();
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
69
GameServer/Contents/Calium/Action/CaliumExchangerAction.cs
Normal file
69
GameServer/Contents/Calium/Action/CaliumExchangerAction.cs
Normal file
@@ -0,0 +1,69 @@
|
||||
|
||||
using ServerCore;
|
||||
using ServerBase;
|
||||
using ServerCommon;
|
||||
|
||||
|
||||
namespace GameServer;
|
||||
|
||||
public class CaliumExchangerAction : EntityActionBase
|
||||
{
|
||||
private const double BaseExchangeValue = 0.01;
|
||||
|
||||
public CaliumExchangerAction(Player owner) : base(owner)
|
||||
{
|
||||
}
|
||||
|
||||
public override async Task<Result> onInit() => await Task.FromResult(new Result());
|
||||
|
||||
public override void onClear()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
public async Task<double> calculationConvertCalium(double sapphire)
|
||||
{
|
||||
var calium = await CaliumStorageHelper.calculateCaliumFromSapphire(sapphire);
|
||||
if (calium < BaseExchangeValue) calium = 0;
|
||||
|
||||
return calium;
|
||||
}
|
||||
|
||||
public Result checkConvertConditions(double sapphire)
|
||||
{
|
||||
var result = new Result();
|
||||
|
||||
var player = getOwner() as Player;
|
||||
NullReferenceCheckHelper.throwIfNull(player, () => $"player is null !!!");
|
||||
|
||||
// 1. 재화 보유 체크
|
||||
var money_attribute = getOwner().getEntityAttribute<MoneyAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(money_attribute, () => $"money_attribute is null !!!");
|
||||
|
||||
if (money_attribute.Sapphire < sapphire)
|
||||
{
|
||||
var err_msg = $"fail to convert calium!!! : lack of currency - currency[{sapphire}]";
|
||||
result.setFail(ServerErrorCode.LackOfCommissionCurrency, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public async Task<Result> changeCurrency(double obtainCalium, CurrencyType currencyType, double spendCurrency)
|
||||
{
|
||||
var result = new Result();
|
||||
|
||||
var money_action = getOwner().getEntityAction<MoneyAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(money_action, () => $"money_action is null !!!");
|
||||
|
||||
// 1. calium 획득
|
||||
result = await money_action.changeMoney(CurrencyType.Calium, obtainCalium, useCaliumEvent: false);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 2. 변환을 위한 재화 소모
|
||||
result = await money_action.changeMoney(currencyType, -1 * spendCurrency, useCaliumEvent: false);
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
50
GameServer/Contents/Calium/CaliumExchangerCheat.cs
Normal file
50
GameServer/Contents/Calium/CaliumExchangerCheat.cs
Normal file
@@ -0,0 +1,50 @@
|
||||
using ServerCommon;
|
||||
using ServerCore; using ServerBase;
|
||||
|
||||
namespace GameServer.Contents.Calium;
|
||||
|
||||
[ChatCommandAttribute("caliumexchanger", typeof(ChatCommandCaliumExchanger), AuthAdminLevelType.Developer, AuthAdminLevelType.GmNormal, AuthAdminLevelType.GmSuper)]
|
||||
public class ChatCommandCaliumExchanger : ChatCommandBase
|
||||
{
|
||||
public override async Task invoke(Player player, string token, string[] args)
|
||||
{
|
||||
Log.getLogger().info($"ChatCommandCaliumExchanger");
|
||||
|
||||
var message = new ClientToGame();
|
||||
message.Request = new ClientToGameReq();
|
||||
message.Request.ReqCaliumExchangerInfo = new();
|
||||
|
||||
var result = await GameServerApp.getServerLogic().onCallProtocolHandler(player, message);
|
||||
if (result.isFail())
|
||||
{
|
||||
Log.getLogger().error($"fail to run ChatCommandCaliumExchanger!! : {result.toBasicString()}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[ChatCommandAttribute("exchangecalium", typeof(ChatCommandConvertExchangeCalium), AuthAdminLevelType.Developer, AuthAdminLevelType.GmNormal, AuthAdminLevelType.GmSuper)]
|
||||
public class ChatCommandConvertExchangeCalium : ChatCommandBase
|
||||
{
|
||||
public override async Task invoke(Player player, string token, string[] args)
|
||||
{
|
||||
Log.getLogger().info($"ChatCommandConvertExchangeCalium");
|
||||
|
||||
if (args.Length < 1 ||false == double.TryParse(args[0], out var sapphire))
|
||||
{
|
||||
var err_msg = $"Not enough argument !!! : argCount:{args.Length} == 1 - {player.toBasicString()}";
|
||||
Log.getLogger().error(err_msg);
|
||||
return;
|
||||
}
|
||||
|
||||
var message = new ClientToGame();
|
||||
message.Request = new ClientToGameReq();
|
||||
message.Request.ReqConvertExchangerCalium = new();
|
||||
message.Request.ReqConvertExchangerCalium.Sapphire = sapphire;
|
||||
|
||||
var result = await GameServerApp.getServerLogic().onCallProtocolHandler(player, message);
|
||||
if (result.isFail())
|
||||
{
|
||||
Log.getLogger().error($"fail to run ChatCommandConvertExchangeCalium!! : {result.toBasicString()}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,200 @@
|
||||
using Google.Protobuf;
|
||||
using Google.Protobuf.WellKnownTypes;
|
||||
|
||||
using ServerCore;
|
||||
using ServerBase;
|
||||
using ServerCommon;
|
||||
|
||||
using static ClientToGameReq.Types;
|
||||
using static ClientToGameRes.Types;
|
||||
|
||||
|
||||
namespace GameServer.PacketHandler;
|
||||
|
||||
[PacketHandler(typeof(ClientToGameReq), typeof(ClientToGameReq.Types.C2GS_REQ_CONVERT_EXCHANGER_CALIUM), typeof(ConvertExchangerCaliumPacketHandler), typeof(GameLoginListener))]
|
||||
public class ConvertExchangerCaliumPacketHandler : PacketRecvHandler
|
||||
{
|
||||
private async Task send_S2C_ACK_CONVERT_EXCHANGER_CALIUM(Player owner, Result result)
|
||||
{
|
||||
var ack_packet = new ClientToGame
|
||||
{
|
||||
Response = new ClientToGameRes
|
||||
{
|
||||
ErrorCode = result.ErrorCode,
|
||||
AckConvertExchangerCalium = new ()
|
||||
}
|
||||
};
|
||||
|
||||
if (result.isSuccess())
|
||||
{
|
||||
var account_attribute = owner.getOriginEntityAttribute<AccountAttribute>();
|
||||
var level_attribute = owner.getOriginEntityAttribute<LevelAttribute>();
|
||||
var money_attribute = owner.getOriginEntityAttribute<MoneyAttribute>();
|
||||
var nickname_attribute = owner.getOriginEntityAttribute<NicknameAttribute>();
|
||||
|
||||
var char_info = new CharInfo
|
||||
{
|
||||
Level = (int)level_attribute!.Level,
|
||||
Exp = (int)level_attribute.Exp,
|
||||
|
||||
Gold = money_attribute!.Gold,
|
||||
Sapphire = money_attribute.Sapphire,
|
||||
Calium = money_attribute.Calium,
|
||||
Ruby = money_attribute.Ruby,
|
||||
|
||||
Usergroup = account_attribute!.AuthAdminLevelType.ToString(),
|
||||
Operator = (int)account_attribute.AuthAdminLevelType,
|
||||
|
||||
DisplayName = nickname_attribute!.Nickname,
|
||||
LanguageInfo = (int)account_attribute.LanguageType,
|
||||
|
||||
IsIntroComplete = 1
|
||||
};
|
||||
|
||||
ack_packet.Response.AckConvertExchangerCalium.CurrencyInfo = char_info;
|
||||
}
|
||||
|
||||
GameServerApp.getServerLogic().onSendPacket(owner, ack_packet);
|
||||
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public override async Task<Result> onProcessPacket(ISession entityWithSession, IMessage recvMessage)
|
||||
{
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
var player = entityWithSession as Player;
|
||||
NullReferenceCheckHelper.throwIfNull(player, () => $"player is null !!!");
|
||||
|
||||
// 1. 기본 정보 체크
|
||||
var request = (recvMessage as ClientToGame)?.Request.ReqConvertExchangerCalium;
|
||||
if (null == request)
|
||||
{
|
||||
err_msg = $"Failed to get request type !!! : {nameof(ClientToGame.Request.ReqConvertExchangerCalium)}";
|
||||
result.setFail(ServerErrorCode.InvalidArgument, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
|
||||
await send_S2C_ACK_CONVERT_EXCHANGER_CALIUM(player, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 2. 변환 로직 시행
|
||||
result = await player.runTransactionRunnerSafely(TransactionIdType.PrivateContents,
|
||||
"CaliumConverterConvertSapphireToCalium", convertSapphireToCaliumDelegate);
|
||||
if (result.isFail())
|
||||
{
|
||||
err_msg = $"Failed to runTransactionRunnerSafely()!!! : {result.toBasicString()} - {player.toBasicString()}";
|
||||
Log.getLogger().error(err_msg);
|
||||
|
||||
await send_S2C_ACK_CONVERT_EXCHANGER_CALIUM(player, result);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
async Task<Result> convertSapphireToCaliumDelegate() => await convertSapphireToCalium(player, request.Sapphire);
|
||||
}
|
||||
|
||||
private async Task<Result> convertSapphireToCalium(Player player, double sapphire)
|
||||
{
|
||||
var result = new Result();
|
||||
|
||||
var user_calium_exchager_action = player.getEntityAction<CaliumExchangerAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_exchager_action, () => $"user_calium_exchager_action is null !!!");
|
||||
|
||||
var calium_storage_entity = GameServerApp.getServerLogic().findGlobalEntity<CaliumStorageEntity>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_entity, () => $"calium_storage_entity is null !!! - {player.toBasicString()}");
|
||||
var calium_storage_action = calium_storage_entity.getEntityAction<CaliumStorageAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_action, () => $"calium_storage_action is null !!! - {player.toBasicString()}");
|
||||
|
||||
// 0. calium storage 체크
|
||||
result = await calium_storage_action.enableCaliumStorage();
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 1. Convert 수량 계산
|
||||
var calium = await user_calium_exchager_action.calculationConvertCalium(sapphire);
|
||||
if (calium <= 0)
|
||||
{
|
||||
var err_msg = $"failed to convert calium !!! - lack of convert calium:[{calium}] / {player.toBasicString()}]";
|
||||
result.setFail(ServerErrorCode.LackOfConvertCalium, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
return result;
|
||||
}
|
||||
|
||||
// 2. Convert 조건 체크
|
||||
result = user_calium_exchager_action.checkConvertConditions(sapphire);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 3. 재화 변경
|
||||
result = await user_calium_exchager_action.changeCurrency(calium, CurrencyType.Sapphire, sapphire);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 4. DB 갱신 - player
|
||||
{
|
||||
var batch = new QueryBatchEx<QueryRunnerWithDocument>(player, LogActionType.ConvertExchangeCalium, GameServerApp.getServerLogic().getDynamoDbClient(), true);
|
||||
batch.addQuery(new DBQWriteToAttributeAllWithTransactionRunner());
|
||||
|
||||
result = await QueryHelper.sendQueryAndBusinessLog(batch);
|
||||
if (result.isFail()) return result;
|
||||
}
|
||||
|
||||
// 5. 변경사항 전송
|
||||
var calium_event_action = calium_storage_entity.getEntityAction<CaliumEventAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_event_action, () => $"calium_event_action is null !!! - {player.toBasicString()}");
|
||||
var send = await calium_event_action.sendCaliumEventFromPlayer(player, CaliumEventType.calium_get, "교환소 교환", -1 * sapphire, calium, false);
|
||||
|
||||
// 6. 실패시 재화 롤백
|
||||
if (false == send.is_success)
|
||||
{
|
||||
result = await rollbackCurrency(player, calium, sapphire, send.event_data);
|
||||
|
||||
// 6-1. 롤백 성공시 패킷 실패 처리
|
||||
if (result.isSuccess())
|
||||
{
|
||||
var err_msg = $"failed to send echoSystem: sapphire[{sapphire}] / {player.toBasicString()}";
|
||||
result.setFail(ServerErrorCode.FailToSendEchoSystem, err_msg);
|
||||
Log.getLogger().error(err_msg);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// 6-2. 롤백 실패시 변경사항 전송 재시도 ( 패킷 성공 처리 )
|
||||
_ = await calium_event_action.sendCaliumEventFromPlayer(player, CaliumEventType.calium_get, "교환소 교환", -1 * sapphire, calium);
|
||||
}
|
||||
|
||||
// 7. Response 응답
|
||||
await send_S2C_ACK_CONVERT_EXCHANGER_CALIUM(player, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
private async Task<Result> rollbackCurrency(Player player, double calium, double sapphire, CaliumEventData eventData)
|
||||
{
|
||||
var user_calium_exchanger_action = player.getEntityAction<CaliumExchangerAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_exchanger_action, () => $"user_calium_exchanger_action is null !!!");
|
||||
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
|
||||
try
|
||||
{
|
||||
// 1. 재화 변경
|
||||
result = await user_calium_exchanger_action.changeCurrency(-1 * calium, CurrencyType.Sapphire, -1 * sapphire);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 2. DB 갱신
|
||||
var batch = new QueryBatchEx<QueryRunnerWithDocument>(player, LogActionType.ConvertExchangeCalium,
|
||||
GameServerApp.getServerLogic().getDynamoDbClient(), true);
|
||||
batch.addQuery(new DBQWriteToAttributeAllWithTransactionRunner());
|
||||
|
||||
result = await QueryHelper.sendQueryAndBusinessLog(batch);
|
||||
if (result.isFail()) return result;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
err_msg = $"failed to rollback currency !!! - calium[{calium}] sapphire[{sapphire}] / {e} / {player.toBasicString()}";
|
||||
result.setFail(ServerErrorCode.FailToSendEchoSystem, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,199 @@
|
||||
using Google.Protobuf;
|
||||
using Google.Protobuf.WellKnownTypes;
|
||||
|
||||
|
||||
using ServerCore;
|
||||
using ServerBase;
|
||||
using ServerCommon;
|
||||
using ServerCommon.BusinessLogDomain;
|
||||
|
||||
|
||||
using static ClientToGameReq.Types;
|
||||
using static ClientToGameRes.Types;
|
||||
|
||||
|
||||
namespace GameServer.PacketHandler;
|
||||
|
||||
|
||||
[PacketHandler(typeof(ClientToGameReq), typeof(ClientToGameReq.Types.C2GS_REQ_CONVERT_MATERIAL_TO_CALIUM), typeof(ConvertMaterialToCaliumPacketHandler), typeof(GameLoginListener))]
|
||||
public class ConvertMaterialToCaliumPacketHandler : PacketRecvHandler
|
||||
{
|
||||
private async Task send_S2C_ACK_CONVERT_MATERIAL_TO_CALIUM(Player owner, Result result, double totalCalium, float caliumForUser, List<Item>? items)
|
||||
{
|
||||
var ack_packet = new ClientToGame
|
||||
{
|
||||
Response = new ClientToGameRes
|
||||
{
|
||||
ErrorCode = result.ErrorCode,
|
||||
AckConvertMaterialToCalium = new()
|
||||
}
|
||||
};
|
||||
|
||||
if (result.isSuccess())
|
||||
{
|
||||
ack_packet.Response.AckConvertMaterialToCalium.TotalCalium = totalCalium;
|
||||
ack_packet.Response.AckConvertMaterialToCalium.CaliumForUser = caliumForUser;
|
||||
|
||||
if (null != items)
|
||||
{
|
||||
ack_packet.Response.AckConvertMaterialToCalium.DelItem.AddRange(items.Select(item => item.toItemData4Client()));
|
||||
}
|
||||
|
||||
// char info 획득
|
||||
var account_attribute = owner.getOriginEntityAttribute<AccountAttribute>();
|
||||
var level_attribute = owner.getOriginEntityAttribute<LevelAttribute>();
|
||||
var money_attribute = owner.getOriginEntityAttribute<MoneyAttribute>();
|
||||
var nickname_attribute = owner.getOriginEntityAttribute<NicknameAttribute>();
|
||||
|
||||
var char_info = new CharInfo
|
||||
{
|
||||
Level = (int)level_attribute!.Level,
|
||||
Exp = (int)level_attribute.Exp,
|
||||
|
||||
Gold = money_attribute!.Gold,
|
||||
Sapphire = money_attribute.Sapphire,
|
||||
Calium = money_attribute.Calium,
|
||||
Ruby = money_attribute.Ruby,
|
||||
|
||||
Usergroup = account_attribute!.AuthAdminLevelType.ToString(),
|
||||
Operator = (int)account_attribute.AuthAdminLevelType,
|
||||
|
||||
DisplayName = nickname_attribute!.Nickname,
|
||||
LanguageInfo = (int)account_attribute.LanguageType,
|
||||
|
||||
IsIntroComplete = 1
|
||||
};
|
||||
|
||||
ack_packet.Response.AckConvertMaterialToCalium.CurrencyInfo = char_info;
|
||||
}
|
||||
|
||||
GameServerApp.getServerLogic().onSendPacket(owner, ack_packet);
|
||||
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public override async Task<Result> onProcessPacket(ISession entityWithSession, IMessage recvMessage)
|
||||
{
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
var player = entityWithSession as Player;
|
||||
NullReferenceCheckHelper.throwIfNull(player, () => $"player is null !!!");
|
||||
|
||||
|
||||
// 1. 기본 정보 체크
|
||||
var request = (recvMessage as ClientToGame)?.Request.ReqConvertMaterialToCalium;
|
||||
if (null == request)
|
||||
{
|
||||
err_msg = $"Failed to get request type !!! : {nameof(ClientToGame.Request.ReqConvertMaterialToCalium)}";
|
||||
result.setFail(ServerErrorCode.InvalidArgument, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
|
||||
await send_S2C_ACK_CONVERT_MATERIAL_TO_CALIUM(player, result, -1, -1, null);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 2. 변환 로직 시행
|
||||
result = await player.runTransactionRunnerSafely(TransactionIdType.PrivateContents, "CaliumConverterConvertMaterialToCalium", convertMaterialToCaliumDelegate);
|
||||
if (result.isFail())
|
||||
{
|
||||
err_msg = $"Failed to runTransactionRunnerSafely()!!! : {result.toBasicString()} - {player.toBasicString()}";
|
||||
Log.getLogger().error(err_msg);
|
||||
|
||||
await send_S2C_ACK_CONVERT_MATERIAL_TO_CALIUM(player, result, -1, -1, null);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
async Task<Result> convertMaterialToCaliumDelegate() => await convertMaterialToCalium(player, request.UseMaterials.ToDictionary());
|
||||
}
|
||||
|
||||
private async Task<Result> convertMaterialToCalium(Player player, Dictionary<int, int> useMaterials)
|
||||
{
|
||||
var server_logic = GameServerApp.getServerLogic();
|
||||
var result = new Result();
|
||||
|
||||
var user_calium_action = player.getEntityAction<CaliumConverterAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_action, () => $"action is null !!!");
|
||||
|
||||
var calium_storage_entity = GameServerApp.getServerLogic().findGlobalEntity<CaliumStorageEntity>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_entity, () => $"caliuim_storage_entity is null !!! - {player.toBasicString()}");
|
||||
var calium_storage_action = calium_storage_entity.getEntityAction<CaliumStorageAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_action, () => $"calium_storage_action is null !!! - {player.toBasicString()}");
|
||||
|
||||
// 0. calium storage 체크
|
||||
result = await calium_storage_action.enableCaliumStorage();
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 1. Convert 수량 계산
|
||||
var convert = await user_calium_action.calculationConvertCalium(useMaterials);
|
||||
|
||||
// 2. Convert 조건 체크
|
||||
result = user_calium_action.checkConvertConditions(useMaterials, convert.calium, convert.currency);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 3. Item 제거
|
||||
var delete_materials = await user_calium_action.deleteMaterials(useMaterials);
|
||||
if (delete_materials.result.isFail()) return delete_materials.result;
|
||||
|
||||
NullReferenceCheckHelper.throwIfNull(delete_materials.items, () => $"delete_materials.items is null !!!");
|
||||
|
||||
// 4. 재화 변경
|
||||
result = await user_calium_action.changeCurrency(convert.calium, MetaHelper.GameConfigMeta.CaliumConverterCommissionType, convert.currency);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
// 5. 개인 calium converter 정보 수정
|
||||
result = user_calium_action.changeDailyCalium(player, convert.calium);
|
||||
if (result.isFail()) return result;
|
||||
|
||||
var delta = -1 * convert.calium;
|
||||
var total_calium = CaliumStorageHelper.AddDoubleByLong(calium_storage_action.getTotalCalium(CaliumStorageType.Converter), delta);
|
||||
|
||||
// 6. DB 갱신
|
||||
{
|
||||
var batch = new QueryBatchEx<QueryRunnerWithItemRequest>(player, LogActionType.ConvertCalium, GameServerApp.getServerLogic().getDynamoDbClient(), true);
|
||||
batch.addQuery(new DBQWriteToAttributeAllWithTransactionRunner());
|
||||
batch.addQuery(new DBQStorageCaliumUpdate(CaliumStorageType.Converter, delta));
|
||||
|
||||
writeBusinessLog(player, batch, total_calium, convert.calium);
|
||||
|
||||
result = await QueryHelper.sendQueryAndBusinessLog(batch);
|
||||
if (result.isFail()) return result;
|
||||
}
|
||||
|
||||
// 7. Calium Storage 재로딩
|
||||
_ = await calium_storage_action.loadStorageAttribute();
|
||||
|
||||
// 8. 변경사항 전송
|
||||
var calium_event_action = calium_storage_entity.getEntityAction<CaliumEventAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_event_action, () => $"calium_event_action is null !!! - {player.toBasicString()}");
|
||||
await calium_event_action.sendCaliumEventFromPlayer(player, CaliumEventType.extra_get, "컨버터 교환", -1 * convert.currency, 0);
|
||||
|
||||
// 9. Response 응답
|
||||
var user_calium_attribute = player.getEntityAttribute<CaliumAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_attribute, () => $"user_calium_attribute is null !!! - {player.toBasicString()}");
|
||||
|
||||
await send_S2C_ACK_CONVERT_MATERIAL_TO_CALIUM(player, result, total_calium, (float)user_calium_attribute.DailyCalium, delete_materials.items.ToList());
|
||||
|
||||
// 10. 정보 변경 통보
|
||||
calium_storage_action.sendChangeStorageInfo();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private void writeBusinessLog(Player player, QueryBatchBase queryBatchBase, double converterTotalCalium, double obtainCalium)
|
||||
{
|
||||
var user_calium_attribute = player.getEntityAttribute<CaliumAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_attribute, () => $"CaliumAttribute is null !!! - {player.toBasicString()}");
|
||||
|
||||
// Converter Calium 변화량 기록
|
||||
var calium_log_data = new CaliumConverterLogData();
|
||||
calium_log_data.CurrentDailyCalium = user_calium_attribute.DailyCalium;
|
||||
calium_log_data.CurrentTotalCalium = converterTotalCalium;
|
||||
calium_log_data.DeltaDailyCalium = obtainCalium;
|
||||
calium_log_data.DeltaTotalCalium = obtainCalium;
|
||||
calium_log_data.AmountDeltaType = AmountDeltaType.Consume;
|
||||
|
||||
var calium_business_log = new CaliumBusinessLog(calium_log_data);
|
||||
queryBatchBase.appendBusinessLog(calium_business_log);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
using Google.Protobuf;
|
||||
using Google.Protobuf.WellKnownTypes;
|
||||
|
||||
|
||||
using ServerCore;
|
||||
using ServerBase;
|
||||
using ServerCommon;
|
||||
|
||||
|
||||
using static ClientToGameReq.Types;
|
||||
using static ClientToGameRes.Types;
|
||||
|
||||
|
||||
namespace GameServer.PacketHandler;
|
||||
|
||||
[PacketHandler(typeof(ClientToGameReq), typeof(ClientToGameReq.Types.C2GS_REQ_CALIUM_CONVERTER), typeof(GetCaliumConverterInfoPacketHandler), typeof(GameLoginListener))]
|
||||
public class GetCaliumConverterInfoPacketHandler : PacketRecvHandler
|
||||
{
|
||||
private static void send_S2C_ACK_CALIUM_CONVERTER(Player owner, Result result, double calium, float caliumForUser, float caliumEfficiency)
|
||||
{
|
||||
var ack_packet = new ClientToGame
|
||||
{
|
||||
Response = new ClientToGameRes
|
||||
{
|
||||
ErrorCode = result.ErrorCode,
|
||||
AckCaliumConverter = new()
|
||||
}
|
||||
};
|
||||
|
||||
if (result.isSuccess())
|
||||
{
|
||||
ack_packet.Response.AckCaliumConverter.Calium = calium;
|
||||
ack_packet.Response.AckCaliumConverter.CaliumEfficiency = caliumEfficiency;
|
||||
ack_packet.Response.AckCaliumConverter.CaliumForUser = caliumForUser;
|
||||
}
|
||||
|
||||
GameServerApp.getServerLogic().onSendPacket(owner, ack_packet);
|
||||
}
|
||||
|
||||
public override async Task<Result> onProcessPacket(ISession entityWithSession, IMessage recvMessage)
|
||||
{
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
var player = entityWithSession as Player;
|
||||
NullReferenceCheckHelper.throwIfNull(player, () => "player is null !!!");
|
||||
|
||||
// 1. 기본 정보 체크
|
||||
var request = (recvMessage as ClientToGame)?.Request.ReqCaliumConverter;
|
||||
if (null == request)
|
||||
{
|
||||
err_msg = $"Failed to get request type !!! : {nameof(ClientToGame.Request.ReqCaliumConverter)}";
|
||||
result.setFail(ServerErrorCode.InvalidArgument, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
|
||||
send_S2C_ACK_CALIUM_CONVERTER(player, result, 0, 0, 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
result = await player.runTransactionRunnerSafely(TransactionIdType.PrivateContents, "GetCaliumConverterInfo", getCaliumConverterInfoDelegase);
|
||||
if (result.isFail())
|
||||
{
|
||||
err_msg = $"Failed to runTransactionRunnerSafely()!!! : {result.toBasicString()} - {player.toBasicString()}";
|
||||
Log.getLogger().error(err_msg);
|
||||
|
||||
send_S2C_ACK_CALIUM_CONVERTER(player, result, 0, 0, 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 2. 총 칼리움 잔여량 체크
|
||||
var calium_converter = GameServerApp.getServerLogic().findGlobalEntity<CaliumStorageEntity>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_converter, () => $"calium converter is null !!!");
|
||||
|
||||
var calium_storage_action = calium_converter.getEntityAction<CaliumStorageAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_action, () => $"calium_storage_action is null !!! - {calium_converter.toBasicString()}");
|
||||
|
||||
var calium = calium_storage_action.getTotalCalium(CaliumStorageType.Converter);
|
||||
if (calium < 0)
|
||||
{
|
||||
err_msg = $"Failed to load calium !!! : {nameof(calium_storage_action.getTotalCalium)}";
|
||||
result.setFail(ServerErrorCode.FailToLoadCalium, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
|
||||
send_S2C_ACK_CALIUM_CONVERTER(player, result, 0, 0, 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 3. 변환 에너지 효율 체크
|
||||
var calium_efficiency = await calium_storage_action.getCaliumConverterEfficiency();
|
||||
|
||||
// 4. 일일 제공 잔여량 체크
|
||||
var user_calium_attribute = player.getEntityAttribute<CaliumAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(user_calium_attribute, () => $"user_calium_attribute is null !!! - {player.toBasicString()}");
|
||||
|
||||
send_S2C_ACK_CALIUM_CONVERTER(player, result, calium, (float)user_calium_attribute.DailyCalium, (float)calium_efficiency);
|
||||
|
||||
return result;
|
||||
|
||||
async Task<Result> getCaliumConverterInfoDelegase() => await getCaliumConverterInfoAsync(player);
|
||||
}
|
||||
|
||||
private async Task<Result> getCaliumConverterInfoAsync(Player player)
|
||||
{
|
||||
var result = new Result();
|
||||
var current_pivot_date = CaliumStorageHelper.CurrentPivotTimeDate();
|
||||
var is_create = false;
|
||||
|
||||
// 1. attribute 가져오기
|
||||
var attribute = player.getEntityAttribute<CaliumAttribute>();
|
||||
NullReferenceCheckHelper.throwIfNull(attribute, () => $"CaliumAttribute is null !!! - {player.toBasicString()}");
|
||||
|
||||
// 2. origin doc 이 없으면 신규 생성 처리
|
||||
var origin_doc = attribute.getOriginDocBase<CaliumAttribute>();
|
||||
if (null == origin_doc)
|
||||
{
|
||||
var new_doc = new CaliumDoc(player.getUserGuid());
|
||||
var attrib = new_doc.getAttrib<CaliumAttrib>();
|
||||
NullReferenceCheckHelper.throwIfNull(attrib, () => $"CaliumAttrib is null !!! - {player.toBasicString()}");
|
||||
|
||||
attrib.DailyCalium = (double)MetaHelper.GameConfigMeta.CaliumConverterLimitPerPerson;
|
||||
attrib.ProvidedDate = current_pivot_date;
|
||||
|
||||
attribute.copyEntityAttributeFromDoc(new_doc);
|
||||
attribute.newEntityAttribute();
|
||||
is_create = true;
|
||||
}
|
||||
|
||||
// 3. 일일 지급 갱신 주기 체크
|
||||
if (null != origin_doc && attribute.ProvidedDate >= current_pivot_date)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
if (false == is_create)
|
||||
{
|
||||
attribute.DailyCalium = (double)MetaHelper.GameConfigMeta.CaliumConverterLimitPerPerson;
|
||||
attribute.ProvidedDate = current_pivot_date;
|
||||
attribute.modifiedEntityAttribute();
|
||||
}
|
||||
|
||||
// 4. db 갱신
|
||||
var batch = new QueryBatchEx<QueryRunnerWithDocument>( player, LogActionType.ChangeConvertCaliumInfo, GameServerApp.getServerLogic().getDynamoDbClient(), true);
|
||||
{
|
||||
batch.addQuery(new DBQWriteToAttributeAllWithTransactionRunner());
|
||||
batch.addQuery(new QueryFinal());
|
||||
}
|
||||
|
||||
result = await QueryHelper.sendQueryAndBusinessLog(batch);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
using Google.Protobuf;
|
||||
using Google.Protobuf.WellKnownTypes;
|
||||
|
||||
|
||||
using ServerCore;
|
||||
using ServerBase;
|
||||
using ServerCommon;
|
||||
|
||||
|
||||
using static ClientToGameReq.Types;
|
||||
using static ClientToGameRes.Types;
|
||||
|
||||
|
||||
namespace GameServer.PacketHandler;
|
||||
|
||||
|
||||
[PacketHandler(typeof(ClientToGameReq), typeof(ClientToGameReq.Types.C2GS_REQ_CALIUM_EXCHANGER_INFO), typeof(GetCaliumExchangerInfoPacketHandler), typeof(GameLoginListener))]
|
||||
public class GetCaliumExchangerInfoPacketHandler : PacketRecvHandler
|
||||
{
|
||||
private async Task send_S2C_ACK_CALIUM_EXCHANGER_INFO(Player owner, Result result, double inflationRate, DateTime nextEpochTime)
|
||||
{
|
||||
var ack_packet = new ClientToGame
|
||||
{
|
||||
Response = new ClientToGameRes
|
||||
{
|
||||
ErrorCode = result.ErrorCode,
|
||||
AckCaliumExchangerInfo = new ()
|
||||
}
|
||||
};
|
||||
|
||||
if (result.isSuccess())
|
||||
{
|
||||
ack_packet.Response.AckCaliumExchangerInfo.InflationRate = inflationRate;
|
||||
ack_packet.Response.AckCaliumExchangerInfo.FixedExchangeRate = CaliumStorageHelper.FixedExchangeRate;
|
||||
|
||||
var time = new DateTime(nextEpochTime.Year, nextEpochTime.Month, nextEpochTime.Day, nextEpochTime.Hour, nextEpochTime.Minute, nextEpochTime.Second, DateTimeKind.Utc);
|
||||
ack_packet.Response.AckCaliumExchangerInfo.NextEpochTime = time.ToTimestamp();
|
||||
}
|
||||
|
||||
GameServerApp.getServerLogic().onSendPacket(owner, ack_packet);
|
||||
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public override async Task<Result> onProcessPacket(ISession entityWithSession, IMessage recvMessage)
|
||||
{
|
||||
var result = new Result();
|
||||
string err_msg;
|
||||
var player = entityWithSession as Player;
|
||||
NullReferenceCheckHelper.throwIfNull(player, () => $"player is null !!!");
|
||||
|
||||
// 1. 기본 정보 체크
|
||||
var request = (recvMessage as ClientToGame)?.Request.ReqCaliumExchangerInfo;
|
||||
if (null == request)
|
||||
{
|
||||
err_msg = $"Failed to get request type !!! : {nameof(ClientToGame.Request.ReqCaliumExchangerInfo)}";
|
||||
result.setFail(ServerErrorCode.InvalidArgument, err_msg);
|
||||
Log.getLogger().error(result.toBasicString());
|
||||
|
||||
await send_S2C_ACK_CALIUM_EXCHANGER_INFO(player, result, 0, DateTimeHelper.MinTime);
|
||||
return result;
|
||||
}
|
||||
|
||||
// 2. 정보 조회
|
||||
var calium_storage_entity = GameServerApp.getServerLogic().findGlobalEntity<CaliumStorageEntity>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_entity, () => $"calium_storage_entity is null !!! - {player.toBasicString()}");
|
||||
|
||||
var calium_storage_action = calium_storage_entity.getEntityAction<CaliumStorageAction>();
|
||||
NullReferenceCheckHelper.throwIfNull(calium_storage_action, () => $"calium_storage_action is null !!! - {calium_storage_entity.toBasicString()} / {player.toBasicString()}");
|
||||
|
||||
var info = await calium_storage_action.getCaliumStorageInfo();
|
||||
await send_S2C_ACK_CALIUM_EXCHANGER_INFO(player, result, info.DailyInflationRate, info.DailyPivotDate.AddDays(1));
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user