| リビジョン | 73bb9a45047e7b3a3999358fb2f5cc2ea3483f4a (tree) |
|---|---|
| 日時 | 2018-08-19 22:40:59 |
| 作者 | Kazuhiro Fujieda <fujieda@user...> |
| コミッター | Kazuhiro Fujieda |
ケッコンカッコカリの結果がすぐに反映されないのを直す
KancolleSniffer.Test/SnifferTest.cs (diff) KancolleSniffer.Test/logs (diff) KancolleSniffer/Model/ShipInfo.cs (diff) KancolleSniffer/Sniffer.cs (diff)| @@ -595,6 +595,17 @@ namespace KancolleSniffer.Test | ||
| 595 | 595 | } |
| 596 | 596 | |
| 597 | 597 | /// <summary> |
| 598 | + /// ship2を待たずにケッコンの結果を反映する | |
| 599 | + /// </summary> | |
| 600 | + [TestMethod] | |
| 601 | + public void MarriageResult() | |
| 602 | + { | |
| 603 | + var sniffer = new Sniffer(); | |
| 604 | + SniffLogFile(sniffer, "marriage_001"); | |
| 605 | + PAssert.That(() => sniffer.Fleets[0].Ships[2].Level == 100); | |
| 606 | + } | |
| 607 | + | |
| 608 | + /// <summary> | |
| 598 | 609 | /// 改修による資材の減少をすぐに反映する |
| 599 | 610 | /// </summary> |
| 600 | 611 | [TestMethod] |
| @@ -1 +1 @@ | ||
| 1 | -Subproject commit 4ae11cc2466653d6179e2b38d602643f256098a0 | |
| 1 | +Subproject commit 79e765595cb3ea0189b3594f94aea1d599ff8c93 |
| @@ -273,6 +273,13 @@ namespace KancolleSniffer.Model | ||
| 273 | 273 | fleet.SetDeck(); // ShipStatusの差し替え |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | + public void InspectMarriage(dynamic json) | |
| 277 | + { | |
| 278 | + InspectShipData(new[]{json}); | |
| 279 | + foreach (var fleet in _fleets) | |
| 280 | + fleet.SetDeck(); // ShipStatusの差し替え | |
| 281 | + } | |
| 282 | + | |
| 276 | 283 | public void InspectDestroyShip(string request, dynamic json) |
| 277 | 284 | { |
| 278 | 285 | var values = HttpUtility.ParseQueryString(request); |
| @@ -148,6 +148,8 @@ namespace KancolleSniffer | ||
| 148 | 148 | return ApiBattle(url, request, data); |
| 149 | 149 | if (url.Contains("hensei")) |
| 150 | 150 | return ApiHensei(url, request, data); |
| 151 | + if (url.Contains("kaisou")) | |
| 152 | + return ApiKaisou(url, request, data); | |
| 151 | 153 | if (url.Contains("air_corps")) |
| 152 | 154 | return ApiAirCorps(url, request, data); |
| 153 | 155 | return ApiOthers(url, request, data); |
| @@ -456,6 +458,34 @@ namespace KancolleSniffer | ||
| 456 | 458 | return Update.None; |
| 457 | 459 | } |
| 458 | 460 | |
| 461 | + private Update ApiKaisou(string url, string request, dynamic data) | |
| 462 | + { | |
| 463 | + if (url.EndsWith("api_req_kaisou/powerup")) | |
| 464 | + { | |
| 465 | + _shipInfo.InspectPowerup(request, data); | |
| 466 | + _conditionTimer.CheckCond(); | |
| 467 | + _akashiTimer.CheckFleet(); | |
| 468 | + _questInfo.InspectPowerup(data); | |
| 469 | + return Update.Item | Update.Ship | Update.QuestList; | |
| 470 | + } | |
| 471 | + if (url.EndsWith("api_req_kaisou/slot_exchange_index")) | |
| 472 | + { | |
| 473 | + _shipInfo.InspectSlotExchange(request, data); | |
| 474 | + return Update.Ship; | |
| 475 | + } | |
| 476 | + if (url.EndsWith("api_req_kaisou/slot_deprive")) | |
| 477 | + { | |
| 478 | + _shipInfo.InspectSlotDeprive(data); | |
| 479 | + return Update.Ship; | |
| 480 | + } | |
| 481 | + if (url.EndsWith("api_req_kaisou/marriage")) | |
| 482 | + { | |
| 483 | + _shipInfo.InspectMarriage(data); | |
| 484 | + return Update.Ship; | |
| 485 | + } | |
| 486 | + return Update.None; | |
| 487 | + } | |
| 488 | + | |
| 459 | 489 | private Update ApiAirCorps(string url, string request, dynamic data) |
| 460 | 490 | { |
| 461 | 491 | if (url.EndsWith("api_req_air_corps/supply")) |
| @@ -492,24 +522,6 @@ namespace KancolleSniffer | ||
| 492 | 522 | _questInfo.CountCharge(); |
| 493 | 523 | return Update.Item | Update.Ship | Update.QuestList; |
| 494 | 524 | } |
| 495 | - if (url.EndsWith("api_req_kaisou/powerup")) | |
| 496 | - { | |
| 497 | - _shipInfo.InspectPowerup(request, data); | |
| 498 | - _conditionTimer.CheckCond(); | |
| 499 | - _akashiTimer.CheckFleet(); | |
| 500 | - _questInfo.InspectPowerup(data); | |
| 501 | - return Update.Item | Update.Ship | Update.QuestList; | |
| 502 | - } | |
| 503 | - if (url.EndsWith("api_req_kaisou/slot_exchange_index")) | |
| 504 | - { | |
| 505 | - _shipInfo.InspectSlotExchange(request, data); | |
| 506 | - return Update.Ship; | |
| 507 | - } | |
| 508 | - if (url.EndsWith("api_req_kaisou/slot_deprive")) | |
| 509 | - { | |
| 510 | - _shipInfo.InspectSlotDeprive(data); | |
| 511 | - return Update.Ship; | |
| 512 | - } | |
| 513 | 525 | if (url.EndsWith("api_req_nyukyo/start")) |
| 514 | 526 | { |
| 515 | 527 | _dockInfo.InspectNyukyo(request); |
KancolleSniffer
Fork