Merge branch 'Player-AnimationFIX'

This commit is contained in:
juliuse98
2021-11-12 08:27:48 +01:00
14 changed files with 2362 additions and 1402 deletions

View File

@@ -0,0 +1,226 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &867143322194457524
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2213212323547960416}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2236875552107647873
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7502619830433694848}
m_Layer: 0
m_Name: Muzzle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7502619830433694848
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2236875552107647873}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.0004, y: -0.01487, z: -0.143}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 732033708985862910}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3709710254213546924
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 808197646603973991}
m_Layer: 0
m_Name: Left_Hand_REF
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &808197646603973991
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3709710254213546924}
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
m_LocalPosition: {x: -0.03000002, y: -0.11399987, z: -0.42400002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 732033708985862910}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
--- !u!1 &3884320679152247161
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5792494204646893847}
m_Layer: 0
m_Name: Right_Hand_REF
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5792494204646893847
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3884320679152247161}
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
m_LocalPosition: {x: 0.030000005, y: -0.10400012, z: -0.42400002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 732033708985862910}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
--- !u!1 &5071598280516985511
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 732033708985862910}
- component: {fileID: 6352645931139448055}
m_Layer: 0
m_Name: M92
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &732033708985862910
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5071598280516985511}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.03999999}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1584484548595912410}
- {fileID: 7502619830433694848}
- {fileID: 808197646603973991}
- {fileID: 5792494204646893847}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6352645931139448055
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5071598280516985511}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1330674258901920049
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 732033708985862910}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalPosition.y
value: -0.054000046
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalPosition.z
value: -0.334
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_Name
value: M92
objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
--- !u!1 &2213212323547960416 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
m_PrefabInstance: {fileID: 1330674258901920049}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1584484548595912410 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
m_PrefabInstance: {fileID: 1330674258901920049}
m_PrefabAsset: {fileID: 0}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bd217f9f85ce78e46a925776562625e8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -119,13 +119,13 @@ MonoBehaviour:
runInBackground: 1
autoStartServerBuild: 1
serverTickRate: 30
offlineScene: Assets/Scenes/TestOfflineScene.unity
offlineScene: Assets/Scenes/TestScene.unity
onlineScene: Assets/Scenes/TestScene.unity
transport: {fileID: 3422988367618467037}
networkAddress: localhost
maxConnections: 100
authenticator: {fileID: 0}
playerPrefab: {fileID: 6272346181302961293, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
playerPrefab: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3}
autoCreatePlayer: 1
playerSpawnMethod: 0
spawnPrefabs: []

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 815ba91b9da92294f8041b56643e5e15
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1,66 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &117587211917336539
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4583300602822713530}
m_Layer: 0
m_Name: GunPosition
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4583300602822713530
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 117587211917336539}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9097354778471689966}
m_Father: {fileID: 1155604412711610141}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &351275810583331071
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 169274211856709645}
m_Layer: 0
m_Name: BuletExitPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &169274211856709645
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351275810583331071}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0.26300016, y: 0.61299956, z: -0.013000095}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9086299259537425155}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &681358948229890261
GameObject:
m_ObjectHideFlags: 0
@@ -89,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.5799999, z: 0.27}
m_LocalScale: {x: 0.8, y: 0.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 981273033772084037}
m_RootOrder: 0
@@ -143,85 +83,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &2940254478074645882
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9097354778471689966}
m_Layer: 0
m_Name: GunRotation
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9097354778471689966
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2940254478074645882}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9086299259537425155}
m_Father: {fileID: 4583300602822713530}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3104486771267849676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1155604412711610141}
- component: {fileID: 902077785060134974}
m_Layer: 0
m_Name: WeaponHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1155604412711610141
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3104486771267849676}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.2703267, y: -0.1790001, z: 0.7789205}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4583300602822713530}
m_Father: {fileID: 6272346181657429396}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &902077785060134974
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3104486771267849676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98dadd30ba25ec34db3b45d0dca2827b, type: 3}
m_Name:
m_EditorClassIdentifier:
currentWeaponIndex: 0
allWeapons: []
activeWeapons: []
cam: {fileID: 0}
--- !u!1 &3649358604728444914
GameObject:
m_ObjectHideFlags: 0
@@ -248,6 +109,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.274, z: 0.7}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181657429396}
m_RootOrder: 0
@@ -280,6 +142,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181302961296}
m_RootOrder: 0
@@ -441,10 +304,9 @@ GameObject:
- component: {fileID: 5630859218361338035}
- component: {fileID: 8436279266335313624}
- component: {fileID: 268368477457052331}
- component: {fileID: 3781802212159559521}
- component: {fileID: 6207632454083444980}
- component: {fileID: 1509131218531316230}
- component: {fileID: 8914029058295428365}
- component: {fileID: 4666987960863501143}
m_Layer: 0
m_Name: Player
m_TagString: Player
@@ -462,6 +324,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5844730607706440515}
- {fileID: 2458562619286483438}
@@ -526,18 +389,21 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 124e7dc536a7de8418284dc873cb1bb2, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
ADSContoller: {fileID: 0}
walkSpeed: 6
sprintSpeed: 8
aimWalkSpeed: 3
moveSmoothTime: 0.05
gravity: -10
jumpHeight: 1.2
inputDirection: {x: 0, y: 0, z: 0}
groundCheck: {fileID: 6272346182417644039}
groundMask:
serializedVersion: 2
@@ -598,7 +464,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8493f0e2b0d4bd4f98d3cd81c2db5ad, type: 3}
m_Name:
@@ -613,6 +479,7 @@ MonoBehaviour:
minCameraAngle: -90
mouseSmoothTime: 0.001
lockCursor: 1
fullPitch: 0
--- !u!114 &8436279266335313624
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -620,7 +487,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3317f24e780855847830f5662153b41d, type: 3}
m_Name:
@@ -639,7 +506,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4db7caf602ce379408a59c8722e06e46, type: 3}
m_Name:
@@ -647,12 +514,33 @@ MonoBehaviour:
syncMode: 0
syncInterval: 0.1
playerController: {fileID: -4574526707603160507}
gunAnimation: {fileID: 0}
posCheckDistance: 1
checkDist: 0
stepAmplitudeWalking: 0.05
stepAmplitudeSprinting: 0.07
stepFrequency: 0.8
Neck: {fileID: 6272346181657429396}
gunRotation: {fileID: 0}
rotationMultiplier: 0.1
--- !u!114 &3781802212159559521
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bc5bc2b49bd326e4db460a6a3af59311, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
muzzle: {fileID: 3649358604728444914}
shootAnim: {fileID: 0}
fireRate: 0
gunHoldPos: {fileID: 0}
--- !u!114 &6207632454083444980
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -713,35 +601,6 @@ MonoBehaviour:
showOverlay: 0
overlayColor: {r: 0, g: 0, b: 0, a: 0.5}
target: {fileID: 981273033772084037}
--- !u!114 &8914029058295428365
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 323a821a5fef23a45aa5333ce1f55202, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4666987960863501143
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0f43c52a1834dcb4bab807bc0cbddec2, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
muzzle: {fileID: 351275810583331071}
weaponHolder: {fileID: 8454054357811321273}
GunRotation: {fileID: 2940254478074645882}
--- !u!1 &6272346181657429393
GameObject:
m_ObjectHideFlags: 0
@@ -758,7 +617,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6272346181657429396
Transform:
m_ObjectHideFlags: 0
@@ -769,9 +628,9 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5021921342190399731}
- {fileID: 1155604412711610141}
m_Father: {fileID: 981273033772084037}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -844,6 +703,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181302961296}
m_RootOrder: 2
@@ -874,35 +734,13 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4399039561386292163}
- {fileID: 6272346181657429396}
m_Father: {fileID: 6272346181302961296}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4862277589106201629
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8454054357811321273}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3}
m_Name:
m_EditorClassIdentifier:
weaponKind: 1
active: 0
damage: 15
firerate: 1
roundsPerShot: 1
recoilStrength: 15
currentAmmunition: 12
magazinSize: 12
totalAmmunition: 24
bulletExit: {fileID: 351275810583331071}
allowAction: 1
--- !u!1 &8690889598169456425
GameObject:
m_ObjectHideFlags: 0
@@ -931,6 +769,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181302961296}
m_RootOrder: 1
@@ -985,82 +824,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &8760552908600304872
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 9097354778471689966}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalScale.x
value: 0.15000002
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalScale.y
value: 0.15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalScale.z
value: 0.15000002
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6952859
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalRotation.y
value: -0.7187333
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -91.9
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
propertyPath: m_Name
value: USP
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
--- !u!1 &8454054357811321273 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
m_PrefabInstance: {fileID: 8760552908600304872}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9086299259537425155 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
m_PrefabInstance: {fileID: 8760552908600304872}
m_PrefabAsset: {fileID: 0}

