From b45c501d0decb1f905ba8171354b2d52b9498ab0 Mon Sep 17 00:00:00 2001
From: 116KBr <2768918334@qq.com>
Date: Mon, 22 Nov 2021 16:30:53 +0800
Subject: [PATCH] Added:some new features

---
 logic/Client/Client.csproj           |   4 -
 logic/Client/ConnectRegister.xaml    |  12 ++-
 logic/Client/ConnectRegister.xaml.cs |   2 +-
 logic/Client/ErrorDisplayer.xaml.cs  |   2 +-
 logic/Client/MainWindow.xaml         |  26 ++---
 logic/Client/MainWindow.xaml.cs      | 137 +++++++++++++++++++++------
 logic/Client/Map.png                 | Bin 42028 -> 0 bytes
 7 files changed, 129 insertions(+), 54 deletions(-)
 delete mode 100644 logic/Client/Map.png

diff --git a/logic/Client/Client.csproj b/logic/Client/Client.csproj
index 1e6fd3d2..86b6daf9 100644
--- a/logic/Client/Client.csproj
+++ b/logic/Client/Client.csproj
@@ -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>
diff --git a/logic/Client/ConnectRegister.xaml b/logic/Client/ConnectRegister.xaml
index b16cbb9d..105f88b4 100644
--- a/logic/Client/ConnectRegister.xaml
+++ b/logic/Client/ConnectRegister.xaml
@@ -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>
diff --git a/logic/Client/ConnectRegister.xaml.cs b/logic/Client/ConnectRegister.xaml.cs
index dee72e0c..0fa7ef4e 100644
--- a/logic/Client/ConnectRegister.xaml.cs
+++ b/logic/Client/ConnectRegister.xaml.cs
@@ -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.";
                 }
             }
diff --git a/logic/Client/ErrorDisplayer.xaml.cs b/logic/Client/ErrorDisplayer.xaml.cs
index 122368f6..4e2bbc4e 100644
--- a/logic/Client/ErrorDisplayer.xaml.cs
+++ b/logic/Client/ErrorDisplayer.xaml.cs
@@ -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)
         {
diff --git a/logic/Client/MainWindow.xaml b/logic/Client/MainWindow.xaml
index eae3e4ce..c70c58b5 100644
--- a/logic/Client/MainWindow.xaml
+++ b/logic/Client/MainWindow.xaml
@@ -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"/>
@@ -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;♥：" />
@@ -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>
diff --git a/logic/Client/MainWindow.xaml.cs b/logic/Client/MainWindow.xaml.cs
index 671d36d6..956bbcea 100644
--- a/logic/Client/MainWindow.xaml.cs
+++ b/logic/Client/MainWindow.xaml.cs
@@ -35,6 +35,7 @@ public MainWindow()
             };
             timer.Tick += new EventHandler(Refresh);    //定时器初始化
             InitializeComponent();
+            DrawMap();
             timer.Start();
             isClientStocked = true;
             playerData = new List<MessageToClient.Types.GameObjMessage>();
@@ -67,7 +68,47 @@ private void DragWindow(object sender, RoutedEventArgs e)
         {
             DragMove();
         }
-
+        private void Attack(object sender,RoutedEventArgs e)
+        {
+            MessageToServer msgJ = new MessageToServer();
+            msgJ.MessageType = MessageType.Attack;
+            msgJ.PlayerID = playerID;
+            msgJ.TeamID = teamID;
+            foreach(var i in playerData)
+            {
+                //待补充
+            }
+            communicator.SendMessage(msgJ);
+        }
+        private void DrawMap()
+        {
+            for (int i = 0; i < defaultMap.GetLength(0); i++)
+            {
+                for (int j = 0; j < defaultMap.GetLength(1); j++)
+                {
+                    Rectangle rectangle = new Rectangle();
+                    rectangle.Width = 13;
+                    rectangle.Height = 13;
+                    rectangle.HorizontalAlignment = HorizontalAlignment.Left;
+                    rectangle.VerticalAlignment = VerticalAlignment.Top;
+                    rectangle.Margin = new Thickness(13 * (j), 13 * (i), 0, 0);
+                    switch (defaultMap[i, j])
+                    {
+                        case 1:
+                            rectangle.Fill = Brushes.Brown;
+                            rectangle.Stroke = Brushes.Brown;
+                            break;
+                        case 2:
+                        case 3:
+                        case 4:
+                            rectangle.Fill = Brushes.Green;
+                            rectangle.Stroke = Brushes.Green;
+                            break;
+                    }
+                    UnderLayerOfMap.Children.Add(rectangle);
+                }
+            }
+        }
         //Client控制函数
 
         private void ClickToPauseOrContinue(object sender, RoutedEventArgs e)
@@ -159,9 +200,9 @@ private void ClickToConnect(object sender, RoutedEventArgs e)
 #pragma warning disable CS8602 // 解引用可能出现空引用。
                         string[] comInfo = sr.ReadLine().Split(' ');
 #pragma warning restore CS8602 // 解引用可能出现空引用。
-                        if (comInfo[0] == "" || comInfo[1] == "" || comInfo[2] == "" || comInfo[3] == "")
+                        if (comInfo[0] == "" || comInfo[1] == "" || comInfo[2] == "" || comInfo[3] == ""|| comInfo[4] == ""|| comInfo[5] == "")
                         {
-                            throw new Exception("Length<4");
+                            throw new Exception("Input data not sufficent");
                         }
                         playerID = Convert.ToInt64(comInfo[2]);
                         teamID = Convert.ToInt64(comInfo[3]);
