GoaLitiuM/GoakeFlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staf

Browse Source
This commit is contained in:
Ari Vuollet
2023-03-02 22:07:43 +02:00
parent 1a0709d113
commit 5e48806b8c
21 changed files with 145 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Game/Player/PlayerActor.cs
View File

@@ -17,7 +17,7 @@ namespace Game
var items = GetItemsForType(type, type.IsClass, true);
// Remove all Rigid Body options
items.RemoveAll(x => x.Display.Group == "Rigid Body");
items.RemoveAll(x => x.Display?.Group == "Rigid Body");
// Inject scripts editor
ScriptMemberInfo scriptsMember = type.GetProperty("Scripts");
@@ -40,6 +40,12 @@ namespace Game
private PlayerMovement playerMovement;
private RigidBody playerRigidBody;
[NetworkReplicated]
public uint PlayerId = uint.MaxValue;
[NetworkReplicated]
public uint hai = 1;
public PlayerActor()
{
// Default internal values for RigidBody
@@ -56,20 +62,33 @@ namespace Game
playerMovement = FindScript<PlayerMovement>();
playerRigidBody = FindActor<RigidBody>();
}
NetworkReplicator.AddObject(this);
public override void OnEnable()
{
// Trigger OnEnable manually, does not seem to propagate when parent gets enabled/disabled
playerMovement.Enabled = true;
//NetworkReplicator.AddObject(this);
}
public override void OnDisable()
{
playerMovement.Enabled = false;
//NetworkReplicator.RemoveObject(this);
}
public void Initialize(uint playerId)
{
playerMovement.SetInput(playerId);
//if (playerId == NetworkManager.LocalPlayerClientId)
if (NetworkReplicator.GetObjectRole(this) == NetworkObjectRole.OwnedAuthoritative)
PlayerId = playerId;
//playerMovement.SetInput(playerId);
if (playerId == NetworkManager.LocalClientId)
{
FindActor("CameraHolder").IsActive = true;
//FindActor("ViewModelHolder").IsActive = true;
FindActor("PlayerModel").IsActive = false;
}
else
FindActor("PlayerModel").IsActive = true;
}
public void UpdateNetworkInput(PlayerInputState inputState)