From 15ecf615ad54e0ae0c03976bbbdce8d39d6ca1ed Mon Sep 17 00:00:00 2001 From: Andante Date: Tue, 26 May 2015 00:19:55 +0900 Subject: [PATCH] Version 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・ログ：ケッコン時のメッセージを追加 --- ElectronicObserver/ElectronicObserver.csproj | 1 + ElectronicObserver/Observer/APIObserver.cs | 1 + .../Observer/kcsapi/api_get_member/ship2.cs | 2 +- .../kcsapi/api_req_kaisou/marriage.cs | 23 +++++++++++++++++++ .../Other/Information/apilist.txt | 3 ++- .../Utility/SoftwareInformation.cs | 6 ++--- README.md | 2 +- 7 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 ElectronicObserver/Observer/kcsapi/api_req_kaisou/marriage.cs diff --git a/ElectronicObserver/ElectronicObserver.csproj b/ElectronicObserver/ElectronicObserver.csproj index 35f6ea9ba..87f29c4d9 100644 --- a/ElectronicObserver/ElectronicObserver.csproj +++ b/ElectronicObserver/ElectronicObserver.csproj @@ -157,6 +157,7 @@ + diff --git a/ElectronicObserver/Observer/APIObserver.cs b/ElectronicObserver/Observer/APIObserver.cs index 4912f70da..6bc3edffa 100644 --- a/ElectronicObserver/Observer/APIObserver.cs +++ b/ElectronicObserver/Observer/APIObserver.cs @@ -87,6 +87,7 @@ private APIObserver() { APIList.Add( new kcsapi.api_req_ranking.getlist() ); APIList.Add( new kcsapi.api_req_sortie.airbattle() ); APIList.Add( new kcsapi.api_get_member.ship_deck() ); + APIList.Add( new kcsapi.api_req_kaisou.marriage() ); APIList.Add( new kcsapi.api_req_quest.clearitemget() ); APIList.Add( new kcsapi.api_req_nyukyo.start() ); diff --git a/ElectronicObserver/Observer/kcsapi/api_get_member/ship2.cs b/ElectronicObserver/Observer/kcsapi/api_get_member/ship2.cs index 457988b04..b6b1dd569 100644 --- a/ElectronicObserver/Observer/kcsapi/api_get_member/ship2.cs +++ b/ElectronicObserver/Observer/kcsapi/api_get_member/ship2.cs @@ -7,7 +7,7 @@ namespace ElectronicObserver.Observer.kcsapi.api_get_member { - //[Obsolete( "このAPIは廃止された可能性があります。", false)] + //一応現役、ケッコンした時などに呼ばれる public class ship2 : APIBase { public override void OnResponseReceived( dynamic data ) { diff --git a/ElectronicObserver/Observer/kcsapi/api_req_kaisou/marriage.cs b/ElectronicObserver/Observer/kcsapi/api_req_kaisou/marriage.cs new file mode 100644 index 000000000..e1143e12f --- /dev/null +++ b/ElectronicObserver/Observer/kcsapi/api_req_kaisou/marriage.cs @@ -0,0 +1,23 @@ +using ElectronicObserver.Data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicObserver.Observer.kcsapi.api_req_kaisou { + + public class marriage : APIBase { + + public override void OnResponseReceived( dynamic data ) { + + Utility.Logger.Add( 2, string.Format( "{0} とケッコンカッコカリしました。おめでとうございます！", KCDatabase.Instance.Ships[(int)data.api_id].Name ) ); + + base.OnResponseReceived( (object)data ); + } + + public override string APIName { + get { return "api_req_kaisou/marriage"; } + } + } +} diff --git a/ElectronicObserver/Other/Information/apilist.txt b/ElectronicObserver/Other/Information/apilist.txt index 961961a2d..9adf37992 100644 --- a/ElectronicObserver/Other/Information/apilist.txt +++ b/ElectronicObserver/Other/Information/apilist.txt @@ -796,7 +796,8 @@ api_get_member/picture_book ：装備図鑑　図鑑登録済みのもののみ api_houk ：回避 api_saku ：索敵 api_leng ：射程 - api_flag ： + api_flag ：カテゴリ? + [0]=砲, [1]=魚雷, [2]=攻撃機(雷撃機), [3]=爆撃機, [4]=機銃, [5]=戦闘機, [6]=偵察機, [7]=戦闘機/機銃 api_info ：説明 diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs index a2baac2f0..8499952ec 100644 --- a/ElectronicObserver/Utility/SoftwareInformation.cs +++ b/ElectronicObserver/Utility/SoftwareInformation.cs @@ -35,7 +35,7 @@ public static string SoftwareNameEnglish { /// public static string VersionJapanese { get { - return SoftwareNameJapanese + "一二型改六"; + return SoftwareNameJapanese + "一三型"; } } @@ -44,7 +44,7 @@ public static string VersionJapanese { /// public static string VersionEnglish { get { - return "1.2.6"; + return "1.3.0"; } } @@ -54,7 +54,7 @@ public static string VersionEnglish { /// public static DateTime UpdateTime { get { - return DateTimeHelper.CSVStringToTime( "2015/05/18 20:00:00" ); + return DateTimeHelper.CSVStringToTime( "2015/05/26 00:00:00" ); } } diff --git a/README.md b/README.md index 6f52d258c..af6730dba 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ *このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。* -[ver. 1.2.6 (2015/05/18)](http://bit.ly/1HpDM2i) +[ver. 1.3.0 (2015/05/26)](http://bit.ly/1HsatH4) 更新内容・履歴は[こちら](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)で確認できます。