Camera recoil

This commit is contained in:
juliuse98
2021-11-08 22:56:15 +01:00
parent df60a95c80
commit ea8394bd16
10 changed files with 368 additions and 216 deletions

View File

@@ -286,7 +286,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4058555163434875561} m_Father: {fileID: 4058555163434875561}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
--- !u!1 &2221492823855642591 --- !u!1 &2221492823855642591
GameObject: GameObject:
@@ -317,7 +317,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4058555163434875561} m_Father: {fileID: 4058555163434875561}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
--- !u!1 &2992488853448454767 --- !u!1 &2992488853448454767
GameObject: GameObject:
@@ -343,7 +343,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2992488853448454767} m_GameObject: {fileID: 2992488853448454767}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.35}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -680,11 +680,14 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
syncMode: 0 syncMode: 0
syncInterval: 0.1 syncInterval: 0.1
ADSContoller: {fileID: 7198056240135858432}
walkSpeed: 6 walkSpeed: 6
sprintSpeed: 8 sprintSpeed: 8
aimWalkSpeed: 3
moveSmoothTime: 0.05 moveSmoothTime: 0.05
gravity: -10 gravity: -10
jumpHeight: 1.2 jumpHeight: 1.2
inputDirection: {x: 0, y: 0, z: 0}
groundCheck: {fileID: 6272346182417644039} groundCheck: {fileID: 6272346182417644039}
groundMask: groundMask:
serializedVersion: 2 serializedVersion: 2
@@ -760,6 +763,7 @@ MonoBehaviour:
minCameraAngle: -90 minCameraAngle: -90
mouseSmoothTime: 0.001 mouseSmoothTime: 0.001
lockCursor: 1 lockCursor: 1
fullPitch: 0
--- !u!114 &8436279266335313624 --- !u!114 &8436279266335313624
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -794,12 +798,15 @@ MonoBehaviour:
syncMode: 0 syncMode: 0
syncInterval: 0.1 syncInterval: 0.1
playerController: {fileID: -4574526707603160507} playerController: {fileID: -4574526707603160507}
gunAnimation: {fileID: 4276885029697240453}
posCheckDistance: 1 posCheckDistance: 1
checkDist: 0 checkDist: 0
stepAmplitudeWalking: 0.05 stepAmplitudeWalking: 0.05
stepAmplitudeSprinting: 0.07 stepAmplitudeSprinting: 0.07
stepFrequency: 0.8 stepFrequency: 0.8
Neck: {fileID: 6272346181657429396} Neck: {fileID: 6272346181657429396}
gunRotation: {fileID: 0}
rotationMultiplier: 0.1
--- !u!114 &3781802212159559521 --- !u!114 &3781802212159559521
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -932,18 +939,26 @@ MonoBehaviour:
gunRotationObj: {fileID: 7768205653369755348} gunRotationObj: {fileID: 7768205653369755348}
positionRecoil: 1 positionRecoil: 1
rotationRecoil: 1 rotationRecoil: 1
positionMultX: 0.1 positionMultX: 0.2
positionMultY: 0.1 positionMultY: 0.5
positionMultZ: 1 positionMultZ: 1
playerMouseLook: {fileID: 5630859218361338035}
cameraRecoilX: 8
cameraRecoilY: 4
rotX: 1 rotX: 1
rotationMultX: 25 rotationMultX: 60
rotationOffsetX: 0.1
rotY: 1 rotY: 1
rotationMultY: 25 rotationMultY: 50
rotZ: 1 rotZ: 1
rotationMultZ: 15 rotationMultZ: 100
ADSController: {fileID: 7198056240135858432}
sideSwey: 1
sweyMult: 1.2
sweyWhileAim: 0.05
returnForce: 0.006 returnForce: 0.006
impulsForce: 0.025 impulsForce: 0.025
maxRecoil: 0.1 maxRecoil: 0.25
--- !u!114 &7198056240135858432 --- !u!114 &7198056240135858432
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -956,7 +971,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 916f2d37f60a91149bbca3280a1b69ec, type: 3} m_Script: {fileID: 11500000, guid: 916f2d37f60a91149bbca3280a1b69ec, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
aimSpeed: 0.03 aimSpeed: 0.09
aimVal: 1 aimVal: 1
gun: {fileID: 6522444664664986769} gun: {fileID: 6522444664664986769}
AimPoint: {fileID: 2992488853448454767} AimPoint: {fileID: 2992488853448454767}
@@ -1110,7 +1125,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6522444664664986769} m_GameObject: {fileID: 6522444664664986769}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.4}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -1221,7 +1236,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7263663517583319679} m_GameObject: {fileID: 7263663517583319679}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0.04}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -1310,7 +1325,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8043317747957554736} m_GameObject: {fileID: 8043317747957554736}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.134, y: -0.115, z: 0.397} m_LocalPosition: {x: 0.108, y: -0.084, z: 0.35}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -1439,10 +1454,106 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.w
value: 0.49565774
objectReference: {fileID: 0}
- target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.x
value: 0.4028321
objectReference: {fileID: 0}
- target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.y
value: 0.47084302
objectReference: {fileID: 0}
- target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.z
value: 0.6085693
objectReference: {fileID: 0}
- target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5662176
objectReference: {fileID: 0}
- target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.x
value: 0.8008484
objectReference: {fileID: 0}
- target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.y
value: 0.04959982
objectReference: {fileID: 0}
- target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.z
value: -0.18862498
objectReference: {fileID: 0}
- target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6432096
objectReference: {fileID: 0}
- target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7010284
objectReference: {fileID: 0}
- target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.y
value: 0.02918151
objectReference: {fileID: 0}
- target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.z
value: 0.30657643
objectReference: {fileID: 0}
- target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.w
value: 0.64756745
objectReference: {fileID: 0}
- target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6947033
objectReference: {fileID: 0}
- target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.y
value: -0.034390952
objectReference: {fileID: 0}
- target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.z
value: -0.3112249
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} - target: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Human without head value: Human without head
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.w
value: 0.556481
objectReference: {fileID: 0}
- target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.x
value: 0.80733955
objectReference: {fileID: 0}
- target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.y
value: -0.048747048
objectReference: {fileID: 0}
- target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.z
value: 0.19014606
objectReference: {fileID: 0}
- target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.w
value: 0.4882959
objectReference: {fileID: 0}
- target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.x
value: 0.41018188
objectReference: {fileID: 0}
- target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.y
value: -0.4844513
objectReference: {fileID: 0}
- target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
propertyPath: m_LocalRotation.z
value: -0.59885305
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3}
--- !u!1 &6576156620079053231 stripped --- !u!1 &6576156620079053231 stripped

