Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
andanteyk committed Oct 28, 2020
2 parents 037f97d + eaff07f commit e071203
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 43 deletions.
24 changes: 12 additions & 12 deletions Browser/Browser.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props')" />
<Import Project="..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -152,15 +152,15 @@
<PropertyGroup>
<ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.targets'))" />
<Error Condition="!Exists('..\packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('..\packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets'))" />
</Target>
<Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.targets')" />
<Import Project="..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
8 changes: 4 additions & 4 deletions Browser/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="84.4.1" targetFramework="net452" />
<package id="cef.redist.x86" version="84.4.1" targetFramework="net452" />
<package id="CefSharp.Common" version="84.4.10" targetFramework="net452" />
<package id="CefSharp.WinForms" version="84.4.10" targetFramework="net452" />
<package id="cef.redist.x64" version="85.3.13" targetFramework="net452" />
<package id="cef.redist.x86" version="85.3.13" targetFramework="net452" />
<package id="CefSharp.Common" version="85.3.130" targetFramework="net452" />
<package id="CefSharp.WinForms" version="85.3.130" targetFramework="net452" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Nekoxy" version="1.5.3.21" targetFramework="net45" />
</packages>
39 changes: 22 additions & 17 deletions ElectronicObserver/Other/Information/apilist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -468,20 +468,24 @@ api_start2/getData :艦娘・装備固有データその他
api_map_bgm :通常戦闘BGMID [0]=昼戦, [1]=夜戦
api_boss_bgm :ボス戦闘BGMID

api_mst_mission :遠征データ
api_id :遠征ID
api_disp_no :表示上の遠征ID ("A1"のような)
api_maparea_id :海域カテゴリID
api_name :遠征名
api_details :遠征詳細
api_time :時間 分単位
api_deck_num :必要隻数
api_difficulty :難易度
api_use_fuel :燃料消費割合
api_use_bull :弾薬消費割合
api_win_item1 :獲得アイテム1 [0]=アイテムID, [1]=入手個数
api_win_item2 :獲得アイテム2
api_return_flag :遠征中止可否
api_mst_mission :遠征データ
api_id :遠征ID
api_disp_no :表示上の遠征ID ("A1"のような)
api_maparea_id :海域カテゴリID
api_name :遠征名
api_details :遠征詳細
api_reset_type :進捗リセットタイミング 0=通常 1=マンスリー
api_damage_type :交戦種別 0=通常 1=交戦 2=交戦II型
api_time :時間 分単位
api_deck_num :必要隻数
api_difficulty :難易度
api_use_fuel :燃料消費割合
api_use_bull :弾薬消費割合
api_win_item1 :獲得アイテム1 [0]=アイテムID, [1]=入手個数
api_win_item2 :獲得アイテム2
api_win_mat_level :獲得資源量目安 0~4 [燃料,弾薬,鋼材,ボーキサイト]
api_return_flag :遠征中止可否
api_sample_fleet :編成アイコン [6] 0=空欄, それ以外は艦種ID

api_mst_const :
api_parallel_quest_max :
Expand Down Expand Up @@ -825,9 +829,10 @@ api_req_nyukyo/speedchange :バケツ使用


api_get_member/mission :遠征達成状況
api_mission_id :遠征ID
api_state :達成状況 0=未出撃, 1=未達成, 2=達成済み

api_list_items :遠征達成状況
api_mission_id :遠征ID
api_state :達成状況 0=未出撃, 1=未達成, 2=達成済み
api_limit_time :マンスリー遠征更新日時 unixtime

