Highland/AceField
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Bug fixes

Browse Source
This commit is contained in:
LittleSheep
2024-08-09 13:49:04 +08:00
parent 6b48561f45
commit 34100ee727
6 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Scripts/Logic/Scoreboard.cs
View File

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using Godot;
@ -16,17 +15,55 @@ public partial class Scoreboard : Node
public void AddPlayer(int networkId, string playerName = null)
{
Players[networkId] = new PlayerData(playerName ?? $"Player#{networkId}");
Rpc(nameof(UpdateEntry), networkId, 0, playerName ?? $"Player#{networkId}");
}
public void RemovePlayer(int networkId)
{
Players.Remove(networkId);
Rpc(nameof(DropEntry), networkId);
}
public void AddScore(int networkId, int amount = 1)
{
if (Players[networkId]?.Score == null) return;
Players[networkId]!.Score += amount;
if (!Players.TryGetValue(networkId, out var player)) return;
player.Score += amount;
Rpc(nameof(UpdateEntry), networkId, player.Score, player.Name);
}
public void SetName(int networkId, string name)
{
if (!Players.TryGetValue(networkId, out var player)) return;
player.Name = name;
Rpc(nameof(UpdateEntry), networkId, player.Score, player.Name);
}
public PlayerData GetData(int networkId)
{
return Players.GetValueOrDefault(networkId);
}
public PlayerData GetCurrentData()
{
return Players.GetValueOrDefault(Multiplayer.GetUniqueId());
}
[Rpc(MultiplayerApi.RpcMode.AnyPeer, CallLocal = true)]
private void UpdateEntry(int networkId, int score, string name)
{
if (Players.ContainsKey(networkId))
{
Players[networkId].Score = score;
Players[networkId].Name = name;
}
else
{
Players.Add(networkId, new PlayerData(name, score));
}
}
[Rpc(MultiplayerApi.RpcMode.AnyPeer, CallLocal = true)]
private void DropEntry(int networkId)
{
Players.Remove(networkId);
}
}

3
Scripts/Logic/World.cs
View File

@ -77,7 +77,6 @@ public partial class World : Node2D
var position = Vector2.FromAngle(GD.Randf() * 2 * Mathf.Pi);
player.Position = new Vector2(position.X * 5f * GD.Randf(), position.Y * 5f * GD.Randf());
player.Name = BuildPlayerName(id);
player.PlayerName = name;
player.PlayerDied += (killerId) =>
{
if (killerId == 0) return;
@ -85,6 +84,7 @@ public partial class World : Node2D
};
AddChild(player, true);
player.PlayerName = name;
}
private void PutPlayers(string currentPlayerName = null)
@ -108,7 +108,6 @@ public partial class World : Node2D
}
PutPlayers();
_roundTimer.Start();
}