Skip to content

Battle processing rework #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
myangelkamikaze wants to merge 43 commits into
base: main
Choose a base branch
from
Draft

Battle processing rework #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e704bf3
WIP
myangelkamikaze Jul 4, 2024
9f0163b
WIP
myangelkamikaze Jul 11, 2024
5386cf6
add battle detail descriptor
myangelkamikaze Jul 12, 2024
7a439a8
merge
myangelkamikaze Jul 26, 2024
bb31978
merge
myangelkamikaze Jul 27, 2024
7abdb5a
fix battle detail
myangelkamikaze Jul 28, 2024
aa71f86
implement missing battle handling
myangelkamikaze Jul 30, 2024
86cf0b0
adjustments
myangelkamikaze Jul 31, 2024
63bdee9
remove battle modes
myangelkamikaze Jul 31, 2024
d97f815
sonar
myangelkamikaze Jul 31, 2024
f99eade
sonar
myangelkamikaze Jul 31, 2024
9e25e1f
add heavy base air raid response
myangelkamikaze Aug 1, 2024
feba95b
fix id dictionary null annotations
myangelkamikaze Aug 1, 2024
62bc195
fix nullability
myangelkamikaze Aug 1, 2024
8267fa2
battle manager fixes
myangelkamikaze Aug 1, 2024
a24bac7
update battle deserialization
myangelkamikaze Aug 1, 2024
79b4619
sonar
myangelkamikaze Aug 1, 2024
4d601d3
sonar
myangelkamikaze Aug 1, 2024
822fde2
sonar
myangelkamikaze Aug 1, 2024
ad9467b
sonar
myangelkamikaze Aug 1, 2024
50870f2
sonar
myangelkamikaze Aug 1, 2024
052da95
fix
myangelkamikaze Aug 1, 2024
c121d89
update R# config
myangelkamikaze Aug 1, 2024
e904a96
sonar
myangelkamikaze Aug 1, 2024
04d98fc
sonar
myangelkamikaze Aug 1, 2024
82ff2c4
sonar
myangelkamikaze Aug 1, 2024
f39de66
refactor
myangelkamikaze Aug 1, 2024
dd85cb0
simplify code
myangelkamikaze Aug 1, 2024
3ad39af
sonar
myangelkamikaze Aug 1, 2024
cd1fd9a
sonar
myangelkamikaze Aug 1, 2024
48df479
sonar
myangelkamikaze Aug 1, 2024
382a17d
sonar
myangelkamikaze Aug 1, 2024
3243098
add mvp prediction
myangelkamikaze Aug 1, 2024
d3da166
sonar
myangelkamikaze Aug 1, 2024
f4b071f
sonar
myangelkamikaze Aug 1, 2024
642c473
sonar
myangelkamikaze Aug 1, 2024
8c6d3a4
undo changes
myangelkamikaze Aug 1, 2024
5034f37
undo
myangelkamikaze Aug 1, 2024
532cc61
remove useless code
myangelkamikaze Aug 3, 2024
b1cbc52
Merge branch 'main' into BattleProcessingRework
myangelkamikaze Aug 5, 2024
85da307
merge
myangelkamikaze Sep 26, 2024
4541ad2
fix
myangelkamikaze Sep 26, 2024
34393ed
merge
myangelkamikaze Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
786 changes: 393 additions & 393 deletions Browser/Properties/Resources.zh-CN.resx
View file
Open in desktop

Large diffs are not rendered by default.

286 changes: 143 additions & 143 deletions Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorResources.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,144 +1,144 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Equipment" xml:space="preserve">
<value>装备</value>
</data>
<data name="Fleet" xml:space="preserve">
<value>舰队</value>
</data>
<data name="LockedShips" xml:space="preserve">
<value>锁定的舰娘</value>
</data>
<data name="Title" xml:space="preserve">
<value>制空权模拟器</value>
</data>
<data name="DataRefresh" xml:space="preserve">
<value>数据刷新</value>
</data>
<data name="LockedEquipment" xml:space="preserve">
<value>锁定的装备</value>
</data>
<data name="AllEquipment" xml:space="preserve">
<value>所有装备</value>
</data>
<data name="AllShips" xml:space="preserve">
<value>所有舰娘</value>
</data>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Equipment" xml:space="preserve">
<value>装备</value>
</data>
<data name="Fleet" xml:space="preserve">
<value>舰队</value>
</data>
<data name="LockedShips" xml:space="preserve">
<value>锁定的舰娘</value>
</data>
<data name="Title" xml:space="preserve">
<value>制空权模拟器</value>
</data>
<data name="DataRefresh" xml:space="preserve">
<value>数据刷新</value>
</data>
<data name="LockedEquipment" xml:space="preserve">
<value>锁定的装备</value>
</data>
<data name="AllEquipment" xml:space="preserve">
<value>所有装备</value>
</data>
<data name="AllShips" xml:space="preserve">
<value>所有舰娘</value>
</data>
</root>
Loading
Loading