Skip to content
This repository has been archived by the owner on Apr 17, 2024. It is now read-only.

Added:some new features #82

Merged
merged 1 commit into from
Nov 22, 2021
Merged

Added:some new features #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions logic/Client/Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@

<ItemGroup>
<None Remove="Logo.png" />
<None Remove="Map.png" />
<None Remove="Player.png" />
<None Remove="Team.png" />
<None Remove="Warning.png" />
</ItemGroup>

<ItemGroup>
<Content Include="Map.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Player.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down
12 changes: 8 additions & 4 deletions logic/Client/ConnectRegister.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,23 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Client"
mc:Ignorable="d"
Title="ConnectRegister" Height="315" Width="350" ResizeMode="NoResize" >
Title="ConnectRegister" Height="370" Width="350" ResizeMode="NoResize" >
<Grid>
<Label Content="Input your Message below." HorizontalAlignment="Left" Height="26" VerticalAlignment="Top" Width="184" />
<Label Content="IP:" HorizontalAlignment="Left" Height="24" Margin="0,31,0,0" VerticalAlignment="Top" Width="53"/>
<Label Content="Port:" HorizontalAlignment="Left" Height="24" Margin="0,103,0,0" VerticalAlignment="Top" Width="53"/>
<TextBox Name="IPBox" HorizontalAlignment="Left" Height="20" Margin="2,55,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="117" BorderBrush="Black"/>
<TextBox Name="PortBox" HorizontalAlignment="Left" Height="20" Margin="2,127,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="117" BorderBrush="Black"/>
<Button Content="Save" HorizontalAlignment="Left" Margin="261,246,0,0" VerticalAlignment="Top" Click="Save" Width="62" Background="Ivory"/>
<TextBox x:Name="State" HorizontalAlignment="Left" Height="100" Margin="2,165,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="254" BorderBrush="White" IsReadOnly="True"/>
<Button Content="Save" HorizontalAlignment="Left" Margin="261,308,0,0" VerticalAlignment="Top" Click="Save" Width="62" Background="Ivory"/>
<TextBox x:Name="State" HorizontalAlignment="Left" Height="100" Margin="2,227,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="254" BorderBrush="White" IsReadOnly="True"/>
<TextBox x:Name="PlayerIDBox" HorizontalAlignment="Left" Height="20" Margin="183,55,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="117" BorderBrush="Black"/>
<TextBox x:Name="TeamIDBox" HorizontalAlignment="Left" Height="20" Margin="183,127,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="117" BorderBrush="Black"/>
<Label Content="PlayerID:" HorizontalAlignment="Left" Height="24" Margin="183,31,0,0" VerticalAlignment="Top" Width="68"/>
<Label Content="TeamID:" HorizontalAlignment="Left" Height="24" Margin="183,104,0,0" VerticalAlignment="Top" Width="68"/>
<Label Content="TeamID:" HorizontalAlignment="Left" Height="24" Margin="183,103,0,0" VerticalAlignment="Top" Width="68"/>
<Label Content="Pskill:" HorizontalAlignment="Left" Height="24" Margin="0,175,0,0" VerticalAlignment="Top" Width="53"/>
<TextBox x:Name="Pskill" HorizontalAlignment="Left" Height="20" Margin="2,199,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="117" BorderBrush="Black"/>
<Label Content="Askill:" HorizontalAlignment="Left" Height="24" Margin="183,175,0,0" VerticalAlignment="Top" Width="53"/>
<TextBox x:Name="Askill" HorizontalAlignment="Left" Height="20" Margin="183,199,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="117" BorderBrush="Black"/>

