diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs index e13516c210..6c796eb5d8 100644 --- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs +++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs @@ -199,7 +199,7 @@ namespace MaaWpfGui.Constants public const string ReceiveAward = "Mission.ReceiveAward"; public const string ReceiveMail = "Mission.ReceiveMail"; - public const string ReceiveFreeRecruit = "Mission.ReceiveFreeRecruit"; + public const string ReceiveFreeGacha = "Mission.ReceiveFreeRecruit"; public const string ReceiveOrundum = "Mission.ReceiveOrundum"; public const string ReceiveMining = "Mission.ReceiveMining"; public const string ReceiveSpecialAccess = "Mission.ReceiveSpecialAccess"; diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 6e8cfa8671..424fbc080c 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -447,8 +447,8 @@ Please do not check it when the stage OF-1 is not unlocked. Doctor! \nPurchasing only discounted items has caused an overflow in credits! \nBe cautious of wasting credits!\nRemaining credits:  Collect daily/weekly mission rewards Collect all mail rewards - Conducting daily free single pull from the limited banner - If there is no free single pull, it will not be pooled + Conducting daily free single pull from the limited banner + If there is no free single pull, it will not be pooled It's a dangerous feature and may result in a mis-pull.\nBy pressing 「{key=Confirm}」, you understand and are willing to accept the possible risks. Collect daily Orundum reward from the Lucky Strips Collect daily Orundum reward from the provisional mining permit diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 5ab09d6de9..0ba07ac9b5 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -447,8 +447,8 @@ MAA は非インストール型のアプリケーションであり、レジス ドクター! \n割引アイテムのみの購入がFPのオーバーフローを引き起こしました! \nFPの浪費に注意してください! \n残りのFP: 毎日/毎週任務報酬を受取 すべてのメール報酬を受取 - リミテッドスカウトから毎日無料スカウトを行う - 無料スカウトがない場合はスカウトしない + リミテッドスカウトから毎日無料スカウトを行う + 無料スカウトがない場合はスカウトしない これは危険な機能であり、誤用につながる可能性があります\n「{key=Confirm}」ボタンを押すことで、起こりうる危険を理解し、それを引き受ける意思があるとみなされます ラッキーウォールから毎日合成玉の報酬を受け取る 期間限定の採掘許可で毎日合成玉の報酬を受け取る diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index e370844520..d20a520e07 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -446,8 +446,8 @@ OF-1 스테이지가 개방되지 않은 경우에는 선택하지 마세요.박사님!\n할인된 상품만 구매해 크레딧이 넘쳤습니다!\n낭비되는 크레딧을 주의하세요!\n남은 크레딧: 일일/주간 임무 보상 받기 모든 메일 보상 받기 - 한정 가챠의 일일 무료 가챠 진행 - 무료 가챠가 없는 경우 가챠를 하지 않습니다 + 한정 가챠의 일일 무료 가챠 진행 + 무료 가챠가 없는 경우 가챠를 하지 않습니다 이 기능은 위험한 기능이며 문제가 발생할 수 있습니다\n「{key=Confirm}」 버튼을 누름으로써 귀하는 발생 가능한 위험성을 인지하였음을 확인합니다 복권방의 일일 합성옥 받기 한정 채굴의 일일 합성옥 받기 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index fb665358ee..8f98e65d65 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -447,8 +447,8 @@ 博士! \n只购买折扣商品让信用点数溢出了!\n小心信用点数浪费哦!\n剩余信用点数: 领取每日/每周任务奖励 领取所有邮件奖励 - 进行限定池赠送的每日免费单抽 - 若不存在免费单抽,则不会抽取 + 进行限定池赠送的每日免费单抽 + 若不存在免费单抽,则不会抽取 该功能属于危险功能,可能会造成误抽\n按下 「{key=Confirm}」 键即视为你了解并愿意承担可能出现的风险 领取幸运墙的每日合成玉奖励 领取限时开采许可的每日合成玉奖励 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 4f08e812da..656bf740dd 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -445,8 +445,8 @@ 博士! \n只購買折扣商品讓信用點數溢出了!\n小心信用點數浪費哦!\n剩餘信用點數: 領取每日 / 每週任務獎勵 領取所有郵件獎勵 - 進行限定池贈送的每日免費單抽 - 若不存在免費單抽,則不會抽取 + 進行限定池贈送的每日免費單抽 + 若不存在免費單抽,則不會抽取 該功能屬於危險功能,可能會造成誤抽\n按下 「{key=Confirm}」 鍵即視為你了解並願意承擔可能出現的風險 收集幸運牆的每日合成玉獎勵 領取限時開採許可的每日合成玉獎勵 diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs index f45793bb4d..f64e225689 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs @@ -63,14 +63,14 @@ public class AwardSettingsUserControlModel : TaskViewModel } } - private bool _receiveFreeRecruit = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ReceiveFreeRecruit, bool.FalseString)); + private bool _receiveFreeGacha = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ReceiveFreeGacha, bool.FalseString)); /// /// Gets or sets a value indicating whether receive mail is enabled. /// - public bool ReceiveFreeRecruit + public bool ReceiveFreeGacha { - get => _receiveFreeRecruit; + get => _receiveFreeGacha; set { if (value) @@ -89,8 +89,8 @@ public class AwardSettingsUserControlModel : TaskViewModel } } - SetAndNotify(ref _receiveFreeRecruit, value); - ConfigurationHelper.SetValue(ConfigurationKeys.ReceiveFreeRecruit, value.ToString()); + SetAndNotify(ref _receiveFreeGacha, value); + ConfigurationHelper.SetValue(ConfigurationKeys.ReceiveFreeGacha, value.ToString()); } } @@ -145,7 +145,7 @@ public class AwardSettingsUserControlModel : TaskViewModel { Award = ReceiveAward, Mail = ReceiveMail, - FreeGacha = ReceiveFreeRecruit, + FreeGacha = ReceiveFreeGacha, Orundum = ReceiveOrundum, Mining = ReceiveMining, SpecialAccess = ReceiveSpecialAccess, diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml index 9415a0bcc7..896e10d951 100644 --- a/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml @@ -26,10 +26,10 @@ Content="{DynamicResource ReceiveMail}" IsChecked="{Binding ReceiveMail}" /> - - + + - +