View File

@@ -302,6 +302,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: DebugCanvas value: DebugCanvas
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
--- !u!1 &518996702 --- !u!1 &518996702

View File

@@ -1041,7 +1041,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} - target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4636852677968575729, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} - target: {fileID: 4636852677968575729, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_text propertyPath: m_text

View File

@@ -5,7 +5,7 @@ using UnityEngine;
public class AimDownSights : MonoBehaviour public class AimDownSights : MonoBehaviour
{ {
[SerializeField] float aimSpeed = 0.01f; [SerializeField] float aimSpeed = 0.01f;
[SerializeField][Range(0,1)] float aimVal = 0; [SerializeField][Range(0,1)] public float aimVal = 0;
[SerializeField] private GameObject gun; [SerializeField] private GameObject gun;
[SerializeField] GameObject AimPoint; [SerializeField] GameObject AimPoint;
[SerializeField] GameObject HoldPoint; [SerializeField] GameObject HoldPoint;
@@ -15,9 +15,8 @@ public class AimDownSights : MonoBehaviour
return true; return true;
} }
private void Update() private void FixedUpdate()
{ {
Debug.Log(Input.GetButton("Aim"));
if (Input.GetButton("Aim")) if (Input.GetButton("Aim"))
{ {
isAiming = true; isAiming = true;
@@ -30,6 +29,6 @@ public class AimDownSights : MonoBehaviour
} }
aimVal = Mathf.Clamp(aimVal,0,1); aimVal = Mathf.Clamp(aimVal,0,1);
gun.transform.position = Vector3.Lerp(HoldPoint.transform.position, AimPoint.transform.position, aimVal); gun.transform.position = Vector3.Lerp(HoldPoint.transform.position, AimPoint.transform.position,Mathf.Pow(aimVal,1.3f)) ;
} }
} }

