Skip to content

Commit

Permalink
Merge pull request #6870 from planetarium/hotfix/280.1.0
Browse files Browse the repository at this point in the history
Hotfix/280.1.0 to Main
  • Loading branch information
jonny-jeahyunchoi authored Feb 17, 2025
2 parents a5bb6e8 + 0960959 commit 678e69e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using Bencodex;
using Bencodex.Types;
Expand Down Expand Up @@ -361,7 +362,7 @@ private void DrawBalances()
{
(
new Address(searchingAddrStr),
FungibleAssetValue.Parse(ncg.Value, ncgValue)
FungibleAssetValue.Parse(ncg.Value, ncgValue.ToString(CultureInfo.InvariantCulture))
),
};
ActionManager.Instance?.ManipulateState(null, balanceList);
Expand All @@ -379,7 +380,7 @@ private void DrawBalances()
var balanceList = new List<(Address addr, FungibleAssetValue fav)>
{
(new Address(searchingAddrStr),
FungibleAssetValue.Parse(Currencies.Crystal, crystalValue)),
FungibleAssetValue.Parse(Currencies.Crystal, crystalValue.ToString(CultureInfo.InvariantCulture))),
};
ActionManager.Instance?.ManipulateState(null, balanceList);
}
Expand All @@ -398,7 +399,7 @@ private void DrawBalances()
ticker: itemTokenTicker,
decimalPlaces: 0,
minters: null);
var fav = FungibleAssetValue.Parse(currency, itemTokenValue);
var fav = FungibleAssetValue.Parse(currency, itemTokenValue.ToString(CultureInfo.InvariantCulture));
var balanceList = new List<(Address addr, FungibleAssetValue fav)>
{
(new Address(searchingAddrStr), fav),
Expand Down
4 changes: 2 additions & 2 deletions nekoyume/Assets/_Scripts/UI/Widget/ArenaBoard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ private async UniTask RefreshArenaBoardAsync()
{
var nextCost = RxProps.ArenaInfo.Value.RefreshTicketStatus.NextNCGCosts.FirstOrDefault();
var goldCurrency = States.Instance.GoldBalanceState.Gold.Currency;
var cost = Libplanet.Types.Assets.FungibleAssetValue.Parse(goldCurrency, nextCost.ToString());
var cost = Libplanet.Types.Assets.FungibleAssetValue.Parse(goldCurrency, nextCost.ToString(CultureInfo.InvariantCulture));

int logId = -1;
try
Expand Down Expand Up @@ -681,7 +681,7 @@ public void RefreshArenaBoard()
{
var nextCost = RxProps.ArenaInfo.Value.RefreshTicketStatus.NextNCGCosts.FirstOrDefault();
var goldCurrency = States.Instance.GoldBalanceState.Gold.Currency;
var cost = Libplanet.Types.Assets.FungibleAssetValue.Parse(goldCurrency, nextCost.ToString());
var cost = Libplanet.Types.Assets.FungibleAssetValue.Parse(goldCurrency, nextCost.ToString(CultureInfo.InvariantCulture));
Find<PaymentPopup>().ShowCheckPaymentNCG(
States.Instance.GoldBalanceState.Gold,
cost,
Expand Down
5 changes: 3 additions & 2 deletions nekoyume/Assets/_Scripts/UI/Widget/Popup/ArenaTicketPopup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Nekoyume.UI
{
using System.Globalization;
using Cysharp.Threading.Tasks;
using GeneratedApiNamespace.ArenaServiceClient;
using Libplanet.Crypto;
Expand Down Expand Up @@ -69,7 +70,7 @@ protected override void Awake()

var ticketCount = _ticketCountToBuy.Value;
var goldCurrency = States.Instance.GoldBalanceState.Gold.Currency;
var cost = Libplanet.Types.Assets.FungibleAssetValue.Parse(goldCurrency, _ticketPrice.ToString());
var cost = Libplanet.Types.Assets.FungibleAssetValue.Parse(goldCurrency, _ticketPrice.ToString(CultureInfo.InvariantCulture));

if (States.Instance.GoldBalanceState.Gold < cost)
{
Expand All @@ -94,7 +95,7 @@ protected override void Awake()
catch (Exception e)
{
NcDebug.LogError($"[ArenaTicketPopup] 티켓 구매 중 예외 발생: {e.Message}");

Find<IconAndButtonSystem>().Show(
"UI_ERROR",
e.InnerException != null ? e.InnerException.Message : e.Message,
Expand Down
4 changes: 2 additions & 2 deletions nekoyume/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ PlayerSettings:
16:10: 0
16:9: 1
Others: 0
bundleVersion: 280.0.13
bundleVersion: 280.1.0
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
Expand Down Expand Up @@ -168,7 +168,7 @@ PlayerSettings:
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 297
AndroidBundleVersionCode: 298
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 34
AndroidPreferredInstallLocation: 2
Expand Down

0 comments on commit 678e69e

Please sign in to comment.