Compare commits
2 Commits
v1.0.0-exp
...
trunk
| Author | SHA1 | Date |
|---|---|---|
|
|
ecb3ff1acb | |
|
|
81446f9286 |
|
|
@ -245,7 +245,7 @@ public class Bootstrapper : Interfaces.IBootstrapper
|
|||
StartInfo = new()
|
||||
{
|
||||
FileName = Path.Combine(Paths.Versions, Arguments["Version"], $"{Constants.PROJECT_NAME}.Player.exe"),
|
||||
Arguments = $"-a \"{Web.FormatUrl("/Login/Negotiate.ashx")}\" -t \"{Arguments["Ticket"]}\" -j \"{Arguments["JoinScript"]}\" ",
|
||||
Arguments = $"-a \"{Web.FormatUrl("/Login/Negotiate.ashx", null, true)}\" -t \"{Arguments["Ticket"]}\" -j \"{Arguments["JoinScript"]}\" ",
|
||||
UseShellExecute = true,
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,12 +20,6 @@
|
|||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
|
||||
<Compile Update="Properties\Settings.Designer.cs">
|
||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>Settings.settings</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -35,13 +29,6 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Kiseki.Launcher\**\*.cs" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,12 @@ internal static class Program
|
|||
[STAThread]
|
||||
static void Main(string[] args)
|
||||
{
|
||||
if (args.Length > 0 && args[0] == "-uninstall")
|
||||
{
|
||||
Bootstrapper.Uninstall(args[0] == "-quiet");
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize directories
|
||||
if (Path.GetFileName(Path.GetDirectoryName(Application.ExecutablePath))!.ToLower().Contains(Constants.PROJECT_NAME.ToLower()))
|
||||
{
|
||||
|
|
@ -62,12 +68,6 @@ internal static class Program
|
|||
return;
|
||||
}
|
||||
|
||||
if (args[0] == "-uninstall")
|
||||
{
|
||||
Bootstrapper.Uninstall(args[0] == "-quiet");
|
||||
return;
|
||||
}
|
||||
|
||||
ApplicationConfiguration.Initialize();
|
||||
Application.Run(new MainWindow(args[0]));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public static class Web
|
|||
return response?.Status ?? HealthCheckStatus.Failure;
|
||||
}
|
||||
|
||||
public static string FormatUrl(string path, string? subdomain = null)
|
||||
public static string FormatUrl(string path, string? subdomain = null, bool forceHttp = false)
|
||||
{
|
||||
string scheme = "https";
|
||||
string url = subdomain == null ? CurrentUrl! : $"{subdomain!}.{CurrentUrl!}";
|
||||
|
|
@ -68,6 +68,11 @@ public static class Web
|
|||
scheme = "http";
|
||||
#endif
|
||||
|
||||
if (forceHttp)
|
||||
{
|
||||
scheme = "http";
|
||||
}
|
||||
|
||||
return $"{scheme}://{url}{path}";
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue