Skip to content

Commit

Permalink
Version 4.4.1
Browse files Browse the repository at this point in the history
* 装備解除後近代化改修に対応
* 羅針盤:Colorado Touch を特殊砲撃カウンタに追加
  • Loading branch information
andanteyk authored and myangelkamikaze committed Jan 16, 2020
1 parent 1b73012 commit a43ee83
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ElectronicObserver/Data/Battle/BattleManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public bool StartsFromNightBattle
/// <summary>
/// 記録する特殊攻撃
/// </summary>
private readonly int[] TracedSpecialAttack = new int[] { 100, 101, 102 };
private readonly int[] TracedSpecialAttack = new int[] { 100, 101, 102, 103 };



Expand Down
13 changes: 7 additions & 6 deletions ElectronicObserver/Observer/kcsapi/api_req_kaisou/powerup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace ElectronicObserver.Observer.kcsapi.api_req_kaisou
public class powerup : APIBase
{


public override void OnRequestReceived(Dictionary<string, string> data)
{

Expand All @@ -21,18 +20,20 @@ public override void OnRequestReceived(Dictionary<string, string> 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);
Expand Down
12 changes: 8 additions & 4 deletions ElectronicObserver/Other/Information/apilist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 に準じる 


Expand Down
6 changes: 3 additions & 3 deletions ElectronicObserver/Utility/SoftwareInformation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ public static class SoftwareInformation
/// <summary>
/// バージョン(日本語, ソフトウェア名を含みます)
/// </summary>
public static string VersionJapanese => SoftwareNameJapanese + "四四型甲";
public static string VersionJapanese => SoftwareNameJapanese + "四四型改";


/// <summary>
/// バージョン(英語)
/// </summary>
public static string VersionEnglish => "4.4.0.1";
public static string VersionEnglish => "4.4.1";



/// <summary>
/// 更新日時
/// </summary>
public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2019/12/25 23:00:00");
public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/01/15 20:30:00");



Expand Down

0 comments on commit a43ee83

Please sign in to comment.