4 Commits

Author SHA1 Message Date
Mikhail Tyukin
2b92e3191b fix random boxes 2025-12-04 11:06:33 -05:00
Mikhail Tyukin
663bf58549 update to .net 10 2025-12-04 11:03:56 -05:00
Mikhail Tyukin
aac1c00715 Update ServerSwitcher.cs 2025-12-04 09:38:35 -05:00
Mikhail Tyukin
338a769ade fix serverselector 2025-12-04 09:37:12 -05:00
6 changed files with 15 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.0.2</AvaloniaVersion>
<AvaloniaVersion>11.3.9</AvaloniaVersion>
</PropertyGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IncludeHttpRuleProtos>true</IncludeHttpRuleProtos>

View File

@@ -119,12 +119,12 @@ namespace EpinelPS.Utils
{
AddSingleCurrencyObject(user, ref ret, (CurrencyType)rewardId, rewardCount);
}
else if (rewardType == RewardType.Item ||rewardType.ToString().StartsWith("Equipment_"))
else if (rewardType == RewardType.Item ||rewardType.ToString().StartsWith("Equipment"))
{
int corpId = 0; // Default to 0 (None)
if (rewardType.ToString().StartsWith("Equipment_"))
if (rewardType.ToString().StartsWith("Equipment"))
{
var corpSetting = GameData.Instance.ItemEquipCorpSettingTable.Values.FirstOrDefault(x => x.Key == rewardType);

View File

@@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest>

View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);SYSLIB0057</NoWarn>
<LangVersion>latest</LangVersion>
@@ -16,7 +16,7 @@
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.6" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.6" />
<PackageReference Include="FluentAvaloniaUI" Version="2.3.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.4.1" />
</ItemGroup>
<ItemGroup>

View File

@@ -43,7 +43,11 @@ namespace ServerSelector
return "Launcher path is invalid. Make sure that the game executable exists in the launcher folder";
}
string launcherCertList = launcherPath + "/intl_service/cacert.pem";
// TODO fix this mess
string launcherCertList = launcherPath + "/intl_service/intl_cacert.pem";
if (!File.Exists(launcherCertList))
launcherCertList = launcherPath + "/intl_service/cacert.pem"; // older INTL sdk versions
string gameCertList = gamePath + "/nikke_Data/Plugins/x86_64/intl_cacert.pem";
if (!File.Exists(gameCertList))
gameCertList = gamePath + "/nikke_Data/Plugins/x86_64/cacert.pem"; // older INTL sdk versions
@@ -130,7 +134,9 @@ namespace ServerSelector
string hostsFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "drivers/etc/hosts");
string CAcert = await File.ReadAllTextAsync(AppDomain.CurrentDomain.BaseDirectory + "myCA.pem");
string launcherCertList = launcherPath + "/intl_service/cacert.pem";
string launcherCertList = launcherPath + "/intl_service/intl_cacert.pem";
if (!File.Exists(launcherCertList))
launcherCertList = launcherPath + "/intl_service/cacert.pem"; // older INTL sdk versions
string gameCertList = gamePath + "/nikke_Data/Plugins/x86_64/intl_cacert.pem";
if (!File.Exists(gameCertList))
gameCertList = gamePath + "/nikke_Data/Plugins/x86_64/cacert.pem"; // older INTL sdk versions