progtime/ZoFo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #64 from progtime-net/FixingDevelopment

Browse source 
Fixing development
This commit is contained in:
SergoDobro 2024-08-18 15:31:14 +03:00 • committed by GitHub
commit 0ea1f44072
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs
View file

@ -108,7 +108,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
} }
} }
return IPAddress.Loopback; return IPAddress.Loopback;
} }
//поток 2 //поток 2

1
ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
View file

@ -62,7 +62,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
} }
} }
return IPAddress.Loopback; return IPAddress.Loopback;
} }
/// <summary> /// <summary>

20
ZoFo/GameCore/GameManagers/SoundManager.cs
View file

@ -8,8 +8,9 @@ using Microsoft.Xna.Framework.Content;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using Microsoft.Xna.Framework.Media; using Microsoft.Xna.Framework.Media;
using ZoFo.GameCore.GUI; using System.Runtime.InteropServices;
using ZoFo.GameCore.GUI;
namespace ZoFo.GameCore.GameManagers namespace ZoFo.GameCore.GameManagers
{ {
@ -21,9 +22,18 @@ namespace ZoFo.GameCore.GameManagers
public void LoadSounds() // метод для загрузки звуков из папки public void LoadSounds() // метод для загрузки звуков из папки
{ {
//List<string> sounds = AppManager.Instance.Content.Load<List<string>>("sounds/"); //List<string> sounds = AppManager.Instance.Content.Load<List<string>>("sounds/");
var k = Directory.GetFiles(Path.Combine(AppContext.BaseDirectory, "Content", "sounds")).Where(x => x.EndsWith("xnb"));
if (k.Count() > 0) 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 string[] soundFiles = k.Select(x => x.Split("\\").Last().Split("/").Last().Replace(".xnb", "")).ToArray();// папка со звуками там где exe