View File

@@ -8,7 +8,7 @@ using Mirror;
public class PlayerController : NetworkBehaviour
{
[SerializeField] private AimDownSights ADSContoller;
[SerializeField] private ProcedualAnimationController procedualAnimationController;
[Header("Movement")]
[SerializeField] private float walkSpeed = 6.0f;
[SerializeField] private float sprintSpeed = 10.0f;
@@ -36,7 +36,8 @@ public class PlayerController : NetworkBehaviour
private Vector3 currentDir = Vector3.zero;
private Vector3 currentDirVelocity = Vector3.zero;
private Vector3 velocity = Vector3.zero;
public Vector3 velocity = Vector3.zero;
private Vector3 refVelocity = Vector3.zero;
private void Start()
@@ -65,8 +66,8 @@ public class PlayerController : NetworkBehaviour
public bool isMoving()
{
if (velocity.x == 0 && velocity.y == 0 && velocity.z == 0) return true;
else return false;
if (velocity.x == 0 && velocity.y == 0 && velocity.z == 0) return false;
else return true;
}
private void CheckGoundAngle()
@@ -101,16 +102,18 @@ public class PlayerController : NetworkBehaviour
{
if (Input.GetAxisRaw("Sprint") > 0 && isGrounded && !ADSContoller.isAiming)
{
if (Input.GetAxisRaw("Sprint") > 0 && isGrounded && !procedualAnimationController.isAiming)
{
movementSpeed = sprintSpeed;
isSprinting = true;
}
else
{
if(ADSContoller.isAiming) movementSpeed = aimWalkSpeed;
if(procedualAnimationController.isAiming) movementSpeed = aimWalkSpeed;
else movementSpeed = walkSpeed;
isSprinting = false;
}
//Grounded
@@ -133,6 +136,7 @@ public class PlayerController : NetworkBehaviour
}
inputDirection = new Vector3(Input.GetAxisRaw("Horizontal"),0, Input.GetAxisRaw("Vertical")); //Get Inputs
inputDirection.Normalize(); //Damit schr<68>g laufen nicht schneller ist
if (isGrounded)
@@ -145,11 +149,8 @@ public class PlayerController : NetworkBehaviour
currentDir = moveDirection;
}
velocity = currentDir * movementSpeed + new Vector3(0, velocityY, 0);
velocity = Vector3.SmoothDamp(velocity, currentDir * movementSpeed + new Vector3(0, velocityY, 0),ref refVelocity,0.01f);
controller.Move(velocity * Time.deltaTime);
}
}