View File

@@ -5,6 +5,7 @@ using Mirror;
public class Headbob : NetworkBehaviour public class Headbob : NetworkBehaviour
{ {
[SerializeField] private PlayerController playerController; [SerializeField] private PlayerController playerController;
[SerializeField] private ShootAnimation gunAnimation;
[SerializeField] private float posCheckDistance = 0.01f; [SerializeField] private float posCheckDistance = 0.01f;
@@ -22,6 +23,14 @@ public class Headbob : NetworkBehaviour
private Vector3 newPos; private Vector3 newPos;
private float oldDist = 0; private float oldDist = 0;
private float lerpVal = 0; private float lerpVal = 0;
[Header("Gun Settings")]
[SerializeField] GameObject gunRotation;
[SerializeField] float rotationMultiplier = 0.1f;
private void Start() private void Start()
{ {
lastPos = this.transform.position; lastPos = this.transform.position;
@@ -50,6 +59,7 @@ public class Headbob : NetworkBehaviour
{ {
checkDist = currentDist + dist; checkDist = currentDist + dist;
} }
gunAnimation.gunSideSwey(getSin(amplitude, stepFrequency/2, checkDist),playerController.inputDirection.magnitude);
newPos = new Vector3(getSin(amplitude / 2, stepFrequency, checkDist), getSin(amplitude, stepFrequency, checkDist), 0); newPos = new Vector3(getSin(amplitude / 2, stepFrequency, checkDist), getSin(amplitude, stepFrequency, checkDist), 0);
Neck.localPosition = newPos; Neck.localPosition = newPos;
} }

View File

@@ -8,15 +8,16 @@ using Mirror;
public class PlayerController : NetworkBehaviour public class PlayerController : NetworkBehaviour
{ {
[SerializeField] private AimDownSights ADSContoller;
[Header("Movement")] [Header("Movement")]
[SerializeField] private float walkSpeed = 6.0f; [SerializeField] private float walkSpeed = 6.0f;
[SerializeField] private float sprintSpeed = 10.0f; [SerializeField] private float sprintSpeed = 10.0f;
[SerializeField] private float aimWalkSpeed = 3.0f;
[SerializeField][Range(0.0f, 0.5f)] private float moveSmoothTime = 0.001f; [SerializeField][Range(0.0f, 0.5f)] private float moveSmoothTime = 0.001f;
[SerializeField] float gravity = -10.0f; [SerializeField] float gravity = -10.0f;
[SerializeField] private float jumpHeight; [SerializeField] private float jumpHeight;
private Vector3 inputDirection = Vector3.zero; public Vector3 inputDirection = Vector3.zero;
private Vector3 moveDirection; private Vector3 moveDirection;
[Header("Ground Check")] [Header("Ground Check")]
@@ -100,15 +101,15 @@ public class PlayerController : NetworkBehaviour
{ {
if (Input.GetAxisRaw("Sprint") > 0 && isGrounded) if (Input.GetAxisRaw("Sprint") > 0 && isGrounded && !ADSContoller.isAiming)
{ {
//Debug.Log("Sprint");
movementSpeed = sprintSpeed; movementSpeed = sprintSpeed;
isSprinting = true; isSprinting = true;
} }
else else
{ {
movementSpeed = walkSpeed; if(ADSContoller.isAiming) movementSpeed = aimWalkSpeed;
else movementSpeed = walkSpeed;
isSprinting = false; isSprinting = false;
} }

View File

@@ -18,7 +18,7 @@ public class PlayerMouseLook : NetworkBehaviour
[SerializeField] [Range(0.0f, 0.5f)] private float mouseSmoothTime = 0.001f; [SerializeField] [Range(0.0f, 0.5f)] private float mouseSmoothTime = 0.001f;
[SerializeField] private bool lockCursor = true; [SerializeField] private bool lockCursor = true;
private float fullPitch = 0f; public float fullPitch = 0f;
private float cameraPitch = 0f; private float cameraPitch = 0f;
private float neckPitch = 0f; private float neckPitch = 0f;
private float velocityY = 0.0f; private float velocityY = 0.0f;

View File

@@ -22,13 +22,26 @@ public class ShootAnimation : MonoBehaviour
[SerializeField] float positionMultZ = 25f; [SerializeField] float positionMultZ = 25f;
[Header("Rotation Settings")] [Header("Rotation Settings")]
[SerializeField] PlayerMouseLook playerMouseLook;
[SerializeField] float cameraRecoilX = 0.1f;
[SerializeField] float cameraRecoilY = 0.1f;
[SerializeField] bool rotX = true; [SerializeField] bool rotX = true;
[SerializeField] float rotationMultX = 25f; [SerializeField] float rotationMultX = 25f;
[SerializeField] float rotationOffsetX = 0.1f;
[SerializeField] bool rotY = true; [SerializeField] bool rotY = true;
[SerializeField] float rotationMultY = 25f; [SerializeField] float rotationMultY = 25f;
[SerializeField] bool rotZ = true; [SerializeField] bool rotZ = true;
[SerializeField] float rotationMultZ = 15f; [SerializeField] float rotationMultZ = 15f;
[Header("Swey Settings")]
[SerializeField] AimDownSights ADSController;
[SerializeField] bool sideSwey = true;
[SerializeField] float sweyMult = 15f;
[SerializeField] float sweyWhileAim = 0.1f;
float swey = 0f;
[SerializeField] float returnForce = 0.006f; [SerializeField] float returnForce = 0.006f;
@@ -59,11 +72,20 @@ public class ShootAnimation : MonoBehaviour
{ {
//Play the animation //Play the animation
anim.Play("Shoot"); anim.Play("Shoot");
playerMouseLook.fullPitch -= cameraRecoilX * Mathf.PerlinNoise(Time.time * 3f + 10f, 1f);
transform.Rotate(Vector3.up * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * cameraRecoilY);
//Add force for the recoil //Add force for the recoil
recoilCounter++; recoilCounter++;
} }
public void gunSideSwey(float sinVal,float moveInput)
{
swey = (sweyMult * sinVal * moveInput * 0.7f
+ sweyMult * sinVal * moveInput * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * 0.3f) * Mathf.Clamp((1 - ADSController.aimVal) * (1 - ADSController.aimVal), sweyWhileAim,1f);
}
void FixedUpdate() void FixedUpdate()
{ {
@@ -93,9 +115,12 @@ public class ShootAnimation : MonoBehaviour
//Position recoil //Position recoil
if (positionRecoil) if (positionRecoil)
{ {
int sideLock = 0;
if (sideSwey) sideLock = 1;
gunPositionObj.transform.localPosition = startPos + new Vector3( gunPositionObj.transform.localPosition = startPos + new Vector3(
positionMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f), positionMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) + sideLock * swey,
positionMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 20f, 2f) - 0.5f) * 2f), positionMultY * zOffset * Mathf.PerlinNoise(Time.time * 2f + 20f, 2f),
positionMultZ* zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 3f) - 0.5f) * 2f)); positionMultZ* zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 3f) - 0.5f) * 2f));
} }
else else
@@ -110,12 +135,14 @@ public class ShootAnimation : MonoBehaviour
int yLock = 0; int yLock = 0;
int zLock = 0; int zLock = 0;
if (rotX) xLock = 1; if (rotX) xLock = 1;
if (rotY) yLock = 1; if (rotY) yLock = 1;
if (rotZ) zLock = 1; if (rotZ) zLock = 1;
gunRotationObj.transform.localRotation = Quaternion.Euler( gunRotationObj.transform.localRotation = Quaternion.Euler(
startRot.x + xLock * rotationMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 4f) - 0.5f) * 2f), startRot.x + xLock * rotationMultX * zOffset * Mathf.PerlinNoise(Time.time * 3f + 30f, 4f),
startRot.y + yLock * rotationMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 10f, 3f) - 0.5f) * 2f), startRot.y + yLock * rotationMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 10f, 3f) - 0.5f) * 2f),
startRot.z + zLock * rotationMultZ * zOffset * ((Mathf.PerlinNoise(Time.time * 1.5f, 2f) - 0.5f) * 2f)); startRot.z + zLock * rotationMultZ * zOffset * ((Mathf.PerlinNoise(Time.time * 1.5f, 2f) - 0.5f) * 2f));
} }