api_get_member/record :戦績表示
api_member_id :提督ID
Expand Down
3 changes: 3 additions & 0 deletions ElectronicObserver/Other/Information/kcmemo.md
Original file line number Diff line number Diff line change
Expand Up @@ -1498,6 +1498,8 @@ Bismarck dreiに対する魚雷装備・試製51cm連装砲といったものの
|337||「十八駆」演習!|演習S勝利3|要(霞/霰/陽炎/不知火)4, デイリー扱い|
|339|季|「十九駆」演習!|演習S勝利3|要磯波/浦波/綾波/敷波, デイリー扱い|進捗は2/5開始(1/3で50%, 2/3で80%)
|342|季|小艦艇群演習強化任務|演習A勝利4|要(駆逐+海防+min(軽巡級, 1))4, デイリー扱い|進捗は1/5開始(3/4で80%)
|345|10|演習ティータイム!|演習A勝利4|要(Warspite/金剛/Ark Royal/Nelson/J級駆逐艦)4, デイリー扱い
|346|10|最精鋭!主力オブ主力、演習開始!|演習S勝利4|要夕雲改二/巻雲改二/風雲改二/秋雲改二, デイリー扱い
|402|日|「遠征」を3回成功させよう!|遠征成功3
|403|日|「遠征」を10回成功させよう!|遠征成功10
|404|週|大規模遠征作戦、発令!|遠征成功30
Expand Down Expand Up @@ -1539,6 +1541,7 @@ Bismarck dreiに対する魚雷装備・試製51cm連装砲といったものの
|686|季|戦時改修A型高角砲の量産|12.7cm連装砲A型改二★10を第一スロ装備の特型駆逐艦旗艦, (10cm連装高角砲x4, 94式高射装置x1)廃棄, (開発資材30, 鋼材900, 新型砲熕兵装資材1)保有
|688|季|航空戦力の強化|(艦上戦闘機x3, 艦上爆撃機x3, 艦上攻撃機x3, 水上偵察機x3)廃棄, (熟練搭乗員x1, ボーキサイトx1800)保有
|657||新型兵装開発整備の強化|(小口径主砲x6, 中口径主砲x5, 魚雷x4)廃棄, 鋼材4000保有|
|654|10|精鋭複葉機飛行隊の編成|(Swordfishx1, Fulmarx2)廃棄, 秘書艦Ark Royalの第一スロットにSwordfish★10装備, (熟練搭乗員x1, 弾薬x1500, ボーキサイトx1500)保有
|702|日|艦の「近代化改修」を実施せよ!|近代化改修成功2
|703|週|「近代化改修」を進め、戦備を整えよ!|近代化改修成功15

Expand Down
30 changes: 23 additions & 7 deletions ElectronicObserver/Utility/Data/Calculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1600,14 +1600,27 @@ public static double GetAdjustedAAValue(ShipData ship)

double levelBonus;
if (eqmaster.IsHighAngleGun)
levelBonus = 3;

{
if (eqmaster.IsHighAngleGunWithAADirector)
levelBonus = 3;
else
levelBonus = 2;
}
else if (eqmaster.CategoryType == EquipmentTypes.AAGun)
levelBonus = 4;

{
if (eqmaster.AA >= 8)
levelBonus = 6;
else
levelBonus = 4;
}
else if (eqmaster.CategoryType == EquipmentTypes.AADirector)
{
levelBonus = 2;
}
else
{
levelBonus = 0;

}

x += eqmaster.AA * equipmentBonus + Math.Sqrt(eq.Level) * levelBonus;
}
Expand Down Expand Up @@ -1670,16 +1683,19 @@ public static double GetAdjustedFleetAAValue(IEnumerable<ShipData> ships, int fo
else if (eqmaster.CategoryType == EquipmentTypes.AAShell)
equipmentBonus = 0.6;

else if (eqmaster.EquipmentID == 9) // 46cm三連装砲
equipmentBonus = 0.25;

else
equipmentBonus = 0.2;


double levelBonus;

if (eqmaster.IsHighAngleGun)
if (eqmaster.IsHighAngleGunWithAADirector)
levelBonus = 3.0;

else if (eqmaster.CategoryType == EquipmentTypes.AADirector)
else if (eqmaster.IsHighAngleGun || eqmaster.CategoryType == EquipmentTypes.AADirector)
levelBonus = 2.0;

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


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



/// <summary>
/// 更新日時
/// </summary>
public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/09/21 02:30:00");
public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/10/28 21:00:00");



Expand Down

0 comments on commit e071203

Please sign in to comment.