From a43ee83b56560b6392f6a42c946d2d592635bbb3 Mon Sep 17 00:00:00 2001 From: Andante Date: Wed, 15 Jan 2020 20:31:22 +0900 Subject: [PATCH] Version 4.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 装備解除後近代化改修に対応 * 羅針盤：Colorado Touch を特殊砲撃カウンタに追加 --- ElectronicObserver/Data/Battle/BattleManager.cs | 2 +- .../Observer/kcsapi/api_req_kaisou/powerup.cs | 13 +++++++------ ElectronicObserver/Other/Information/apilist.txt | 12 ++++++++---- ElectronicObserver/Utility/SoftwareInformation.cs | 6 +++--- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ElectronicObserver/Data/Battle/BattleManager.cs b/ElectronicObserver/Data/Battle/BattleManager.cs index 710327c7a..87643ab27 100644 --- a/ElectronicObserver/Data/Battle/BattleManager.cs +++ b/ElectronicObserver/Data/Battle/BattleManager.cs @@ -149,7 +149,7 @@ public bool StartsFromNightBattle /// /// 記録する特殊攻撃 /// - private readonly int[] TracedSpecialAttack = new int[] { 100, 101, 102 }; + private readonly int[] TracedSpecialAttack = new int[] { 100, 101, 102, 103 }; diff --git a/ElectronicObserver/Observer/kcsapi/api_req_kaisou/powerup.cs b/ElectronicObserver/Observer/kcsapi/api_req_kaisou/powerup.cs index 946d919fb..c831317cc 100644 --- a/ElectronicObserver/Observer/kcsapi/api_req_kaisou/powerup.cs +++ b/ElectronicObserver/Observer/kcsapi/api_req_kaisou/powerup.cs @@ -12,7 +12,6 @@ namespace ElectronicObserver.Observer.kcsapi.api_req_kaisou public class powerup : APIBase { - public override void OnRequestReceived(Dictionary data) { @@ -21,18 +20,20 @@ public override void OnRequestReceived(Dictionary data) db.Fleet.LoadFromRequest(APIName, data); + bool destroysEquipments = data.ContainsKey("api_slot_dest_flag") ? (data["api_slot_dest_flag"] != "0") : true; foreach (string id in data["api_id_items"].Split(",".ToCharArray())) { - int shipID = int.Parse(id); - ShipData ship = db.Ships[shipID]; - for (int i = 0; i < ship.Slot.Count; i++) + if (destroysEquipments) { - if (ship.Slot[i] != -1) - db.Equipments.Remove(ship.Slot[i]); + for (int i = 0; i < ship.Slot.Count; i++) + { + if (ship.Slot[i] != -1) + db.Equipments.Remove(ship.Slot[i]); + } } Utility.Logger.Add(2, ship.NameWithLevel + LoggerRes.Decomissioned); diff --git a/ElectronicObserver/Other/Information/apilist.txt b/ElectronicObserver/Other/Information/apilist.txt index d7cfae50c..7f7132c1d 100644 --- a/ElectronicObserver/Other/Information/apilist.txt +++ b/ElectronicObserver/Other/Information/apilist.txt @@ -1079,14 +1079,17 @@ api_get_member/picture_book ：装備図鑑　図鑑登録済みのもののみ Request.api_req_kaisou/powerup ：近代化改修 - api_id_items ：素材の艦船ID？ + api_id_items ：素材の艦船IDリスト　,区切り api_id ：対象艦船ID + api_slot_dest_flag ：装備を廃棄するか　0=しない　1=する api_req_kaisou/powerup ：近代化改修 - api_powerup_flag ：改修成功/失敗 + api_powerup_flag ：改修成功フラグ　0=失敗　1=成功 api_ship ：改修艦のデータ　port.api_shipに準じる - api_deck ：艦隊のデータ　port.api_deck_portに準じる - + api_deck ：艦隊のデータ[保有艦隊数?]　port.api_deck_portに準じる + api_unset_list ：未装備の装備リスト[]　外した装備があるときのみ存在　更新されたカテゴリのみ + api_type3No ：装備カテゴリID + api_slot_list ：未装備の装備IDリスト[] Request.api_req_mission/result ：遠征帰投 api_deck_id ：対象の艦隊ID @@ -3382,6 +3385,7 @@ Request.api_req_member/set_friendly_request ：友軍艦隊要請 api_req_map/anchorage_repair ：緊急泊地修理 api_used_ship ：発動させた艦娘のID (固有IDではない; 450=秋津洲改 など) + api_repair_ships ：修理される艦娘の固有ID [] api_ship_data ：艦船データ　[出撃艦隊の艦船数]　api_port/port.api_ship に準じる　 diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs index bf9a71919..3e2a113f5 100644 --- a/ElectronicObserver/Utility/SoftwareInformation.cs +++ b/ElectronicObserver/Utility/SoftwareInformation.cs @@ -31,20 +31,20 @@ public static class SoftwareInformation /// /// バージョン(日本語, ソフトウェア名を含みます) /// - public static string VersionJapanese => SoftwareNameJapanese + "四四型甲"; + public static string VersionJapanese => SoftwareNameJapanese + "四四型改"; /// /// バージョン(英語) /// - public static string VersionEnglish => "4.4.0.1"; + public static string VersionEnglish => "4.4.1"; /// /// 更新日時 /// - public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2019/12/25 23:00:00"); + public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/01/15 20:30:00");