diff --git a/.vs/Bowling/DesignTimeBuild/.dtbcache.v2 b/.vs/Bowling/DesignTimeBuild/.dtbcache.v2 index ae2c7c2..02f8669 100644 Binary files a/.vs/Bowling/DesignTimeBuild/.dtbcache.v2 and b/.vs/Bowling/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Bowling/FileContentIndex/3e5b10d1-6738-43b9-bce1-7acc81b77cdb.vsidx b/.vs/Bowling/FileContentIndex/3e5b10d1-6738-43b9-bce1-7acc81b77cdb.vsidx new file mode 100644 index 0000000..8122641 Binary files /dev/null and b/.vs/Bowling/FileContentIndex/3e5b10d1-6738-43b9-bce1-7acc81b77cdb.vsidx differ diff --git a/.vs/Bowling/FileContentIndex/d2706ece-85f2-44cc-b746-b34e35db2aa1.vsidx b/.vs/Bowling/FileContentIndex/544888fc-21ba-4ae3-a23a-9b22626db7dc.vsidx similarity index 53% rename from .vs/Bowling/FileContentIndex/d2706ece-85f2-44cc-b746-b34e35db2aa1.vsidx rename to .vs/Bowling/FileContentIndex/544888fc-21ba-4ae3-a23a-9b22626db7dc.vsidx index 83f1daa..b37d1c9 100644 Binary files a/.vs/Bowling/FileContentIndex/d2706ece-85f2-44cc-b746-b34e35db2aa1.vsidx and b/.vs/Bowling/FileContentIndex/544888fc-21ba-4ae3-a23a-9b22626db7dc.vsidx differ diff --git a/.vs/Bowling/FileContentIndex/8a9882eb-11ac-49f9-8049-b0a7fce2c775.vsidx b/.vs/Bowling/FileContentIndex/8a9882eb-11ac-49f9-8049-b0a7fce2c775.vsidx deleted file mode 100644 index 72c22d7..0000000 Binary files a/.vs/Bowling/FileContentIndex/8a9882eb-11ac-49f9-8049-b0a7fce2c775.vsidx and /dev/null differ diff --git a/.vs/Bowling/FileContentIndex/da10ab89-687e-42de-b1b5-2f9a7383b110.vsidx b/.vs/Bowling/FileContentIndex/ae1d199b-49d2-4445-a221-676e55f405ee.vsidx similarity index 80% rename from .vs/Bowling/FileContentIndex/da10ab89-687e-42de-b1b5-2f9a7383b110.vsidx rename to .vs/Bowling/FileContentIndex/ae1d199b-49d2-4445-a221-676e55f405ee.vsidx index abfce9a..a545fa9 100644 Binary files a/.vs/Bowling/FileContentIndex/da10ab89-687e-42de-b1b5-2f9a7383b110.vsidx and b/.vs/Bowling/FileContentIndex/ae1d199b-49d2-4445-a221-676e55f405ee.vsidx differ diff --git a/.vs/Bowling/FileContentIndex/b31a2f80-b827-4c45-98e8-79b696866f46.vsidx b/.vs/Bowling/FileContentIndex/b31a2f80-b827-4c45-98e8-79b696866f46.vsidx deleted file mode 100644 index e369278..0000000 Binary files a/.vs/Bowling/FileContentIndex/b31a2f80-b827-4c45-98e8-79b696866f46.vsidx and /dev/null differ diff --git a/.vs/Bowling/FileContentIndex/c44f0eb0-0ffc-4ff6-a158-767349595e58.vsidx b/.vs/Bowling/FileContentIndex/c44f0eb0-0ffc-4ff6-a158-767349595e58.vsidx new file mode 100644 index 0000000..8455e66 Binary files /dev/null and b/.vs/Bowling/FileContentIndex/c44f0eb0-0ffc-4ff6-a158-767349595e58.vsidx differ diff --git a/.vs/Bowling/v17/.suo b/.vs/Bowling/v17/.suo index 505ad07..8d1fbbe 100644 Binary files a/.vs/Bowling/v17/.suo and b/.vs/Bowling/v17/.suo differ diff --git a/.vs/ProjectEvaluation/bowling.metadata.v2 b/.vs/ProjectEvaluation/bowling.metadata.v2 index d18fff4..767881c 100644 Binary files a/.vs/ProjectEvaluation/bowling.metadata.v2 and b/.vs/ProjectEvaluation/bowling.metadata.v2 differ diff --git a/.vs/ProjectEvaluation/bowling.projects.v2 b/.vs/ProjectEvaluation/bowling.projects.v2 index 266ab14..9aa22c9 100644 Binary files a/.vs/ProjectEvaluation/bowling.projects.v2 and b/.vs/ProjectEvaluation/bowling.projects.v2 differ diff --git a/Bowling/Connect.Designer.cs b/Bowling/Connect.Designer.cs index 9a296fc..2d4bcfe 100644 --- a/Bowling/Connect.Designer.cs +++ b/Bowling/Connect.Designer.cs @@ -44,6 +44,7 @@ this.NameTB.Name = "NameTB"; this.NameTB.Size = new System.Drawing.Size(224, 27); this.NameTB.TabIndex = 0; + this.NameTB.Text = "test"; // // IPTB // @@ -51,6 +52,7 @@ this.IPTB.Name = "IPTB"; this.IPTB.Size = new System.Drawing.Size(224, 27); this.IPTB.TabIndex = 1; + this.IPTB.Text = "127.0.0.1"; // // PortTB // @@ -58,6 +60,7 @@ this.PortTB.Name = "PortTB"; this.PortTB.Size = new System.Drawing.Size(224, 27); this.PortTB.TabIndex = 2; + this.PortTB.Text = "7632"; // // label1 // diff --git a/Bowling/Content/bin/Windows/Content/keggle.xnb b/Bowling/Content/bin/Windows/Content/keggle.xnb index c7f09f0..2288f2e 100644 Binary files a/Bowling/Content/bin/Windows/Content/keggle.xnb and b/Bowling/Content/bin/Windows/Content/keggle.xnb differ diff --git a/Bowling/Content/bin/Windows/keggle.xnb b/Bowling/Content/bin/Windows/keggle.xnb index c7f09f0..2288f2e 100644 Binary files a/Bowling/Content/bin/Windows/keggle.xnb and b/Bowling/Content/bin/Windows/keggle.xnb differ diff --git a/Bowling/Content/keggle.png b/Bowling/Content/keggle.png index 006d897..295fd5f 100644 Binary files a/Bowling/Content/keggle.png and b/Bowling/Content/keggle.png differ diff --git a/Bowling/Content/obj/Windows/.mgstats b/Bowling/Content/obj/Windows/.mgstats index b77c5aa..6a973f4 100644 --- a/Bowling/Content/obj/Windows/.mgstats +++ b/Bowling/Content/obj/Windows/.mgstats @@ -1,8 +1,2 @@ Source File,Dest File,Processor Type,Content Type,Source File Size,Dest File Size,Build Seconds -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/arrow.png","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/arrow.xnb","TextureProcessor","Texture2DContent",365,2725,0,1991587 -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/ball.png","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/ball.xnb","TextureProcessor","Texture2DContent",652,10085,0,0067644 -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/gameFont.spritefont","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/gameFont.xnb","FontDescriptionProcessor","SpriteFontContent",2069,70690,0,1546222 -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/gameFont2.spritefont","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/gameFont2.xnb","FontDescriptionProcessor","SpriteFontContent",2069,136226,0,0475374 -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/keggle.png","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/keggle.xnb","TextureProcessor","Texture2DContent",276,4181,0,0053606 -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/line.png","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/line.xnb","TextureProcessor","Texture2DContent",39598,224925,0,0162617 -"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/logo.png","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/logo.xnb","TextureProcessor","Texture2DContent",28661,504373,0,0282225 +"C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/keggle.png","C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/keggle.xnb","TextureProcessor","Texture2DContent",980,6485,0,2016653 diff --git a/Bowling/Content/obj/Windows/Content/keggle.mgcontent b/Bowling/Content/obj/Windows/Content/keggle.mgcontent index 4ec6709..6bbaeff 100644 --- a/Bowling/Content/obj/Windows/Content/keggle.mgcontent +++ b/Bowling/Content/obj/Windows/Content/keggle.mgcontent @@ -1,9 +1,9 @@ C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/keggle.png - 2022-04-23T00:12:43.2915834+03:00 + 2022-04-23T21:52:30+03:00 C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/Content/keggle.xnb - 2022-04-23T14:37:54.0070101+03:00 + 2022-04-23T23:52:18.2788162+03:00 TextureImporter 2020-08-10T16:17:54+03:00 TextureProcessor diff --git a/Bowling/Content/obj/Windows/keggle.mgcontent b/Bowling/Content/obj/Windows/keggle.mgcontent index 390c1d3..101bb6c 100644 --- a/Bowling/Content/obj/Windows/keggle.mgcontent +++ b/Bowling/Content/obj/Windows/keggle.mgcontent @@ -1,9 +1,9 @@ C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/keggle.png - 2022-04-23T00:12:43.2915834+03:00 + 2022-04-23T21:52:30+03:00 C:/Users/Semejkin_AV/Documents/Github_repos/ProgtimeHack2022_Bowling/Bowling/Content/bin/Windows/keggle.xnb - 2022-04-23T23:12:15.4604061+03:00 + 2022-04-23T23:34:45.4964315+03:00 TextureImporter 2020-08-10T16:17:54+03:00 TextureProcessor diff --git a/Bowling/Game1.cs b/Bowling/Game1.cs index 7328d34..a482336 100644 --- a/Bowling/Game1.cs +++ b/Bowling/Game1.cs @@ -93,7 +93,7 @@ namespace Bowling { for (int j = 0; j < count; j++) { - pins.Add(new Pin(keggle_texture, new Vector2(_graphics.PreferredBackBufferWidth - 150 * modifier + i * keggle_texture.Width * modifier, j * keggle_texture.Height * modifier + gutter_top_y - keggle_texture.Height * count / 2 * modifier + keggle_texture.Height * 5 + 30))); + pins.Add(new Pin(keggle_texture, new Vector2(_graphics.PreferredBackBufferWidth - 150 * modifier + i * keggle_texture.Width * modifier, j * keggle_texture.Height * modifier + gutter_top_y - keggle_texture.Height * count / 2 * modifier + keggle_texture.Height * 5 + 40))); } count += 1; } @@ -123,7 +123,7 @@ namespace Bowling if (connect.ShowDialog() == DialogResult.OK) { gameState = GameState.Menu; - player1 = new Player() { Name = connect.Name, Score = new List() }; + player1 = new Player() { Name = connect.name, Score = new List() }; NetLib.NetLib.IP = connect.IP; NetLib.NetLib.port = connect.Port; NetLib.NetLib.Connect(); @@ -153,8 +153,8 @@ namespace Bowling if (counter >= 300) { gameState = GameState.Menu; - NetLib.NetLib.Send("11"); counter = 0; + NetLib.NetLib.Send("11"); } break; case GameState.PauseGame: diff --git a/Bowling/bin/Debug/netcoreapp3.1/Bowling.dll b/Bowling/bin/Debug/netcoreapp3.1/Bowling.dll index 7b6649d..cfbd498 100644 Binary files a/Bowling/bin/Debug/netcoreapp3.1/Bowling.dll and b/Bowling/bin/Debug/netcoreapp3.1/Bowling.dll differ diff --git a/Bowling/bin/Debug/netcoreapp3.1/Bowling.pdb b/Bowling/bin/Debug/netcoreapp3.1/Bowling.pdb index 99d8392..7ec97c2 100644 Binary files a/Bowling/bin/Debug/netcoreapp3.1/Bowling.pdb and b/Bowling/bin/Debug/netcoreapp3.1/Bowling.pdb differ diff --git a/Bowling/bin/Debug/netcoreapp3.1/Content/keggle.xnb b/Bowling/bin/Debug/netcoreapp3.1/Content/keggle.xnb index c7f09f0..2288f2e 100644 Binary files a/Bowling/bin/Debug/netcoreapp3.1/Content/keggle.xnb and b/Bowling/bin/Debug/netcoreapp3.1/Content/keggle.xnb differ diff --git a/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.AssemblyReference.cache b/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.AssemblyReference.cache index 0d7c739..263fd86 100644 Binary files a/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.AssemblyReference.cache and b/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.AssemblyReference.cache differ diff --git a/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.GenerateResource.cache b/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.GenerateResource.cache index 643bc1f..f660842 100644 Binary files a/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.GenerateResource.cache and b/Bowling/obj/Debug/netcoreapp3.1/Bowling.csproj.GenerateResource.cache differ diff --git a/Bowling/obj/Debug/netcoreapp3.1/Bowling.dll b/Bowling/obj/Debug/netcoreapp3.1/Bowling.dll index 7b6649d..cfbd498 100644 Binary files a/Bowling/obj/Debug/netcoreapp3.1/Bowling.dll and b/Bowling/obj/Debug/netcoreapp3.1/Bowling.dll differ diff --git a/Bowling/obj/Debug/netcoreapp3.1/Bowling.pdb b/Bowling/obj/Debug/netcoreapp3.1/Bowling.pdb index 99d8392..7ec97c2 100644 Binary files a/Bowling/obj/Debug/netcoreapp3.1/Bowling.pdb and b/Bowling/obj/Debug/netcoreapp3.1/Bowling.pdb differ diff --git a/Bowling_Server/Program.cs b/Bowling_Server/Program.cs index b032ee1..89ec13f 100644 --- a/Bowling_Server/Program.cs +++ b/Bowling_Server/Program.cs @@ -32,7 +32,7 @@ namespace Bowling_Server } StartGame(group); } - Thread.Sleep(1000); + Thread.Sleep(500); } }); matchmakingThread.Start(); @@ -83,7 +83,7 @@ namespace Bowling_Server static void StartGame(List group) { - + Console.WriteLine("OK"); CastOpponents(group); foreach (var player in group) @@ -100,12 +100,12 @@ namespace Bowling_Server string json = Encoding.ASCII.GetString(data, 0, dataLength); if (json == "11") { - //foreach (var player in group) - //{ - player.socket.Send(Encoding.ASCII.GetBytes("11")); - player.Score = new List(); - players.Add(player); - //} + foreach (var player in group) + { + player.socket.Send(Encoding.ASCII.GetBytes("11")); + player.Score = new List(); + players.Add(player); + } break; } player.Deserialize(json); @@ -120,11 +120,13 @@ namespace Bowling_Server if (group.IndexOf(player) == 1) { group[0].socket.Send(Encoding.ASCII.GetBytes("11")); + group[0].Score = new List(); players.Add(group[0]); } else { group[1].socket.Send(Encoding.ASCII.GetBytes("11")); + group[1].Score = new List(); players.Add(group[1]); } } @@ -137,5 +139,9 @@ namespace Bowling_Server thread.Start(); } } + public void Die() + { + + } } -} +} \ No newline at end of file diff --git a/Bowling_Server/bin/Debug/net5.0/Bowling_Server.dll b/Bowling_Server/bin/Debug/net5.0/Bowling_Server.dll index 8f38b4a..bdbdfdd 100644 Binary files a/Bowling_Server/bin/Debug/net5.0/Bowling_Server.dll and b/Bowling_Server/bin/Debug/net5.0/Bowling_Server.dll differ diff --git a/Bowling_Server/bin/Debug/net5.0/Bowling_Server.pdb b/Bowling_Server/bin/Debug/net5.0/Bowling_Server.pdb index 491ea1c..ecdce76 100644 Binary files a/Bowling_Server/bin/Debug/net5.0/Bowling_Server.pdb and b/Bowling_Server/bin/Debug/net5.0/Bowling_Server.pdb differ diff --git a/Bowling_Server/obj/Debug/net5.0/Bowling_Server.csproj.AssemblyReference.cache b/Bowling_Server/obj/Debug/net5.0/Bowling_Server.csproj.AssemblyReference.cache index b3ae11a..0afe8fc 100644 Binary files a/Bowling_Server/obj/Debug/net5.0/Bowling_Server.csproj.AssemblyReference.cache and b/Bowling_Server/obj/Debug/net5.0/Bowling_Server.csproj.AssemblyReference.cache differ diff --git a/Bowling_Server/obj/Debug/net5.0/Bowling_Server.dll b/Bowling_Server/obj/Debug/net5.0/Bowling_Server.dll index 8f38b4a..bdbdfdd 100644 Binary files a/Bowling_Server/obj/Debug/net5.0/Bowling_Server.dll and b/Bowling_Server/obj/Debug/net5.0/Bowling_Server.dll differ diff --git a/Bowling_Server/obj/Debug/net5.0/Bowling_Server.pdb b/Bowling_Server/obj/Debug/net5.0/Bowling_Server.pdb index 491ea1c..ecdce76 100644 Binary files a/Bowling_Server/obj/Debug/net5.0/Bowling_Server.pdb and b/Bowling_Server/obj/Debug/net5.0/Bowling_Server.pdb differ diff --git a/Bowling_Server/obj/Debug/net5.0/ref/Bowling_Server.dll b/Bowling_Server/obj/Debug/net5.0/ref/Bowling_Server.dll index 47e8bcf..2501dd5 100644 Binary files a/Bowling_Server/obj/Debug/net5.0/ref/Bowling_Server.dll and b/Bowling_Server/obj/Debug/net5.0/ref/Bowling_Server.dll differ diff --git a/Bowling_Server/obj/Debug/net5.0/refint/Bowling_Server.dll b/Bowling_Server/obj/Debug/net5.0/refint/Bowling_Server.dll index 47e8bcf..2501dd5 100644 Binary files a/Bowling_Server/obj/Debug/net5.0/refint/Bowling_Server.dll and b/Bowling_Server/obj/Debug/net5.0/refint/Bowling_Server.dll differ