wonderking/continuity
2
0
Fork 0
Code Issues Pull requests 16 Projects 1 Releases Packages 1 Wiki Activity Actions

feature/72-channelselection-and-character-creation #82

Merged
rainote merged 35 commits from feature/72-channelselection-and-character-creation into master 2023-11-14 19:47:01 +00:00
Conversation 0 Commits 35 Files changed 55 +6 -14
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 98aa813f65 - Show all commits

15
Server/PacketHandlers/ChannelSelectionHandler.cs
View file

@ -1,11 +1,3 @@
/* Nicht gemergte Änderung aus Projekt "Server(net7.0)"
Vor:
using System.Net;
using Microsoft.EntityFrameworkCore;
Nach:
using Microsoft.EntityFrameworkCore;
*/
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Server.DB.Documents; using Server.DB.Documents;
using Wonderking.Game.Data.Character; using Wonderking.Game.Data.Character;
@ -46,7 +38,8 @@ public class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPacket>
?.Characters; ?.Characters;
ChannelSelectionResponsePacket responsePacket; ChannelSelectionResponsePacket responsePacket;
if (charactersOfAccount != null && false) var testingChars = true;
if (charactersOfAccount != null && testingChars)
{ {
responsePacket = new ChannelSelectionResponsePacket responsePacket = new ChannelSelectionResponsePacket
{ {
@ -103,8 +96,8 @@ public class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPacket>
}, },
Health = int.MaxValue - 1, Health = int.MaxValue - 1,
Mana = int.MaxValue - 1, Mana = int.MaxValue - 1,
EquippedItems = Enumerable.Repeat((ushort)25,20).ToArray(), EquippedItems = Enumerable.Repeat((ushort)25, 20).ToArray(),
EquippedCashItems = Enumerable.Repeat((ushort)25,20).ToArray() EquippedCashItems = Enumerable.Repeat((ushort)25, 20).ToArray()
}, },
}, },
}; };

2
Server/Server.csproj
View file

@ -8,7 +8,6 @@
<RootNamespace>Server</RootNamespace> <RootNamespace>Server</RootNamespace>
<LangVersion>12</LangVersion> <LangVersion>12</LangVersion>
<ServerGarbageCollection>true</ServerGarbageCollection> <ServerGarbageCollection>true</ServerGarbageCollection>
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
<EnableNETAnalyzers>true</EnableNETAnalyzers> <EnableNETAnalyzers>true</EnableNETAnalyzers>
<Features>strict</Features> <Features>strict</Features>
<Authors>Timothy (RaiNote) Schenk</Authors> <Authors>Timothy (RaiNote) Schenk</Authors>
@ -20,6 +19,7 @@
<ProduceReferenceAssembly>True</ProduceReferenceAssembly> <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<AnalysisLevel>latest-recommended</AnalysisLevel> <AnalysisLevel>latest-recommended</AnalysisLevel>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">

1
Wonderking/Packets/Outgoing/ChannelSelectionResponsePacket.cs
View file

@ -10,7 +10,6 @@ public class ChannelSelectionResponsePacket : IPacket
public required string Endpoint { get; set; } public required string Endpoint { get; set; }
public required ushort Port { get; set; } public required ushort Port { get; set; }
public required CharacterData[] Characters { get; set; } public required CharacterData[] Characters { get; set; }
public required string GuildName { get; set; }
public void Deserialize(byte[] data) public void Deserialize(byte[] data)
{ {

2
Wonderking/Wonderking.csproj
View file

@ -3,9 +3,9 @@
<PropertyGroup> <PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
<Features>strict</Features> <Features>strict</Features>
<LangVersion>12</LangVersion> <LangVersion>12</LangVersion>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>