sync: main repo (#cb069bf)

This commit is contained in:
StopWuyu
2024-12-14 18:31:31 +08:00
11 changed files with 1279 additions and 2154 deletions

View File

@@ -8,6 +8,11 @@
<AssemblyName>DanhengCommand</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.29.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\GameServer\GameServer.csproj" />

View File

@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.28.3" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.28.3" />
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.29.1" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -9,7 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.28.3" />
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.29.1" />
<PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
</ItemGroup>

View File

@@ -20,6 +20,8 @@
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\DanhengKcpSharp\DanhengKcpSharp.csproj" />
<ProjectReference Include="..\Proto\Proto.csproj" />
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.29.1" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
<PackageReference Include="McMaster.NETCore.Plugins.Mvc" Version="1.4.0" />
<PackageReference Include="System.IO.Pipelines" Version="9.0.0" />

View File

@@ -71,12 +71,12 @@ public static class HandbookGenerator
builder.AppendLine();
builder.AppendLine("#Avatar");
builder.AppendLine();
GenerateAvatar(builder, textMap, fallbackTextMap);
GenerateAvatar(builder, textMap, fallbackTextMap, lang == config.ServerOption.Language);
builder.AppendLine();
builder.AppendLine("#Item");
builder.AppendLine();
GenerateItem(builder, textMap, fallbackTextMap);
GenerateItem(builder, textMap, fallbackTextMap, lang == config.ServerOption.Language);
builder.AppendLine();
builder.AppendLine("#MainMission");
@@ -91,12 +91,12 @@ public static class HandbookGenerator
builder.AppendLine();
builder.AppendLine("#RogueBuff");
builder.AppendLine();
GenerateRogueBuff(builder, textMap, fallbackTextMap);
GenerateRogueBuff(builder, textMap, fallbackTextMap, lang == config.ServerOption.Language);
builder.AppendLine();
builder.AppendLine("#RogueMiracle");
builder.AppendLine();
GenerateRogueMiracleDisplay(builder, textMap, fallbackTextMap);
GenerateRogueMiracleDisplay(builder, textMap, fallbackTextMap, lang == config.ServerOption.Language);
#if DEBUG
builder.AppendLine();
@@ -120,7 +120,7 @@ public static class HandbookGenerator
}
public static void GenerateItem(StringBuilder builder, Dictionary<long, string> map,
Dictionary<long, string> fallback)
Dictionary<long, string> fallback, bool setName)
{
foreach (var item in GameData.ItemConfigData.Values)
{
@@ -128,12 +128,12 @@ public static class HandbookGenerator
fallback.TryGetValue(item.ItemName.Hash, out value) ? value : $"[{item.ItemName.Hash}]";
builder.AppendLine(item.ID + ": " + name);
if (name != $"[{item.ItemName.Hash}]") item.Name = name;
if (setName && name != $"[{item.ItemName.Hash}]") item.Name = name;
}
}
public static void GenerateAvatar(StringBuilder builder, Dictionary<long, string> map,
Dictionary<long, string> fallback)
Dictionary<long, string> fallback, bool setName)
{
foreach (var avatar in GameData.AvatarConfigData.Values)
{
@@ -141,7 +141,7 @@ public static class HandbookGenerator
fallback.TryGetValue(avatar.AvatarName.Hash, out value) ? value : $"[{avatar.AvatarName.Hash}]";
builder.AppendLine(avatar.AvatarID + ": " + name);
if (name != $"[{avatar.AvatarName.Hash}]") avatar.Name = name;
if (setName && name != $"[{avatar.AvatarName.Hash}]") avatar.Name = name;
}
}
@@ -168,7 +168,7 @@ public static class HandbookGenerator
}
public static void GenerateRogueBuff(StringBuilder builder, Dictionary<long, string> map,
Dictionary<long, string> fallback)
Dictionary<long, string> fallback, bool setName)
{
foreach (var buff in GameData.RogueMazeBuffData)
{
@@ -179,12 +179,12 @@ public static class HandbookGenerator
: $"[{buff.Value.BuffName.Hash}]";
builder.AppendLine(buff.Key + ": " + name + " --- Level:" + buff.Value.Lv);
if (name != $"[{buff.Value.BuffName.Hash}]") buff.Value.Name = name;
if (setName && name != $"[{buff.Value.BuffName.Hash}]") buff.Value.Name = name;
}
}
public static void GenerateRogueMiracleDisplay(StringBuilder builder, Dictionary<long, string> map,
Dictionary<long, string> fallback)
Dictionary<long, string> fallback, bool setName)
{
foreach (var display in GameData.RogueMiracleData.Values)
{
@@ -195,7 +195,7 @@ public static class HandbookGenerator
: $"[{display.MiracleName.Hash}]";
builder.AppendLine(display.MiracleID + ": " + name);
if (name != $"[{display.MiracleName.Hash}]") display.Name = name;
if (setName && name != $"[{display.MiracleName.Hash}]") display.Name = name;
}
}

View File

@@ -14,6 +14,11 @@
<Content Include="Danheng.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.29.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Command\Command.csproj" />
<ProjectReference Include="..\Common\Common.csproj" />

View File

@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.28.3" />
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
</ItemGroup>
</Project>

View File

@@ -10,15 +10,15 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.28.3" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.28.3" />
<PackageReference Include="Google.Protobuf" Version="3.29.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.29.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="Spectre.Console" Version="0.49.1" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.10" />
<PackageReference Include="SQLitePCLRaw.provider.e_sqlite3" Version="2.1.10" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
<PackageReference Include="System.Management" Version="9.0.0" />
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\Proto\Proto.csproj" />