|
|
@@ -247,8 +247,8 @@ namespace Client |
|
|
TextBox icon = new() |
|
|
TextBox icon = new() |
|
|
{ |
|
|
{ |
|
|
FontSize = 10, |
|
|
FontSize = 10, |
|
|
Width = 20, |
|
|
|
|
|
Height = 20, |
|
|
|
|
|
|
|
|
Width = unitWidth, |
|
|
|
|
|
Height = unitHeight, |
|
|
Text = text, |
|
|
Text = text, |
|
|
HorizontalAlignment = HorizontalAlignment.Left, |
|
|
HorizontalAlignment = HorizontalAlignment.Left, |
|
|
VerticalAlignment = VerticalAlignment.Top, |
|
|
VerticalAlignment = VerticalAlignment.Top, |
|
|
@@ -764,11 +764,12 @@ namespace Client |
|
|
{ |
|
|
{ |
|
|
Ellipse icon = new() |
|
|
Ellipse icon = new() |
|
|
{ |
|
|
{ |
|
|
Width = 10, |
|
|
|
|
|
Height = 10, |
|
|
|
|
|
|
|
|
Width = unitWidth * radiusTimes, |
|
|
|
|
|
Height = unitHeight * radiusTimes, |
|
|
HorizontalAlignment = HorizontalAlignment.Left, |
|
|
HorizontalAlignment = HorizontalAlignment.Left, |
|
|
VerticalAlignment = VerticalAlignment.Top, |
|
|
VerticalAlignment = VerticalAlignment.Top, |
|
|
Margin = new Thickness(data.Y * unitWidth / 1000.0 - unitWidth / 2, data.X * unitHeight / 1000.0 - unitHeight / 2, 0, 0), |
|
|
|
|
|
|
|
|
Margin = new Thickness(data.Y * unitWidth / 1000.0 - unitWidth * radiusTimes / 2, data.X * unitHeight / 1000.0 - unitHeight * radiusTimes / 2, 0, 0), |
|
|
|
|
|
Fill = Brushes.Red, |
|
|
}; |
|
|
}; |
|
|
switch (data.Type) |
|
|
switch (data.Type) |
|
|
{ |
|
|
{ |
|
|
@@ -778,9 +779,8 @@ namespace Client |
|
|
case Protobuf.BulletType.CommonAttackOfTricker: |
|
|
case Protobuf.BulletType.CommonAttackOfTricker: |
|
|
case Protobuf.BulletType.BombBomb: |
|
|
case Protobuf.BulletType.BombBomb: |
|
|
case Protobuf.BulletType.JumpyDumpty: |
|
|
case Protobuf.BulletType.JumpyDumpty: |
|
|
icon.Fill = Brushes.Red; |
|
|
|
|
|
break; |
|
|
|
|
|
default: |
|
|
default: |
|
|
|
|
|
icon.Fill = Brushes.Red; |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
UpperLayerOfMap.Children.Add(icon); |
|
|
UpperLayerOfMap.Children.Add(icon); |
|
|
@@ -1194,8 +1194,8 @@ namespace Client |
|
|
} |
|
|
} |
|
|
catch (Exception) |
|
|
catch (Exception) |
|
|
{ |
|
|
{ |
|
|
// ErrorDisplayer error = new("发生错误。以下是系统报告\n" + exc.ToString()); |
|
|
|
|
|
// error.Show(); |
|
|
|
|
|
|
|
|
//ErrorDisplayer error = new("发生错误。以下是系统报告\n" + exc.ToString()); |
|
|
|
|
|
//error.Show(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -1243,8 +1243,8 @@ namespace Client |
|
|
} |
|
|
} |
|
|
catch (Exception) |
|
|
catch (Exception) |
|
|
{ |
|
|
{ |
|
|
// ErrorDisplayer error = new(exc.Message); |
|
|
|
|
|
// error.Show(); |
|
|
|
|
|
|
|
|
//ErrorDisplayer error = new(exc.Message) |
|
|
|
|
|
//error.Show() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|