mirror of
https://github.com/crskycode/GARbro.git
synced 2024-11-23 13:45:34 +08:00
Merge
This commit is contained in:
commit
cc78b2d42d
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>GameRes.Formats</RootNamespace>
|
<RootNamespace>GameRes.Formats</RootNamespace>
|
||||||
<AssemblyName>ArcFormats</AssemblyName>
|
<AssemblyName>ArcFormats</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||||
@ -49,40 +49,49 @@
|
|||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.1.9, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
|
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
|
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="NAudio">
|
<Reference Include="NAudio">
|
||||||
<HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
|
<HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="NVorbis, Version=0.10.0.3, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="NVorbis, Version=0.10.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\NVorbis.0.10.1\lib\net45\NVorbis.dll</HintPath>
|
<HintPath>..\packages\NVorbis.0.10.4\lib\net45\NVorbis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<Reference Include="PresentationFramework" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll</HintPath>
|
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.ComponentModel.Composition" />
|
<Reference Include="System.ComponentModel.Composition" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.IO.Compression" />
|
<Reference Include="System.IO.Compression" />
|
||||||
|
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll</HintPath>
|
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Numerics" />
|
<Reference Include="System.Numerics" />
|
||||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
|
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
|
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Xaml" />
|
<Reference Include="System.Xaml" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
@ -215,6 +224,8 @@
|
|||||||
<Compile Include="Interheart\ArcFPK2.cs" />
|
<Compile Include="Interheart\ArcFPK2.cs" />
|
||||||
<Compile Include="Interheart\ImageCandy.cs" />
|
<Compile Include="Interheart\ImageCandy.cs" />
|
||||||
<Compile Include="Ivory\ArcSG.cs" />
|
<Compile Include="Ivory\ArcSG.cs" />
|
||||||
|
<Compile Include="Kaguya\ArcPL00.cs" />
|
||||||
|
<Compile Include="Kaguya\ArcPL10.cs" />
|
||||||
<Compile Include="Key\ArcPAK.cs" />
|
<Compile Include="Key\ArcPAK.cs" />
|
||||||
<Compile Include="Key\AudioOGGPAK.cs" />
|
<Compile Include="Key\AudioOGGPAK.cs" />
|
||||||
<Compile Include="Key\ImageCZ.cs" />
|
<Compile Include="Key\ImageCZ.cs" />
|
||||||
@ -787,6 +798,7 @@
|
|||||||
<Compile Include="Unity\AudioClip.cs" />
|
<Compile Include="Unity\AudioClip.cs" />
|
||||||
<Compile Include="Unity\AudioFSB5.cs" />
|
<Compile Include="Unity\AudioFSB5.cs" />
|
||||||
<Compile Include="Unity\BundleStream.cs" />
|
<Compile Include="Unity\BundleStream.cs" />
|
||||||
|
<None Include="packages.config" />
|
||||||
<None Include="Unity\Gx4Lib\ArcDAT.cs" />
|
<None Include="Unity\Gx4Lib\ArcDAT.cs" />
|
||||||
<Compile Include="Unity\OggStream.cs" />
|
<Compile Include="Unity\OggStream.cs" />
|
||||||
<Compile Include="Unity\PMaster\ArcDAT.cs" />
|
<Compile Include="Unity\PMaster\ArcDAT.cs" />
|
||||||
@ -804,7 +816,6 @@
|
|||||||
<Compile Include="VnEngine\ArcAXR.cs" />
|
<Compile Include="VnEngine\ArcAXR.cs" />
|
||||||
<Compile Include="VnEngine\ImageZAW.cs" />
|
<Compile Include="VnEngine\ImageZAW.cs" />
|
||||||
<EmbeddedResource Include="Abogado\keytable.dat" />
|
<EmbeddedResource Include="Abogado\keytable.dat" />
|
||||||
<None Include="packages.config" />
|
|
||||||
<EmbeddedResource Include="Strings\arcStrings.ja-JP.resx" />
|
<EmbeddedResource Include="Strings\arcStrings.ja-JP.resx" />
|
||||||
<EmbeddedResource Include="Unity\strings.dat" />
|
<EmbeddedResource Include="Unity\strings.dat" />
|
||||||
<None Include="WebP\Alpha.cs" />
|
<None Include="WebP\Alpha.cs" />
|
||||||
|
@ -41,19 +41,39 @@ namespace GameRes.Formats.Astronauts
|
|||||||
public override bool IsHierarchic { get { return true; } }
|
public override bool IsHierarchic { get { return true; } }
|
||||||
public override bool CanWrite { get { return false; } }
|
public override bool CanWrite { get { return false; } }
|
||||||
|
|
||||||
|
private bool UseNameAsKey = false;
|
||||||
|
|
||||||
static readonly byte[] KnownKey = {
|
static readonly byte[] KnownKey = {
|
||||||
0x40, 0x21, 0x28, 0x38, 0xA6, 0x6E, 0x43, 0xA5, 0x40, 0x21, 0x28, 0x38, 0xA6, 0x43, 0xA5, 0x64,
|
0x40, 0x21, 0x28, 0x38, 0xA6, 0x6E, 0x43, 0xA5, 0x40, 0x21, 0x28, 0x38, 0xA6, 0x43, 0xA5, 0x64,
|
||||||
0x3E, 0x65, 0x24, 0x20, 0x46, 0x6E, 0x74,
|
0x3E, 0x65, 0x24, 0x20, 0x46, 0x6E, 0x74,
|
||||||
};
|
};
|
||||||
|
|
||||||
public override ArcFile TryOpen (ArcView file)
|
public override ArcFile TryOpen(ArcView file)
|
||||||
|
{
|
||||||
|
UseNameAsKey = false;
|
||||||
|
ArcFile arc = TryOpenGxpFile(file);
|
||||||
|
if(null == arc)
|
||||||
|
{
|
||||||
|
UseNameAsKey = true; //try use arc name as key
|
||||||
|
arc = TryOpenGxpFile(file);
|
||||||
|
}
|
||||||
|
return arc;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArcFile TryOpenGxpFile (ArcView file)
|
||||||
{
|
{
|
||||||
int count = file.View.ReadInt32 (0x18);
|
int count = file.View.ReadInt32 (0x18);
|
||||||
if (!IsSaneCount (count))
|
if (!IsSaneCount (count))
|
||||||
return null;
|
return null;
|
||||||
|
string arcname = Path.GetFileName(file.Name);
|
||||||
|
byte[] arcname_bytes = Encoding.ASCII.GetBytes(arcname);
|
||||||
long base_offset = file.View.ReadInt64 (0x28);
|
long base_offset = file.View.ReadInt64 (0x28);
|
||||||
uint entry_key = KnownKey[0] | (1u^KnownKey[1]) << 8 | (2u^KnownKey[2]) << 16 | (3u^KnownKey[3]) << 24;
|
uint entry_key = KnownKey[0] | (1u ^ KnownKey[1]) << 8 | (2u ^ KnownKey[2]) << 16 | (3u ^ KnownKey[3]) << 24;
|
||||||
|
if (UseNameAsKey)
|
||||||
|
{
|
||||||
|
uint arcname_key = (uint)(arcname_bytes[0] | (arcname_bytes[1 % arcname_bytes.Length]) << 8 | (arcname_bytes[2 % arcname_bytes.Length]) << 16 | (arcname_bytes[3 % arcname_bytes.Length]) << 24);
|
||||||
|
entry_key ^= arcname_key;
|
||||||
|
}
|
||||||
uint index_offset = 0x30;
|
uint index_offset = 0x30;
|
||||||
var entry_buffer = new byte[0x100];
|
var entry_buffer = new byte[0x100];
|
||||||
var dir = new List<Entry> (count);
|
var dir = new List<Entry> (count);
|
||||||
@ -66,7 +86,10 @@ namespace GameRes.Formats.Astronauts
|
|||||||
entry_buffer = new byte[entry_length];
|
entry_buffer = new byte[entry_length];
|
||||||
if (entry_length != file.View.Read (index_offset, entry_buffer, 0, entry_length))
|
if (entry_length != file.View.Read (index_offset, entry_buffer, 0, entry_length))
|
||||||
return null;
|
return null;
|
||||||
Decrypt (entry_buffer, entry_length);
|
if (UseNameAsKey)
|
||||||
|
Decrypt(entry_buffer, entry_length, arcname_bytes);
|
||||||
|
else
|
||||||
|
Decrypt(entry_buffer, entry_length);
|
||||||
int name_length = LittleEndian.ToInt32 (entry_buffer, 0xC) * 2; // length in characters
|
int name_length = LittleEndian.ToInt32 (entry_buffer, 0xC) * 2; // length in characters
|
||||||
if (name_length >= entry_length)
|
if (name_length >= entry_length)
|
||||||
return null;
|
return null;
|
||||||
@ -85,15 +108,25 @@ namespace GameRes.Formats.Astronauts
|
|||||||
public override Stream OpenEntry (ArcFile arc, Entry entry)
|
public override Stream OpenEntry (ArcFile arc, Entry entry)
|
||||||
{
|
{
|
||||||
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
|
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
|
||||||
Decrypt (data, entry.Size);
|
if (UseNameAsKey)
|
||||||
|
{
|
||||||
|
string arcname = Path.GetFileName(arc.File.Name);
|
||||||
|
byte[] arcname_bytes = Encoding.ASCII.GetBytes(arcname);
|
||||||
|
Decrypt(data, entry.Size, arcname_bytes);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
Decrypt(data, entry.Size);
|
||||||
return new BinMemoryStream (data, entry.Name);
|
return new BinMemoryStream (data, entry.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Decrypt (byte[] data, uint length)
|
static void Decrypt (byte[] data, uint length, byte[] key=null)
|
||||||
{
|
{
|
||||||
for (uint i = 0; i < length; ++i)
|
for (uint i = 0; i < length; ++i)
|
||||||
{
|
{
|
||||||
data[i] ^= (byte)(i ^ KnownKey[i % KnownKey.Length]);
|
byte xorkey = (byte)(i ^ KnownKey[i % KnownKey.Length]);
|
||||||
|
if(null != key)
|
||||||
|
xorkey ^= key[i % key.Length];
|
||||||
|
data[i] ^= xorkey;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -648,7 +648,10 @@ namespace GameRes.Formats.Kaguya
|
|||||||
if (anm_encrypted)
|
if (anm_encrypted)
|
||||||
{
|
{
|
||||||
table.Add (new Tuple<string, Decryptor> ("AN00", (a, e) => DecryptAn00 (a, e)));
|
table.Add (new Tuple<string, Decryptor> ("AN00", (a, e) => DecryptAn00 (a, e)));
|
||||||
|
table.Add (new Tuple<string, Decryptor> ("AN20", (a, e) => DecryptAn20 (a, e)));
|
||||||
table.Add (new Tuple<string, Decryptor> ("AN21", (a, e) => DecryptAn21 (a, e)));
|
table.Add (new Tuple<string, Decryptor> ("AN21", (a, e) => DecryptAn21 (a, e)));
|
||||||
|
table.Add (new Tuple<string, Decryptor> ("PL00", (a, e) => DecryptPL00 (a, e)));
|
||||||
|
table.Add (new Tuple<string, Decryptor> ("PL10", (a, e) => DecryptPL10 (a, e)));
|
||||||
}
|
}
|
||||||
m_type_table = table.ToArray();
|
m_type_table = table.ToArray();
|
||||||
}
|
}
|
||||||
@ -688,6 +691,42 @@ namespace GameRes.Formats.Kaguya
|
|||||||
frame_offset += size + 8;
|
frame_offset += size + 8;
|
||||||
}
|
}
|
||||||
return new BinMemoryStream (data, entry.Name);
|
return new BinMemoryStream (data, entry.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream DecryptAn20(LinkArchive arc, LinkEntry entry)
|
||||||
|
{
|
||||||
|
var data = arc.File.View.ReadBytes(entry.Offset, entry.Size);
|
||||||
|
int count = data.ToUInt16(4);
|
||||||
|
int offset = 8;
|
||||||
|
for (int i = 0; i < count; ++i)
|
||||||
|
{
|
||||||
|
switch (data[offset++])
|
||||||
|
{
|
||||||
|
case 0: break;
|
||||||
|
case 1: offset += 8; break;
|
||||||
|
case 2:
|
||||||
|
case 3:
|
||||||
|
case 4:
|
||||||
|
case 5: offset += 4; break;
|
||||||
|
default: return new BinMemoryStream(data, entry.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
count = data.ToUInt16(offset);
|
||||||
|
offset += 2 + count * 8;
|
||||||
|
int frame_count = data.ToInt16(offset);
|
||||||
|
offset += 18;
|
||||||
|
for(int i = 0; i < frame_count; ++i)
|
||||||
|
{
|
||||||
|
offset += 8;
|
||||||
|
int w = data.ToInt32(offset);
|
||||||
|
int h = data.ToInt32(offset + 4);
|
||||||
|
int channels = data.ToInt32(offset + 8);
|
||||||
|
int frame_size = channels * w * h;
|
||||||
|
offset += 12;
|
||||||
|
DecryptData(data, offset, frame_size);
|
||||||
|
offset += frame_size;
|
||||||
|
}
|
||||||
|
return new BinMemoryStream(data, entry.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
Stream DecryptAn21 (LinkArchive arc, LinkEntry entry)
|
Stream DecryptAn21 (LinkArchive arc, LinkEntry entry)
|
||||||
@ -716,6 +755,37 @@ namespace GameRes.Formats.Kaguya
|
|||||||
offset += 12;
|
offset += 12;
|
||||||
DecryptData (data, offset, channels * w * h);
|
DecryptData (data, offset, channels * w * h);
|
||||||
return new BinMemoryStream (data, entry.Name);
|
return new BinMemoryStream (data, entry.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream DecryptPL00(LinkArchive arc, LinkEntry entry)
|
||||||
|
{
|
||||||
|
var data = arc.File.View.ReadBytes(entry.Offset, entry.Size);
|
||||||
|
int count = data.ToUInt16(4);
|
||||||
|
int offset = 22;
|
||||||
|
for(int i = 0; i < count; ++i)
|
||||||
|
{
|
||||||
|
offset += 8;
|
||||||
|
int w = data.ToInt32(offset);
|
||||||
|
int h = data.ToInt32(offset + 4);
|
||||||
|
int channels = data.ToInt32(offset + 8);
|
||||||
|
int size = channels * w * h;
|
||||||
|
offset += 12;
|
||||||
|
DecryptData(data, offset, size);
|
||||||
|
offset += size;
|
||||||
|
}
|
||||||
|
return new BinMemoryStream(data, entry.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream DecryptPL10(LinkArchive arc, LinkEntry entry)
|
||||||
|
{
|
||||||
|
var data = arc.File.View.ReadBytes(entry.Offset, entry.Size);
|
||||||
|
int offset = 30;
|
||||||
|
int w = data.ToInt32(offset);
|
||||||
|
int h = data.ToInt32(offset + 4);
|
||||||
|
int channels = data.ToInt32(offset + 8);
|
||||||
|
offset += 12;
|
||||||
|
DecryptData(data, offset, channels * w * h);
|
||||||
|
return new BinMemoryStream(data, entry.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DecryptData (byte[] data, int index, int length)
|
void DecryptData (byte[] data, int index, int length)
|
||||||
|
126
ArcFormats/Kaguya/ArcPL00.cs
Normal file
126
ArcFormats/Kaguya/ArcPL00.cs
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
//! \file ArcAN21.cs
|
||||||
|
//! \date Sun Apr 30 21:04:25 2017
|
||||||
|
//! \brief KaGuYa script engine animation resource.
|
||||||
|
//
|
||||||
|
// Copyright (C) 2017 by morkt
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to
|
||||||
|
// deal in the Software without restriction, including without limitation the
|
||||||
|
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
// sell copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
// IN THE SOFTWARE.
|
||||||
|
//
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel.Composition;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace GameRes.Formats.Kaguya
|
||||||
|
{
|
||||||
|
class PL00Entry : PackedEntry
|
||||||
|
{
|
||||||
|
public int FrameIndex;
|
||||||
|
public ImageMetaData ImageInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Export(typeof(ArchiveFormat))]
|
||||||
|
public class PL00Opener : ArchiveFormat
|
||||||
|
{
|
||||||
|
public override string Tag { get { return "PL00/KAGUYA"; } }
|
||||||
|
public override string Description { get { return "KaGuYa script engine animation resource"; } }
|
||||||
|
public override uint Signature { get { return 0x30304C50; } } // 'PL00'
|
||||||
|
public override bool IsHierarchic { get { return false; } }
|
||||||
|
public override bool CanWrite { get { return false; } }
|
||||||
|
|
||||||
|
public PL00Opener()
|
||||||
|
{
|
||||||
|
Extensions = new string[] { "plt" };
|
||||||
|
}
|
||||||
|
|
||||||
|
public override ArcFile TryOpen(ArcView file)
|
||||||
|
{
|
||||||
|
uint current_offset = 4;
|
||||||
|
int frame_count = file.View.ReadUInt16(current_offset);
|
||||||
|
if (!IsSaneCount(frame_count))
|
||||||
|
return null;
|
||||||
|
current_offset += 2;
|
||||||
|
string base_name = Path.GetFileNameWithoutExtension(file.Name);
|
||||||
|
var dir = new List<Entry>(frame_count);
|
||||||
|
var info = new ImageMetaData
|
||||||
|
{
|
||||||
|
OffsetX = file.View.ReadInt32(current_offset),
|
||||||
|
OffsetY = file.View.ReadInt32(current_offset + 4),
|
||||||
|
Width = file.View.ReadUInt32(current_offset + 8),
|
||||||
|
Height = file.View.ReadUInt32(current_offset + 12),
|
||||||
|
};
|
||||||
|
int channels = file.View.ReadInt32(38);
|
||||||
|
info.BPP = channels * 8;
|
||||||
|
current_offset += 16;
|
||||||
|
for (int i = 0; i < frame_count; ++i)
|
||||||
|
{
|
||||||
|
int offsetx = file.View.ReadInt32(current_offset);
|
||||||
|
int offsety = file.View.ReadInt32(current_offset + 4);
|
||||||
|
uint width = file.View.ReadUInt32(current_offset + 8);
|
||||||
|
uint height = file.View.ReadUInt32(current_offset + 12);
|
||||||
|
channels = file.View.ReadInt32(current_offset + 16);
|
||||||
|
uint size = (uint)(width * height * channels);
|
||||||
|
current_offset += 20;
|
||||||
|
var entry = new PL00Entry
|
||||||
|
{
|
||||||
|
FrameIndex = i,
|
||||||
|
Name = string.Format("{0}#{1:D2}", base_name, i),
|
||||||
|
Type = "image",
|
||||||
|
Offset = current_offset,
|
||||||
|
Size = size,
|
||||||
|
IsPacked = false,
|
||||||
|
ImageInfo = new ImageMetaData
|
||||||
|
{
|
||||||
|
OffsetX = offsetx,
|
||||||
|
OffsetY = offsety,
|
||||||
|
Width = width,
|
||||||
|
Height = height,
|
||||||
|
BPP = channels * 8,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
dir.Add(entry);
|
||||||
|
current_offset += size;
|
||||||
|
}
|
||||||
|
return new PL00Archive(file, this, dir, info);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override IImageDecoder OpenImage(ArcFile arc, Entry entry)
|
||||||
|
{
|
||||||
|
var anent = (PL00Entry)entry;
|
||||||
|
var input = arc.File.CreateStream(entry.Offset, entry.Size);
|
||||||
|
var pixels = input.ReadBytes((int)anent.Size);
|
||||||
|
return new BitmapDecoder(pixels, anent.ImageInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class PL00Archive : ArcFile
|
||||||
|
{
|
||||||
|
public readonly ImageMetaData ImageInfo;
|
||||||
|
|
||||||
|
public PL00Archive(ArcView arc, ArchiveFormat impl, ICollection<Entry> dir, ImageMetaData base_info)
|
||||||
|
: base(arc, impl, dir)
|
||||||
|
{
|
||||||
|
ImageInfo = base_info;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
207
ArcFormats/Kaguya/ArcPL10.cs
Normal file
207
ArcFormats/Kaguya/ArcPL10.cs
Normal file
@ -0,0 +1,207 @@
|
|||||||
|
//! \file ArcAN21.cs
|
||||||
|
//! \date Sun Apr 30 21:04:25 2017
|
||||||
|
//! \brief KaGuYa script engine animation resource.
|
||||||
|
//
|
||||||
|
// Copyright (C) 2017 by morkt
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to
|
||||||
|
// deal in the Software without restriction, including without limitation the
|
||||||
|
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
// sell copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
// IN THE SOFTWARE.
|
||||||
|
//
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel.Composition;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace GameRes.Formats.Kaguya
|
||||||
|
{
|
||||||
|
class PL10Entry : PackedEntry
|
||||||
|
{
|
||||||
|
public int FrameIndex;
|
||||||
|
public int RleStep;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Export(typeof(ArchiveFormat))]
|
||||||
|
public class PL10Opener : ArchiveFormat
|
||||||
|
{
|
||||||
|
public override string Tag { get { return "PL10/KAGUYA"; } }
|
||||||
|
public override string Description { get { return "KaGuYa script engine animation resource"; } }
|
||||||
|
public override uint Signature { get { return 0x30314C50; } } // 'PL10'
|
||||||
|
public override bool IsHierarchic { get { return false; } }
|
||||||
|
public override bool CanWrite { get { return false; } }
|
||||||
|
|
||||||
|
public PL10Opener()
|
||||||
|
{
|
||||||
|
Extensions = new string[] { "plt" };
|
||||||
|
}
|
||||||
|
|
||||||
|
public override ArcFile TryOpen(ArcView file)
|
||||||
|
{
|
||||||
|
uint current_offset = 4;
|
||||||
|
int frame_count = file.View.ReadUInt16(current_offset);
|
||||||
|
if (!IsSaneCount(frame_count))
|
||||||
|
return null;
|
||||||
|
current_offset += 0x12;
|
||||||
|
string base_name = Path.GetFileNameWithoutExtension(file.Name);
|
||||||
|
var dir = new List<Entry>(frame_count);
|
||||||
|
var info = new ImageMetaData
|
||||||
|
{
|
||||||
|
OffsetX = file.View.ReadInt32(current_offset),
|
||||||
|
OffsetY = file.View.ReadInt32(current_offset + 4),
|
||||||
|
Width = file.View.ReadUInt32(current_offset + 8),
|
||||||
|
Height = file.View.ReadUInt32(current_offset + 12),
|
||||||
|
};
|
||||||
|
int channels = file.View.ReadInt32(current_offset + 0x10);
|
||||||
|
info.BPP = channels * 8;
|
||||||
|
current_offset += 0x14;
|
||||||
|
var entry = new PL10Entry
|
||||||
|
{
|
||||||
|
FrameIndex = 0,
|
||||||
|
Name = string.Format("{0}#{1:D2}", base_name, 0),
|
||||||
|
Type = "image",
|
||||||
|
Offset = current_offset,
|
||||||
|
Size = (uint)channels * info.Width * info.Height,
|
||||||
|
IsPacked = false,
|
||||||
|
};
|
||||||
|
dir.Add(entry);
|
||||||
|
current_offset += entry.Size;
|
||||||
|
for (int i = 1; i < frame_count; ++i)
|
||||||
|
{
|
||||||
|
int step = file.View.ReadByte(current_offset++);
|
||||||
|
if (0 == step)
|
||||||
|
return null;
|
||||||
|
uint packed_size = file.View.ReadUInt32(current_offset);
|
||||||
|
uint unpacked_size = (uint)(channels * (info.OffsetX + (int)info.Width)
|
||||||
|
* (info.OffsetY + (int)info.Height));
|
||||||
|
current_offset += 4;
|
||||||
|
entry = new PL10Entry
|
||||||
|
{
|
||||||
|
FrameIndex = i,
|
||||||
|
Name = string.Format("{0}#{1:D2}", base_name, i),
|
||||||
|
Type = "image",
|
||||||
|
Offset = current_offset,
|
||||||
|
Size = packed_size,
|
||||||
|
UnpackedSize = unpacked_size,
|
||||||
|
IsPacked = true,
|
||||||
|
RleStep = step,
|
||||||
|
};
|
||||||
|
dir.Add(entry);
|
||||||
|
current_offset += packed_size;
|
||||||
|
}
|
||||||
|
return new PL10Archive(file, this, dir, info);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Stream OpenEntry(ArcFile arc, Entry entry)
|
||||||
|
{
|
||||||
|
var anent = entry as PL10Entry;
|
||||||
|
var input = arc.File.CreateStream(entry.Offset, entry.Size);
|
||||||
|
if (null == anent || !anent.IsPacked)
|
||||||
|
return input;
|
||||||
|
using (input)
|
||||||
|
{
|
||||||
|
var data = DecompressRLE(input, anent.UnpackedSize, anent.RleStep);
|
||||||
|
return new BinMemoryStream(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override IImageDecoder OpenImage(ArcFile arc, Entry entry)
|
||||||
|
{
|
||||||
|
var anarc = (PL10Archive)arc;
|
||||||
|
var anent = (PL10Entry)entry;
|
||||||
|
var pixels = anarc.GetFrame(anent.FrameIndex);
|
||||||
|
return new BitmapDecoder(pixels, anarc.ImageInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static byte[] DecompressRLE(IBinaryStream input, uint unpacked_size, int rle_step)
|
||||||
|
{
|
||||||
|
var output = new byte[unpacked_size];
|
||||||
|
for (int i = 0; i < rle_step; ++i)
|
||||||
|
{
|
||||||
|
byte v1 = input.ReadUInt8();
|
||||||
|
output[i] = v1;
|
||||||
|
int dst = i + rle_step;
|
||||||
|
while (dst < output.Length)
|
||||||
|
{
|
||||||
|
byte v2 = input.ReadUInt8();
|
||||||
|
output[dst] = v2;
|
||||||
|
dst += rle_step;
|
||||||
|
if (v2 == v1)
|
||||||
|
{
|
||||||
|
int count = input.ReadUInt8();
|
||||||
|
if (0 != (count & 0x80))
|
||||||
|
count = input.ReadUInt8() + ((count & 0x7F) << 8) + 128;
|
||||||
|
while (count-- > 0 && dst < output.Length)
|
||||||
|
{
|
||||||
|
output[dst] = v2;
|
||||||
|
dst += rle_step;
|
||||||
|
}
|
||||||
|
if (dst < output.Length)
|
||||||
|
{
|
||||||
|
v2 = input.ReadUInt8();
|
||||||
|
output[dst] = v2;
|
||||||
|
dst += rle_step;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
v1 = v2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class PL10Archive : ArcFile
|
||||||
|
{
|
||||||
|
byte[][] Frames;
|
||||||
|
|
||||||
|
public readonly ImageMetaData ImageInfo;
|
||||||
|
|
||||||
|
public PL10Archive(ArcView arc, ArchiveFormat impl, ICollection<Entry> dir, ImageMetaData base_info)
|
||||||
|
: base(arc, impl, dir)
|
||||||
|
{
|
||||||
|
Frames = new byte[dir.Count][];
|
||||||
|
ImageInfo = base_info;
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] GetFrame(int index)
|
||||||
|
{
|
||||||
|
if (index >= Frames.Length)
|
||||||
|
throw new ArgumentException("index");
|
||||||
|
if (null != Frames[index])
|
||||||
|
return Frames[index];
|
||||||
|
|
||||||
|
var entry = Dir.ElementAt(index);
|
||||||
|
byte[] pixels;
|
||||||
|
using (var stream = OpenEntry(entry))
|
||||||
|
{
|
||||||
|
pixels = new byte[stream.Length];
|
||||||
|
stream.Read(pixels, 0, pixels.Length);
|
||||||
|
}
|
||||||
|
if (index > 0)
|
||||||
|
{
|
||||||
|
var prev_frame = GetFrame(index - 1);
|
||||||
|
for (int i = 0; i < pixels.Length; ++i)
|
||||||
|
pixels[i] += prev_frame[i];
|
||||||
|
}
|
||||||
|
Frames[index] = pixels;
|
||||||
|
return pixels;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1406,4 +1406,91 @@ namespace GameRes.Formats.KiriKiri
|
|||||||
return key;
|
return key;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
public class NinkiSeiyuuCrypt : ICrypt
|
||||||
|
{
|
||||||
|
ulong m_key1;
|
||||||
|
ulong m_key2;
|
||||||
|
ulong m_key3;
|
||||||
|
|
||||||
|
byte[] m_tbl2;
|
||||||
|
byte[] m_tbl3;
|
||||||
|
|
||||||
|
public NinkiSeiyuuCrypt(ulong key1, ulong key2, ulong key3)
|
||||||
|
{
|
||||||
|
m_key1 = key1;
|
||||||
|
m_key2 = key2;
|
||||||
|
m_key3 = key3;
|
||||||
|
|
||||||
|
m_tbl2 = GetTable2(3080);
|
||||||
|
m_tbl3 = GetTable3(3080, m_key1, m_key2, m_key3);
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] GetTable1(uint seed)
|
||||||
|
{
|
||||||
|
var key = new byte[32];
|
||||||
|
|
||||||
|
uint v48 = seed & 0x7FFFFFFF;
|
||||||
|
|
||||||
|
for (var i = 0; i < 31; i++)
|
||||||
|
{
|
||||||
|
key[i] = (byte)v48;
|
||||||
|
v48 = (v48 >> 8) | (uint)((byte)v48 << 23);
|
||||||
|
}
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] GetTable2(uint seed)
|
||||||
|
{
|
||||||
|
var key = new byte[64];
|
||||||
|
|
||||||
|
uint v51 = seed & 0xFFF;
|
||||||
|
ulong v52 = (ulong)(v51 | (v51 << 13)) | ((ulong)(v51 >> 19) << 32);
|
||||||
|
uint v53 = v51 | ((uint)v52 << 13);
|
||||||
|
uint v54 = (uint)((ulong)(((uint)v52 << 7) & 0x1FFFFFFF) | (v52 >> 19));
|
||||||
|
|
||||||
|
for (int i = 0; i < 61; i++)
|
||||||
|
{
|
||||||
|
var v56 = (byte)v53;
|
||||||
|
key[i] = (byte)v53;
|
||||||
|
v53 = (uint)((((ulong)v54 << 32) | v53) >> 8);
|
||||||
|
v54 = (v54 >> 8) | (uint)(v56 << 21);
|
||||||
|
}
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] GetTable3(uint seed, ulong key1, ulong key2, ulong key3)
|
||||||
|
{
|
||||||
|
var key = new byte[64];
|
||||||
|
|
||||||
|
uint v88 = seed & 0xFFF;
|
||||||
|
ulong v89 = (ulong)(v88 | (v88 << 13)) | ((ulong)(v88 >> 19) << 32);
|
||||||
|
uint v90 = (uint)((key1 + key2) ^ (ulong)(v88 | ((uint)v89 << 13)));
|
||||||
|
uint v91 = (uint)((ulong)(((key1 + ((key3 & 0xFFFFFFFF00000000) | (key2 & 0xFFFFFFFF))) >> 32) & 0x1FFFFFFF) ^ ((ulong)(((uint)v89 << 7) & 0x1FFFFFFF) | (v89 >> 19)));
|
||||||
|
|
||||||
|
for (int i = 0; i < 61; i++)
|
||||||
|
{
|
||||||
|
var v93 = (byte)v90;
|
||||||
|
key[i] = (byte)v90;
|
||||||
|
v90 = (uint)((((ulong)v91 << 32) | v90) >> 8);
|
||||||
|
v91 = (v91 >> 8) | (uint)(v93 << 21);
|
||||||
|
}
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Decrypt(Xp3Entry entry, long offset, byte[] buffer, int pos, int count)
|
||||||
|
{
|
||||||
|
var tbl1 = GetTable1(entry.Hash);
|
||||||
|
|
||||||
|
for (var i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
buffer[pos + i] ^= tbl1[(offset + i) % 0x1F];
|
||||||
|
buffer[pos + i] += (byte)(m_tbl2[(offset + i) % 0x3D] ^ m_tbl3[(offset + i) % 0x3D]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
2
ArcFormats/Properties/Settings.Designer.cs
generated
2
ArcFormats/Properties/Settings.Designer.cs
generated
@ -12,7 +12,7 @@ namespace GameRes.Formats.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
|
||||||
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
Binary file not shown.
2
ArcFormats/Strings/arcStrings.Designer.cs
generated
2
ArcFormats/Strings/arcStrings.Designer.cs
generated
@ -19,7 +19,7 @@ namespace GameRes.Formats.Strings {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
public class arcStrings {
|
public class arcStrings {
|
||||||
|
@ -201,7 +201,7 @@
|
|||||||
</setting>
|
</setting>
|
||||||
</GameRes.Formats.Properties.Settings>
|
</GameRes.Formats.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
@ -226,7 +226,7 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="NVorbis" version="0.10.1" targetFramework="net46" />
|
<package id="NVorbis" version="0.10.4" targetFramework="net461" />
|
||||||
<package id="SharpZipLib" version="1.3.1" targetFramework="net46" />
|
<package id="SharpZipLib" version="1.3.3" targetFramework="net461" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net46" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
|
||||||
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net46" />
|
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
|
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Memory" version="4.5.4" targetFramework="net46" />
|
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
|
||||||
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net46" />
|
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
|
||||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net46" />
|
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
|
||||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
|
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
|
||||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net46" />
|
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
|
||||||
|
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
|
||||||
</packages>
|
</packages>
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>GARbro</RootNamespace>
|
<RootNamespace>GARbro</RootNamespace>
|
||||||
<AssemblyName>GARbro.Console</AssemblyName>
|
<AssemblyName>GARbro.Console</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<PublishUrl>publish\</PublishUrl>
|
<PublishUrl>publish\</PublishUrl>
|
||||||
<Install>true</Install>
|
<Install>true</Install>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>GameRes.Extra</RootNamespace>
|
<RootNamespace>GameRes.Extra</RootNamespace>
|
||||||
<AssemblyName>ArcExtra</AssemblyName>
|
<AssemblyName>ArcExtra</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<NuGetPackageImportStamp>
|
<NuGetPackageImportStamp>
|
||||||
</NuGetPackageImportStamp>
|
</NuGetPackageImportStamp>
|
||||||
@ -49,16 +49,16 @@
|
|||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Concentus">
|
<Reference Include="Concentus, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Concentus.1.1.7\lib\portable-net45+win+wpa81+wp80\Concentus.dll</HintPath>
|
<HintPath>..\packages\Concentus.1.1.7\lib\portable-net45+win+wpa81+wp80\Concentus.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Concentus.Oggfile, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Concentus.Oggfile, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Concentus.Oggfile.1.0.4\lib\net45\Concentus.Oggfile.dll</HintPath>
|
<HintPath>..\packages\Concentus.Oggfile.1.0.4\lib\net45\Concentus.Oggfile.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Deployment.Compression">
|
<Reference Include="Microsoft.Deployment.Compression, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.dll</HintPath>
|
<HintPath>..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Deployment.Compression.Cab">
|
<Reference Include="Microsoft.Deployment.Compression.Cab, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.Cab.dll</HintPath>
|
<HintPath>..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.Cab.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
@ -74,8 +74,8 @@
|
|||||||
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
|
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
<Reference Include="System.Data.SQLite, Version=1.0.115.5, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net46\System.Data.SQLite.dll</HintPath>
|
<HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
@ -105,8 +105,8 @@
|
|||||||
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
|
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
<Reference Include="System.Runtime.Serialization" />
|
||||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
|
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||||
@ -114,8 +114,8 @@
|
|||||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Web.Extensions" />
|
<Reference Include="System.Web.Extensions" />
|
||||||
<Reference Include="System.Xaml" />
|
<Reference Include="System.Xaml" />
|
||||||
@ -216,13 +216,15 @@ exit 0</PreBuildEvent>
|
|||||||
<Output TaskParameter="Outputs" ItemName="IPT" />
|
<Output TaskParameter="Outputs" ItemName="IPT" />
|
||||||
</Exec>
|
</Exec>
|
||||||
</Target>
|
</Target>
|
||||||
<Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
|
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
|
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
|
||||||
|
<Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
|
||||||
</Target>
|
</Target>
|
||||||
|
<Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- 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.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||||
|
@ -1,27 +1,27 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Concentus" version="1.1.7" targetFramework="net46" />
|
<package id="Concentus" version="1.1.7" targetFramework="net461" />
|
||||||
<package id="Concentus.Oggfile" version="1.0.4" targetFramework="net46" />
|
<package id="Concentus.Oggfile" version="1.0.4" targetFramework="net461" />
|
||||||
<package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net46" />
|
<package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="net461" />
|
||||||
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
|
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="MSFTCompressionCab" version="1.0.0" targetFramework="net46" />
|
<package id="MSFTCompressionCab" version="1.0.0" targetFramework="net461" />
|
||||||
<package id="NETStandard.Library" version="2.0.3" targetFramework="net46" />
|
<package id="NETStandard.Library" version="2.0.3" targetFramework="net461" />
|
||||||
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net46" />
|
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.5" targetFramework="net461" />
|
||||||
<package id="System.AppContext" version="4.3.0" targetFramework="net46" />
|
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Console" version="4.3.1" targetFramework="net46" />
|
<package id="System.Console" version="4.3.1" targetFramework="net461" />
|
||||||
<package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net46" />
|
<package id="System.Data.SQLite.Core" version="1.0.115.5" targetFramework="net461" />
|
||||||
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net46" />
|
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net46" />
|
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net46" />
|
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net46" />
|
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
|
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Net.Http" version="4.3.4" targetFramework="net46" />
|
<package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
|
||||||
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />
|
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net46" />
|
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net46" />
|
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
|
||||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
|
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
|
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
|
||||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net46" />
|
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
|
||||||
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net46" />
|
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net461" />
|
||||||
<package id="YaccLexTools" version="0.2.2" targetFramework="net46" />
|
<package id="YaccLexTools" version="0.2.2" targetFramework="net461" />
|
||||||
</packages>
|
</packages>
|
15
GARbro.sln
15
GARbro.sln
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.0.31005.135
|
VisualStudioVersion = 17.0.32126.317
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GARbro.Console", "Console\GARbro.Console.csproj", "{B966F292-431A-4D8A-A1D3-1EB45048A1D2}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GARbro.Console", "Console\GARbro.Console.csproj", "{B966F292-431A-4D8A-A1D3-1EB45048A1D2}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
@ -47,8 +47,11 @@ Global
|
|||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
||||||
|
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
|
||||||
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{B966F292-431A-4D8A-A1D3-1EB45048A1D2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{A8865685-27CC-427B-AC38-E48D2AD05DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{A8865685-27CC-427B-AC38-E48D2AD05DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{A8865685-27CC-427B-AC38-E48D2AD05DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{A8865685-27CC-427B-AC38-E48D2AD05DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{A8865685-27CC-427B-AC38-E48D2AD05DF4}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
{A8865685-27CC-427B-AC38-E48D2AD05DF4}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
||||||
@ -68,14 +71,19 @@ Global
|
|||||||
{2935BE57-C4E0-43E7-86DE-C1848C820B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{2935BE57-C4E0-43E7-86DE-C1848C820B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{2935BE57-C4E0-43E7-86DE-C1848C820B19}.Release|Any CPU.Build.0 = Release|Any CPU
|
{2935BE57-C4E0-43E7-86DE-C1848C820B19}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
||||||
|
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
|
||||||
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{757EB8B1-F62C-4690-AC3D-DAE4A5576B3E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
||||||
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Release|Any CPU.Build.0 = Release|Any CPU
|
{B7E7EBFB-C06E-4FC8-9AF2-7CD132AB15FD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
|
||||||
|
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
|
||||||
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Release|Any CPU.Build.0 = Release|Any CPU
|
{60054FD9-4472-4BB4-9E3D-2F80D3D22468}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
@ -91,11 +99,8 @@ Global
|
|||||||
{73B6C693-9846-4D33-8300-A80239FCFFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{73B6C693-9846-4D33-8300-A80239FCFFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{73B6C693-9846-4D33-8300-A80239FCFFF9}.Release|Any CPU.Build.0 = Release|Any CPU
|
{73B6C693-9846-4D33-8300-A80239FCFFF9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
|
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Prerelease|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{CF0D6842-D071-49AF-A6B7-D5C5799CE582}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
<userSettings>
|
<userSettings>
|
||||||
<GARbro.GUI.Properties.Settings>
|
<GARbro.GUI.Properties.Settings>
|
||||||
@ -53,19 +53,19 @@
|
|||||||
<value>True</value>
|
<value>True</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="appImageFormat" serializeAs="String">
|
<setting name="appImageFormat" serializeAs="String">
|
||||||
<value />
|
<value/>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="appTextEncoding" serializeAs="String">
|
<setting name="appTextEncoding" serializeAs="String">
|
||||||
<value>65001</value>
|
<value>65001</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="appLastDirectory" serializeAs="String">
|
<setting name="appLastDirectory" serializeAs="String">
|
||||||
<value />
|
<value/>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="appArchiveFormat" serializeAs="String">
|
<setting name="appArchiveFormat" serializeAs="String">
|
||||||
<value />
|
<value/>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="appLastCreatedArchive" serializeAs="String">
|
<setting name="appLastCreatedArchive" serializeAs="String">
|
||||||
<value />
|
<value/>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="winMenuBarVisibility" serializeAs="String">
|
<setting name="winMenuBarVisibility" serializeAs="String">
|
||||||
<value>Visible</value>
|
<value>Visible</value>
|
||||||
@ -89,11 +89,19 @@
|
|||||||
<value>False</value>
|
<value>False</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="appLastDestination" serializeAs="String">
|
<setting name="appLastDestination" serializeAs="String">
|
||||||
<value />
|
<value/>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="winDownScaleImage" serializeAs="String">
|
<setting name="winDownScaleImage" serializeAs="String">
|
||||||
<value>False</value>
|
<value>False</value>
|
||||||
</setting>
|
</setting>
|
||||||
</GARbro.GUI.Properties.Settings>
|
</GARbro.GUI.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
|
<runtime>
|
||||||
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||||
|
<bindingRedirect oldVersion="4.0.4.1" newVersion="6.0.0.0"/>
|
||||||
|
</dependentAssembly>
|
||||||
|
</assemblyBinding>
|
||||||
|
</runtime>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>GARbro.GUI</RootNamespace>
|
<RootNamespace>GARbro.GUI</RootNamespace>
|
||||||
<AssemblyName>GARbro.GUI</AssemblyName>
|
<AssemblyName>GARbro.GUI</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
@ -84,24 +84,27 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
<Reference Include="Microsoft.VisualBasic" />
|
||||||
<Reference Include="Microsoft.WindowsAPICodePack">
|
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
|
<HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
|
||||||
<Private>True</Private>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.WindowsAPICodePack.Shell">
|
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
|
<HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
|
||||||
<Private>True</Private>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
|
<HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
<Reference Include="System.Windows.Controls.Input.Toolkit">
|
<Reference Include="System.Windows.Controls.Input.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll</HintPath>
|
<HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll</HintPath>
|
||||||
<Private>True</Private>
|
</Reference>
|
||||||
|
<Reference Include="System.Windows.Controls.Layout.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Layout.Toolkit.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Reference Include="System.Windows.Forms" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
@ -115,9 +118,8 @@
|
|||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<Reference Include="PresentationFramework" />
|
||||||
<Reference Include="WPFToolkit">
|
<Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
|
<HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
|
||||||
<Private>True</Private>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
2
GUI/Properties/Settings.Designer.cs
generated
2
GUI/Properties/Settings.Designer.cs
generated
@ -12,7 +12,7 @@ namespace GARbro.GUI.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
2
GUI/Strings/guiStrings.Designer.cs
generated
2
GUI/Strings/guiStrings.Designer.cs
generated
@ -19,7 +19,7 @@ namespace GARbro.GUI.Strings {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
public class guiStrings {
|
public class guiStrings {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="NAudio" version="1.10.0" targetFramework="net46" />
|
<package id="NAudio" version="1.10.0" targetFramework="net461" />
|
||||||
<package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net46" />
|
<package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net461" />
|
||||||
<package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net46" />
|
<package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net461" />
|
||||||
<package id="WPFToolkit" version="3.5.50211.1" targetFramework="net46" />
|
<package id="WPFToolkit" version="3.5.50211.1" targetFramework="net461" />
|
||||||
</packages>
|
</packages>
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>GameRes</RootNamespace>
|
<RootNamespace>GameRes</RootNamespace>
|
||||||
<AssemblyName>GameRes</AssemblyName>
|
<AssemblyName>GameRes</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||||
|
2
GameRes/Properties/Settings.Designer.cs
generated
2
GameRes/Properties/Settings.Designer.cs
generated
@ -12,7 +12,7 @@ namespace GameRes.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
|
||||||
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
2
GameRes/Strings/garStrings.Designer.cs
generated
2
GameRes/Strings/garStrings.Designer.cs
generated
@ -19,7 +19,7 @@ namespace GameRes.Strings {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
public class garStrings {
|
public class garStrings {
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
|
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<section name="GameRes.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
<section name="GameRes.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
|
||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<userSettings>
|
<userSettings>
|
||||||
@ -18,4 +18,4 @@
|
|||||||
</setting>
|
</setting>
|
||||||
</GameRes.Properties.Settings>
|
</GameRes.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
</configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="NAudio" version="1.10.0" targetFramework="net46" />
|
<package id="NAudio" version="1.10.0" targetFramework="net461" />
|
||||||
</packages>
|
</packages>
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Image.Convert</RootNamespace>
|
<RootNamespace>Image.Convert</RootNamespace>
|
||||||
<AssemblyName>Image.Convert</AssemblyName>
|
<AssemblyName>Image.Convert</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>GameRes.Legacy</RootNamespace>
|
<RootNamespace>GameRes.Legacy</RootNamespace>
|
||||||
<AssemblyName>ArcLegacy</AssemblyName>
|
<AssemblyName>ArcLegacy</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||||
|
@ -13,6 +13,10 @@
|
|||||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
|
||||||
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
</configuration>
|
Loading…
Reference in New Issue
Block a user