animation fixed
This commit is contained in:
parent
3c8ab4d6ad
commit
1fc4c37e5a
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 96a44475794fb6445a6f3c4b9ee13966
|
||||
guid: a9c34549a246d47439b106bb23f71dff
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
@ -1619,11 +1619,11 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_steamAppID: 480
|
||||
_serverBindAddress:
|
||||
_serverBindAddress: 76561198308605766
|
||||
_port: 7770
|
||||
_maximumClients: 3188
|
||||
_peerToPeer: 0
|
||||
_clientAddress:
|
||||
_peerToPeer: 1
|
||||
_clientAddress: 76561198308605766
|
||||
--- !u!1001 &1138118844
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8,7 +8,7 @@ namespace Player
|
||||
{
|
||||
//private float mouseX = 0;
|
||||
//private float mouseY;
|
||||
[SerializeField] private Camera cam;
|
||||
public Camera cam;
|
||||
|
||||
|
||||
[SerializeField] private Transform target;
|
||||
|
@ -1,9 +1,10 @@
|
||||
using Cinemachine;
|
||||
using FishNet.Object;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Player
|
||||
{
|
||||
public class PlayerComponent : MonoBehaviour
|
||||
public class PlayerComponent : NetworkBehaviour
|
||||
{
|
||||
[SerializeField] private float health = 5f;
|
||||
|
||||
@ -38,6 +39,15 @@ namespace Player
|
||||
|
||||
[HideInInspector] public bool IsAlive => health > 0;
|
||||
|
||||
public override void OnStartClient()
|
||||
{
|
||||
base.OnStartClient();
|
||||
if (base.IsOwner)
|
||||
{
|
||||
cameraFreeLook = GameObject.Find("CM vcam1").GetComponent<CinemachineFreeLook>();
|
||||
}
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
flareRegister = FindObjectOfType<Item.FlareRegister>();
|
||||
|
@ -72,6 +72,7 @@ namespace Player
|
||||
camObject.GetComponent<CinemachineFreeLook>().Follow = transform;
|
||||
camObject.GetComponent<CinemachineFreeLook>().LookAt = transform.GetChild(0).GetChild(2);
|
||||
transform.GetChild(0).GetComponent<PlayerAnimationController>().hiddenCam = cam;
|
||||
transform.GetChild(0).GetChild(2).GetComponent<CameraController>().cam = cam;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0957b521a08374f4aa508231735153bc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Reference in New Issue
Block a user