Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2025-03-05 07:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync current weapon slot

Browse source
This commit is contained in:
in0finite 2019-07-07 00:46:47 +02:00
parent 2b0f955352
commit 2c30229ed7
3 changed files with 20 additions and 11 deletions
Assets/Scripts/Behaviours/Ped
Ped_Networking.cs
States
BaseScriptState.csIPedState.cs

25
Assets/Scripts/Behaviours/Ped/Ped_Networking.cs
View file

@ -31,7 +31,8 @@ namespace SanAndreasUnity.Behaviours
public static int NumStateChangesReceived { get; private set; }
[SyncVar(hook=nameof(Net_OnWeaponChanged))] internal GameObject m_net_weaponGameObject;
//[SyncVar(hook=nameof(Net_OnWeaponChanged))] GameObject m_net_weaponGameObject;
[SyncVar(hook=nameof(Net_OnWeaponChanged))] int m_net_currentWeaponSlot;
@ -53,12 +54,11 @@ namespace SanAndreasUnity.Behaviours
if (m_net_playerOwnerGameObject != null)
m_net_playerOwnerGameObject.GetComponent<Player>().OwnedPed = this;
// assign ped owner in current weapon
if (m_net_weaponGameObject != null)
m_net_weaponGameObject.GetComponent<Weapons.NetworkedWeapon>().PedOwner = this;
this.TryToLoadNewModel(m_net_pedId);
// switch weapon
F.RunExceptionSafe( () => this.WeaponHolder.SwitchWeapon(m_net_currentWeaponSlot) );
this.ChangeStateBasedOnSyncData(new StateSyncData(){state = m_net_state, additionalData = m_net_additionalStateData});
}
@ -104,6 +104,12 @@ namespace SanAndreasUnity.Behaviours
// assign new state
m_net_state = newStateName;
}
if (this.WeaponHolder.CurrentWeaponSlot != m_net_currentWeaponSlot)
{
m_net_currentWeaponSlot = this.WeaponHolder.CurrentWeaponSlot;
}
}
// send input to server
@ -187,7 +193,7 @@ namespace SanAndreasUnity.Behaviours
}
void Net_OnWeaponChanged(GameObject newWeaponGameObject)
void Net_OnWeaponChanged(int newSlot)
{
if (NetStatus.IsServer)
@ -195,10 +201,13 @@ namespace SanAndreasUnity.Behaviours
F.RunExceptionSafe( () => {
Debug.LogFormat("weapon changed for ped {0} to {1}", this.DescriptionForLogging, newWeaponGameObject);
Debug.LogFormat("weapon slot changed for ped {0} to {1}", this.DescriptionForLogging, newSlot);
if (this.CurrentState != null)
this.CurrentState.OnChangedWeaponByServer(newWeaponGameObject != null ? newWeaponGameObject.GetComponent<Weapon>() : null);
{
//this.CurrentState.OnChangedWeaponByServer(newWeaponGameObject != null ? newWeaponGameObject.GetComponent<Weapon>() : null);
this.CurrentState.OnChangedWeaponByServer(newSlot);
}
});

4
Assets/Scripts/Behaviours/Ped/States/BaseScriptState.cs
View file

@ -272,9 +272,9 @@ namespace SanAndreasUnity.Behaviours.Peds.States
return null;
}
public virtual void OnChangedWeaponByServer(Weapon weapon)
public virtual void OnChangedWeaponByServer(int newSlot)
{
m_ped.WeaponHolder.SwitchWeapon(newSlot);
}
}

2
Assets/Scripts/Behaviours/Ped/States/IPedState.cs
View file

@ -27,7 +27,7 @@ namespace SanAndreasUnity.Behaviours.Peds.States
/// when the state gets activated. </summary>
byte[] GetAdditionalNetworkData();
void OnChangedWeaponByServer(Weapon weapon);
void OnChangedWeaponByServer(int newSlot);
}