| Revision | 16aa2530b73b6933b8f79103674dddf7219e6602 (tree) |
|---|---|
| Zeit | 2020-09-27 20:39:40 |
| Autor | Kazuhiro Fujieda <fujieda@user...> |
| Commiter | Kazuhiro Fujieda |
7-3-Dの海戦報告書が正しく表示されないのを直す
KancolleSniffer.Test/LogProcessorTest.cs (diff) KancolleSniffer/Log/BattleLogProcessor.cs (diff)| @@ -72,6 +72,27 @@ namespace KancolleSniffer.Test | ||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /// <summary> |
| 75 | + /// 敵艦隊名がカンマを含む海戦・ドロップ報告書を加工する | |
| 76 | + /// </summary> | |
| 77 | + [TestMethod] | |
| 78 | + public void BattleLogWithComma() | |
| 79 | + { | |
| 80 | + var processor = new LogProcessor(); | |
| 81 | + var log = new[] | |
| 82 | + { | |
| 83 | + "2020-09-27 19:49:04,ペナン島沖,4,,S,同航戦,単縦陣,梯形陣,深海5,500t級軽巡洋艦,駆逐艦,神風," + | |
| 84 | + "羽黒改二(Lv159),64/64,足柄改二(Lv159),60/63,神風改(Lv99),23/23,島風改(Lv158),41/41,Gotland andra(Lv136),53/53,,," + | |
| 85 | + "軽巡ホ級(flagship),0/53,駆逐ロ級後期型,0/37,駆逐ロ級後期型,0/37,,,,,,,9,0,制空権確保,7-3", | |
| 86 | + }; | |
| 87 | + var result = processor.Process(log, "海戦・ドロップ報告書.csv", DateTime.MinValue, DateTime.MaxValue, false); | |
| 88 | + PAssert.That(() => | |
| 89 | + result.First() == | |
| 90 | + "[\"2020-09-27 19:49:04\",\"ペナン島沖\",\"4\",\"\",\"S\",\"同航戦\",\"単縦陣\",\"梯形陣\",\"深海5,500t級軽巡洋艦\",\"駆逐艦\",\"神風\"," + | |
| 91 | + "\"羽黒改二(Lv159)\",\"64/64\",\"足柄改二(Lv159)\",\"60/63\",\"神風改(Lv99)\",\"23/23\",\"島風改(Lv158)\",\"41/41\",\"Gotland andra(Lv136)\",\"53/53\",\"\",\"\"," + | |
| 92 | + "\"軽巡ホ級(flagship)\",\"0/53\",\"駆逐ロ級後期型\",\"0/37\",\"駆逐ロ級後期型\",\"0/37\",\"\",\"\",\"\",\"\",\"\",\"\",\"9\",\"0\",\"確保\",\"\",\"\",\"7-3\"]"); | |
| 93 | + } | |
| 94 | + | |
| 95 | + /// <summary> | |
| 75 | 96 | /// 資材ログの最後に現在値を示すレコードを追加する |
| 76 | 97 | /// </summary> |
| 77 | 98 | [TestMethod] |
| @@ -43,7 +43,14 @@ namespace KancolleSniffer.Log | ||
| 43 | 43 | case 39: |
| 44 | 44 | map = data[38]; |
| 45 | 45 | break; |
| 46 | - case 40: // 七隻分のログが出力されている | |
| 46 | + case 40: | |
| 47 | + if (data[8] == "深海5" && data[9] == "500t級軽巡洋艦") | |
| 48 | + { | |
| 49 | + data[8] = "深海5,500t級軽巡洋艦"; | |
| 50 | + Array.Copy(data, 10, data, 9, 30); | |
| 51 | + goto case 39; | |
| 52 | + } | |
| 53 | + // 七隻分のログが出力されている | |
| 47 | 54 | data[21] = data[21] + "・" + data[23]; |
| 48 | 55 | data[22] = data[22] + "・" + data[24]; |
| 49 | 56 | Array.Copy(data, 24, data, 23, 15); |
KancolleSniffer
Fork