diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs b/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs index 465eabf..6f58b5e 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs @@ -108,7 +108,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager } } return IPAddress.Loopback; - } //поток 2 diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs b/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs index fa4a718..98b93b6 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs @@ -62,7 +62,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager } } return IPAddress.Loopback; - } /// diff --git a/ZoFo/GameCore/GameManagers/SoundManager.cs b/ZoFo/GameCore/GameManagers/SoundManager.cs index da8880b..97a5922 100644 --- a/ZoFo/GameCore/GameManagers/SoundManager.cs +++ b/ZoFo/GameCore/GameManagers/SoundManager.cs @@ -8,8 +8,9 @@ using Microsoft.Xna.Framework.Content; using System.Linq; using Newtonsoft.Json; -using Microsoft.Xna.Framework.Media; -using ZoFo.GameCore.GUI; +using Microsoft.Xna.Framework.Media; +using System.Runtime.InteropServices; +using ZoFo.GameCore.GUI; namespace ZoFo.GameCore.GameManagers { @@ -21,9 +22,18 @@ namespace ZoFo.GameCore.GameManagers public void LoadSounds() // метод для загрузки звуков из папки { - //List sounds = AppManager.Instance.Content.Load>("sounds/"); - var k = Directory.GetFiles(Path.Combine(AppContext.BaseDirectory, "Content", "sounds")).Where(x => x.EndsWith("xnb")); - if (k.Count() > 0) + //List sounds = AppManager.Instance.Content.Load>("sounds/"); + + string a = Path.Combine("Content", "sounds"); + string[] k; + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + k = Directory.GetFiles(Path.Combine("bin", "Debug", "net8.0", "Content", "sounds")).Where(x => x.EndsWith("xnb")).ToArray(); + } + else{ + k = Directory.GetFiles(Path.Combine(Directory.GetCurrentDirectory(), "Content", "sounds")).Where(x => x.EndsWith("xnb")).ToArray(); + } + if (k.Length > 0) { string[] soundFiles = k.Select(x => x.Split("\\").Last().Split("/").Last().Replace(".xnb", "")).ToArray();// папка со звуками там где exe