diff --git a/ASFEnhance/AssemblyInfo.cs b/ASFEnhance/AssemblyInfo.cs
index d84560da..6c150901 100644
--- a/ASFEnhance/AssemblyInfo.cs
+++ b/ASFEnhance/AssemblyInfo.cs
@@ -1,8 +1,8 @@
using System.Reflection;
[assembly: System.CLSCompliant(false)]
-[assembly: AssemblyVersion("1.6.1.432")]
-[assembly: AssemblyFileVersion("1.6.1.432")]
+[assembly: AssemblyVersion("1.6.1.434")]
+[assembly: AssemblyFileVersion("1.6.1.434")]
[assembly: AssemblyCopyright("Copyright © 2022 Chr_")]
[assembly: AssemblyProduct("ASFEnhance")]
diff --git a/ASFEnhance/Localization/Langs.Designer.cs b/ASFEnhance/Localization/Langs.Designer.cs
index 3529c32b..cd43d33a 100644
--- a/ASFEnhance/Localization/Langs.Designer.cs
+++ b/ASFEnhance/Localization/Langs.Designer.cs
@@ -1195,7 +1195,7 @@ internal static string PruchaseHistoryTypeOther {
}
///
- /// 查找类似 - 退款: {0:0.00} {1} 的本地化字符串。
+ /// 查找类似 - 退款: {0:0.00} {1} 的本地化字符串。
///
internal static string PruchaseHistoryTypeRefunded {
get {
@@ -1221,6 +1221,15 @@ internal static string PruchaseHistoryTypeWallet {
}
}
+ ///
+ /// 查找类似 - 余额充值: {0:0.00} {1} 的本地化字符串。
+ ///
+ internal static string PruchaseHistoryTypeWalletPurchase {
+ get {
+ return ResourceManager.GetString("PruchaseHistoryTypeWalletPurchase", resourceCulture);
+ }
+ }
+
///
/// 查找类似 购物车是空的,无需结账 的本地化字符串。
///
diff --git a/ASFEnhance/Localization/Langs.en-US.resx b/ASFEnhance/Localization/Langs.en-US.resx
index f726f4f5..739d2951 100644
--- a/ASFEnhance/Localization/Langs.en-US.resx
+++ b/ASFEnhance/Localization/Langs.en-US.resx
@@ -460,7 +460,7 @@
- Store purchase: {0:0.00} {1}
- - Refunded purchase: {0:0.00} {1}
+ - Refunded purchase: {0:0.00} {1}
- Total external spend: {0:0.00} {1}
@@ -585,4 +585,7 @@
找不到相关命令的帮助
+
+ - 余额充值: {0:0.00} {1}
+
\ No newline at end of file
diff --git a/ASFEnhance/Localization/Langs.resx b/ASFEnhance/Localization/Langs.resx
index fa99925b..f6765a18 100644
--- a/ASFEnhance/Localization/Langs.resx
+++ b/ASFEnhance/Localization/Langs.resx
@@ -457,7 +457,7 @@
- 其他类型: {0:0.00} {1}
- - 退款: {0:0.00} {1}
+ - 退款: {0:0.00} {1}
数据统计(仅供参考):
@@ -585,4 +585,7 @@
找不到相关命令的帮助
+
+ - 余额充值: {0:0.00} {1}
+
\ No newline at end of file
diff --git a/ASFEnhance/Localization/Langs.zh-Hans.resx b/ASFEnhance/Localization/Langs.zh-Hans.resx
index eed0d7f3..39892d5e 100644
--- a/ASFEnhance/Localization/Langs.zh-Hans.resx
+++ b/ASFEnhance/Localization/Langs.zh-Hans.resx
@@ -487,7 +487,7 @@
- 其他类型: {0:0.00} {1}
- - 退款: {0:0.00} {1}
+ - 退款: {0:0.00} {1}
- 市场购买: {0:0.00} {1}
@@ -585,4 +585,7 @@
找不到相关命令的帮助
+
+ - 余额充值: {0:0.00} {1}
+
\ No newline at end of file
diff --git a/ASFEnhance/Other/Command.cs b/ASFEnhance/Other/Command.cs
index 81d02015..aacdb337 100644
--- a/ASFEnhance/Other/Command.cs
+++ b/ASFEnhance/Other/Command.cs
@@ -48,7 +48,6 @@ internal static string ResponseASFEnhanceVersion()
{
StringBuilder sb = new();
- sb.AppendLine(Langs.MultipleLineResult);
sb.AppendLine(Langs.CommandHelp);
int count = 0;
@@ -90,6 +89,7 @@ internal static string ResponseASFEnhanceVersion()
if (count > 0)
{
+ sb.AppendLine();
sb.AppendLine(Langs.HelpArgsExplain);
}
diff --git a/ASFEnhance/Store/HtmlParser.cs b/ASFEnhance/Store/HtmlParser.cs
index 623159b7..04e6a689 100644
--- a/ASFEnhance/Store/HtmlParser.cs
+++ b/ASFEnhance/Store/HtmlParser.cs
@@ -312,6 +312,10 @@ int ParseMoneyString(string strMoney)
result.RefundPurchaseWallet += walletChange;
}
}
+ else
+ {
+ result.WalletPurchase += total;
+ }
}
else if (strType.StartsWith("礼物购买"))
{
diff --git a/ASFEnhance/Store/Response.cs b/ASFEnhance/Store/Response.cs
index cc6fbaa1..a7245eaa 100644
--- a/ASFEnhance/Store/Response.cs
+++ b/ASFEnhance/Store/Response.cs
@@ -61,6 +61,8 @@ internal class HistoryParseResponse
public int RefundPurchase;
/// 退款[余额]
public int RefundPurchaseWallet;
+ /// 购买余额
+ public int WalletPurchase;
/// 其他
public int Other;
@@ -77,6 +79,7 @@ internal class HistoryParseResponse
InGamePurchase = a.InGamePurchase + b.InGamePurchase,
RefundPurchase = a.RefundPurchase + b.RefundPurchase,
RefundPurchaseWallet = a.RefundPurchaseWallet + b.RefundPurchaseWallet,
+ WalletPurchase = a.WalletPurchase + b.WalletPurchase,
Other = a.Other + b.Other,
};
return result;
diff --git a/ASFEnhance/Store/WebRequest.cs b/ASFEnhance/Store/WebRequest.cs
index 8f2b544e..6d64cb40 100644
--- a/ASFEnhance/Store/WebRequest.cs
+++ b/ASFEnhance/Store/WebRequest.cs
@@ -273,6 +273,7 @@ internal static async Task DeleteRecommend(Bot bot, uint gameID)
result.AppendLine(string.Format(Langs.PruchaseHistoryTypeMarketSelling, historyData.MarketSelling / 100.0, symbol));
result.AppendLine(Langs.PruchaseHistoryGroupOther);
+ result.AppendLine(string.Format(Langs.PruchaseHistoryTypeWalletPurchase, historyData.WalletPurchase / 100.0, symbol));
result.AppendLine(string.Format(Langs.PruchaseHistoryTypeOther, historyData.Other / 100.0, symbol));
result.AppendLine(string.Format(Langs.PruchaseHistoryTypeRefunded, historyData.RefundPurchase / 100.0, symbol));
result.AppendLine(string.Format(Langs.PruchaseHistoryTypeExternal, (historyData.RefundPurchase - historyData.RefundPurchaseWallet) / 100.0, symbol));