Merge remote-tracking branch 'origin/develop' into feature/movement

# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
This commit is contained in:
NguyenVanDat
2025-10-07 09:31:01 +07:00
163 changed files with 16015 additions and 192 deletions
@@ -53,7 +53,7 @@ namespace BrewMonster.Network
/// <summary>Set the connection info. This MUST be called call before login</summary>
public static void SetConnectionInfo(string ip, int port)
{
Logger.Log($"Set connection info {ip} {port}");
BMLogger.Log($"Set connection info {ip} {port}");
Instance._ip = ip;
Instance._port = port;
}
@@ -65,7 +65,7 @@ namespace BrewMonster.Network
if (Instance._ip == "" || Instance._port == 0)
{
Logger.LogError($"IP or port is not set {Instance._ip} {Instance._port}");
BMLogger.LogError($"IP or port is not set {Instance._ip} {Instance._port}");
onLoginComplete?.Invoke(false);
return;
}
@@ -74,7 +74,7 @@ namespace BrewMonster.Network
if (!Instance._gameSession.IsConnected)
{
Logger.LogError($"Failed to connect to {Instance._ip} {Instance._port}");
BMLogger.LogError($"Failed to connect to {Instance._ip} {Instance._port}");
onLoginComplete?.Invoke(false);
return;
}
@@ -107,7 +107,7 @@ namespace BrewMonster.Network
{
if (!Instance._isInitialized)
{
Logger.LogError("GameSession is not initialized");
BMLogger.LogError("GameSession is not initialized");
return;
}
await Instance._gameSession.ConnectAsync(ip, port);