Revisão | 0cfdc97f2a8b60eade5531c4d40ce642240e32a1 (tree) |
---|---|
Hora | 2021-01-23 17:03:27 |
Autor | Kazuhiro Fujieda <fujieda@user...> |
Commiter | Kazuhiro Fujieda |
航空戦力の再編増強準備のカウンターを実装する
@@ -1985,10 +1985,11 @@ namespace KancolleSniffer.Test | ||
1985 | 1985 | /// 677: 継戦支援能力の整備 |
1986 | 1986 | /// 678: 主力艦上戦闘機の更新 |
1987 | 1987 | /// 680: 対空兵装の整備拡充 |
1988 | + /// 681: 航空戦力の再編増強準備 | |
1988 | 1989 | /// 688: 航空戦力の強化 |
1989 | 1990 | /// </summary> |
1990 | 1991 | [TestMethod] |
1991 | - public void DestroyItem_613_638_643_645_653_654_655_657_663_673_674_675_676_677_678_680_686_688() | |
1992 | + public void DestroyItem_613_638_643_645_653_654_655_657_663_673_674_675_676_677_678_680_681_686_688() | |
1992 | 1993 | { |
1993 | 1994 | InjectItems(new[] |
1994 | 1995 | { |
@@ -2012,7 +2013,7 @@ namespace KancolleSniffer.Test | ||
2012 | 2013 | new ItemSpec {Id = 242, Name = "Swordfish", Type = 8}, |
2013 | 2014 | new ItemSpec {Id = 249, Name = "Fulmar", Type = 6} |
2014 | 2015 | }); |
2015 | - var questList = new[] {613, 638, 643, 645, 655, 653, 654, 657, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688}; | |
2016 | + var questList = new[] {613, 638, 643, 645, 655, 653, 654, 657, 663, 673, 674, 675, 676, 677, 678, 680, 681, 686, 688}; | |
2016 | 2017 | InjectQuestList(questList); |
2017 | 2018 | _questCounter.InspectDestroyItem( |
2018 | 2019 | $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, _itemInventory.Count))}&api%5Fverno=1"); |
@@ -2034,6 +2035,7 @@ namespace KancolleSniffer.Test | ||
2034 | 2035 | new {Id = 675, NowArray = new[] {3, 1}}, new {Id = 676, NowArray = new[] {1, 1, 1}}, |
2035 | 2036 | new {Id = 677, NowArray = new[] {1, 1, 1}}, new {Id = 678, NowArray = new[] {1, 1}}, |
2036 | 2037 | new {Id = 680, NowArray = new[] {1, 2}}, new {Id = 686, NowArray = new[] {1, 1}}, |
2038 | + new {Id = 681, NowArray = new[] {1, 2}}, | |
2037 | 2039 | new {Id = 688, NowArray = new[] {3, 1, 2, 1}} |
2038 | 2040 | }; |
2039 | 2041 | foreach (var e in array) |
@@ -23,6 +23,7 @@ namespace KancolleSniffer.Model | ||
23 | 23 | private const QuestInterval Weekly = QuestInterval.Weekly; |
24 | 24 | private const QuestInterval Monthly = QuestInterval.Monthly; |
25 | 25 | private const QuestInterval Quarterly = QuestInterval.Quarterly; |
26 | + private const QuestInterval Yearly1 = QuestInterval.Yearly1; | |
26 | 27 | private const QuestInterval Yearly2 = QuestInterval.Yearly2; |
27 | 28 | private const QuestInterval Yearly3 = QuestInterval.Yearly3; |
28 | 29 | private const QuestInterval Yearly5 = QuestInterval.Yearly5; |
@@ -139,6 +140,7 @@ namespace KancolleSniffer.Model | ||
139 | 140 | {677, new QuestDestroyItem {Interval = Weekly, MaxArray = new[] {4, 2, 3}, Types = new[] {3, 10, 5}, Material = new[] {0, 5, 0, 0}}}, // 677: 継戦支援能力の整備 |
140 | 141 | {678, new QuestDestroyItem {Interval = Quarterly, MaxArray = new[] {3, 5}, Ids = new[] {19, 20}, Material = new[] {0, 0, 8, 0}}}, // 678: 主力艦上戦闘機の更新 |
141 | 142 | {680, new QuestSpec {Interval = Quarterly, MaxArray = new[] {4, 4}, Material = new[] {0, 0, 6, 0}}}, // 680: 対空兵装の整備拡充 |
143 | + {681, new QuestDestroyItem {Interval = Yearly1, MaxArray = new[] {4, 4}, Types = new[] {7, 8}, Material = new[] {0, 0, 0, 4}}}, // 681: 航空戦力の再編増強準備 | |
142 | 144 | {686, new QuestDestroyItem {Interval = Quarterly, MaxArray = new[] {4, 1}, Ids = new[] {3, 121}, Material = new[] {0, 0, 0, 0}}}, // 686: 戦時改修A型高角砲の量産 |
143 | 145 | {688, new QuestDestroyItem {Interval = Quarterly, MaxArray = new[] {3, 3, 3, 3}, Types = new[] {6, 7, 8, 10}, Material = new[] {0, 0, 0, 0}}}, // 688: 航空戦力の強化 |
144 | 146 |
@@ -62,6 +62,7 @@ namespace KancolleSniffer.Model | ||
62 | 62 | Weekly, |
63 | 63 | Monthly, |
64 | 64 | Quarterly, |
65 | + Yearly1, | |
65 | 66 | Yearly2, |
66 | 67 | Yearly3, |
67 | 68 | Yearly5, |
@@ -198,6 +199,7 @@ namespace KancolleSniffer.Model | ||
198 | 199 | QuestInterval.Weekly => CrossBoundary(LastMonday.AddHours(5)), |
199 | 200 | QuestInterval.Monthly => CrossBoundary(new DateTime(_now.Year, _now.Month, 1, 5, 0, 0)), |
200 | 201 | QuestInterval.Quarterly => CrossBoundary(QuarterlyBoundary.AddHours(5)), |
202 | + QuestInterval.Yearly1 => CrossBoundary(new DateTime(_now.Year, 1, 1, 5, 0, 0)), | |
201 | 203 | QuestInterval.Yearly2 => CrossBoundary(new DateTime(_now.Year, 2, 1, 5, 0, 0)), |
202 | 204 | QuestInterval.Yearly3 => CrossBoundary(new DateTime(_now.Year, 3, 1, 5, 0, 0)), |
203 | 205 | QuestInterval.Yearly5 => CrossBoundary(new DateTime(_now.Year, 5, 1, 5, 0, 0)), |