View File

@@ -45,9 +45,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 880 x: 713.60004
y: 73.6 y: 73.6
width: 289.19995 width: 455.59998
height: 450.2 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
@@ -59,7 +59,7 @@ MonoBehaviour:
m_ShowGizmos: 0 m_ShowGizmos: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0} m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 289.19995, y: 429.2} m_TargetSize: {x: 455.59998, y: 429.2}
m_TextureFilterMode: 0 m_TextureFilterMode: 0
m_TextureHideFlags: 61 m_TextureHideFlags: 61
m_RenderIMGUI: 1 m_RenderIMGUI: 1
@@ -74,8 +74,8 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -115.679985 m_HBaseRangeMin: -182.23999
m_HBaseRangeMax: 115.679985 m_HBaseRangeMax: 182.23999
m_VBaseRangeMin: -171.68001 m_VBaseRangeMin: -171.68001
m_VBaseRangeMax: 171.68001 m_VBaseRangeMax: 171.68001
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
@@ -95,23 +95,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 289.19995 width: 455.59998
height: 429.2 height: 429.2
m_Scale: {x: 1.1592739, y: 1.1592739} m_Scale: {x: 1.1592739, y: 1.1592739}
m_Translation: {x: 144.59998, y: 214.6} m_Translation: {x: 227.79999, y: 214.6}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -124.73323 x: -196.5023
y: -185.11589 y: -185.11589
width: 249.46646 width: 393.0046
height: 370.23178 height: 370.23178
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_LastWindowPixelSize: {x: 361.49994, y: 562.75} m_LastWindowPixelSize: {x: 569.5, y: 562.75}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
@@ -187,8 +187,8 @@ MonoBehaviour:
y: 0 y: 0
width: 297.6 width: 297.6
height: 471.2 height: 471.2
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6} m_ActualView: {fileID: 6}
m_Panes: m_Panes:
- {fileID: 6} - {fileID: 6}
@@ -227,7 +227,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 740affffa018ffff5019ffffdc1efffffe55ffff0456ffff1456ffff2056ffff2656ffff5656ffff0657ffff9265ffff9865ffffa865ffffb465ffffba65ffffea65ffff9a66ffff7e88ffff8488ffffb488ffff6489ffffa48dffff548effff3af4ffff40f4ffff50f4ffff5cf4ffff62f4ffff90f4ffff40f5ffffa6f7ffff m_ExpandedIDs: 4e34fdfff434fdff5255fdffe496fdffb2b0fdff62d4fdff08d5fdffc6f5fdff6cf6fdff6251feff0852feff4658feff4859feffe695feff849ffeff34a0feff02cbfeff740affffa018ffff5019ffffdc1efffffe55ffff0456ffff1456ffff2056ffff2656ffff5656ffff0657ffff9265ffff9865ffffa865ffffb465ffffba65ffffea65ffff9a66ffff7e88ffff8488ffffb488ffff6489ffffa48dffff548effff3af4ffff40f4ffff50f4ffff5cf4ffff62f4ffff90f4ffff40f5ffffa6f7fffff4ffffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -261,22 +261,22 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: AnimatorControllerTool m_Name: SceneView
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 297.6 x: 297.6
y: 0 y: 0
width: 582.4 width: 415.99997
height: 471.2 height: 471.2
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 8} m_ActualView: {fileID: 9}
m_Panes: m_Panes:
- {fileID: 8} - {fileID: 8}
- {fileID: 9} - {fileID: 9}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &8 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
@@ -298,9 +298,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 297.6 x: 298.6
y: 73.6 y: 19
width: 580.4 width: 871.6
height: 450.2 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
@@ -310,14 +310,14 @@ MonoBehaviour:
m_KeySerializationHelper: m_KeySerializationHelper:
- {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_ValueSerializationHelper: m_ValueSerializationHelper:
- e00: 0.43999997 - e00: 1.0177464
e01: 0 e01: 0
e02: 0 e02: 0
e03: -7 e03: -77.03352
e10: 0 e10: 0
e11: 0.43999997 e11: 1.0177464
e12: 0 e12: 0
e13: 142.02002 e13: 111.43313
e20: 0 e20: 0
e21: 0 e21: 0
e22: 1 e22: 1
@@ -364,7 +364,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 297.6 x: 297.6
y: 73.6 y: 73.6
width: 580.4 width: 413.99997
height: 450.2 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
@@ -673,9 +673,9 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 880 x: 713.6
y: 0 y: 0
width: 291.19995 width: 457.59998
height: 471.2 height: 471.2
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
@@ -764,10 +764,10 @@ MonoBehaviour:
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 101.20001} scrollPos: {x: 0, y: 165.20001}
m_SelectedIDs: 2a690000 m_SelectedIDs: 2a690000
m_LastClickedID: 26922 m_LastClickedID: 26922
m_ExpandedIDs: 00000000c4640000c6640000c8640000dc640000de640000e264000000ca9a3bffffff7f m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -940,7 +940,7 @@ MonoBehaviour:
m_ControlHash: -371814159 m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1 m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 1399.2 m_LastVerticalScrollValue: 0
m_GlobalObjectId: m_GlobalObjectId:
m_InspectorMode: 0 m_InspectorMode: 0
m_LockTracker: m_LockTracker:

