mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-19 18:47:55 +08:00
feat: 界园肉鸽烧水支持票券
This commit is contained in:
@@ -72,6 +72,9 @@ public:
|
||||
int idea_count = 0; // 构想数量
|
||||
int burden_number = 0; // 负荷
|
||||
int burden_upper_limit = 3; // 负荷上限
|
||||
|
||||
// ------------------ 界园 ------------------
|
||||
int ticket_count = 0; // 票券数量
|
||||
};
|
||||
|
||||
class RoguelikeConfig
|
||||
|
||||
@@ -269,6 +269,9 @@ std::vector<std::string> asst::RoguelikeCustomStartTaskPlugin::get_select_list()
|
||||
else if (m_config->get_theme() == RoguelikeTheme::Sarkaz && m_start_select.ideas) {
|
||||
list.emplace_back("Sarkaz@Roguelike@LastReward5"); // 构想
|
||||
}
|
||||
else if (m_config->get_theme() == RoguelikeTheme::JieGarden && m_start_select.ticket) {
|
||||
list.emplace_back("JieGarden@Roguelike@LastReward5"); // 票券
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ struct RoguelikeStartSelect // 刷开局模式下凹开局奖励选择
|
||||
bool key = false; // 钥匙
|
||||
bool dice = false; // 骰子
|
||||
bool ideas = false; // 构想
|
||||
bool ticket = false; // 票券
|
||||
};
|
||||
|
||||
class RoguelikeCustomStartTaskPlugin : public AbstractRoguelikeTaskPlugin
|
||||
|
||||
@@ -268,4 +268,9 @@ public enum RoguelikeCollectibleAward
|
||||
/// 构想, Sarkaz@Roguelike@LastReward5
|
||||
/// </summary>
|
||||
Idea = 1 << 7,
|
||||
|
||||
/// <summary>
|
||||
/// 票券, JieGarden@Roguelike@LastReward5
|
||||
/// </summary>
|
||||
Ticket = 1 << 8,
|
||||
}
|
||||
|
||||
@@ -399,6 +399,7 @@ You can cancel this popup by clicking the 「{key=Settings} - {key=IssueReport}
|
||||
<system:String x:Key="RoguelikeStartWithKey">Key</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithDice">Dice</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithIdea">Idea[TODO]</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithTicket">票券</system:String>
|
||||
<system:String x:Key="RefreshTraderWithDice">Refresh Rogue Trader with Dice</system:String>
|
||||
<system:String x:Key="PenguinId">Penguin Report ID (Number part)</system:String>
|
||||
<system:String x:Key="EnablePenguin">Report Penguin</system:String>
|
||||
|
||||
@@ -400,6 +400,7 @@
|
||||
<system:String x:Key="RoguelikeStartWithKey">鍵</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithDice">ダイスロール回数</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithIdea">構想</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithTicket">票券</system:String>
|
||||
<system:String x:Key="RefreshTraderWithDice">ダイスで品揃えを更新する(ミチビキリンジュウ)</system:String>
|
||||
<system:String x:Key="PenguinId">Penguin-StatsのレポートのID(デジタル部分のみ)</system:String>
|
||||
<system:String x:Key="EnablePenguin">Penguin-Statsへ報告</system:String>
|
||||
|
||||
@@ -399,6 +399,7 @@
|
||||
<system:String x:Key="RoguelikeStartWithKey">열쇠</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithDice">주사위</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithIdea">구상</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithTicket">票券</system:String>
|
||||
<system:String x:Key="RefreshTraderWithDice">상점 새로고침</system:String>
|
||||
<system:String x:Key="PenguinId">Penguin-Stats 보고 ID (숫자만)</system:String>
|
||||
<system:String x:Key="EnablePenguin">Penguin-Stats 보고</system:String>
|
||||
|
||||
@@ -400,6 +400,7 @@
|
||||
<system:String x:Key="RoguelikeStartWithKey">钥匙</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithDice">骰子</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithIdea">构想</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithTicket">票券</system:String>
|
||||
<system:String x:Key="RefreshTraderWithDice">刷新商店(指路鳞)</system:String>
|
||||
<system:String x:Key="PenguinId">企鹅物流汇报ID(仅数字部分)</system:String>
|
||||
<system:String x:Key="EnablePenguin">上报企鹅物流</system:String>
|
||||
|
||||
@@ -398,6 +398,7 @@
|
||||
<system:String x:Key="RoguelikeStartWithKey">鑰匙</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithDice">骰子</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithIdea">構想</system:String>
|
||||
<system:String x:Key="RoguelikeStartWithTicket">票券</system:String>
|
||||
<system:String x:Key="RefreshTraderWithDice">刷新商店(指路鱗)</system:String>
|
||||
<system:String x:Key="PenguinId">企鵝物流匯報 ID(僅數字部分)</system:String>
|
||||
<system:String x:Key="EnablePenguin">上報企鵝物流</system:String>
|
||||
|
||||
@@ -609,9 +609,10 @@ public class RoguelikeSettingsUserControlModel : TaskViewModel
|
||||
{ "Mizuki@Roguelike@LastReward5", LocalizationHelper.GetString("RoguelikeStartWithKey") },
|
||||
{ "Mizuki@Roguelike@LastReward6", LocalizationHelper.GetString("RoguelikeStartWithDice") },
|
||||
{ "Sarkaz@Roguelike@LastReward5", LocalizationHelper.GetString("RoguelikeStartWithIdea") },
|
||||
{ "JieGarden@Roguelike@LastReward5", LocalizationHelper.GetString("RoguelikeStartWithTicket") },
|
||||
};
|
||||
|
||||
private object[] _roguelikeStartWithSelectListRaw = ConfigurationHelper.GetGlobalValue(ConfigurationKeys.RoguelikeStartWithSelectList, "Roguelike@LastReward Roguelike@LastReward4 Sarkaz@Roguelike@LastReward5")
|
||||
private object[] _roguelikeStartWithSelectListRaw = ConfigurationHelper.GetGlobalValue(ConfigurationKeys.RoguelikeStartWithSelectList, "Roguelike@LastReward Roguelike@LastReward4")
|
||||
.Split(' ')
|
||||
.Where(s => RoguelikeStartWithAllDict.ContainsKey(s.ToString()))
|
||||
.Select(s => (object)new KeyValuePair<string, string>(s, RoguelikeStartWithAllDict[s]))
|
||||
@@ -1143,6 +1144,7 @@ public class RoguelikeSettingsUserControlModel : TaskViewModel
|
||||
{ "Mizuki@Roguelike@LastReward5", "key" },
|
||||
{ "Mizuki@Roguelike@LastReward6", "dice" },
|
||||
{ "Sarkaz@Roguelike@LastReward5", "ideas" },
|
||||
{ "JieGarden@Roguelike@LastReward5", "ticket" },
|
||||
};
|
||||
var startWithSelect = new JObject();
|
||||
foreach (var select in RoguelikeStartWithSelectList)
|
||||
|
||||
Reference in New Issue
Block a user