@@ -178,6 +219,61 @@ private void ClickToConnect(object sender, RoutedEventArgs e)
                             msg.MessageType = MessageType.AddPlayer;
                             msg.PlayerID = playerID;
                             msg.TeamID = teamID;
+                            switch(Convert.ToInt64(comInfo[4]))
+                            {
+                                case 0:
+                                    msg.PSkill = PassiveSkillType.NullPassiveSkillType;
+                                    break;
+                                case 1:
+                                    msg.PSkill = PassiveSkillType.RecoverAfterBattle;
+                                    break;
+                                case 2:
+                                    msg.PSkill = PassiveSkillType.SpeedUpWhenLeavingGrass;
+                                    break;
+                                case 3:
+                                    msg.PSkill = PassiveSkillType.Vampire;
+                                    break;
+                                case 4:
+                                    msg.PSkill = PassiveSkillType.Pskill3;
+                                    break;
+                                case 5:
+                                    msg.PSkill = PassiveSkillType.Pskill4;
+                                    break;
+                                default:
+                                    msg.PSkill = PassiveSkillType.Pskill5;
+                                    break;
+                            }
+                            switch(Convert.ToInt64(comInfo[5]))
+                            {
+                                case 0:
+                                    msg.ASkill1 = ActiveSkillType.NullActiveSkillType;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                                case 1:
+                                    msg.ASkill1 = ActiveSkillType.BecomeAssassin;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                                case 2:
+                                    msg.ASkill1 = ActiveSkillType.BecomeVampire;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                                case 3:
+                                    msg.ASkill1 = ActiveSkillType.NuclearWeapon;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                                case 4:
+                                    msg.ASkill1 = ActiveSkillType.SuperFast;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                                case 5:
+                                    msg.ASkill1 = ActiveSkillType.Askill4;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                                default:
+                                    msg.ASkill1 = ActiveSkillType.Askill5;
+                                    msg.ASkill2 = ActiveSkillType.NullActiveSkillType;
+                                    break;
+                            }
                             communicator.SendMessage(msg);
                             Connect.Background = Brushes.Green;
                             isClientStocked = false;
@@ -377,39 +473,15 @@ private void Refresh(object? sender, EventArgs e)
                 try
                 {
                     UpperLayerOfMap.Children.Clear();
-                    if (communicator == null)
+                    if (!communicator.Client.IsConnected)
                     {
-                        throw new Exception("Error: communicator is unexpectly null during a running game");
+                        throw new Exception("Client is unconnected.");
                     }
-                    else if (communicator.Client.IsConnected)
+                    else
                     {
 
                         lock(drawPicLock) //加锁是必要的，画图操作和接收信息操作不能同时进行
                         {
-                            for (int i = 0; i < defaultMap.GetLength(0); i++)
-                            {
-                                for (int j = 0; j < defaultMap.GetLength(1); j++)
-                                {
-                                    Rectangle rectangle = new Rectangle();
-                                    rectangle.Width = 13;
-                                    rectangle.Height = 13;
-                                    rectangle.HorizontalAlignment = HorizontalAlignment.Left;
-                                    rectangle.VerticalAlignment = VerticalAlignment.Top;
-                                    rectangle.Margin = new Thickness(13 * (j+0.5), 13 * (i+0.5), 0, 0);
-                                    switch (defaultMap[i, j])
-                                    {
-                                        case 1:
-                                            rectangle.Fill = Brushes.Brown;
-                                            break;
-                                        case 2:
-                                        case 3:
-                                        case 4:
-                                            rectangle.Fill = Brushes.Green;
-                                            break;
-                                    }
-                                    UpperLayerOfMap.Children.Add(rectangle);
-                                }
-                            }
                             foreach (var data in playerData)
                             {
                                 Ellipse icon = new Ellipse();
@@ -486,7 +558,6 @@ private void Refresh(object? sender, EventArgs e)
 
         private Stack<string>? myMessages;
 
-        private Queue<MessageToServer>? messageToServers;
         /// <summary>
         /// 50*50
         /// 1:Wall; 2:Grass1; 3:Grass2 ; 4:Grass3 
@@ -551,3 +622,7 @@ private void Refresh(object? sender, EventArgs e)
 //目前没有画图。并且，Client端能够开始游戏，但不能停止游戏，也不会收到游戏停止的消息。加上该功能后记得游戏停止时把Begin钮变红,isGameRunning置false.
 //2021-10-25
 //调整了一些提示出现的逻辑，并且修改了计时器，使得Error弹窗不再频繁弹出。
+//2021-11-22
+//更改显示方式，现在会在底层图层加载地图；为更新侧边栏人物信息和鼠标点击攻击做好了准备，但缺少ID属性；报错现在会显示时间，程序不再检测communicator是否为空，而是检测是否已连接；
+//放弃了log窗口设计；可以注册主动技能和被动技能，主动技能2号暂不采用；messageToServer弃用，改为包装后立刻发送。。
+//下一步的更新目标:引入生成地图机制；更新侧边栏人物信息和鼠标点击攻击；快捷键；未完成的按钮。
diff --git a/logic/Client/Map.png b/logic/Client/Map.png
deleted file mode 100644
index 06609421bc0ff92aec564ffc389b33e411ffc4c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42028
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