View File

@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1536 width: 1536
height: 780.8 height: 780.8
m_ShowMode: 4 m_ShowMode: 4
m_Title: Animator m_Title: Inspector
m_RootView: {fileID: 2} m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200} m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192} m_MaxSize: {x: 32384, y: 16192}
vertical: 0 vertical: 0
controlID: 51 controlID: 24963
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1171 width: 1171.2
height: 731 height: 731
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 1 vertical: 1
controlID: 52 controlID: 24964
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -165,12 +165,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1171 width: 1171.2
height: 471 height: 471.2
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096} m_MaxSize: {x: 24288, y: 8096}
vertical: 0 vertical: 0
controlID: 53 controlID: 24965
--- !u!114 &8 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -188,8 +188,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 298 width: 297.6
height: 471 height: 471.2
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
@@ -207,22 +207,23 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: AnimatorControllerTool m_Name: SceneView
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 298 x: 297.6
y: 0 y: 0
width: 580 width: 415.99997
height: 471 height: 471.2
m_MinSize: {x: 102, y: 121} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 15}
- {fileID: 16} - {fileID: 16}
m_Selected: 0 m_Selected: 1
m_LastSelected: 0 m_LastSelected: 1
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -233,23 +234,22 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView m_Name: GameView
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 878 x: 713.6
y: 0 y: 0
width: 293 width: 457.59998
height: 471 height: 471.2
m_MinSize: {x: 202, y: 221} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 15}
- {fileID: 13} - {fileID: 13}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -266,9 +266,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 471 y: 471.2
width: 1171 width: 1171.2
height: 260 height: 259.8
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 17}
@@ -292,12 +292,12 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1171 x: 1171.2
y: 0 y: 0
width: 365 width: 364.80005
height: 731 height: 731
m_MinSize: {x: 276, y: 71} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 19}
m_Panes: m_Panes:
- {fileID: 19} - {fileID: 19}
@@ -323,10 +323,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 879.2 x: 713.60004
y: 73.6 y: 73.6
width: 289.8 width: 455.59998
height: 450 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -337,7 +337,7 @@ MonoBehaviour:
m_ShowGizmos: 0 m_ShowGizmos: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0} m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 289.8, y: 429} m_TargetSize: {x: 455.59998, y: 429.2}
m_TextureFilterMode: 0 m_TextureFilterMode: 0
m_TextureHideFlags: 61 m_TextureHideFlags: 61
m_RenderIMGUI: 1 m_RenderIMGUI: 1
@@ -352,10 +352,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -115.92 m_HBaseRangeMin: -182.23999
m_HBaseRangeMax: 115.92 m_HBaseRangeMax: 182.23999
m_VBaseRangeMin: -171.6 m_VBaseRangeMin: -171.68001
m_VBaseRangeMax: 171.6 m_VBaseRangeMax: 171.68001
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
@@ -364,7 +364,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0 m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
@@ -373,23 +373,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 289.8 width: 455.59998
height: 429 height: 429.2
m_Scale: {x: 1.1592739, y: 1.1592739} m_Scale: {x: 1.1592739, y: 1.1592739}
m_Translation: {x: 144.9, y: 214.5} m_Translation: {x: 227.79999, y: 214.6}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -124.99203 x: -196.5023
y: -185.02962 y: -185.11589
width: 249.98405 width: 393.0046
height: 370.05923 height: 370.23178
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_LastWindowPixelSize: {x: 362.25, y: 562.5} m_LastWindowPixelSize: {x: 569.5, y: 562.75}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
@@ -417,8 +417,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 73.6 y: 73.6
width: 297 width: 296.6
height: 450 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -426,9 +426,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs: 0ee80000
m_LastClickedID: 0 m_LastClickedID: 59406
m_ExpandedIDs: f6e2fffffcecffff m_ExpandedIDs: f8c1fcff2ec2fcff32c2fcff36c2fcff56c2fcffd8c2fcfff8e700002ee800004ee8000054e8000060e8000062e8000064e800006ae8000070e80000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -453,6 +453,70 @@ MonoBehaviour:
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593 m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &15 --- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Animator
m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 298.6
y: 19
width: 871.6
height: 450.2
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_ViewTransforms:
m_KeySerializationHelper:
- {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_ValueSerializationHelper:
- e00: 1.0177464
e01: 0
e02: 0
e03: -77.03352
e10: 0
e11: 1.0177464
e12: 0
e13: 111.43313
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_PreviewAnimator: {fileID: 0}
m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_BreadCrumbs:
- m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
stateMachineGraphGUI: {fileID: 0}
blendTreeGraph: {fileID: 0}
blendTreeGraphGUI: {fileID: 0}
m_AutoLiveLink: 1
m_MiniTool: 0
m_LockTracker:
m_IsLocked: 0
m_CurrentEditor: 1
m_LayerEditor:
m_SelectedLayerIndex: 0
--- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@@ -472,10 +536,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 878.4 x: 297.6
y: 73.6 y: 73.6
width: 291 width: 413.99997
height: 450 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -519,7 +583,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 1 snapCorner: 1
id: unity-search-toolbar id: unity-search-toolbar
index: 1 index: 1
@@ -552,7 +616,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Light Settings id: Scene View/Light Settings
index: 0 index: 0
@@ -574,7 +638,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Cloth Constraints id: Scene View/Cloth Constraints
index: 2 index: 2
@@ -585,7 +649,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Cloth Collisions id: Scene View/Cloth Collisions
index: 3 index: 3
@@ -596,7 +660,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Navmesh Display id: Scene View/Navmesh Display
index: 4 index: 4
@@ -607,7 +671,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Agent Display id: Scene View/Agent Display
index: 5 index: 5
@@ -618,7 +682,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Obstacle Display id: Scene View/Obstacle Display
index: 6 index: 6
@@ -629,7 +693,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Occlusion Culling id: Scene View/Occlusion Culling
index: 7 index: 7
@@ -640,7 +704,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Physics Debugger id: Scene View/Physics Debugger
index: 8 index: 8
@@ -651,7 +715,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Scene Visibility id: Scene View/Scene Visibility
index: 9 index: 9
@@ -662,7 +726,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 0 displayed: 0
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 24.8}
snapCorner: 0 snapCorner: 0
id: Scene View/Particles id: Scene View/Particles
index: 10 index: 10
@@ -671,8 +735,8 @@ MonoBehaviour:
containerId: overlay-container--right containerId: overlay-container--right
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 0 displayed: 1
snapOffset: {x: 0, y: 0} snapOffset: {x: 0, y: 24.8}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0 snapCorner: 0
id: Scene View/Animation Rigging id: Scene View/Animation Rigging
@@ -680,7 +744,7 @@ MonoBehaviour:
layout: 4 layout: 4
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 0 m_Gizmos: 0
m_OverrideSceneCullingMask: 6917529027641081856 m_OverrideSceneCullingMask: 0
m_SceneIsLit: 0 m_SceneIsLit: 0
m_SceneLighting: 1 m_SceneLighting: 1
m_2DMode: 0 m_2DMode: 0
@@ -688,9 +752,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: -0.062267028, y: -0.11840155, z: 0.045074694} m_Target: {x: -0.076223016, y: 3.9235106, z: 0.32627058}
speed: 2 speed: 2
m_Value: {x: -0.062267028, y: -0.11840155, z: 0.045074694} m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@@ -702,7 +766,7 @@ MonoBehaviour:
m_SceneViewState: m_SceneViewState:
m_AlwaysRefresh: 0 m_AlwaysRefresh: 0
showFog: 1 showFog: 1
showSkybox: 1 showSkybox: 0
showFlares: 1 showFlares: 1
showImageEffects: 1 showImageEffects: 1
showParticleSystems: 1 showParticleSystems: 1
@@ -737,13 +801,13 @@ MonoBehaviour:
m_GridAxis: 1 m_GridAxis: 1
m_gridOpacity: 0.5 m_gridOpacity: 0.5
m_Rotation: m_Rotation:
m_Target: {x: -0.12716745, y: -0.27125975, z: 0.036181852, w: -0.9534008} m_Target: {x: 0.06845912, y: -0.65953904, z: 0.06051697, w: 0.74609524}
speed: 2 speed: 2
m_Value: {x: -0.12716518, y: -0.27125493, z: 0.036181208, w: -0.95338386} m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994}
m_Size: m_Size:
m_Target: 0.2153474 m_Target: 0.3056236
speed: 2 speed: 2
m_Value: 0.2153474 m_Value: 1.0003884
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
@@ -768,70 +832,6 @@ MonoBehaviour:
m_SceneVisActive: 1 m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0} m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0 m_ViewIsLockedToObject: 0
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Animator
m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 298.4
y: 73.6
width: 578
height: 450
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_ViewTransforms:
m_KeySerializationHelper:
- {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_ValueSerializationHelper:
- e00: 0.93576187
e01: 0
e02: 0
e03: -83.14328
e10: 0
e11: 0.93576187
e12: 0
e13: 81.3544
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_PreviewAnimator: {fileID: 0}
m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_BreadCrumbs:
- m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
stateMachineGraphGUI: {fileID: 0}
blendTreeGraph: {fileID: 0}
blendTreeGraphGUI: {fileID: 0}
m_AutoLiveLink: 1
m_MiniTool: 0
m_LockTracker:
m_IsLocked: 0
m_CurrentEditor: 0
m_LayerEditor:
m_SelectedLayerIndex: 0
--- !u!114 &17 --- !u!114 &17
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -853,9 +853,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 544 y: 544.8
width: 1170 width: 1170.2
height: 239 height: 238.79999
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -873,22 +873,22 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Objects - Assets/Prefabs/Player
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Objects - Assets/Prefabs/Player
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 165.20001}
m_SelectedIDs: b4690000 m_SelectedIDs: 2a690000
m_LastClickedID: 27060 m_LastClickedID: 26922
m_ExpandedIDs: 000000005269000054690000b4690000746b000000ca9a3bffffff7f m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -916,7 +916,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000005269000054690000 m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -994,7 +994,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 544.8 y: 544.8
width: 1170 width: 1170.2
height: 238.79999 height: 238.79999
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
@@ -1022,7 +1022,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 1171.2001 x: 1171.2001
y: 73.6 y: 73.6
width: 364 width: 363.80005
height: 710 height: 710
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
@@ -1035,7 +1035,7 @@ MonoBehaviour:
m_ControlHash: -371814159 m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1 m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0 m_LastVerticalScrollValue: 987.6001
m_GlobalObjectId: m_GlobalObjectId:
m_InspectorMode: 0 m_InspectorMode: 0
m_LockTracker: m_LockTracker: