really good progress, need to fix tile upload
This commit is contained in:
parent
573e9ea7bf
commit
9ef43bb9f6
25 changed files with 280 additions and 112 deletions
|
@ -347,7 +347,7 @@ namespace Sledgemapper
|
|||
{
|
||||
foreach (var player in _sessionData.Players.Copy())
|
||||
{
|
||||
var hexs = player.Color.Split(2).ToArray();
|
||||
var hexs = player.Color.TrimStart('#').Split(2).ToArray();
|
||||
var color = new Color(int.Parse(hexs[0], System.Globalization.NumberStyles.HexNumber),
|
||||
int.Parse(hexs[1], System.Globalization.NumberStyles.HexNumber),
|
||||
int.Parse(hexs[2], System.Globalization.NumberStyles.HexNumber));
|
||||
|
@ -426,13 +426,13 @@ namespace Sledgemapper
|
|||
var successful = false;
|
||||
try
|
||||
{
|
||||
var result = await _communicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text, _authResponse.Initials);
|
||||
var result = await _communicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text);
|
||||
if (result != null)
|
||||
{
|
||||
_sessionData.Map = result.Map;
|
||||
_sessionData.Walls = result.Walls;
|
||||
_sessionData.Overlays = result.Overlays;
|
||||
_sessionData.Players = result.Players;
|
||||
|
||||
_sessionData.MapEntityAdded += OnMapEntityAdded;
|
||||
_sessionData.MapEntityDeleted += OnMapEntityDeleted;
|
||||
}
|
||||
|
@ -486,7 +486,7 @@ namespace Sledgemapper
|
|||
|
||||
}
|
||||
successful = result;
|
||||
var result2 = await _communicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text, _authResponse.Initials);
|
||||
var result2 = await _communicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text);
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -688,7 +688,9 @@ namespace Sledgemapper
|
|||
|
||||
private async void OnMenuConnectSyncSelected(object sender, EventArgs e)
|
||||
{
|
||||
await _communicationManager.Connection?.InvokeAsync("Sync", _sessionData.SessionName, _sessionData);
|
||||
// await _communicationManager.Connection?.InvokeAsync("Sync", _sessionData.SessionName, _sessionData);
|
||||
var serverMap = await _communicationManager.Api.Session(_sessionData.SessionName);
|
||||
|
||||
}
|
||||
|
||||
private void OnMenuConnectNewSelected(object sender, EventArgs e)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue