Skip to content

Commit

Permalink
Pre-Release v2.5.2-a1
Browse files Browse the repository at this point in the history 
日志：修正远征获取家具箱时显示间距过大
主题：根据用户反馈调整浅色主题血条配色

对应原版：2.5.2 beta-2
部分喷式飞机相关功能
固定舰名宽度时可自定义宽度
修复夜间触接报错、补强格机枪参与计算 ( 2016/12/22 维护 )
  • Loading branch information
@RadarNyan
RadarNyan committed Dec 23, 2016
2 parents e1f8977 + 1e68d42 commit 2567d6e
Show file tree
Hide file tree
Showing 46 changed files with 937 additions and 450 deletions.
Binary file modified ElectronicObserver/Assets.zip
View file
Binary file not shown.
Binary file added ElectronicObserver/Assets/Equipment/JetFightingBomberKeiun.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ElectronicObserver/Assets/Equipment/JetFightingBomberKikka.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ElectronicObserver/Assets/Equipment/LandAttacker.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions ElectronicObserver/Data/Battle/BattleAirBattle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public class BattleAirBattle : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "第一次航空战" );
Support = new PhaseSupport( this, "支援攻击" );
AirBattle2 = new PhaseAirBattle( this, "第二次航空战", "2" );

BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
AirBattle2.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -45,6 +45,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
9 changes: 7 additions & 2 deletions ElectronicObserver/Data/Battle/BattleAirRaid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ public class BattleAirRaid : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式空袭战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "空袭战" );
// 支援は出ないものとする

BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

public override string APIName {
Expand All @@ -39,6 +42,8 @@ public override BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
}
Expand Down
18 changes: 11 additions & 7 deletions ElectronicObserver/Data/Battle/BattleBaseAirRaid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@
using System.Threading.Tasks;

namespace ElectronicObserver.Data.Battle {

/// <summary>
/// 基地空襲戦
/// 基地防空戦
/// </summary>
public class BattleBaseAirRaid : BattleDay {

public PhaseBaseAirRaid BaseAirRaid { get; protected set; }

public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

AirBattle = new PhaseBaseAirRaid( this, "空袭战" );
BaseAirRaid = new PhaseBaseAirRaid( this, "防空战" );

foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

AirBattle.EmulateBattle( _resultHPs, _attackDamages );
}


Expand All @@ -26,17 +30,17 @@ public override string APIName {
}

public override string BattleName {
get { return "基地空袭战"; }
get { return "基地防空战"; }
}

public override BattleData.BattleTypeFlag BattleType {
get { return BattleTypeFlag.Day | BattleTypeFlag.BaseAirRaid; }
}

public override IEnumerable<Phase.PhaseBase> GetPhases() {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return AirBattle;
yield return BaseAirRaid;
}
}
}
10 changes: 6 additions & 4 deletions ElectronicObserver/Data/Battle/BattleCombinedAirBattle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public class BattleCombinedAirBattle : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "第一次航空战" );
Support = new PhaseSupport( this, "支援攻击" );
AirBattle2 = new PhaseAirBattle( this, "第二次航空战", "2" );

BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
AirBattle2.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -47,6 +47,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
8 changes: 6 additions & 2 deletions ElectronicObserver/Data/Battle/BattleCombinedAirRaid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ public class BattleCombinedAirRaid : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式空袭战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "空袭战" );
// 支援はないものとする

BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -41,6 +43,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
}
Expand Down
15 changes: 6 additions & 9 deletions ElectronicObserver/Data/Battle/BattleCombinedEachDay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class BattleCombinedEachDay : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "航空战" );
Support = new PhaseSupport( this, "支援攻击" );
Expand All @@ -26,15 +28,8 @@ public override void LoadFromResponse( string apiname, dynamic data ) {
Shelling3 = new PhaseShelling( this, "第三次炮击战", 4, "3", false, false );


BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
OpeningASW.EmulateBattle( _resultHPs, _attackDamages );
OpeningTorpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling1.EmulateBattle( _resultHPs, _attackDamages );
Shelling2.EmulateBattle( _resultHPs, _attackDamages );
Torpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling3.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -55,6 +50,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
16 changes: 6 additions & 10 deletions ElectronicObserver/Data/Battle/BattleCombinedEachWater.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class BattleCombinedEachWater : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "航空战" );
Support = new PhaseSupport( this, "支援攻击" );
Expand All @@ -25,16 +27,8 @@ public override void LoadFromResponse( string apiname, dynamic data ) {
Shelling3 = new PhaseShelling( this, "第三次炮击战", 3, "3", true, true );
Torpedo = new PhaseTorpedo( this, "雷击战", 4 );


BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
OpeningASW.EmulateBattle( _resultHPs, _attackDamages );
OpeningTorpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling1.EmulateBattle( _resultHPs, _attackDamages );
Shelling2.EmulateBattle( _resultHPs, _attackDamages );
Shelling3.EmulateBattle( _resultHPs, _attackDamages );
Torpedo.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -55,6 +49,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
16 changes: 6 additions & 10 deletions ElectronicObserver/Data/Battle/BattleCombinedNormalDay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class BattleCombinedNormalDay : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "航空战" );
Support = new PhaseSupport( this, "支援攻击" );
Expand All @@ -26,16 +28,8 @@ public override void LoadFromResponse( string apiname, dynamic data ) {
Shelling2 = new PhaseShelling( this, "第二次炮击战", 3, "2", false );
Shelling3 = new PhaseShelling( this, "第三次炮击战", 4, "3", false );


BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
OpeningASW.EmulateBattle( _resultHPs, _attackDamages );
OpeningTorpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling1.EmulateBattle( _resultHPs, _attackDamages );
Torpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling2.EmulateBattle( _resultHPs, _attackDamages );
Shelling3.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -56,6 +50,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
16 changes: 6 additions & 10 deletions ElectronicObserver/Data/Battle/BattleCombinedWater.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class BattleCombinedWater : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "航空战" );
Support = new PhaseSupport( this, "支援攻击" );
Expand All @@ -25,16 +27,8 @@ public override void LoadFromResponse( string apiname, dynamic data ) {
Shelling3 = new PhaseShelling( this, "第三次炮击战", 3, "3", true );
Torpedo = new PhaseTorpedo( this, "雷击战", 4 );


BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
OpeningASW.EmulateBattle( _resultHPs, _attackDamages );
OpeningTorpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling1.EmulateBattle( _resultHPs, _attackDamages );
Shelling2.EmulateBattle( _resultHPs, _attackDamages );
Shelling3.EmulateBattle( _resultHPs, _attackDamages );
Torpedo.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -55,6 +49,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
2 changes: 2 additions & 0 deletions ElectronicObserver/Data/Battle/BattleDay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace ElectronicObserver.Data.Battle {
/// </summary>
public abstract class BattleDay : BattleData {

public PhaseJetBaseAirAttack JetBaseAirAttack { get; protected set; }
public PhaseJetAirBattle JetAirBattle { get; protected set; }
public PhaseBaseAirAttack BaseAirAttack { get; protected set; }
public PhaseAirBattle AirBattle { get; protected set; }
public PhaseSupport Support { get; protected set; }
Expand Down
16 changes: 6 additions & 10 deletions ElectronicObserver/Data/Battle/BattleEnemyCombinedDay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class BattleEnemyCombinedDay : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "航空战" );
Support = new PhaseSupport( this, "支援攻击" );
Expand All @@ -25,17 +27,9 @@ public override void LoadFromResponse( string apiname, dynamic data ) {
Shelling2 = new PhaseShelling( this, "第二次炮击战", 3, "2", false, false );
Shelling3 = new PhaseShelling( this, "第三次炮击战", 4, "3", false, false );

foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
OpeningASW.EmulateBattle( _resultHPs, _attackDamages );
OpeningTorpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling1.EmulateBattle( _resultHPs, _attackDamages );
Torpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling2.EmulateBattle( _resultHPs, _attackDamages );
Shelling3.EmulateBattle( _resultHPs, _attackDamages );

}


Expand All @@ -55,6 +49,8 @@ public override BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
16 changes: 6 additions & 10 deletions ElectronicObserver/Data/Battle/BattleNormalDay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class BattleNormalDay : BattleDay {
public override void LoadFromResponse( string apiname, dynamic data ) {
base.LoadFromResponse( apiname, (object)data );

JetBaseAirAttack = new PhaseJetBaseAirAttack( this, "喷式基地航空队攻击" );
JetAirBattle = new PhaseJetAirBattle( this, "喷式航空战" );
BaseAirAttack = new PhaseBaseAirAttack( this, "基地航空队攻击" );
AirBattle = new PhaseAirBattle( this, "航空战" );
Support = new PhaseSupport( this, "支援攻击" );
Expand All @@ -26,16 +28,8 @@ public override void LoadFromResponse( string apiname, dynamic data ) {
Shelling3 = new PhaseShelling( this, "第三次炮击战", 3, "3", false );
Torpedo = new PhaseTorpedo( this, "雷击战", 4 );


BaseAirAttack.EmulateBattle( _resultHPs, _attackDamages );
AirBattle.EmulateBattle( _resultHPs, _attackDamages );
Support.EmulateBattle( _resultHPs, _attackDamages );
OpeningASW.EmulateBattle( _resultHPs, _attackDamages );
OpeningTorpedo.EmulateBattle( _resultHPs, _attackDamages );
Shelling1.EmulateBattle( _resultHPs, _attackDamages );
Shelling2.EmulateBattle( _resultHPs, _attackDamages );
Shelling3.EmulateBattle( _resultHPs, _attackDamages );
Torpedo.EmulateBattle( _resultHPs, _attackDamages );
foreach ( var phase in GetPhases() )
phase.EmulateBattle( _resultHPs, _attackDamages );

}

Expand All @@ -56,6 +50,8 @@ public override BattleData.BattleTypeFlag BattleType {
public override IEnumerable<PhaseBase> GetPhases() {
yield return Initial;
yield return Searching;
yield return JetBaseAirAttack;
yield return JetAirBattle;
yield return BaseAirAttack;
yield return AirBattle;
yield return Support;
Expand Down
Loading

0 comments on commit 2567d6e

Please sign in to comment.