Browse Source

Merge pull request #25 from Shawqeem/feat/statusbar

chore: choose some cuter emojis
tags/0.1.0
TCL GitHub 3 years ago
parent
commit
586a4f77c5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
  1. +6
    -6
      logic/Client/StatusBarOfCircumstance.xaml
  2. +1
    -1
      logic/Client/StatusBarOfHunter.xaml

+ 6
- 6
logic/Client/StatusBarOfCircumstance.xaml View File

@@ -15,13 +15,13 @@
<RowDefinition Height="26*"/> <RowDefinition Height="26*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="53*"/>
<ColumnDefinition Width="13*"/>
<ColumnDefinition Width="77*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox Name="serial" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Time:&#xA;Round:" Grid.Row="0" Grid.ColumnSpan="2" FontSize="12" Margin="0,0,0,68" Grid.RowSpan="2"/>
<TextBox Name="status" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="📱:&#xA;🏃:&#xA;🤺:&#xA;🗡:" Grid.Row="1" Grid.ColumnSpan="2"/>
<TextBox Name="scores" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Scores:" Grid.Row="1" Grid.ColumnSpan="2" Margin="0,68,0,20" Grid.RowSpan="3"/>
<TextBox Name="star" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="" Grid.Row="3" Grid.ColumnSpan="2"/>
<TextBox Name="serial" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Time⏳:&#xA;Round🎃:" Grid.Row="0" Grid.ColumnSpan="2" FontSize="12" Margin="0,0,0,68" Grid.RowSpan="2"/>
<TextBox Name="status" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="📱:&#xA;🛗:&#xA;⚰️:&#xA;🏃:" Grid.Row="1" Grid.ColumnSpan="2"/>
<TextBox Name="scores" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Scores of Survivors:" Grid.Row="1" Grid.ColumnSpan="2" Margin="0,68,0,20" Grid.RowSpan="3"/>
<TextBox Name="star" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Scores of Hunters:" Grid.Row="3" Grid.ColumnSpan="2"/>
<TextBox Name="prop" IsReadOnly="True" BorderBrush="Gray" Text="" FontSize="12" Margin="0,20,0,0" TextWrapping="Wrap" Grid.Row="3" Grid.Column="0" Grid.RowSpan="2"></TextBox> <TextBox Name="prop" IsReadOnly="True" BorderBrush="Gray" Text="" FontSize="12" Margin="0,20,0,0" TextWrapping="Wrap" Grid.Row="3" Grid.Column="0" Grid.RowSpan="2"></TextBox>
<ProgressBar Name="skillprogress" Background="White" Margin="0,20,0,0" Grid.Row="3" Grid.Column="1" Grid.RowSpan="2"/> <ProgressBar Name="skillprogress" Background="White" Margin="0,20,0,0" Grid.Row="3" Grid.Column="1" Grid.RowSpan="2"/>
</Grid> </Grid>

+ 1
- 1
logic/Client/StatusBarOfHunter.xaml View File

@@ -18,7 +18,7 @@
<ColumnDefinition Width="7*"/> <ColumnDefinition Width="7*"/>
<ColumnDefinition Width="53*"/> <ColumnDefinition Width="53*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox Name="serial" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="👥null🤡null&#xD;&#xA;Skill:" Grid.Row="0" Grid.ColumnSpan="2" FontSize="12" Margin="0,0,0,68" Grid.RowSpan="2"/>
<TextBox Name="serial" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="👥null👻null&#xD;&#xA;Skill:" Grid.Row="0" Grid.ColumnSpan="2" FontSize="12" Margin="0,0,0,68" Grid.RowSpan="2"/>
<TextBox Name="status" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="🏹:&#xA;🏃:&#xA;🤺:&#xA;🗡:" Grid.Row="1" Grid.ColumnSpan="2"/> <TextBox Name="status" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="🏹:&#xA;🏃:&#xA;🤺:&#xA;🗡:" Grid.Row="1" Grid.ColumnSpan="2"/>
<TextBox Name="scores" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Scores:" Grid.Row="1" Grid.ColumnSpan="2" Margin="0,68,0,20" Grid.RowSpan="3"/> <TextBox Name="scores" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="Scores:" Grid.Row="1" Grid.ColumnSpan="2" Margin="0,68,0,20" Grid.RowSpan="3"/>
<TextBox Name="star" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="" Grid.Row="3" Grid.ColumnSpan="2"/> <TextBox Name="star" IsReadOnly="True" BorderBrush="White" TextWrapping="Wrap" Text="" Grid.Row="3" Grid.ColumnSpan="2"/>


Loading…
Cancel
Save