perf: ⚡ change the number of the prop-bars

change the number of the prop-bars

installer/Installer/Model.cs

@@ -1170,7 +1170,7 @@ namespace WebConnect
                                 string eTag = result.eTag;
                                 //到这里应该是成功了，但是因为我没有试过，也不知道具体情况，可能还要根据result的内容判断
                             }
-                            catch (Exception e)
+                            catch (Exception)
                             {
                                 return -3;
                             }

logic/Client/MainWindow.xaml.cs

@@ -702,7 +702,7 @@ namespace Client
                     {
                         foreach (var data in listOfAll)
                         {
-                            StatusBarsOfCircumstance.SetValue(data, gateOpened, isEmergencyDrawed, isEmergencyOpened,playerID);
+                            StatusBarsOfCircumstance.SetValue(data, gateOpened, isEmergencyDrawed, isEmergencyOpened, playerID);
                         }
                         if (!hasDrawed && mapFlag)
                             DrawMap();

logic/Client/StatusBarOfCircumstance.xaml.cs

@@ -37,31 +37,31 @@ namespace Client
             scoresOfStudents.FontSize = scoresOfTrickers.FontSize = fontsize;
         }
 
-        public void SetValue(MessageOfAll obj, bool gateOpened, bool hiddenGateRefreshed, bool hiddenGateOpened,long playerId)
+        public void SetValue(MessageOfAll obj, bool gateOpened, bool hiddenGateRefreshed, bool hiddenGateOpened, long playerId)
         {
             int min, sec;
             sec = obj.GameTime / 1000;
             min = sec / 60;
             sec = sec % 60;
-            time.Text = "Time⏳: " + Convert.ToString(min)+": ";
-            if(sec/10==0)
+            time.Text = "Time⏳: " + Convert.ToString(min) + ": ";
+            if (sec / 10 == 0)
             {
-                time.Text += "0" ;
+                time.Text += "0";
                 time.Text += Convert.ToString(sec);
             }
             else
             {
                 time.Text += Convert.ToString(sec);
             }
-            if(playerId==4)
+            if (playerId == 4)
             {
                 name.Text = "🚀 Tricker's";
             }
             else
             {
-                name.Text = "🚀 Student"+ Convert.ToString(playerId)+"'s";
+                name.Text = "🚀 Student" + Convert.ToString(playerId) + "'s";
             }
-            if(obj.SubjectFinished< Preparation.Utility.GameData.numOfGeneratorRequiredForRepair)
+            if (obj.SubjectFinished < Preparation.Utility.GameData.numOfGeneratorRequiredForRepair)
             {
                 status.Text = "📱: " + Convert.ToString(obj.SubjectFinished) + "\n🚪: ";
             }

logic/Client/StatusBarOfHunter.xaml

@@ -17,25 +17,27 @@
             <RowDefinition Height="23*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="20*"/>
-            <ColumnDefinition Width="21*"/>
-            <ColumnDefinition Width="20*"/>
-            <ColumnDefinition Width="21*"/>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="10*"/>
         </Grid.ColumnDefinitions>
-        <TextBox Name="serial" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="👥null👻null&#xD;&#xA;职业:  "  Grid.Row="0" Grid.ColumnSpan="4" FontSize="12"/>
-        <TextBox Name="status" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="🏃🏿‍:  " Grid.Row="1" Grid.ColumnSpan="2" />
-        <TextBox Name="state" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" />
-        <TextBox Name="scores" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="Scores:  " Grid.Row="2" Grid.ColumnSpan="4"/>
-        
-        <TextBox Name="activeSkill0" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="3" Grid.ColumnSpan="2"/>
-        <ProgressBar Name="skillprogress0" Background="White" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2"/>
-        <TextBox Name="activeSkill1" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="4" Grid.ColumnSpan="2"/>
-        <ProgressBar Name="skillprogress1" Background="White" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2"/>
-        <TextBox Name="activeSkill2" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="5" Grid.ColumnSpan="2"/>
-        <ProgressBar Name="skillprogress2" Background="White" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2"/>
-        <TextBox Name="prop0" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="1"/>
-        <TextBox Name="prop1" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="1"/>
-        <TextBox Name="prop2" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="2" Grid.ColumnSpan="1"/>
-        <TextBox Name="prop3" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="3" Grid.ColumnSpan="1"/>
+        <TextBox Name="serial" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="👥null👻null&#xD;&#xA;Occupation:  "  Grid.Row="0" Grid.ColumnSpan="7" FontSize="12"/>
+        <TextBox Name="status" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="🏃🏿‍:  " Grid.Row="1" Grid.ColumnSpan="3" />
+        <TextBox Name="state" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="4" />
+        <TextBox Name="scores" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="Scores:  " Grid.Row="2" Grid.ColumnSpan="7"/>
+
+        <TextBox Name="activeSkill0" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="3" Grid.ColumnSpan="3"/>
+        <ProgressBar Name="skillprogress0" Background="White" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="4"/>
+        <TextBox Name="activeSkill1" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="4" Grid.ColumnSpan="3"/>
+        <ProgressBar Name="skillprogress1" Background="White" Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="4"/>
+        <TextBox Name="activeSkill2" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="5" Grid.ColumnSpan="3"/>
+        <ProgressBar Name="skillprogress2" Background="White" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="4"/>
+        <TextBox Name="prop0" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/>
+        <TextBox Name="prop1" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="3"/>
+        <TextBox Name="prop2" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="6" Grid.Column="5" Grid.ColumnSpan="2"/>
     </Grid>
 </UserControl>

logic/Client/StatusBarOfHunter.xaml.cs

@@ -36,7 +36,7 @@ namespace Client
         }
         public void SetFontSize(double fontsize)
         {
-            serial.FontSize = scores.FontSize = state.FontSize = status.FontSize = activeSkill0.FontSize = activeSkill1.FontSize = activeSkill2.FontSize = prop0.FontSize = prop1.FontSize = prop2.FontSize = prop3.FontSize = fontsize;
+            serial.FontSize = scores.FontSize = state.FontSize = status.FontSize = activeSkill0.FontSize = activeSkill1.FontSize = activeSkill2.FontSize = prop0.FontSize = prop1.FontSize = prop2.FontSize = fontsize;
         }
 
         private void SetStaticValue(MessageOfTricker obj, double time0, double time1, double time2)