</Grid>
</Window>
2 changes: 1 addition & 1 deletion logic/Client/ConnectRegister.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private void Save(object sender, RoutedEventArgs e)
}
else using (var sw = new StreamWriter(".\\ConnectInfo.txt"))
{
sw.WriteLine(IPBox.Text + " " + PortBox.Text + " " + PlayerIDBox.Text + " " + TeamIDBox.Text);
sw.WriteLine(IPBox.Text + " " + PortBox.Text + " " + PlayerIDBox.Text + " " + TeamIDBox.Text+" "+Pskill.Text+" "+Askill.Text);
State.Text = "Info Registered.";
}
}
Expand Down
2 changes: 1 addition & 1 deletion logic/Client/ErrorDisplayer.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public partial class ErrorDisplayer : Window
public ErrorDisplayer(string s)
{
InitializeComponent();
errorDisplayer.Text = s;
errorDisplayer.Text = s+" Time:"+DateTime.Now.ToString();
}
private void DragWindow(object sender, RoutedEventArgs e)
{
Expand Down
26 changes: 13 additions & 13 deletions logic/Client/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

</Grid.ColumnDefinitions>

<Image x:Name="Map" Margin="182,45,52,0" Stretch="Fill" Source="Map.png"/>
<Button x:Name="PorC" Content="▶" HorizontalAlignment="Left" Height="25" VerticalAlignment="Bottom" Width="25" RenderTransformOrigin="0.637,-0.304" Margin="157,0,0,648" Background="Green" BorderBrush="Green" FontFamily="Microsoft YaHei" Click="ClickToPauseOrContinue"/>
<Grid x:Name="UnderLayerOfMap" HorizontalAlignment="Left" Height="650" Margin="182,45,0,0" VerticalAlignment="Top" Width="650"></Grid>
<Button x:Name="PorC" Content="▶" HorizontalAlignment="Left" Height="25" VerticalAlignment="Bottom" Width="25" RenderTransformOrigin="0.637,-0.304" Margin="157,0,0,650" Background="Green" BorderBrush="Green" FontFamily="Microsoft YaHei" Click="ClickToPauseOrContinue"/>
<Button Content="❎" HorizontalAlignment="Left" Height="36" VerticalAlignment="Bottom" Width="51" RenderTransformOrigin="0.488,0.772" Margin="859,0,0,685" Background="White" FontFamily="Microsoft YaHei" BorderBrush="White" Click="ClickToClose"/>
<Button Content="—" Height="34" VerticalAlignment="Bottom" RenderTransformOrigin="0.488,0.772" Margin="803,0,56,687" Background="White" FontFamily="Microsoft YaHei" BorderBrush="White" Click="ClickToMinimize"/>
<Label Content="THUAI5 Client for players " HorizontalAlignment="Right" Height="38" Margin="0,0,622,680" VerticalAlignment="Bottom" Width="254" FontSize="20" />
<Button x:Name="Mode" Content="⚙" HorizontalAlignment="Left" Height="25" VerticalAlignment="Bottom" Width="25" RenderTransformOrigin="0.597,-2.532" Margin="157,0,0,618" Background="BlueViolet" BorderBrush="BlueViolet" FontFamily="Microsoft YaHei" Click="ClickToSetMode"/>
<Button x:Name="Mode" Content="⚙" HorizontalAlignment="Left" Height="25" VerticalAlignment="Bottom" Width="25" RenderTransformOrigin="0.597,-2.532" Margin="157,0,0,620" Background="BlueViolet" BorderBrush="BlueViolet" FontFamily="Microsoft YaHei" Click="ClickToSetMode"/>
<Button Content="关&#xA;于&#xA;我&#xA;们&#xA;(F)" HorizontalAlignment="Left" Height="84" Margin="859,424,0,0" VerticalAlignment="Top" Width="42" Background="Ivory" Click="ClickToVisitEESAST"/>

<Image Margin="0,1,874,681" Stretch="Fill" Source="pack://siteoforigin:,,,/Logo.png" RenderTransformOrigin="0.511,1.002"/>
Expand All @@ -33,56 +33,56 @@
<Button Content="天梯信息(L)" Height="40" Width="93" RenderTransformOrigin="0.488,0.772" Background="White" FontFamily="Microsoft YaHei" FontSize="16" BorderBrush="White" Click="ClickToCheckLadder"/>
</ToolBar>
</ToolBarTray>
<Canvas Background="Ivory" Margin="2,40,841,513" >
<Canvas Name="Bar1" Background="White" Margin="2,40,841,513" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="82,40,764,513" >
<Canvas Name="Bar2" Background="White" Margin="82,40,764,513" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA; ⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="2,212,841,344" >
<Canvas Name="Bar3" Background="White" Margin="2,212,841,344" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="82,212,763,344" >
<Canvas Name="Bar4" Background="White" Margin="82,212,763,344" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="1,381,842,175" >
<Canvas Name="Bar5" Background="White" Margin="1,381,842,175" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="82,381,762,175" >
<Canvas Name="Bar6" Background="White" Margin="82,381,762,175" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="2,550,841,1" >
<Canvas Name="Bar7" Background="White" Margin="2,550,841,1" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
<TextBox Height="15" Canvas.Top="115" Text="Scores:" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True"/>
<TextBox Height="42" Text="👥1🧓1&#xA;职1/职2" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
</Canvas>
<Canvas Background="Ivory" Margin="82,550,762,0" >
<Canvas Name="Bar8" Background="White" Margin="82,550,762,0" >
<ProgressBar Height="15" Canvas.Top="150" Width="65" Background="Green"/>
<TextBox Height="15" Text="⭐：" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" Canvas.Top="130" RenderTransformOrigin="0.478,1.459" IsReadOnly="True"/>
<TextBox Height="63" Canvas.Top="47" TextWrapping="Wrap" Width="65" FontSize="12" BorderBrush="White" IsReadOnly="True" Text="🗡：&#xA;⌚：&#xA; 🏃：&#xA;♥：" />
Expand All @@ -100,8 +100,8 @@
</Border.RenderTransform>
</Border>
<Button Content=" 帮&#xA; 助&#xA;(H)" HorizontalAlignment="Left" Height="84" Margin="859,170,0,0" VerticalAlignment="Top" Width="42" Background="Ivory" Click="ClickForHelp"/>
<Grid x:Name="UpperLayerOfMap" HorizontalAlignment="Left" Height="676" Margin="182,45,0,0" VerticalAlignment="Top" Width="676">
<Grid x:Name="UpperLayerOfMap" HorizontalAlignment="Left" Height="650" Margin="182,45,0,0" VerticalAlignment="Top" Width="650" MouseLeftButtonDown="Attack">
</Grid>
<Button Name="Connect" Content="🔗" HorizontalAlignment="Left" Margin="856,53,0,0" VerticalAlignment="Top" Width="20" Background="Aqua" Click="ClickToConnect"/>
<Button Name="Connect" Content="🔗" HorizontalAlignment="Left" Margin="832,53,0,0" VerticalAlignment="Top" Width="20" Background="Aqua" Click="ClickToConnect"/>
</Grid>
</Window>
Loading