From 0b7b3116b4c48010be0f464d028428d35c5540e3 Mon Sep 17 00:00:00 2001 From: Michele Date: Fri, 20 Nov 2020 00:05:23 +0000 Subject: [PATCH] small changes --- Sledgemapper.Api/Hubs/SledgemapperHub.cs | 9 +++++---- Sledgemapper.Api/sledgemapper.db | Bin 233472 -> 233472 bytes Sledgemapper/CommunicationManager.cs | 4 ++-- Sledgemapper/Sledgemapper.cs | 20 +++++++++++++++++++- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Sledgemapper.Api/Hubs/SledgemapperHub.cs b/Sledgemapper.Api/Hubs/SledgemapperHub.cs index ae25fd3..8ea8867 100644 --- a/Sledgemapper.Api/Hubs/SledgemapperHub.cs +++ b/Sledgemapper.Api/Hubs/SledgemapperHub.cs @@ -38,7 +38,8 @@ namespace SignalRChat.Hubs "#911eb4", "#800000", "#808000", - "#469990"}; + "#469990" + }; public async Task NewTile(string sessionName, Tile tile) { @@ -107,7 +108,7 @@ namespace SignalRChat.Hubs var userId = int.Parse(Context.User.Identity.Name); var SessionUsers = _dbContext.SessionUsers.Where(m => m.SessionId == sessionId).OrderBy(m => m.UserId).ToList(); var user = _datacontext.Users.First(u => u.Id == userId); - var player = new Player { UserId = userId, Initials = user.Initials, Position = tile, Color = Colors[SessionUsers.IndexOf(SessionUsers.FirstOrDefault(m => m.UserId == userId))] }; + var player = new Player { UserId = userId, Initials = user.Initials, Position = tile, Color = UserColors[userId]}; await Clients.Group(sessionName).PlayerUpdate(player); } @@ -125,12 +126,13 @@ namespace SignalRChat.Hubs public override async Task OnDisconnectedAsync(Exception exception) { var userConnection = _dbContext.UserConnections.FirstOrDefault(m => m.ConnectionId == Context.ConnectionId); + var userId=userConnection.UserId; if (userConnection != null) { _dbContext.UserConnections.Remove(userConnection); } - var userSessions = _dbContext.SessionUsers.Where(m => m.UserId == userConnection.UserId).ToList(); + var userSessions = _dbContext.SessionUsers.Where(m => m.UserId == userId).ToList(); { foreach (var userSession in userSessions) { @@ -138,7 +140,6 @@ namespace SignalRChat.Hubs await Clients.Group(session.SessionName).PlayerUpdate(null); //send remove player _dbContext.SessionUsers.Remove(userSession); } - } await _dbContext.SaveChangesAsync(); diff --git a/Sledgemapper.Api/sledgemapper.db b/Sledgemapper.Api/sledgemapper.db index 5531a3990de09d4f94961e1348f66280a89f64ac..892ac8b5fc74db18147be9a0c69048263eb0579c 100644 GIT binary patch delta 356 zcmZozz}K*VZ^H$BM*hhc_4OEeHyQ8>us-I0%zt~cpurh_Q4U5%W;O-}1_2<=3Zy}N z*3F;&1qCEH_+=RQpYR{&U(MgoU(7GVAI5LV_n+_4W<`aQeD$)7mTV@4rTM|RQQ?VB zu4!47<-wIciT){$KvRH{tj?yP@vgxpZiYGGUX^K{UWrAfdFkoWTr3PgosLOaUWQfS zNjVl(89|=@Cg#RY#xCX3ydX)|!i?a`+>(N@yu#2tr}Dh4BJa$ofIw+(uwrxFmp1p zfe0p`3t6~8p5?#F!2gH;BmW!z=ltLJAM)SkzY2sWfhKI=mu6$*2dZIX?ZRDnB3pF9tqFPG%s*&dABM`Ln;E z03R!VF$4b-{^R_s`TO~cH!CV6@^3EApC!Qjn*a4?!GhcT>imBgc$iuFS(rH)*+2vn q0|NsK7m#4(f6l=FhyNr08~*3~-@sNhKcC Register(RegisterModel registerModel) + public async Task Register(RegisterModel registerModel) { var result = await Api.Register(registerModel).ConfigureAwait(false); - return result.IsSuccessStatusCode; + return result; } public async Task Login(AuthenticateModel authenticateModel) diff --git a/Sledgemapper/Sledgemapper.cs b/Sledgemapper/Sledgemapper.cs index 0651f2e..d5360d1 100644 --- a/Sledgemapper/Sledgemapper.cs +++ b/Sledgemapper/Sledgemapper.cs @@ -153,6 +153,11 @@ namespace Sledgemapper _state.SelectOverlay(screenPosition); } + if (newState.IsKeyDown(Keys.LeftControl) && newState.IsKeyDown(Keys.C)) + { + CenterOnSelectedTile(); + } + if (mouseState.LeftButton == ButtonState.Pressed && mouseState.LeftButton != oldMouseState.LeftButton) { _state._selectedTile.X = _state._hoveredTile.X; @@ -187,6 +192,8 @@ namespace Sledgemapper if (!newState.IsKeyDown(Keys.LeftControl) && mouseState.LeftButton == ButtonState.Pressed && mouseState.LeftButton == oldMouseState.LeftButton) { _viewportCenter = new Vector3(_viewportCenter.X + mouseState.Position.X - oldMouseState.Position.X, _viewportCenter.Y + mouseState.Position.Y - oldMouseState.Position.Y, 0); + + Console.WriteLine($"{_state._selectedTile.X}:{_state._selectedTile.Y} / {_viewportCenter.X}:{_viewportCenter.Y}"); } if (newState.IsKeyDown(Keys.LeftControl) && mouseState.ScrollWheelValue != oldMouseState.ScrollWheelValue) @@ -254,6 +261,12 @@ namespace Sledgemapper base.Update(gameTime); } + private void CenterOnSelectedTile() + { + _viewportCenter.X=_state._selectedTile.X*_state._tileSize; + _viewportCenter.Y=_state._selectedTile.Y*_state._tileSize; + } + protected override void Draw(GameTime gameTime) { if (_spriteBatch is null) @@ -676,7 +689,7 @@ namespace Sledgemapper LastName = localContent.TxtLastname.Text, Initials = localContent.TxtInitials.Text }); - if (result) + if (result.IsSuccessStatusCode) { _authResponse = await _communicationManager.Login(new AuthenticateModel { @@ -685,6 +698,11 @@ namespace Sledgemapper }); successful = true; } + else + { + localContent.LblLoginError.Text = result.ReasonPhrase; + localContent.LblLoginError.Visible = true; + } } catch (Refit.ApiException refitException) {