@@ -247,39 +247,6 @@ namespace Client
                         }
                         cnt++;
                         break;
-                    case 3:
-                        switch (icon)
-                        {
-                            case Protobuf.PropType.Key3:
-                                prop3.Text = "🔑3";
-                                break;
-                            case Protobuf.PropType.Key5:
-                                prop3.Text = "🔑5";
-                                break;
-                            case Protobuf.PropType.Key6:
-                                prop3.Text = "🔑6";
-                                break;
-                            case Protobuf.PropType.AddSpeed:
-                                prop3.Text = "⛸";
-                                break;
-                            case Protobuf.PropType.AddLifeOrClairaudience:
-                                prop3.Text = "🏅";
-                                break;
-                            case Protobuf.PropType.AddHpOrAp:
-                                prop3.Text = "♥";
-                                break;
-                            case Protobuf.PropType.ShieldOrSpear:
-                                prop3.Text = "🛡";
-                                break;
-                            case Protobuf.PropType.RecoveryFromDizziness:
-                                prop3.Text = "🕶";
-                                break;
-                            default:
-                                prop3.Text = "";
-                                break;
-                        }
-                        cnt++;
-                        break;
                     default:
                         break;
                 }

logic/Client/StatusBarOfSurvivor.xaml

@@ -19,22 +19,24 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="10*"/>
-            <ColumnDefinition Width="10*"/>
-            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="3*"/>
             <ColumnDefinition Width="10*"/>
         </Grid.ColumnDefinitions>
