Skip to content

Commit

Permalink
Merge pull request #26 from anon5r/minor-bugs
Browse files Browse the repository at this point in the history
Fix and update some minor bugs
  • Loading branch information
anon5r authored Jul 29, 2022
2 parents 59b5ea2 + a497fe0 commit f4ed0cc
Show file tree
Hide file tree
Showing 20 changed files with 413 additions and 156 deletions.
155 changes: 85 additions & 70 deletions KsGameLauncher/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<value>https://p.eagate.573.jp/gate/p/logout.html</value>
</setting>
<setting name="LoginURL" serializeAs="String">
<value>https://p.eagate.573.jp/gate/k/API/common/getloginurl.html</value>
<value>https://p.eagate.573.jp/gate/p/login.html</value>
</setting>
<setting name="BaseURL" serializeAs="String">
<value>https://p.eagate.573.jp/game/konasteapp/</value>
Expand Down Expand Up @@ -50,6 +50,18 @@
</ArrayOfString>
</value>
</setting>
<setting name="ErrorReporterPath" serializeAs="String">
<value>launcher\modules\errorreporter.exe</value>
</setting>
<setting name="ErrorReporterPath_2dx" serializeAs="String">
<value>launcher\modules\bm2dx_er.exe</value>
</setting>
<setting name="LauncherPath" serializeAs="String">
<value>launcher\modules\launcher.exe</value>
</setting>
<setting name="LauncherPath_2dx" serializeAs="String">
<value>launcher\modules\bm2dx_launcher.exe</value>
</setting>
</KsGameLauncher.Properties.Settings>
<KonaStaGameLauncher.Properties.Settings>
<setting name="appInfoLocal" serializeAs="String">
Expand Down Expand Up @@ -95,75 +107,78 @@
</runtime>
<userSettings>
<KsGameLauncher.Properties.Settings>
<setting name="appInfoURL" serializeAs="String">
<value>https://launcher-app.sdvx.net/conf/appinfo.json</value>
</setting>
<setting name="selector_login_user" serializeAs="String">
<value>#id_userId</value>
</setting>
<setting name="selector_login_pass" serializeAs="String">
<value>#id_password</value>
</setting>
<setting name="selector_login_button" serializeAs="String">
<value>#login&gt;div&gt;a.link-btn</value>
</setting>
<setting name="selector_csrf" serializeAs="String">
<value>div.form-area&gt;form&gt;input[type=hidden][name=csrfmiddlewaretoken]</value>
</setting>
<setting name="selector_login_form" serializeAs="String">
<value>#login-form&gt;div.form-area&gt;form</value>
</setting>
<setting name="UseProxy" serializeAs="String">
<value>False</value>
</setting>
<setting name="EnableNotification" serializeAs="String">
<value>True</value>
</setting>
<setting name="NotificationTimeout" serializeAs="String">
<value>1</value>
</setting>
<setting name="ShowConfirmExit" serializeAs="String">
<value>True</value>
</setting>
<setting name="ContextMenuSize" serializeAs="String">
<value>0</value>
</setting>
<setting name="AppInfo_selector_default" serializeAs="String">
<value>#login&gt;div&gt;a.link-btn</value>
</setting>
<setting name="ShowOnlyInstalledGames" serializeAs="String">
<value>True</value>
</setting>
<setting name="NewGameFormSize" serializeAs="String">
<value>400, 300</value>
</setting>
<setting name="RegisterCustomURI" serializeAs="String">
<value>False</value>
</setting>
<setting name="selector_2fa_pincode" serializeAs="String">
<value>#id_pincode</value>
</setting>
<setting name="selector_2fa_pincod_persistnt" serializeAs="String">
<value>#is_persistent</value>
</setting>
<setting name="AuthPage_2FAPath" serializeAs="String">
<value>two_step.html</value>
</setting>
<setting name="UseOTP" serializeAs="String">
<value>False</value>
</setting>
<setting name="selector_2fa_form" serializeAs="String">
<value>#two-step-form&gt;div.form-area&gt;form</value>
</setting>
<setting name="Language" serializeAs="String">
<value>system</value>
</setting>
<setting name="UpdateCheckInterval" serializeAs="String">
<value>0</value>
</setting>
<setting name="UpdateCheckIntervalUnit" serializeAs="String">
<value>0</value>
</setting>
<setting name="appInfoURL" serializeAs="String">
<value>https://launcher-app.sdvx.net/conf/appinfo.json</value>
</setting>
<setting name="selector_login_user" serializeAs="String">
<value>#id_userId</value>
</setting>
<setting name="selector_login_pass" serializeAs="String">
<value>#id_password</value>
</setting>
<setting name="selector_login_button" serializeAs="String">
<value>#login&gt;div&gt;a.link-btn</value>
</setting>
<setting name="selector_csrf" serializeAs="String">
<value>div.form-area&gt;form&gt;input[type=hidden][name=csrfmiddlewaretoken]</value>
</setting>
<setting name="selector_login_form" serializeAs="String">
<value>#login-form&gt;div.form-area&gt;form</value>
</setting>
<setting name="UseProxy" serializeAs="String">
<value>False</value>
</setting>
<setting name="EnableNotification" serializeAs="String">
<value>True</value>
</setting>
<setting name="NotificationTimeout" serializeAs="String">
<value>1</value>
</setting>
<setting name="ShowConfirmExit" serializeAs="String">
<value>True</value>
</setting>
<setting name="ContextMenuSize" serializeAs="String">
<value>0</value>
</setting>
<setting name="AppInfo_selector_default" serializeAs="String">
<value>#login&gt;div&gt;a.link-btn</value>
</setting>
<setting name="ShowOnlyInstalledGames" serializeAs="String">
<value>True</value>
</setting>
<setting name="NewGameFormSize" serializeAs="String">
<value>400, 300</value>
</setting>
<setting name="RegisterCustomURI" serializeAs="String">
<value>False</value>
</setting>
<setting name="selector_2fa_pincode" serializeAs="String">
<value>#id_pincode</value>
</setting>
<setting name="selector_2fa_pincod_persistnt" serializeAs="String">
<value>#is_persistent</value>
</setting>
<setting name="AuthPage_2FAPath" serializeAs="String">
<value>two_step.html</value>
</setting>
<setting name="UseOTP" serializeAs="String">
<value>False</value>
</setting>
<setting name="selector_2fa_form" serializeAs="String">
<value>#two-step-form&gt;div.form-area&gt;form</value>
</setting>
<setting name="Language" serializeAs="String">
<value>system</value>
</setting>
<setting name="UpdateCheckInterval" serializeAs="String">
<value>0</value>
</setting>
<setting name="UpdateCheckIntervalUnit" serializeAs="String">
<value>0</value>
</setting>
<setting name="PrivacyConfirmPath" serializeAs="String">
<value>https://p.eagate.573.jp/gate/agree/p/privacy_confirm.html</value>
</setting>
</KsGameLauncher.Properties.Settings>
<KonaStaGameLauncher.Properties.Settings>
<setting name="appInfoURL" serializeAs="String">
Expand Down
52 changes: 52 additions & 0 deletions KsGameLauncher/Exceptions/PrivacyConfirmationException.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
using System;
using System.Runtime.Serialization;

namespace KsGameLauncher
{
[Serializable]
internal class PrivacyConfirmationException : Exception
{
public static string PrivacyURL;

public PrivacyConfirmationException()
{
}

public PrivacyConfirmationException(string message) : base(message)
{
}

public PrivacyConfirmationException(string message, Exception innerException) : base(message, innerException)
{
}

protected PrivacyConfirmationException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}

public PrivacyConfirmationException(string message, string URL) : base(message)
{
PrivacyURL = URL;
}

public PrivacyConfirmationException(string message, string URL, Exception innerException) : base(message, innerException)
{
PrivacyURL = URL;
}

public void SetTosURL(string url)
{
PrivacyURL = url ?? throw new ArgumentNullException("url");
}
public void SetTosURL(Uri url)
{
if (url == null)
throw new ArgumentNullException("url");
PrivacyURL = url.ToString();
}
public string GetPrivacyURL()
{
return PrivacyURL;
}
}
}
3 changes: 2 additions & 1 deletion KsGameLauncher/Forms/AboutForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ private void About_Load(object sender, EventArgs e)
if (GetInstalledGamesName().Length > 0)
{
string installedGameRights = string.Format("\"{0}\"", string.Join("\", \"", GetInstalledGamesName()));
textBox_Copyrights.Text += string.Format("{0} are KONAMI Amusement All Rights Reserved.\r\n", installedGameRights);
string allrightsReserved = string.Format("{0} All Rights Reserved.", Properties.Resources.GamePublisher);
textBox_Copyrights.Text += string.Format("{0} are {1}.\r\n", installedGameRights, allrightsReserved);
}
textBox_Copyrights.Text += Properties.Resources.Copyrights;
linkLabel_Support.Text = Properties.Resources.SupportLabelText;
Expand Down
Loading

0 comments on commit f4ed0cc

Please sign in to comment.