fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Change the delimiter for credit store to a semicolon

Browse Source
This commit is contained in:
MistEO
2022-08-01 22:36:19 +08:00
parent 6b4726fbea
commit dbc4ee7316
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MeoAsstGui/Resources/Localizations/en-us.xaml
View File

@@ -105,8 +105,8 @@
<system:String x:Key="PenguinID">Penguin Report ID(Number part only)</system:String>
<system:String x:Key="SocialPtShop">Social Point shopping</system:String>
<system:String x:Key="HighPriority">Whitelist (split by space)</system:String>
<system:String x:Key="Blacklist">Blacklist (split by space)</system:String>
<system:String x:Key="HighPriority">Whitelist (split by semicolon)</system:String>
<system:String x:Key="Blacklist">Blacklist (split by semicolon)</system:String>
<system:String x:Key="Drink">Would you like a drink🍷? doctor</system:String>
<system:String x:Key="DroneUsage">Drone Usage</system:String>

4
src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
View File

@@ -105,8 +105,8 @@
<system:String x:Key="PenguinID">Penguin StatisticsレポートID（デジタル部分のみ）</system:String>
<system:String x:Key="SocialPtShop">FP交換</system:String>
<system:String x:Key="HighPriority">優先購入　スペースで区切</system:String>
<system:String x:Key="Blacklist">ブラックリスト　スペースで区切</system:String>
<system:String x:Key="HighPriority">優先購入　セミコロンで区切</system:String>
<system:String x:Key="Blacklist">ブラックリスト　セミコロンで区切</system:String>
<system:String x:Key="Drink">飲み物はいかがですか🍷？ドクター</system:String>
<system:String x:Key="DroneUsage">ドローンの使用</system:String>

4
src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
View File

@@ -105,8 +105,8 @@
<system:String x:Key="PenguinID">PenguinStats 보고 ID (숫자만)</system:String>
<system:String x:Key="SocialPtShop">크레딧 구매</system:String>
<system:String x:Key="HighPriority">구매 우선 항목 (공백으로 구분)</system:String>
<system:String x:Key="Blacklist">무시 항목 (공백으로 구분)</system:String>
<system:String x:Key="HighPriority">구매 우선 항목 (세미콜론으로 구분)</system:String>
<system:String x:Key="Blacklist">무시 항목 (세미콜론으로 구분)</system:String>
<system:String x:Key="Drink">술 한잔은 어떻습니까🍷? 박사님</system:String>
<system:String x:Key="DroneUsage">드런 용법</system:String>

4
src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
View File

@@ -105,8 +105,8 @@
<system:String x:Key="PenguinID">企鹅物流汇报ID（仅数字部分）</system:String>
<system:String x:Key="SocialPtShop">信用购物</system:String>
<system:String x:Key="HighPriority">优先购买 子串即可 空格分隔</system:String>
<system:String x:Key="Blacklist">黑名单 子串即可 空格分隔</system:String>
<system:String x:Key="HighPriority">优先购买 子串即可 分号分隔</system:String>
<system:String x:Key="Blacklist">黑名单 子串即可 分号分隔</system:String>
<system:String x:Key="Drink">要来一杯美酒吗🍷？博士</system:String>
<system:String x:Key="DroneUsage">无人机用途</system:String>

4
src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
View File

@@ -105,8 +105,8 @@
<system:String x:Key="PenguinID">企鵝物流匯報ID（僅數字部分）</system:String>
<system:String x:Key="SocialPtShop">信用購物</system:String>
<system:String x:Key="HighPriority">優先購買 子串即可 空格分隔</system:String>
<system:String x:Key="Blacklist">黑名單 子串即可 空格分隔</system:String>
<system:String x:Key="HighPriority">優先購買 子串即可 分号分隔</system:String>
<system:String x:Key="Blacklist">黑名單 子串即可 分号分隔</system:String>
<system:String x:Key="Drink">要來一杯美酒嗎🍷？博士</system:String>
<system:String x:Key="DroneUsage">無人機用途</system:String>

9
src/MeoAsstGui/ViewModels/SettingsViewModel.cs
View File

@@ -855,7 +855,7 @@ namespace MeoAsstGui
}
}
private string _creditFirstList = ViewStatusStorage.Get("Mall.CreditFirstList", "招聘许可 龙门币");
private string _creditFirstList = ViewStatusStorage.Get("Mall.CreditFirstListNew", "招聘许可；龙门币");
/// <summary>
/// Gets or sets the priority item list of credit shop.
@@ -870,11 +870,11 @@ namespace MeoAsstGui
set
{
SetAndNotify(ref _creditFirstList, value);
ViewStatusStorage.Set("Mall.CreditFirstList", value);
ViewStatusStorage.Set("Mall.CreditFirstListNew", value);
}
}
private string _creditBlackList = ViewStatusStorage.Get("Mall.CreditBlackList", "碳 家具");
private string _creditBlackList = ViewStatusStorage.Get("Mall.CreditBlackListNew", "碳；家具");
/// <summary>
/// Gets or sets the blacklist of credit shop.
@@ -889,7 +889,7 @@ namespace MeoAsstGui
set
{
SetAndNotify(ref _creditBlackList, value);
ViewStatusStorage.Set("Mall.CreditBlackList", value);
ViewStatusStorage.Set("Mall.CreditBlackListNew", value);
}
}
@@ -1660,6 +1660,7 @@ namespace MeoAsstGui
/// Gets or sets a value indicating whether to use tray icon.
/// </summary>
public bool UseTray = true;
#pragma warning restore SA1401 // Fields should be private
// private bool _useTray = Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseTray", bool.TrueString));

4
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -895,8 +895,8 @@ namespace MeoAsstGui
{
var settings = _container.Get<SettingsViewModel>();
var asstProxy = _container.Get<AsstProxy>();
var buy_first = settings.CreditFirstList.Split(new char[] { ' ', ',', '，', ';', '；', '|' });
var black_list = settings.CreditBlackList.Split(new char[] { ' ', ',', '，', ';', '；', '|' });
var buy_first = settings.CreditFirstList.Split(new char[] { ';', '；' });
var black_list = settings.CreditBlackList.Split(new char[] { ';', '；' });
return asstProxy.AsstAppendMall(settings.CreditShopping, buy_first, black_list);
}