View File

@@ -7,7 +7,6 @@ public class PlayerMouseLook : NetworkBehaviour
{
[Header("Mouse Look")]
[SerializeField] private Transform playerCamera = null;
[SerializeField] private Transform weaponCamera = null;
[SerializeField] private Transform playerNeck = null;
[SerializeField] private float mouseSensitivity = 4.0f;
@@ -36,7 +35,7 @@ public class PlayerMouseLook : NetworkBehaviour
{
controller = GetComponent<CharacterController>();
playerCamera.gameObject.GetComponent<Camera>().enabled = true;
playerCamera.GetComponent<Camera>().enabled = true;
neckLength = Vector3.Distance(playerNeck.position,playerCamera.position);
if (lockCursor)
@@ -53,7 +52,7 @@ public class PlayerMouseLook : NetworkBehaviour
{
UpdateMouseLook();
}
}
private void UpdateMouseLook()

View File

@@ -0,0 +1,306 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class ProcedualAnimationController : NetworkBehaviour
{
[Header("Step Settings")]
[SerializeField] private float stepAmplitudeWalking;
[SerializeField] private float stepAmplitudeSprinting;
[SerializeField] private float stepFrequency;
private float checkDist = 0f;
private float stepDistance = 1;
private float stepSin;
float moveSoftStart = 0;
Vector3 lastPos = Vector3.zero;
float posCheckDistance = 0.01f;
float currentDist = 0;
float f = 0f;
[SerializeField] private PlayerController playerController;
[Header("GameObjects")]
[SerializeField] private float currentCameraRecoilX = 0f;
[SerializeField] private float currentCameraRecoilY = 0f;
[Header("GameObjects")]
[SerializeField] private GameObject gun; // The gun object with the animator on it.
[SerializeField] private GameObject gunHolder;
[Header("General Settings")]
[SerializeField] bool positionRecoil = true;
[SerializeField] bool rotationRecoil = true;
[Header("Position Settings")]
[SerializeField] float positionMultX = 25f;
[SerializeField] float positionMultY = 25f;
[SerializeField] float positionMultZ = 25f;
[Header("Rotation Settings")]
[SerializeField] PlayerMouseLook playerMouseLook;
[SerializeField] float cameraRecoilX = 0.1f;
[SerializeField] float cameraRecoilY = 0.1f;
[SerializeField] bool rotX = true;
[SerializeField] float rotationMultX = 25f;
[SerializeField] float rotationOffsetX = 0.1f;
[SerializeField] bool rotY = true;
[SerializeField] float rotationMultY = 25f;
[SerializeField] bool rotZ = true;
[SerializeField] float rotationMultZ = 15f;
[Header("Swey Settings")]
[SerializeField] bool sideSwey = true;
[SerializeField] float sweyMultX = 15f;
[SerializeField] float sweyMultY = 15f;
[SerializeField] float sweyMultZ = 15f;
[SerializeField] float sweyWhileAim = 0.1f;
float swey = 0f;
[Header("External Settings")]
[SerializeField] const int externalPositionVectorsNum = 1;
private Vector3[] externalPositionVectors = new Vector3[externalPositionVectorsNum];
[SerializeField] float returnForce = 0.006f;
[SerializeField] float impulsForce = 0.025f;
[SerializeField] float maxRecoil = 0.1f;
private Animator gunAnimator;
Vector3 startPos, startRot;
float recoilOffset = 0f;
float zOffset = 0f;
float zVelocity = 0f;
int recoilCounter = 0;
[Header("Aiming Settings")]
[SerializeField] float aimSpeed = 0.01f;
[Range(0, 1)] public float aimVal = 0;
[SerializeField] GameObject AimPoint;
[SerializeField] GameObject HoldPoint;
public bool isAiming = false;
Vector3[] positionMod = new Vector3[3];
Quaternion[] rotationMod = new Quaternion[3];
public void OnSwitchWeapon(float fireRate)
{
if (isLocalPlayer)
{
//gun = newGun;
gunAnimator = gun.GetComponent<Animator>();
gunAnimator.SetFloat("ShootSpeed", 1f / (60f / fireRate));
//startPos = gunPositionObj.transform.localPosition;
//startRot = gunRotationObj.transform.localRotation.eulerAngles;
}
}
public void Recoil(float force)
{
if (isLocalPlayer)
{
//Play the animation
gunAnimator.Play("Shoot");
//Add force for the recoil
//currentCameraRecoilX -= weightedPerlinNoise(cameraRecoilX, 1f, Time.time, 1);
//playerMouseLook = Mathf.SmoothDamp(playerMouseLook.fullPitch, playerMouseLook.fullPitch - weightedPerlinNoise(cameraRecoilX, 1f, Time.time, 1),ref f,0.01f);
CmdRecoil();
}
}
[Command]
private void CmdRecoil()
{
recoilCounter++;
playerMouseLook.fullPitch -= weightedPerlinNoise(cameraRecoilX, 1f, Time.time, 1);
transform.Rotate(Vector3.up * weightedPerlinNoise(cameraRecoilY, 1f, Time.time, 1f, -0.5f));
}
[Command]
private void CmdAim(bool input)
{
if (input) isAiming = true;
else isAiming = false;
}
void Update()
{
if (isLocalPlayer)
{
CmdAim(Input.GetButton("Aim"));
}
/*-----Aiming-----*/
}
private void FixedUpdate()
{
if (isServer)
{
positionMod = new Vector3[3];
rotationMod = new Quaternion[3];
/*-----Recoil-----*/
calcRecoilOffset();
/*-----Position Recoil-----*/
PositionRecoil();
/*-----Rotation Recoil-----*/
RotationRecoil();
/*-----Step Swey-----*/
calcStepSin();
SideStep();
/*-----Aiming-----*/
AimDownSights();
/*-----Apply Gun Position-----*/
Vector3 totalPosition = Vector3.zero;
for (int i = 0; i < positionMod.Length; i++)
{
if (positionMod[i] != null)
totalPosition += positionMod[i];
}
/*-----Apply Gun Rotation-----*/
Quaternion totalRotation = Quaternion.identity;
for (int i = 0; i < rotationMod.Length; i++)
{
totalRotation *= rotationMod[i];
}
//gunHolder.transform.localPosition = positionMod[2];
gunHolder.transform.localPosition = totalPosition;
//gunHolder.transform.localRotation = totalRotation;
gunHolder.transform.localRotation = rotationMod[0];
}
}
void RotationRecoil()
{
/*-----Rotation Recoil-----*/
if (rotationRecoil)
{
float deltaX = 100f * rotationMultX * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 1f);
float deltaY = 100f * rotationMultY * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 1f, -0.5f);
float deltaZ = 100f * rotationMultZ * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 1f, -0.5f);
rotationMod[0] = Quaternion.Euler(deltaX, deltaY, deltaZ);
}
}
void PositionRecoil()
{
if (positionRecoil)
{
float deltaX = -positionMultX * weightedPerlinNoise(recoilOffset, 0.7f, Time.time, 1f, -0.5f);
float deltaY = -positionMultY * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 2f);
float deltaZ = positionMultZ * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 3f);
positionMod[0] = new Vector3(deltaX, deltaY, deltaZ);
}
}
void AimDownSights()
{
aimVal = gravityValue(aimVal, aimSpeed, 1, 0, isAiming);
positionMod[2] = Vector3.Lerp(HoldPoint.transform.localPosition, AimPoint.transform.localPosition, Mathf.Pow(aimVal, 1.3f));
}
void calcRecoilOffset()
{
for (int i = 0; i < recoilCounter; i++)
{
zVelocity -= weightedPerlinNoise(impulsForce, 0.1f, i, 1f);
}
recoilCounter = 0;
recoilOffset += zVelocity;
zVelocity = 0;
if (recoilOffset > 0)
recoilOffset = 0f;
else if (recoilOffset < 0)
zVelocity += weightedPerlinNoise(returnForce, 0.1f, Time.time, 1f);
recoilOffset = Mathf.Clamp(recoilOffset, -weightedPerlinNoise(maxRecoil, 0.5f, Time.time * 1000, 1f), 0);
}
void calcStepSin()
{
float amplitude;
float dist = Vector3.Distance(lastPos, this.transform.position);
if (playerController.isSprinting)
amplitude = stepAmplitudeSprinting;
else
amplitude = stepAmplitudeWalking;
if (dist > posCheckDistance)
{
currentDist += dist;
lastPos = this.transform.position;
}
else
{
checkDist = currentDist + dist;
}
stepSin = ezSin(stepAmplitudeWalking, stepFrequency, currentDist);
}
void SideStep()
{
if (sideSwey)
{
//To start and end the sweying motion softly
moveSoftStart = gravityValue(moveSoftStart, 0.1f, 0.03f, 1f, 0f, playerController.isMoving() && playerController.isGrounded);
if (playerController.isMoving())
{
float deltaX = sweyMultX * moveSoftStart * Mathf.Clamp(Vector3.Magnitude(playerController.velocity), 0, 1) * weightedPerlinNoise(stepSin, 0.3f, Time.time, 10f, 0.5f) * Mathf.Clamp((1 - aimVal) * (1 - aimVal), sweyWhileAim, 1f);
float deltaY = sweyMultY * moveSoftStart * Mathf.Clamp(Vector3.Magnitude(playerController.velocity), 0, 1) * weightedPerlinNoise(stepSin, 0.7f, Time.time, 20f, -0.5f) * Mathf.Clamp((1 - aimVal) * (1 - aimVal), sweyWhileAim, 1f);
float deltaZ = sweyMultZ * moveSoftStart * Mathf.Clamp(Vector3.Magnitude(playerController.velocity), 0, 1) * weightedPerlinNoise(stepSin, 0.3f, Time.time, 30f, 0.5f) * Mathf.Clamp((1 - aimVal) * (1 - aimVal), sweyWhileAim, 1f);
positionMod[1] = new Vector3(deltaX, deltaY, deltaZ);
}
}
}
/*-----Helper Methods-----*/
float gravityValue(float curretnValue, float rateOfChange, float maxValue, float minValue, bool add)
{
// The currentValue will be advanced or reduced by the rateOfChange depending on the add boolean. But only in the specified range.
// Usage: val = gravityValue(val, 0.01f, 1, 0, true);
float value = curretnValue;
if (add) value += rateOfChange;
else value -= rateOfChange;
return Mathf.Clamp(value, minValue, maxValue);
}
float weightedPerlinNoise(float value, float weight, float pX, float pY, float offset = 0f)
{
return value * (1f - weight) + value * weight * (Mathf.PerlinNoise(pX, pY) + offset);
}
float gravityValue(float curretnValue, float rateOfChangePos, float rateOfChangeNeg, float maxValue, float minValue, bool add)
{
// The currentValue will be advanced by the rateOfChangePos and reduced by the rateOfChangeNeg depending on the add boolean. But only in the specified range.
// Usage: val = gravityValue(val, 0.01f, 0.05f, 1, 0, true);
float value = curretnValue;
if (add) value += rateOfChangePos;
else value -= rateOfChangeNeg;
return Mathf.Clamp(value, minValue, maxValue);
}
private float ezSin(float amplitude, float frequency, float x)
{
// Simplification of the sin function.
return amplitude * Mathf.Sin((x / 3.1831f) * 10 * frequency);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9bd09d0992070b049b461b56fd022956
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -6,13 +6,13 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e
value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268
flags: 0
RecentlyUsedSceneGuid-1:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e
flags: 0
RecentlyUsedSceneGuid-2:
value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

View File

@@ -8,22 +8,23 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
- {fileID: 14}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1536
height: 731
height: 730.8
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 1
controlID: 10675
vertical: 0
controlID: -1
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -44,10 +45,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 656.8
x: 711.2
y: 73.6
width: 511.60004
height: 450.2
width: 457.99994
height: 451
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -58,11 +59,11 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 511.60004, y: 429.2}
m_TargetSize: {x: 457.99994, y: 430}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
m_EnterPlayModeBehavior: 1
m_EnterPlayModeBehavior: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
@@ -73,10 +74,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -204.64001
m_HBaseRangeMax: 204.64001
m_VBaseRangeMin: -171.68001
m_VBaseRangeMax: 171.68001
m_HBaseRangeMin: -183.19998
m_HBaseRangeMax: 183.19998
m_VBaseRangeMin: -172
m_VBaseRangeMax: 172
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -85,7 +86,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -94,23 +95,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 511.60004
height: 429.2
m_Scale: {x: 1.1592733, y: 1.1592739}
m_Translation: {x: 255.80002, y: 214.6}
width: 457.99994
height: 430
m_Scale: {x: 1, y: 1}
m_Translation: {x: 228.99997, y: 215}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -220.6555
y: -185.11589
width: 441.311
height: 370.23178
x: -228.99997
y: -215
width: 457.99994
height: 430
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 639.50006, y: 562.75}
m_LastWindowPixelSize: {x: 572.49994, y: 563.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -130,17 +131,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 4}
- {fileID: 15}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1536
height: 731
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 10676
width: 1171.2
height: 730.8
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: -1
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -155,44 +156,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 5}
- {fileID: 12}
- {fileID: 7}
- {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1170.4
height: 731
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 10677
--- !u!114 &5
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: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 8}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1170.4
height: 471.2
width: 1171.2
height: 472
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
controlID: 10678
--- !u!114 &6
controlID: -1
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -209,16 +185,16 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 275.2
height: 471.2
width: 296
height: 472
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 7}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 7}
- {fileID: 6}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &7
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -240,8 +216,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73.6
width: 274.2
height: 450.2
width: 295
height: 451
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -251,7 +227,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: c2faffff2afbffff
m_ExpandedIDs: 2afbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -267,7 +243,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 6}
m_ClientGUIView: {fileID: 5}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -275,7 +251,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &8
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -290,18 +266,82 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 275.2
x: 296
y: 0
width: 381.59998
height: 471.2
width: 415.2
height: 472
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 9}
m_Panes:
- {fileID: 8}
- {fileID: 9}
- {fileID: 10}
m_Selected: 0
m_LastSelected: 0
m_Selected: 1
m_LastSelected: 1
--- !u!114 &8
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 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -322,10 +362,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 275.2
x: 296
y: 73.6
width: 379.59998
height: 450.2
width: 413.2
height: 451
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -335,7 +375,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: -98.399994, y: -26}
snapOffset: {x: -98.400024, y: -26}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3
id: Tool Settings
@@ -346,9 +386,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: -30.199982}
snapOffset: {x: -141, y: 149}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 2
snapCorner: 1
id: unity-grid-and-snap-toolbar
index: 1
layout: 1
@@ -390,9 +430,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: -128, y: -123.20001}
snapOffset: {x: 67.5, y: 86}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3
snapCorner: 0
id: Orientation
index: 0
layout: 4
@@ -412,7 +452,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Camera
@@ -522,7 +562,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Animation Rigging
@@ -531,16 +571,16 @@ MonoBehaviour:
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 0
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneIsLit: 0
m_SceneLighting: 1
m_2DMode: 1
m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 233.63658, y: 216.03629, z: -2.2254918}
m_Target: {x: -0.36444837, y: 8.662055, z: 6.1208687}
speed: 2
m_Value: {x: 233.63658, y: 216.03629, z: -2.2254918}
m_Value: {x: -0.36444837, y: 8.662055, z: 6.1208687}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -569,17 +609,17 @@ MonoBehaviour:
m_Size: {x: 1, y: 1}
yGrid:
m_Fade:
m_Target: 0
m_Target: 1
speed: 2
m_Value: 0
m_Value: 1
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
zGrid:
m_Fade:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
@@ -587,20 +627,20 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0, y: 0, z: 0, w: 1}
m_Target: {x: -0.14265797, y: -0.8023181, z: 0.212259, w: -0.53944343}
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Value: {x: -0.1426495, y: -0.8022705, z: 0.21224639, w: -0.5394114}
m_Size:
m_Target: 338.06198
m_Target: 3.234408
speed: 2
m_Value: 338.06198
m_Value: 3.234408
m_Ortho:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_CameraSettings:
m_Speed: 0.34082997
m_SpeedNormalized: 0.16999999
m_Speed: 1
m_SpeedNormalized: 0.5
m_SpeedMin: 0.001
m_SpeedMax: 2
m_EasingEnabled: 1
@@ -619,70 +659,6 @@ MonoBehaviour:
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &10
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: 578
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: 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 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -697,18 +673,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 656.8
x: 711.2
y: 0
width: 513.60004
height: 471.2
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
width: 459.99994
height: 472
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 2}
m_Panes:
- {fileID: 2}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -724,18 +700,18 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 471.2
width: 1170.4
height: 259.8
y: 472
width: 1171.2
height: 258.8
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 12}
- {fileID: 13}
- {fileID: 14}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &13
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -755,18 +731,17 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 544.8
width: 1169.4
height: 238.79999
x: 1536
y: 684
width: 1463
height: 315
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_SearchFilter:
m_NameFilter:
m_ClassNames:
- Prefab
m_ClassNames: []
m_AssetLabels: []
m_AssetBundleNames: []
m_VersionControlStates: []
@@ -776,22 +751,23 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SkipHidden: 0
m_SearchArea: 1
m_Folders: []
m_Folders:
- Assets/Scenes
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets
- Assets/Scenes
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\.Downloads\Programming\Unity\Projects\Rheinmetall\3dshooter\3d-shooter
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 04ca9a3b
m_LastClickedID: 1000000004
m_ExpandedIDs: 00000000ea630000ec630000ee630000f06300007265000000ca9a3b
scrollPos: {x: 0, y: 120}
m_SelectedIDs: d8640000
m_LastClickedID: 25816
m_ExpandedIDs: 000000000a6300000c6300000e630000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -807,7 +783,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 11}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -819,7 +795,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ea630000ec630000ee630000f06300007265000000ca9a3b
m_ExpandedIDs: 000000000a6300000c6300000e630000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -863,7 +839,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 11}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -875,7 +851,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
--- !u!114 &14
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -896,14 +872,14 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 544.8
width: 1169.4
height: 238.79999
y: 545.60004
width: 1170.2
height: 237.79999
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &15
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -918,18 +894,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1170.4
x: 1171.2
y: 0
width: 365.59998
height: 731
width: 364.80005
height: 730.8
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 16}
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &16
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -949,10 +925,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1170.4
x: 1171.2001
y: 73.6
width: 364.59998
height: 710
width: 363.80005
height: 709.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -960,7 +936,7 @@ MonoBehaviour:
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 151
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1

