From 9f73f7e7b0cc3a4a28c3fc7a9e7190c946791653 Mon Sep 17 00:00:00 2001 From: Andante Date: Sat, 27 Jun 2015 11:35:35 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E8=88=AA=E7=A9=BA=E5=81=B5=E5=AF=9F?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ElectronicObserver/Data/CompassData.cs | 32 +++++++++ .../Other/Information/apilist.txt | 18 +++-- .../Utility/SoftwareInformation.cs | 6 +- ElectronicObserver/Window/FormCompass.cs | 70 +++++++++++++------ 4 files changed, 93 insertions(+), 33 deletions(-) diff --git a/ElectronicObserver/Data/CompassData.cs b/ElectronicObserver/Data/CompassData.cs index 9cacccf78..95b6fd719 100644 --- a/ElectronicObserver/Data/CompassData.cs +++ b/ElectronicObserver/Data/CompassData.cs @@ -206,6 +206,38 @@ public ReadOnlyCollection RouteChoices { } } } + + + /// + /// 航空偵察の航空機 + /// 0=なし, 1=大型飛行艇, 2=水上偵察機 + /// + public int AirReconnaissancePlane { + get { + if ( RawData.api_airsearch() ) { + return (int)RawData.api_airsearch.api_plane_type; + } else { + return 0; + } + } + } + + + /// + /// 航空偵察結果 + /// 0=失敗?, 1=成功?, 2=大成功 + /// + public int AirReconnaissanceResult { + get { + if ( RawData.api_airsearch() ) { + return (int)RawData.api_airsearch.api_result; + } else { + return 0; + } + } + } + + } diff --git a/ElectronicObserver/Other/Information/apilist.txt b/ElectronicObserver/Other/Information/apilist.txt index 14e1dd5f8..29c17d15a 100644 --- a/ElectronicObserver/Other/Information/apilist.txt +++ b/ElectronicObserver/Other/Information/apilist.txt @@ -364,7 +364,7 @@ api_start2 ：艦娘・装備固有データその他 api_id ：海域セルユニークID(全海域の通し番号) api_no ：海域セルID(同海域内限定) api_color_no ：セルの状態 - 0=初期位置, 1=(存在せず), 2=資源獲得, 3=渦潮, 4=通常戦闘, 5=ボス戦闘, 6=(気のせいだった, api_req_map/start|nextにのみ存在, ここでは4として扱われる?), 7=航空戦, 8=船団護衛成功 + 0=初期位置, 1=(存在せず), 2=資源獲得, 3=渦潮, 4=通常戦闘, 5=ボス戦闘, 6=(気のせいだった, api_req_map/start|nextにのみ存在, ここでは4として扱われる?), 7=航空戦, 8=船団護衛成功, 9=航空偵察 api_mst_mission ：遠征データ api_id ：遠征ID @@ -1042,10 +1042,11 @@ api_req_map/next ：進撃 api_maparea_id ：海域カテゴリID(2-3でいう2) api_mapinfo_no ：海域カテゴリ内番号(2-3でいう3) api_no ：次に向かうセルのID - api_color_no ：次のセルの色?　3=青, 4=赤 - api_event_id ：イベント　api_mst_mapcell参照　6=気のせいだった + api_color_no ：次のセルの色　api_mst_mapcell参照　3=青, 4=赤, 9=航空偵察 + api_event_id ：イベント　0=初期位置, 1=(存在せず), 2=資源獲得, 3=渦潮, 4=通常戦闘, 5=ボス戦闘, 6=気のせいだった, 7=航空戦or航空偵察, 8=船団護衛成功 api_event_kind ：イベント種別　0=非戦闘セル 1=通常戦闘 2=夜戦 3=夜昼戦 4=航空戦 - api_event_id=6(気のせいだった)時は 0="気のせいだった。" 1="敵影を見ず。" 2=能動分岐 + api_event_id=6(気のせいだった)時は　0="気のせいだった。", 1="敵影を見ず。", 2=能動分岐 + api_event_id=7(航空戦)時は　0=航空偵察, 4=航空戦 api_next ：次のマスでのルート分岐の本数 0=行き止まり api_bosscell_no ：ボスセルID api_bosscomp ：ボス到達済みフラグ？コード中にスペルミスがあり未使用 @@ -1059,12 +1060,12 @@ api_req_map/next ：進撃 api_enemy_id ：敵艦隊ID api_result ： api_result_str ："start war" - api_itemget ：次が資源マスのときのみ存在 + api_itemget ：次が資源マス/航空偵察マスのときのみ存在 api_usemst ：4=資源, 11=家具箱(中), 12=家具箱(大) - api_id ：1=燃料, 2=弾薬, 11=家具箱(中), 12=家具箱(大) + api_id ：1=燃料, 2=弾薬, 4=ボーキ, 11=家具箱(中), 12=家具箱(大) api_getcount ：入手資源量 api_name ：アイテム名(家具箱のみ?燃料等の資源は"") - api_icon_id ：1=燃料, 2=弾薬, 11=家具箱(中), 12=家具箱(大) + api_icon_id ：1=燃料, 2=弾薬, 4=ボーキ, 11=家具箱(中), 12=家具箱(大) api_happening ：次が渦潮マスのときのみ存在 api_type ：1 api_count ：落とした資源の量 @@ -1083,6 +1084,9 @@ api_req_map/next ：進撃 api_getcount ：入手資源量 api_select_route ：次が能動分岐マスのときのみ存在 api_select_cells：選択可能なセルIDのリスト + api_airsearch ：次が航空偵察マスのときのみ存在 + api_plane_type ：発艦した索敵機の種別　0=なし, 1=大型飛行艇, 2=水上偵察機 + api_result ：偵察結果　0=失敗, 1=成功, 2=大成功 api_req_sortie/battle ：戦闘(昼戦) api_dock_id ：こちらの出撃艦隊ID diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs index e57c6e027..344b48ab4 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.4.0"; + return "1.4.1"; } } @@ -54,7 +54,7 @@ public static string VersionEnglish { /// public static DateTime UpdateTime { get { - return DateTimeHelper.CSVStringToTime( "2015/06/17 23:00:00" ); + return DateTimeHelper.CSVStringToTime( "2015/06/27 12:00:00" ); } } diff --git a/ElectronicObserver/Window/FormCompass.cs b/ElectronicObserver/Window/FormCompass.cs index 9db45db36..2750325a2 100644 --- a/ElectronicObserver/Window/FormCompass.cs +++ b/ElectronicObserver/Window/FormCompass.cs @@ -428,23 +428,7 @@ private void Updated( string apiname, dynamic data ) { case 2: //資源 case 8: //船団護衛成功 - { - string materialname; - if ( compass.GetItemID == 4 ) { //"※"　大方資源専用ID - - materialname = Constants.GetMaterialName( compass.GetItemIDMetadata ); - - } else { - UseItemMaster item = KCDatabase.Instance.MasterUseItems[compass.GetItemIDMetadata]; - if ( item != null ) - materialname = item.Name; - else - materialname = "謎のアイテム"; - } - - TextEventDetail.Text = materialname + " x " + compass.GetItemAmount; - } - + TextEventDetail.Text = GetMaterialName( compass ) + " x " + compass.GetItemAmount; break; case 3: //渦潮 @@ -503,13 +487,37 @@ private void Updated( string apiname, dynamic data ) { } break; - case 7: //航空戦(連合艦隊) - if ( compass.EventKind >= 2 ) { - if ( compass.EventKind != 4 ) //必ず"航空戦"のはずなので除外 - eventkind += "/" + Constants.GetMapEventKind( compass.EventKind ); - TextEventKind.ForeColor = getColorFromEventKind( compass.EventKind ); + case 7: //航空戦or航空偵察 + TextEventKind.ForeColor = getColorFromEventKind( compass.EventKind ); + + switch ( compass.EventKind ) { + case 0: //航空偵察 + eventkind = "航空偵察"; + + switch ( compass.AirReconnaissanceResult ) { + case 0: + default: + TextEventDetail.Text = "失敗"; + break; + case 1: + TextEventDetail.Text = "成功"; + break; + case 2: + TextEventDetail.Text = "大成功"; + break; + } + + if ( compass.AirReconnaissanceResult > 0 || compass.GetItemID != -1 ) { + TextEventDetail.Text += string.Format( "　{0} x {1}", GetMaterialName( compass ), compass.GetItemAmount ); + } + + break; + + case 4: //航空戦 + default: + UpdateEnemyFleet( compass.EnemyFleetID ); + break; } - UpdateEnemyFleet( compass.EnemyFleetID ); break; @@ -530,6 +538,22 @@ private void Updated( string apiname, dynamic data ) { } + private string GetMaterialName( CompassData compass ) { + + if ( compass.GetItemID == 4 ) { //"※"　大方資源専用ID + + return Constants.GetMaterialName( compass.GetItemIDMetadata ); + + } else { + UseItemMaster item = KCDatabase.Instance.MasterUseItems[compass.GetItemIDMetadata]; + if ( item != null ) + return item.Name; + else + return "謎のアイテム"; + } + } + + private void BattleStarted( string apiname, dynamic data ) { UpdateEnemyFleetInstant(); From fc58ea109f448e71734bd7465062b914c779bbc0 Mon Sep 17 00:00:00 2001 From: Andante Date: Sat, 27 Jun 2015 16:04:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BE=85=E9=87=9D=E7=9B=A4=EF=BC=9A?= =?UTF-8?q?=E8=88=AA=E7=A9=BA=E5=81=B5=E5=AF=9F=E3=81=AB=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 情報：戦闘終了時に提督経験値を表示 --- ElectronicObserver/Data/CompassData.cs | 2 +- .../Other/Information/apilist.txt | 2 ++ ElectronicObserver/Window/FormCompass.cs | 25 ++++++++++++- ElectronicObserver/Window/FormInformation.cs | 35 +++++++++++++++---- 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/ElectronicObserver/Data/CompassData.cs b/ElectronicObserver/Data/CompassData.cs index 95b6fd719..13a9e1d3d 100644 --- a/ElectronicObserver/Data/CompassData.cs +++ b/ElectronicObserver/Data/CompassData.cs @@ -225,7 +225,7 @@ public int AirReconnaissancePlane { /// /// 航空偵察結果 - /// 0=失敗?, 1=成功?, 2=大成功 + /// 0=失敗, 1=成功, 2=大成功 /// public int AirReconnaissanceResult { get { diff --git a/ElectronicObserver/Other/Information/apilist.txt b/ElectronicObserver/Other/Information/apilist.txt index 29c17d15a..45dbbbf0f 100644 --- a/ElectronicObserver/Other/Information/apilist.txt +++ b/ElectronicObserver/Other/Information/apilist.txt @@ -960,6 +960,7 @@ api_req_practice/battle_result ：演習結果 api_rank ：敵階級　文字列 api_deck_name ：敵艦隊名 api_first_clear ：(存在せず) + api_mapcell_incentive ：(存在せず) api_get_flag ：(存在せず) api_get_ship ：(存在せず) api_get_eventflag ：(存在せず) @@ -1255,6 +1256,7 @@ api_req_sortie/battleresult ：戦闘結果 api_rank ： api_deck_name ：敵艦隊名 api_first_clear ：初回クリアフラグ(EO海域攻略時も1) + api_mapcell_incentive ：航空偵察作戦報酬獲得フラグ　0=なし, 1=獲得 api_get_flag ：入手フラグ [0]=アイテム, [1]=艦娘 api_get_useitem ：ドロップアイテム情報 api_get_flag[0]=1のときのみ存在 api_useitem_id ：アイテムID 60=プレゼント箱 diff --git a/ElectronicObserver/Window/FormCompass.cs b/ElectronicObserver/Window/FormCompass.cs index 2750325a2..a9ffa17e9 100644 --- a/ElectronicObserver/Window/FormCompass.cs +++ b/ElectronicObserver/Window/FormCompass.cs @@ -305,6 +305,7 @@ public FormCompass( FormMain parent ) { BasePanel.SetFlowBreak( TextEventDetail, true ); TextDestination.ImageList = ResourceManager.Instance.Equipments; + TextEventDetail.ImageList = ResourceManager.Instance.Equipments; Icon = ResourceManager.ImageToIcon( ResourceManager.Instance.Icons.Images[(int)ResourceManager.IconContent.FormCompass] ); } @@ -375,6 +376,8 @@ private void Updated( string apiname, dynamic data ) { TextEventKind.Text = data.api_cmt; TextEventKind.ForeColor = getColorFromEventKind( 0 ); TextEventDetail.Text = string.Format( "Lv. {0} / {1} exp.", data.api_level, data.api_experience[0] ); + TextEventDetail.ImageAlign = ContentAlignment.MiddleCenter; + TextEventDetail.ImageIndex = -1; TextEnemyFleetName.Text = data.api_deckname; } else { @@ -413,6 +416,10 @@ private void Updated( string apiname, dynamic data ) { ToolTipInfo.SetToolTip( TextDestination, null ); } + //とりあえずリセット + TextEventDetail.ImageAlign = ContentAlignment.MiddleCenter; + TextEventDetail.ImageIndex = -1; + TextEventKind.ForeColor = getColorFromEventKind( 0 ); @@ -507,7 +514,23 @@ private void Updated( string apiname, dynamic data ) { break; } - if ( compass.AirReconnaissanceResult > 0 || compass.GetItemID != -1 ) { + switch ( compass.AirReconnaissancePlane ) { + case 0: + default: + TextEventDetail.ImageAlign = ContentAlignment.MiddleCenter; + TextEventDetail.ImageIndex = -1; + break; + case 1: + TextEventDetail.ImageAlign = ContentAlignment.MiddleLeft; + TextEventDetail.ImageIndex = (int)ResourceManager.EquipmentContent.FlyingBoat; + break; + case 2: + TextEventDetail.ImageAlign = ContentAlignment.MiddleLeft; + TextEventDetail.ImageIndex = (int)ResourceManager.EquipmentContent.Seaplane; + break; + } + + if ( compass.GetItemID != -1 ) { TextEventDetail.Text += string.Format( "　{0} x {1}", GetMaterialName( compass ), compass.GetItemAmount ); } diff --git a/ElectronicObserver/Window/FormInformation.cs b/ElectronicObserver/Window/FormInformation.cs index 8db4d1439..c4549f7fd 100644 --- a/ElectronicObserver/Window/FormInformation.cs +++ b/ElectronicObserver/Window/FormInformation.cs @@ -34,13 +34,16 @@ private void FormInformation_Load( object sender, EventArgs e ) { APIObserver o = APIObserver.Instance; - o.APIList["api_port/port"].ResponseReceived += Updated; - o.APIList["api_req_member/get_practice_enemyinfo"].ResponseReceived += Updated; - o.APIList["api_get_member/picture_book"].ResponseReceived += Updated; - o.APIList["api_req_kousyou/createitem"].ResponseReceived += Updated; - o.APIList["api_get_member/mapinfo"].ResponseReceived += Updated; - o.APIList["api_req_mission/result"].ResponseReceived += Updated; - o.APIList["api_req_ranking/getlist"].ResponseReceived += Updated; + o["api_port/port"].ResponseReceived += Updated; + o["api_req_member/get_practice_enemyinfo"].ResponseReceived += Updated; + o["api_get_member/picture_book"].ResponseReceived += Updated; + o["api_req_kousyou/createitem"].ResponseReceived += Updated; + o["api_get_member/mapinfo"].ResponseReceived += Updated; + o["api_req_mission/result"].ResponseReceived += Updated; + o["api_req_ranking/getlist"].ResponseReceived += Updated; + o["api_req_practice/battle_result"].ResponseReceived += Updated; + o["api_req_sortie/battleresult"].ResponseReceived += Updated; + o["api_req_combined_battle/battleresult"].ResponseReceived += Updated; Utility.Configuration.Instance.ConfigurationChanged += ConfigurationChanged; } @@ -88,6 +91,12 @@ void Updated( string apiname, dynamic data ) { TextInformation.Text = GetRankingData( data ); break; + case "api_req_practice/battle_result": + case "api_req_sortie/battleresult": + case "api_req_combined_battle/battleresult": + TextInformation.Text = GetBattleResult( data ); + break; + } } @@ -260,6 +269,18 @@ private string GetRankingData( dynamic data ) { } + private string GetBattleResult( dynamic data ) { + StringBuilder sb = new StringBuilder(); + + sb.AppendLine( "[戦闘終了]" ); + sb.AppendFormat( "敵艦隊名: {0}\r\n", data.api_enemy_info.api_deck_name ); + sb.AppendFormat( "勝敗判定: {0}\r\n", data.api_win_rank ); + sb.AppendFormat( "提督経験値: +{0}\r\n", (int)data.api_get_exp ); + + return sb.ToString(); + } + + protected override string GetPersistString() { return "Information"; } From 7827e5d39736d278f2c2b8eaf8e984fa1ced6d98 Mon Sep 17 00:00:00 2001 From: Andante Date: Fri, 3 Jul 2015 18:33:03 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=B3=E9=91=91=EF=BC=9A=E7=AA=93?= =?UTF-8?q?=E3=81=8C=E5=BE=8C=E3=82=8D=E3=81=AB=E9=9A=A0=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 戦闘：敵探照灯照射艦番号のずれを修正 司令部：チャートの表示は右クリックのみに 図鑑：艦船リソースを常時表示に --- ElectronicObserver/Data/ShipData.cs | 2 +- ElectronicObserver/Data/ShipDataMaster.cs | 4 +- .../Dialog/DialogAlbumMasterEquipment.cs | 4 +- .../Dialog/DialogAlbumMasterShip.Designer.cs | 70 +++++++++++++------ .../Window/Dialog/DialogAlbumMasterShip.cs | 41 +++++++---- .../Window/Dialog/DialogAlbumMasterShip.resx | 3 - ElectronicObserver/Window/FormBattle.cs | 2 +- ElectronicObserver/Window/FormHeadquarters.cs | 8 ++- 8 files changed, 88 insertions(+), 46 deletions(-) diff --git a/ElectronicObserver/Data/ShipData.cs b/ElectronicObserver/Data/ShipData.cs index 8bb0c9603..1a639be9c 100644 --- a/ElectronicObserver/Data/ShipData.cs +++ b/ElectronicObserver/Data/ShipData.cs @@ -14,7 +14,7 @@ namespace ElectronicObserver.Data { /// /// 個別の艦娘データを保持します。 /// - [DebuggerDisplay( "[{ID}] : {KCDatabase.Instance.MasterShips[ShipID].NameWithClass} Lv. {Level}" )] + [DebuggerDisplay( "[{ID}] {KCDatabase.Instance.MasterShips[ShipID].NameWithClass} Lv. {Level}" )] public class ShipData : APIWrapper, IIdentifiable { diff --git a/ElectronicObserver/Data/ShipDataMaster.cs b/ElectronicObserver/Data/ShipDataMaster.cs index 8f4eac40b..a061c2534 100644 --- a/ElectronicObserver/Data/ShipDataMaster.cs +++ b/ElectronicObserver/Data/ShipDataMaster.cs @@ -13,7 +13,7 @@ namespace ElectronicObserver.Data { /// /// 艦船のマスターデータを保持します。 /// - [DebuggerDisplay( "[{ID}] : {NameWithClass}" )] + [DebuggerDisplay( "[{ID}] {NameWithClass}" )] public class ShipDataMaster : ResponseWrapper, IIdentifiable { /// @@ -464,7 +464,7 @@ public int ID { public override string ToString() { - return string.Format( "[{0}] : {1}", ShipID, NameWithClass ); + return string.Format( "[{0}] {1}", ShipID, NameWithClass ); } } diff --git a/ElectronicObserver/Window/Dialog/DialogAlbumMasterEquipment.cs b/ElectronicObserver/Window/Dialog/DialogAlbumMasterEquipment.cs index 70bbd5fed..a8dec89ba 100644 --- a/ElectronicObserver/Window/Dialog/DialogAlbumMasterEquipment.cs +++ b/ElectronicObserver/Window/Dialog/DialogAlbumMasterEquipment.cs @@ -170,7 +170,7 @@ private void EquipmentView_CellMouseClick( object sender, DataGridViewCellMouseE if ( ( e.Button & System.Windows.Forms.MouseButtons.Right ) != 0 ) { Cursor = Cursors.AppStarting; - new DialogAlbumMasterEquipment( equipmentID ).Show(); + new DialogAlbumMasterEquipment( equipmentID ).Show( Owner ); Cursor = Cursors.Default; } else if ( ( e.Button & System.Windows.Forms.MouseButtons.Left ) != 0 ) { @@ -330,7 +330,7 @@ private void DefaultSlots_MouseDown( object sender, MouseEventArgs e ) { int index = DefaultSlots.IndexFromPoint( e.Location ); if ( index >= 0 ) { Cursor = Cursors.AppStarting; - new DialogAlbumMasterShip( ( (ShipDataMaster)DefaultSlots.Items[index] ).ShipID ).Show(); + new DialogAlbumMasterShip( ( (ShipDataMaster)DefaultSlots.Items[index] ).ShipID ).Show( Owner ); Cursor = Cursors.Default; } } diff --git a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.Designer.cs b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.Designer.cs index e6709a079..389009a07 100644 --- a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.Designer.cs +++ b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.Designer.cs @@ -24,8 +24,8 @@ protected override void Dispose( bool disposing ) { /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.StripMenu_File = new System.Windows.Forms.ToolStripMenuItem(); this.StripMenu_File_OutputCSVUser = new System.Windows.Forms.ToolStripMenuItem(); @@ -49,6 +49,7 @@ private void InitializeComponent() { this.ToolTipInfo = new System.Windows.Forms.ToolTip(this.components); this.LevelTimer = new System.Windows.Forms.Timer(this.components); this.SaveCSVDialog = new System.Windows.Forms.SaveFileDialog(); + this.ResourceName = new ElectronicObserver.Window.Control.ImageLabel(); this.TitleDayAttack = new ElectronicObserver.Window.Control.ImageLabel(); this.NightAttack = new ElectronicObserver.Window.Control.ImageLabel(); this.TitleNightAttack = new ElectronicObserver.Window.Control.ImageLabel(); @@ -149,6 +150,7 @@ private void InitializeComponent() { this.ASWSeparater = new ElectronicObserver.Window.Control.ImageLabel(); this.ASWLevel = new ElectronicObserver.Window.Control.ImageLabel(); this.EvasionMin = new ElectronicObserver.Window.Control.ImageLabel(); + this.imageLabel1 = new ElectronicObserver.Window.Control.ImageLabel(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -170,11 +172,12 @@ private void InitializeComponent() { // // menuStrip1 // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(32, 32); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.StripMenu_File}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(800, 26); + this.menuStrip1.Size = new System.Drawing.Size(800, 38); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -184,20 +187,20 @@ private void InitializeComponent() { this.StripMenu_File_OutputCSVUser, this.StripMenu_File_OutputCSVData}); this.StripMenu_File.Name = "StripMenu_File"; - this.StripMenu_File.Size = new System.Drawing.Size(85, 22); + this.StripMenu_File.Size = new System.Drawing.Size(128, 34); this.StripMenu_File.Text = "ファイル(&F)"; // // StripMenu_File_OutputCSVUser // this.StripMenu_File_OutputCSVUser.Name = "StripMenu_File_OutputCSVUser"; - this.StripMenu_File_OutputCSVUser.Size = new System.Drawing.Size(213, 22); + this.StripMenu_File_OutputCSVUser.Size = new System.Drawing.Size(348, 34); this.StripMenu_File_OutputCSVUser.Text = "CSV出力(閲覧用)(&U)..."; this.StripMenu_File_OutputCSVUser.Click += new System.EventHandler(this.StripMenu_File_OutputCSVUser_Click); // // StripMenu_File_OutputCSVData // this.StripMenu_File_OutputCSVData.Name = "StripMenu_File_OutputCSVData"; - this.StripMenu_File_OutputCSVData.Size = new System.Drawing.Size(213, 22); + this.StripMenu_File_OutputCSVData.Size = new System.Drawing.Size(348, 34); this.StripMenu_File_OutputCSVData.Text = "CSV出力(データ用)(&D)..."; this.StripMenu_File_OutputCSVData.Click += new System.EventHandler(this.StripMenu_File_OutputCSVData_Click); // @@ -205,7 +208,7 @@ private void InitializeComponent() { // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.Location = new System.Drawing.Point(0, 26); + this.splitContainer1.Location = new System.Drawing.Point(0, 38); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -215,7 +218,7 @@ private void InitializeComponent() { // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.BasePanelShipGirl); - this.splitContainer1.Size = new System.Drawing.Size(800, 454); + this.splitContainer1.Size = new System.Drawing.Size(800, 442); this.splitContainer1.SplitterDistance = 250; this.splitContainer1.TabIndex = 1; // @@ -231,14 +234,14 @@ private void InitializeComponent() { this.ShipView_ShipID, this.ShipView_ShipType, this.ShipView_Name}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Meiryo UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.ShipView.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Meiryo UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.ShipView.DefaultCellStyle = dataGridViewCellStyle2; this.ShipView.Dock = System.Windows.Forms.DockStyle.Fill; this.ShipView.Location = new System.Drawing.Point(0, 0); this.ShipView.MultiSelect = false; @@ -247,7 +250,7 @@ private void InitializeComponent() { this.ShipView.RowHeadersVisible = false; this.ShipView.RowTemplate.Height = 21; this.ShipView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ShipView.Size = new System.Drawing.Size(250, 454); + this.ShipView.Size = new System.Drawing.Size(250, 442); this.ShipView.TabIndex = 0; this.ShipView.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.ShipView_CellMouseClick); this.ShipView.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.ShipView_SortCompare); @@ -256,8 +259,8 @@ private void InitializeComponent() { // ShipView_ShipID // this.ShipView_ShipID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.ShipView_ShipID.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.ShipView_ShipID.DefaultCellStyle = dataGridViewCellStyle1; this.ShipView_ShipID.HeaderText = "ID"; this.ShipView_ShipID.Name = "ShipView_ShipID"; this.ShipView_ShipID.ReadOnly = true; @@ -280,6 +283,8 @@ private void InitializeComponent() { // // BasePanelShipGirl // + this.BasePanelShipGirl.Controls.Add(this.imageLabel1); + this.BasePanelShipGirl.Controls.Add(this.ResourceName); this.BasePanelShipGirl.Controls.Add(this.TableBattle); this.BasePanelShipGirl.Controls.Add(this.AlbumNo); this.BasePanelShipGirl.Controls.Add(this.imageLabel2); @@ -299,7 +304,7 @@ private void InitializeComponent() { this.BasePanelShipGirl.Dock = System.Windows.Forms.DockStyle.Fill; this.BasePanelShipGirl.Location = new System.Drawing.Point(0, 0); this.BasePanelShipGirl.Name = "BasePanelShipGirl"; - this.BasePanelShipGirl.Size = new System.Drawing.Size(546, 454); + this.BasePanelShipGirl.Size = new System.Drawing.Size(546, 442); this.BasePanelShipGirl.TabIndex = 0; // // TableBattle @@ -584,6 +589,17 @@ private void InitializeComponent() { this.SaveCSVDialog.Filter = "CSV|*.csv|File|*"; this.SaveCSVDialog.Title = "CSVに出力"; // + // ResourceName + // + this.ResourceName.BackColor = System.Drawing.Color.Transparent; + this.ResourceName.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.ResourceName.Location = new System.Drawing.Point(258, 6); + this.ResourceName.Name = "ResourceName"; + this.ResourceName.Size = new System.Drawing.Size(113, 16); + this.ResourceName.TabIndex = 24; + this.ResourceName.Text = "abcdefghijkl ver. 99"; + this.ResourceName.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ResourceName_MouseClick); + // // TitleDayAttack // this.TitleDayAttack.Anchor = System.Windows.Forms.AnchorStyles.Right; @@ -682,7 +698,7 @@ private void InitializeComponent() { this.Description.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.Description.Location = new System.Drawing.Point(9, 380); this.Description.Name = "Description"; - this.Description.Size = new System.Drawing.Size(525, 62); + this.Description.Size = new System.Drawing.Size(525, 50); this.Description.TabIndex = 21; this.Description.Text = "私が重雷装巡洋艦…？冗談じゃないわ！\r\nえ、デバッグ用ですって？…仕方ないわね、早く終わらせるのよ！"; this.Description.TextAlign = System.Drawing.ContentAlignment.TopLeft; @@ -1760,6 +1776,16 @@ private void InitializeComponent() { this.EvasionMin.Text = "123"; this.EvasionMin.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // imageLabel1 + // + this.imageLabel1.BackColor = System.Drawing.Color.Transparent; + this.imageLabel1.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.imageLabel1.Location = new System.Drawing.Point(211, 6); + this.imageLabel1.Name = "imageLabel1"; + this.imageLabel1.Size = new System.Drawing.Size(41, 16); + this.imageLabel1.TabIndex = 25; + this.imageLabel1.Text = "リソース:"; + // // DialogAlbumMasterShip // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1931,5 +1957,7 @@ private void InitializeComponent() { private Control.ImageLabel DayAttack; private Control.ImageLabel AirSuperiority; private Control.ImageLabel TitleAirSuperiority; + private Control.ImageLabel ResourceName; + private Control.ImageLabel imageLabel1; } } \ No newline at end of file diff --git a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs index 286391eb6..6221f640d 100644 --- a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs +++ b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs @@ -153,14 +153,14 @@ public DialogAlbumMasterShip( int shipID ) : this() { UpdateAlbumPage( shipID ); - - + + if ( KCDatabase.Instance.MasterShips.ContainsKey( shipID ) ) { var row = ShipView.Rows.OfType().First( r => (int)r.Cells[ShipView_ShipID.Index].Value == shipID ); if ( row != null ) ShipView.FirstDisplayedScrollingRowIndex = row.Index; } - + } @@ -208,7 +208,7 @@ private void ShipView_CellMouseClick( object sender, DataGridViewCellMouseEventA if ( ( e.Button & System.Windows.Forms.MouseButtons.Right ) != 0 ) { Cursor = Cursors.AppStarting; - new DialogAlbumMasterShip( shipID ).Show(); + new DialogAlbumMasterShip( shipID ).Show( Owner ); Cursor = Cursors.Default; } else if ( ( e.Button & System.Windows.Forms.MouseButtons.Left ) != 0 ) { @@ -235,8 +235,8 @@ private void UpdateAlbumPage( int shipID ) { TableShipName.SuspendLayout(); _shipID = shipID; ShipID.Text = ship.ShipID.ToString(); - ToolTipInfo.SetToolTip( ShipID, ship.ResourceName ); AlbumNo.Text = ship.AlbumNo.ToString(); + ResourceName.Text = string.Format( "{0} ver. {1}", ship.ResourceName, ship.ResourceVersion ); ShipType.Text = ship.IsLandBase ? "陸上基地" : db.ShipTypes[ship.ShipType].Name; ShipName.Text = ship.NameWithClass; @@ -355,7 +355,7 @@ private void UpdateAlbumPage( int shipID ) { TableParameterSub.ResumeLayout(); TableConsumption.SuspendLayout(); - + Fuel.Text = ship.Fuel.ToString(); Ammo.Text = ship.Ammo.ToString(); @@ -365,7 +365,7 @@ private void UpdateAlbumPage( int shipID ) { ( ship.Fuel * 0.032 ), (int)( ship.Fuel * 0.06 * ( ship.HPMaxMarried - 1 ) ), (int)( ship.Fuel * 0.032 * ( ship.HPMaxMarried - 1 ) ) - ) ; + ); ToolTipInfo.SetToolTip( TableConsumption, tooltiptext ); ToolTipInfo.SetToolTip( TitleConsumption, tooltiptext ); @@ -409,7 +409,7 @@ private void UpdateAlbumPage( int shipID ) { eqicon = (int)ResourceManager.EquipmentContent.Unknown; Equipments[i].ImageIndex = eqicon; - + { StringBuilder sb = new StringBuilder(); @@ -533,11 +533,11 @@ private void UpdateLevelParameter( int shipID ) { ASWLevel.Text = EstimateParameter( (int)ParameterLevel.Value, ship.ASW ); EvasionLevel.Text = EstimateParameter( (int)ParameterLevel.Value, ship.Evasion ); LOSLevel.Text = EstimateParameter( (int)ParameterLevel.Value, ship.LOS ); - ASWLevel.Visible = + ASWLevel.Visible = ASWSeparater.Visible = EvasionLevel.Visible = - EvasionSeparater.Visible = - LOSLevel.Visible = + EvasionSeparater.Visible = + LOSLevel.Visible = LOSSeparater.Visible = true; } else { @@ -640,7 +640,7 @@ private void RemodelBeforeShipName_MouseClick( object sender, MouseEventArgs e ) if ( ship != null && ship.RemodelBeforeShipID != 0 ) { if ( ( e.Button & System.Windows.Forms.MouseButtons.Right ) != 0 ) - new DialogAlbumMasterShip( ship.RemodelBeforeShipID ).Show(); + new DialogAlbumMasterShip( ship.RemodelBeforeShipID ).Show( Owner ); else if ( ( e.Button & System.Windows.Forms.MouseButtons.Left ) != 0 ) UpdateAlbumPage( ship.RemodelBeforeShipID ); @@ -655,7 +655,7 @@ private void RemodelAfterShipName_MouseClick( object sender, MouseEventArgs e ) if ( ship != null && ship.RemodelAfterShipID != 0 ) { if ( ( e.Button & System.Windows.Forms.MouseButtons.Right ) != 0 ) - new DialogAlbumMasterShip( ship.RemodelAfterShipID ).Show(); + new DialogAlbumMasterShip( ship.RemodelAfterShipID ).Show( Owner ); else if ( ( e.Button & System.Windows.Forms.MouseButtons.Left ) != 0 ) UpdateAlbumPage( ship.RemodelAfterShipID ); @@ -676,7 +676,7 @@ private void Equipment_MouseClick( object sender, MouseEventArgs e ) { if ( ship != null && ship.DefaultSlot != null && i < ship.DefaultSlot.Count && ship.DefaultSlot[i] != -1 ) { Cursor = Cursors.AppStarting; - new DialogAlbumMasterEquipment( ship.DefaultSlot[i] ).Show(); + new DialogAlbumMasterEquipment( ship.DefaultSlot[i] ).Show( Owner ); Cursor = Cursors.Default; } } @@ -907,5 +907,18 @@ private void Description_Click( object sender, EventArgs e ) { } } + + private void ResourceName_MouseClick( object sender, MouseEventArgs e ) { + + if ( e.Button == System.Windows.Forms.MouseButtons.Right ) { + + var ship = KCDatabase.Instance.MasterShips[_shipID]; + if ( ship != null ) { + Clipboard.SetData( DataFormats.StringFormat, ship.ResourceName ); + } + } + + } + } } diff --git a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.resx b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.resx index 3a2f5af8c..ef5e401b3 100644 --- a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.resx +++ b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.resx @@ -132,9 +132,6 @@ 139, 17 - - 139, 17 - 259, 17 diff --git a/ElectronicObserver/Window/FormBattle.cs b/ElectronicObserver/Window/FormBattle.cs index d8a5daad2..2cfe03080 100644 --- a/ElectronicObserver/Window/FormBattle.cs +++ b/ElectronicObserver/Window/FormBattle.cs @@ -1005,7 +1005,7 @@ private void SetNightBattleEvent( PhaseNightBattle pd ) { { int index = pd.SearchlightIndexEnemy; if ( index != -1 ) { - AirStage1Enemy.Text = "#" + ( index ); + AirStage1Enemy.Text = "#" + ( index + 1 ); AirStage1Enemy.ImageAlign = ContentAlignment.MiddleLeft; AirStage1Enemy.ImageIndex = (int)ResourceManager.EquipmentContent.Searchlight; ToolTipInfo.SetToolTip( AirStage1Enemy, "探照灯照射: " + pd.SearchlightEnemyInstance.NameWithClass ); diff --git a/ElectronicObserver/Window/FormHeadquarters.cs b/ElectronicObserver/Window/FormHeadquarters.cs index 690544edc..4a5b5327e 100644 --- a/ElectronicObserver/Window/FormHeadquarters.cs +++ b/ElectronicObserver/Window/FormHeadquarters.cs @@ -19,10 +19,13 @@ namespace ElectronicObserver.Window { public partial class FormHeadquarters : DockContent { + private Form _parentForm; + public FormHeadquarters( FormMain parent ) { InitializeComponent(); - + _parentForm = parent; + ImageList icons = ResourceManager.Instance.Icons; @@ -275,7 +278,8 @@ void SystemEvents_UpdateTimerTick() { private void Resource_MouseClick( object sender, MouseEventArgs e ) { - new Dialog.DialogResourceChart().Show( this ); + if ( e.Button == System.Windows.Forms.MouseButtons.Right ) + new Dialog.DialogResourceChart().Show( _parentForm ); } From e4a70322c2275d5684a06761ea0bc91c6a07d545 Mon Sep 17 00:00:00 2001 From: Andante Date: Fri, 17 Jul 2015 23:04:42 +0900 Subject: [PATCH 4/4] Version 1.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 07/17アップデートのエラー消し とてもつらい --- .../Data/Battle/BattleManager.cs | 22 ++++--- ElectronicObserver/Data/ShipDataMaster.cs | 64 +++++++++---------- .../Observer/kcsapi/api_start2.cs | 2 + .../Utility/SoftwareInformation.cs | 2 +- README.md | 2 +- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/ElectronicObserver/Data/Battle/BattleManager.cs b/ElectronicObserver/Data/Battle/BattleManager.cs index aee15e66b..8a8e135ac 100644 --- a/ElectronicObserver/Data/Battle/BattleManager.cs +++ b/ElectronicObserver/Data/Battle/BattleManager.cs @@ -175,16 +175,18 @@ public override void LoadFromResponse( string apiname, dynamic data ) { private void BattleFinished() { //敵編成記録 - switch ( BattleMode & BattleModes.BattlePhaseMask ) { - case BattleModes.Normal: - case BattleModes.AirBattle: - RecordManager.Instance.EnemyFleet.Update( new EnemyFleetRecord.EnemyFleetElement( Compass.EnemyFleetID, Result.EnemyFleetName, BattleDay.Searching.FormationEnemy, BattleDay.Initial.EnemyMembers ) ); - break; - - case BattleModes.NightOnly: - case BattleModes.NightDay: - RecordManager.Instance.EnemyFleet.Update( new EnemyFleetRecord.EnemyFleetElement( Compass.EnemyFleetID, Result.EnemyFleetName, BattleNight.Searching.FormationEnemy, BattleNight.Initial.EnemyMembers ) ); - break; + if ( Compass.EnemyFleetID != -1 ) { + switch ( BattleMode & BattleModes.BattlePhaseMask ) { + case BattleModes.Normal: + case BattleModes.AirBattle: + RecordManager.Instance.EnemyFleet.Update( new EnemyFleetRecord.EnemyFleetElement( Compass.EnemyFleetID, Result.EnemyFleetName, BattleDay.Searching.FormationEnemy, BattleDay.Initial.EnemyMembers ) ); + break; + + case BattleModes.NightOnly: + case BattleModes.NightDay: + RecordManager.Instance.EnemyFleet.Update( new EnemyFleetRecord.EnemyFleetElement( Compass.EnemyFleetID, Result.EnemyFleetName, BattleNight.Searching.FormationEnemy, BattleNight.Initial.EnemyMembers ) ); + break; + } } diff --git a/ElectronicObserver/Data/ShipDataMaster.cs b/ElectronicObserver/Data/ShipDataMaster.cs index a061c2534..e61be2fb7 100644 --- a/ElectronicObserver/Data/ShipDataMaster.cs +++ b/ElectronicObserver/Data/ShipDataMaster.cs @@ -27,7 +27,7 @@ public int ShipID { /// 図鑑番号 /// public int AlbumNo { - get { return (int)RawData.api_sortno; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_sortno; } } /// @@ -56,7 +56,7 @@ public int ShipType { /// 改装Lv. /// public int RemodelAfterLevel { - get { return (int)RawData.api_afterlv; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_afterlv; } } /// @@ -64,7 +64,7 @@ public int RemodelAfterLevel { /// 0=なし /// public int RemodelAfterShipID { - get { return int.Parse( (string)RawData.api_aftershipid ); } + get { return IsAbyssalShip ? 0 : int.Parse( (string)RawData.api_aftershipid ); } } /// @@ -88,19 +88,19 @@ public ShipDataMaster RemodelBeforeShip { get { return RemodelBeforeShipID > 0 ? KCDatabase.Instance.MasterShips[RemodelBeforeShipID] : null; } } - + /// /// 改装に必要な弾薬 /// public int RemodelAmmo { - get { return (int)RawData.api_afterfuel; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_afterfuel; } } /// /// 改装に必要な鋼材 /// public int RemodelSteel { - get { return (int)RawData.api_afterbull; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_afterbull; } } /// @@ -110,75 +110,75 @@ public int RemodelSteel { #region Parameters - + /// /// 耐久初期値 /// public int HPMin { - get { return (int)RawData.api_taik[0]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_taik[0]; } } /// /// 耐久最大値 /// public int HPMax { - get { return (int)RawData.api_taik[1]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_taik[1]; } } /// /// 装甲初期値 /// public int ArmorMin { - get { return (int)RawData.api_souk[0]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_souk[0]; } } /// /// 装甲最大値 /// public int ArmorMax { - get { return (int)RawData.api_souk[1]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_souk[1]; } } /// /// 火力初期値 /// public int FirepowerMin { - get { return (int)RawData.api_houg[0]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_houg[0]; } } /// /// 火力最大値 /// public int FirepowerMax { - get { return (int)RawData.api_houg[1]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_houg[1]; } } /// /// 雷装初期値 /// public int TorpedoMin { - get { return (int)RawData.api_raig[0]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_raig[0]; } } /// /// 雷装最大値 /// public int TorpedoMax { - get { return (int)RawData.api_raig[1]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_raig[1]; } } /// /// 対空初期値 /// public int AAMin { - get { return (int)RawData.api_tyku[0]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_tyku[0]; } } /// /// 対空最大値 /// public int AAMax { - get { return (int)RawData.api_tyku[1]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_tyku[1]; } } @@ -226,14 +226,14 @@ public ShipParameterRecord.Parameter LOS { /// 運初期値 /// public int LuckMin { - get { return (int)RawData.api_luck[0]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_luck[0]; } } /// /// 運最大値 /// public int LuckMax { - get { return (int)RawData.api_luck[1]; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_luck[1]; } } /// @@ -248,7 +248,7 @@ public int Speed { /// 射程 /// public int Range { - get { return (int)RawData.api_leng; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_leng; } } #endregion @@ -264,7 +264,7 @@ public int SlotSize { /// 各スロットの航空機搭載数 /// public ReadOnlyCollection Aircraft { - get { return Array.AsReadOnly( (int[])RawData.api_maxeq ); } + get { return Array.AsReadOnly( IsAbyssalShip ? new[] { 0, 0, 0, 0, 0 } : (int[])RawData.api_maxeq ); } } /// @@ -285,7 +285,7 @@ public ReadOnlyCollection DefaultSlot { /// 建造時間(分) /// public int BuildingTime { - get { return (int)RawData.api_buildtime; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_buildtime; } } @@ -293,28 +293,28 @@ public int BuildingTime { /// 解体資材 /// public ReadOnlyCollection Material { - get { return Array.AsReadOnly( (int[])RawData.api_broken ); } + get { return Array.AsReadOnly( IsAbyssalShip ? new[] { 0, 0, 0, 0 } : (int[])RawData.api_broken ); } } /// /// 近代化改修の素材にしたとき上昇するパラメータの量 /// public ReadOnlyCollection PowerUp { - get { return Array.AsReadOnly( (int[])RawData.api_powup ); } + get { return Array.AsReadOnly( IsAbyssalShip ? new[] { 0, 0, 0, 0 } : (int[])RawData.api_powup ); } } /// /// レアリティ /// public int Rarity { - get { return (int)RawData.api_backs; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_backs; } } /// /// ドロップ/ログイン時のメッセージ /// public string MessageGet { - get { return ( (string)RawData.api_getmes ).Replace( "
", "\n" ); } + get { return IsAbyssalShip ? "" : ( (string)RawData.api_getmes ).Replace( "
", "\n" ); } } /// @@ -334,14 +334,14 @@ public string MessageAlbum { /// 搭載燃料 /// public int Fuel { - get { return (int)RawData.api_fuel_max; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_fuel_max; } } - + /// /// 搭載弾薬 /// public int Ammo { - get { return (int)RawData.api_bull_max; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_bull_max; } } @@ -349,7 +349,7 @@ public int Ammo { /// ボイス再生フラグ /// public int VoiceFlag { - get { return (int)RawData.api_voicef; } + get { return IsAbyssalShip ? 0 : (int)RawData.api_voicef; } } @@ -440,7 +440,7 @@ public bool IsLandBase { /// 図鑑に載っているか /// public bool IsListedInAlbum { - get { return 0 < AlbumNo && AlbumNo <= 300; } + get { return 0 < AlbumNo && AlbumNo <= 350; } } @@ -466,7 +466,7 @@ public int ID { public override string ToString() { return string.Format( "[{0}] {1}", ShipID, NameWithClass ); } - + } } diff --git a/ElectronicObserver/Observer/kcsapi/api_start2.cs b/ElectronicObserver/Observer/kcsapi/api_start2.cs index 2dc659662..79c6bfce4 100644 --- a/ElectronicObserver/Observer/kcsapi/api_start2.cs +++ b/ElectronicObserver/Observer/kcsapi/api_start2.cs @@ -94,6 +94,7 @@ public override void OnResponseReceived( dynamic data ) { } //api_mst_slotitemgraph + /* foreach ( var elem in data.api_mst_slotitemgraph ) { int id = (int)elem.api_id; @@ -102,6 +103,7 @@ public override void OnResponseReceived( dynamic data ) { eq.ResourceVersion = elem.api_version; } } + */ //api_mst_useitem foreach ( var elem in data.api_mst_useitem ) { diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs index 344b48ab4..f944b910e 100644 --- a/ElectronicObserver/Utility/SoftwareInformation.cs +++ b/ElectronicObserver/Utility/SoftwareInformation.cs @@ -54,7 +54,7 @@ public static string VersionEnglish { /// public static DateTime UpdateTime { get { - return DateTimeHelper.CSVStringToTime( "2015/06/27 12:00:00" ); + return DateTimeHelper.CSVStringToTime( "2015/07/17 23:00:00" ); } } diff --git a/README.md b/README.md index 002287a1c..57a7a0f4f 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ *このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。* -[ver. 1.4.0 (2015/06/17)](http://bit.ly/1GOwsMb) +[ver. 1.4.1 (2015/07/17)](http://bit.ly/1CLlFT5) 更新内容・履歴は[こちら](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)で確認できます。