-        <TextBox Name="serial" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="👥null🧓null&#xD;&#xA;职业:  "  Grid.Row="0" Grid.ColumnSpan="4" FontSize="12"/>
-        <TextBox Name="status" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="♥: " Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="4"/>
-        <TextBox Name="scores" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="Scores: " Grid.Row="3" Grid.ColumnSpan="4"/>
-        <TextBox Name="activeSkill0" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="4" Grid.ColumnSpan="2"/>
-        <ProgressBar Name="skillprogress0" Background="White" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2"/>
-        <TextBox Name="activeSkill1" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="5" Grid.ColumnSpan="2"/>
-        <ProgressBar Name="skillprogress1" Background="White" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2"/>
-        <TextBox Name="activeSkill2" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="6" Grid.ColumnSpan="2"/>
-        <ProgressBar Name="skillprogress2" Background="White" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2"/>
-        <TextBox Name="prop0" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="1"/>
-        <TextBox Name="prop1" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="1"/>
-        <TextBox Name="prop2" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="2" Grid.ColumnSpan="1"/>
-        <TextBox Name="prop3" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="3" Grid.ColumnSpan="1"/>
+        <TextBox Name="serial" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="👥null🧓null&#xD;&#xA;Occupation:  "  Grid.Row="0" Grid.ColumnSpan="7" FontSize="12"/>
+        <TextBox Name="status" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="♥: " Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="7"/>
+        <TextBox Name="scores" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="Scores: " Grid.Row="3" Grid.ColumnSpan="7"/>
+        <TextBox Name="activeSkill0" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="4" Grid.ColumnSpan="3"/>
+        <ProgressBar Name="skillprogress0" Background="White" Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="4"/>
+        <TextBox Name="activeSkill1" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="5" Grid.ColumnSpan="3"/>
+        <ProgressBar Name="skillprogress1" Background="White" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="4"/>
+        <TextBox Name="activeSkill2" IsReadOnly="True" BorderBrush="LightGray" TextWrapping="Wrap" Text="" Grid.Row="6" Grid.ColumnSpan="3"/>
+        <ProgressBar Name="skillprogress2" Background="White" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="4"/>
+        <TextBox Name="prop0" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2"/>
+        <TextBox Name="prop1" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="2" Grid.ColumnSpan="3"/>
+        <TextBox Name="prop2" IsReadOnly="True" BorderBrush="LightGray" Text="" FontSize="12" TextWrapping="Wrap" Grid.Row="7" Grid.Column="5" Grid.ColumnSpan="2"/>
     </Grid>
 </UserControl>

logic/Client/StatusBarOfSurvivor.xaml.cs

@@ -30,7 +30,7 @@ namespace Client
         }
         public void SetFontSize(double fontsize)
         {
-            serial.FontSize = scores.FontSize = status.FontSize = activeSkill0.FontSize = activeSkill1.FontSize = activeSkill2.FontSize = prop0.FontSize = prop1.FontSize = prop2.FontSize = prop3.FontSize = fontsize;
+            serial.FontSize = scores.FontSize = status.FontSize = activeSkill0.FontSize = activeSkill1.FontSize = activeSkill2.FontSize = prop0.FontSize = prop1.FontSize = prop2.FontSize = fontsize;
         }
 
         private void SetStaticValue(MessageOfStudent obj, double time0, double time1, double time2)
@@ -244,39 +244,6 @@ namespace Client
                         }
                         cnt++;
                         break;
-                    case 3:
-                        switch (icon)
-                        {
-                            case Protobuf.PropType.Key3:
-                                prop3.Text = "🔑3";
-                                break;
-                            case Protobuf.PropType.Key5:
-                                prop3.Text = "🔑5";
-                                break;
-                            case Protobuf.PropType.Key6:
-                                prop3.Text = "🔑6";
-                                break;
-                            case Protobuf.PropType.AddSpeed:
-                                prop3.Text = "⛸";
-                                break;
-                            case Protobuf.PropType.AddLifeOrClairaudience:
-                                prop3.Text = "🏅";
-                                break;
-                            case Protobuf.PropType.AddHpOrAp:
-                                prop3.Text = "♥";
-                                break;
-                            case Protobuf.PropType.ShieldOrSpear:
-                                prop3.Text = "🛡";
-                                break;
-                            case Protobuf.PropType.RecoveryFromDizziness:
-                                prop3.Text = "🕶";
-                                break;
-                            default:
-                                prop3.Text = "";
-                                break;
-                        }
-                        cnt++;
-                        break;
                     default:
                         break;
                 }

logic/Server/RpcServices.cs

@@ -120,7 +120,7 @@ namespace Server
                         //Console.WriteLine("Send!");
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     //Console.WriteLine(ex);
                 }