View File

@@ -14,14 +14,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43.2
width: 1536
height: 780.8
x: 1536
y: 43
width: 1920
height: 997
m_ShowMode: 4
m_Title: Game
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 350}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@@ -44,8 +44,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1536
height: 780.8
width: 1920
height: 997
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1536
width: 1920
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 760.8
width: 1536
y: 977
width: 1920
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -103,22 +103,23 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 12}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1536
height: 730.8
width: 1920
height: 947
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 1
controlID: 11199
vertical: 0
controlID: 754
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -133,17 +134,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 7}
- {fileID: 13}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1536
height: 730.8
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 11200
width: 1464
height: 947
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 755
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -158,44 +159,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 8}
- {fileID: 12}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1218.4
height: 730.8
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 11252
--- !u!114 &8
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: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 9}
- {fileID: 10}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1218.4
height: 470.4
width: 1464
height: 611
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
controlID: 11253
--- !u!114 &9
controlID: 756
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -212,16 +188,16 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 296
height: 470.4
width: 370
height: 611
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 15}
- {fileID: 14}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &10
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -236,19 +212,19 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 296
x: 370
y: 0
width: 388.8
height: 470.4
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
width: 519
height: 611
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
- {fileID: 16}
- {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &11
m_Selected: 1
m_LastSelected: 1
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -263,18 +239,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 684.8
x: 889
y: 0
width: 533.60004
height: 470.4
width: 575
height: 611
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 14}
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -290,18 +266,18 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 470.4
width: 1218.4
height: 260.4
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 19}
y: 611
width: 1464
height: 336
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 17}
- {fileID: 18}
- {fileID: 19}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &13
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -316,18 +292,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1218.4
x: 1464
y: 0
width: 317.59998
height: 730.8
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 20}
width: 456
height: 947
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 20}
- {fileID: 19}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &14
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -343,14 +319,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 684.8
y: 73.6
width: 531.60004
height: 449.4
x: 2425
y: 73
width: 573
height: 590
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -361,7 +337,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 531.60004, y: 428.4}
m_TargetSize: {x: 573, y: 569}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -376,10 +352,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -212.64001
m_HBaseRangeMax: 212.64001
m_VBaseRangeMin: -171.36
m_VBaseRangeMax: 171.36
m_HBaseRangeMin: -286.5
m_HBaseRangeMax: 286.5
m_VBaseRangeMin: -284.5
m_VBaseRangeMax: 284.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -397,29 +373,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 531.60004
height: 428.4
m_Scale: {x: 1.1940521, y: 1.1940521}
m_Translation: {x: 265.80002, y: 214.2}
width: 573
height: 569
m_Scale: {x: 1, y: 1}
m_Translation: {x: 286.5, y: 284.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -222.60336
y: -179.38916
width: 445.20673
height: 358.77832
x: -286.5
y: -284.5
width: 573
height: 569
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 664.50006, y: 561.75}
m_LastWindowPixelSize: {x: 573, y: 590}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &15
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -435,14 +411,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 73.6
width: 295
height: 449.4
x: 1536
y: 73
width: 369
height: 590
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -450,9 +426,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: be05fdff
m_LastClickedID: -195138
m_ExpandedIDs: 3277feff6277feff0e22ffff6622fffff222ffff142dffff6a2dffffd02fffffcc88ffffc2faffff2afbffff
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: e6d2fdff38d3fdffced5fdff80dcfdffd2dcfdff68dffdff44e7fdff96e7fdff2ceafdffc0f5fdff14f6fdffd0f6fdffc2f7fdffd8f9fdffd0fafdff22fbfdffaafdfdffd4fdfdff8636feffd836feff9437feffb037feff8438feffd638feff5e3bfeff883bfeffc647feff1848feffa04afeffca4afeff9a61feffee61feff7664feffa064feffb66cfeff0a6dfeff926ffeffbc6ffeff2afbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -468,7 +444,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 9}
m_ClientGUIView: {fileID: 8}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -476,6 +452,70 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !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: -1673928668082335149, 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:
m_ObjectHideFlags: 52
@@ -492,14 +532,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 296
y: 73.6
width: 386.8
height: 449.4
x: 1906
y: 73
width: 517
height: 590
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -509,9 +549,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: -98.400024, y: -26}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
snapCorner: 3
id: Tool Settings
index: 0
layout: 1
@@ -520,9 +560,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: -141, y: 149}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
snapCorner: 1
id: unity-grid-and-snap-toolbar
index: 1
layout: 1
@@ -564,7 +604,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: 67.5, y: 86}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Orientation
@@ -586,7 +626,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Camera
@@ -696,7 +736,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 24.8}
snapOffset: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Animation Rigging
@@ -705,16 +745,16 @@ MonoBehaviour:
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 0
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneIsLit: 0
m_SceneLighting: 1
m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 12.566701, y: 3.9675372, z: 0.014717923}
m_Target: {x: -0.36444837, y: 8.662055, z: 6.1208687}
speed: 2
m_Value: {x: 12.566701, y: 3.9675372, z: 0.014717923}
m_Value: {x: -0.36444837, y: 8.662055, z: 6.1208687}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -761,20 +801,20 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.12276869, y: -0.59779793, z: 0.09329085, w: 0.78668725}
m_Target: {x: -0.14265797, y: -0.8023181, z: 0.212259, w: -0.53944343}
speed: 2
m_Value: {x: 0.1227678, y: -0.5977936, z: 0.09329017, w: 0.78668153}
m_Value: {x: -0.1426495, y: -0.8022705, z: 0.21224639, w: -0.5394114}
m_Size:
m_Target: 2.8332496
m_Target: 3.234408
speed: 2
m_Value: 2.8332496
m_Value: 3.234408
m_Ortho:
m_Target: 0
speed: 2
m_Value: 0
m_CameraSettings:
m_Speed: 0.34082997
m_SpeedNormalized: 0.16999999
m_Speed: 1
m_SpeedNormalized: 0.5
m_SpeedMin: 0.001
m_SpeedMax: 2
m_EasingEnabled: 1
@@ -785,7 +825,7 @@ MonoBehaviour:
m_FarClip: 10000
m_DynamicClip: 1
m_OcclusionCulling: 0
m_LastSceneViewRotation: {x: -0.057347883, y: 0.942116, z: -0.24952282, w: -0.21652032}
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
@@ -793,70 +833,6 @@ MonoBehaviour:
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &17
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: 578
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: 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 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -872,22 +848,21 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 544
width: 1217.4
height: 239.4
x: 1536
y: 684
width: 1463
height: 315
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_SearchFilter:
m_NameFilter:
m_ClassNames:
- Prefab
m_ClassNames: []
m_AssetLabels: []
m_AssetBundleNames: []
m_VersionControlStates: []
@@ -897,22 +872,23 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SkipHidden: 0
m_SearchArea: 1
m_Folders: []
m_Folders:
- Assets/Scenes
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Objects/Weapons/M9
- Assets/Scenes
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\.Downloads\Programming\Unity\Projects\Rheinmetall\3dshooter\3d-shooter
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 04ca9a3b
m_LastClickedID: 1000000004
m_ExpandedIDs: 00000000ea630000ec630000ee630000f06300007265000000ca9a3b
scrollPos: {x: 0, y: 120}
m_SelectedIDs: d8640000
m_LastClickedID: 25816
m_ExpandedIDs: 00000000406300004263000044630000d4640000d664000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -928,7 +904,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 11}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -940,7 +916,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ea630000ec630000ee630000f06300007265000000ca9a3b
m_ExpandedIDs: 0000000040630000426300004463000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -984,7 +960,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 11}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -996,7 +972,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
--- !u!114 &19
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1012,19 +988,19 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 544
width: 1217.4
height: 239.4
x: 1536
y: 684
width: 1463
height: 315
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &20
--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1040,14 +1016,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1218.4
y: 73.6
width: 316.59998
height: 709.8
x: 3000
y: 73
width: 455
height: 926
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -1055,7 +1031,7 @@ MonoBehaviour:
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 151
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1