Fix issues on Modern Windows

This commit is contained in:
Li 2023-06-08 13:25:06 +12:00
parent 6b5663506c
commit 49e29d622b
15 changed files with 1355 additions and 1357 deletions

BIN
Thumbs.db Normal file

Binary file not shown.

BIN
UGP.gmx/Thumbs.db Normal file

Binary file not shown.

View File

@ -4,7 +4,7 @@
<datafile>
<name>libeay32.dll</name>
<filename>libeay32.dll</filename>
<origname>C:\Users\Li\Documents\git\UGP\UGP.gmx\\\datafiles\libeay32.dll</origname>
<origname>C:\Users\Li\Desktop\NuclearWar\UGP\UGP.gmx\\\datafiles\libeay32.dll</origname>
<exists>-1</exists>
<size>1207808</size>
<exportAction>2</exportAction>
@ -18,7 +18,7 @@
<datafile>
<name>UGP.dll</name>
<filename>UGP.dll</filename>
<origname>C:\Users\Li\Documents\git\UGP\UGP.gmx\\\datafiles\UGP.dll</origname>
<origname>C:\Users\Li\Desktop\NuclearWar\UGP\UGP.gmx\\\datafiles\UGP.dll</origname>
<exists>-1</exists>
<size>97280</size>
<exportAction>2</exportAction>
@ -32,9 +32,9 @@
<datafile>
<name>ModuleDownloader.exe</name>
<filename>ModuleDownloader.exe</filename>
<origname>C:\Users\Li\Documents\git\UGP\UGP.gmx\\\datafiles\ModuleDownloader.exe</origname>
<origname>C:\Users\Li\Desktop\NuclearWar\UGP\Visual Studio Projects\ModuleDownloader\DownloadModules\bin\Release\ModuleDownloader.exe</origname>
<exists>-1</exists>
<size>2146816</size>
<size>2147328</size>
<exportAction>2</exportAction>
<exportDir></exportDir>
<overwrite>0</overwrite>
@ -249,7 +249,7 @@
</objects>
</objects>
</objects>
<rooms name="rooms" roommaxid="100003" room_maxtileid="10000000">
<rooms name="rooms" roommaxid="100000" room_maxtileid="10000000">
<room>rooms\rm_product_select</room>
<room>rooms\rm_crack_gm8</room>
<room>rooms\rm_crack_studio</room>

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,13 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<sound>
<kind>1</kind>
<extension>.mid</extension>
<origname>C:\Users\Li\Documents\git\UGP\UGP.gmx\\\sound\audio\snd_mus.mid</origname>
<kind>3</kind>
<extension>.mp3</extension>
<origname>snd_mus.mp3</origname>
<effects>0</effects>
<volume>1</volume>
<pan>0</pan>
<mp3BitRate>192</mp3BitRate>
<oggQuality>6</oggQuality>
<preload>-1</preload>
<data>snd_mus.mid</data>
<data>snd_mus.mp3</data>
</sound>

View File

@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\..\..\..\AppData\Roaming\GameMaker-Studio\BouncyCastle.Crypto.dll</HintPath>
<HintPath>..\..\..\..\..\..\AppData\Roaming\GameMaker\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.11.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlAgilityPack.1.11.33\lib\Net35\HtmlAgilityPack.dll</HintPath>
@ -56,12 +56,12 @@
<Compile Include="downloadForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<Compile Include="downloadForm.Designer.cs">
<DependentUpon>downloadForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<EmbeddedResource Include="downloadForm.resx">
<DependentUpon>downloadForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">

View File

@ -141,31 +141,29 @@ namespace DownloadModules
}
catch (Exception) { };
if (Urls.Count > 0)
{
CurrentFile = pop();
DownloadLocation = Path.Combine(Path.Combine(Path.Combine(Environment.GetEnvironmentVariable("LOCALAPPDATA"), "GameMaker-Studio"), "UpgradeZip"), Path.GetFileName(CurrentFile));
wc.DownloadFileAsync(new Uri(CurrentFile), DownloadLocation);
}
else
{
Application.Exit();
}
});
extractThread.Start();
while (extractThread.IsAlive)
Application.DoEvents();
if (Urls.Count > 0)
{
CurrentFile = pop();
DownloadLocation = Path.Combine(Path.Combine(Path.Combine(Environment.GetEnvironmentVariable("LOCALAPPDATA"), "GameMaker-Studio"), "UpgradeZip"), Path.GetFileName(CurrentFile));
wc.DownloadFileAsync(new Uri(CurrentFile), DownloadLocation);
}
else
{
Application.Exit();
}
}
private void Wc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
downloadProgress.Value = e.ProgressPercentage;
downloadStatus.Text = "Downloading: (File "+fileCount.ToString()+"/"+filesToDownload.ToString()+") "+Path.GetFileName(CurrentFile)+" "+e.BytesReceived.ToString()+"/"+e.TotalBytesToReceive.ToString()+" "+e.ProgressPercentage.ToString()+"%";
Application.DoEvents();
}
}
}