mirror of
https://github.com/DerTyp7/defrain-shooter-unity.git
synced 2025-10-29 12:52:07 +01:00
Weapon Switch/Standard Hand
ja alles irgendwie klappt jetzt
This commit is contained in:
Noah4ever
8
Assets/Objects/Weapons/Hand.meta
Normal file
8
Assets/Objects/Weapons/Hand.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 86a95b139ccf5ab4980ccd4d3093e6c1
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
245
Assets/Objects/Weapons/Hand/Hand.prefab
Normal file
245
Assets/Objects/Weapons/Hand/Hand.prefab
Normal file
@@ -0,0 +1,245 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2979183580414507987
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6708222704297240606}
|
||||
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 &6708222704297240606
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2979183580414507987}
|
||||
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 4.4113026, y: -1.3282752, z: 10.768935}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7365407325767981108}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
|
||||
--- !u!1 &7365407324475125408
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365407324475125409}
|
||||
- component: {fileID: 7365407324475125414}
|
||||
m_Layer: 0
|
||||
m_Name: Hand
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365407324475125409
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407324475125408}
|
||||
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: 7365407325624913735}
|
||||
m_Father: {fileID: 7365407325767981108}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &7365407324475125414
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407324475125408}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 0}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &7365407325624913734
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365407325624913735}
|
||||
m_Layer: 0
|
||||
m_Name: Muzzle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365407325624913735
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407325624913734}
|
||||
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: []
|
||||
m_Father: {fileID: 7365407324475125409}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7365407325767981110
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365407325767981108}
|
||||
- component: {fileID: 7365407325767981111}
|
||||
- component: {fileID: 3886275361998190322}
|
||||
- component: {fileID: 7572542760695273090}
|
||||
- component: {fileID: 7767085553880336978}
|
||||
m_Layer: 0
|
||||
m_Name: Hand
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365407325767981108
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407325767981110}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 3.7112896, y: 1.9542754, z: -10.937987}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7365407324475125409}
|
||||
- {fileID: 6708222704297240606}
|
||||
- {fileID: 2448190575139433570}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &7365407325767981111
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407325767981110}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
weaponKind: 2
|
||||
active: 0
|
||||
damage: 33
|
||||
firerate: 100
|
||||
roundsPerShot: 1
|
||||
recoilStrength: 3
|
||||
currentAmmunition: 0
|
||||
magazinSize: 0
|
||||
totalAmmunition: 0
|
||||
bulletExit: {fileID: 7365407325624913734}
|
||||
allowAction: 1
|
||||
weaponAnimator: {fileID: 7365407324475125414}
|
||||
--- !u!114 &3886275361998190322
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407325767981110}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!65 &7572542760695273090
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407325767981110}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &7767085553880336978
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7365407325767981110}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &7716234701984758470
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2448190575139433570}
|
||||
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 &2448190575139433570
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7716234701984758470}
|
||||
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 4.471302, y: -1.3182755, z: 10.768935}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7365407325767981108}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
|
||||
7
Assets/Objects/Weapons/Hand/Hand.prefab.meta
Normal file
7
Assets/Objects/Weapons/Hand/Hand.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f1dd059fe90d9e14da7ad60b3612969c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -114,6 +114,7 @@ GameObject:
|
||||
- component: {fileID: 6352645931139448055}
|
||||
- component: {fileID: 5204381087217674634}
|
||||
- component: {fileID: 3937508078766297979}
|
||||
- component: {fileID: 2072484884}
|
||||
m_Layer: 0
|
||||
m_Name: M92
|
||||
m_TagString: Weapon
|
||||
@@ -171,9 +172,10 @@ MonoBehaviour:
|
||||
recoilStrength: 15
|
||||
currentAmmunition: 16
|
||||
magazinSize: 16
|
||||
totalAmmunition: 64
|
||||
totalAmmunition: 16
|
||||
bulletExit: {fileID: 2236875552107647873}
|
||||
allowAction: 1
|
||||
weaponAnimator: {fileID: 4836044225623250080}
|
||||
--- !u!65 &3937508078766297979
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -187,6 +189,22 @@ BoxCollider:
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.040187918, y: 0.16860102, z: 0.2560755}
|
||||
m_Center: {x: 0.00017769728, y: -0.07880532, z: -0.26860136}
|
||||
--- !u!54 &2072484884
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5071598280516985511}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1001 &1330674258901920049
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -258,3 +276,8 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
|
||||
m_PrefabInstance: {fileID: 1330674258901920049}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!95 &4836044225623250080 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
|
||||
m_PrefabInstance: {fileID: 1330674258901920049}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@@ -23,13 +23,13 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1029209707363336683}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.504, y: 0, z: 0.102}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: -0.039, y: -0.0474, z: -0.2881}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8797726366404580855}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0}
|
||||
--- !u!1 &1880099159927430553
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -102,6 +102,7 @@ MonoBehaviour:
|
||||
totalAmmunition: 24
|
||||
bulletExit: {fileID: 7014992348987952529}
|
||||
allowAction: 1
|
||||
weaponAnimator: {fileID: 0}
|
||||
--- !u!65 &6050550425513890989
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -138,13 +139,32 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4999713445390711574}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.503, y: 0, z: -0.072}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 0.034, y: -0.0177, z: -0.2867}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8797726366404580855}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0}
|
||||
--- !u!95 &4797094208700084232
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6885991082275612989}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 9000000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
|
||||
m_Controller: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 1
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &7014992348987952529
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -169,7 +189,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7014992348987952529}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.003, y: 0.04, z: 0.161}
|
||||
m_LocalPosition: {x: -0.008, y: 0.055, z: 0.167}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8797726366404580855}
|
||||
@@ -272,7 +292,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: USP
|
||||
value: USP 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
|
||||
propertyPath: m_Layer
|
||||
@@ -304,6 +324,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
|
||||
--- !u!1 &6885991082275612989 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
|
||||
m_PrefabInstance: {fileID: 6002908758433764460}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6108047450985722759 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
|
||||
|
||||
@@ -48,7 +48,7 @@ MonoBehaviour:
|
||||
m_Root: {fileID: 8334588817950881727}
|
||||
m_Mid: {fileID: 5739201115059209923}
|
||||
m_Tip: {fileID: 1706812538552309319}
|
||||
m_Target: {fileID: 2065766509905691831}
|
||||
m_Target: {fileID: 2667261596731681437}
|
||||
m_Hint: {fileID: 0}
|
||||
m_TargetPositionWeight: 1
|
||||
m_TargetRotationWeight: 1
|
||||
@@ -103,7 +103,7 @@ MonoBehaviour:
|
||||
m_Root: {fileID: 9127245645273413481}
|
||||
m_Mid: {fileID: 8862008152122197222}
|
||||
m_Tip: {fileID: 8703533484509679896}
|
||||
m_Target: {fileID: 909324728237481282}
|
||||
m_Target: {fileID: 6477822315647626977}
|
||||
m_Hint: {fileID: 0}
|
||||
m_TargetPositionWeight: 1
|
||||
m_TargetRotationWeight: 1
|
||||
@@ -283,25 +283,6 @@ Transform:
|
||||
m_Father: {fileID: 6272346181657429396}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &4797094208700084232
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3995507965915027724}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 9000000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
|
||||
m_Controller: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 1
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &4824770690127859843
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -606,8 +587,8 @@ MonoBehaviour:
|
||||
playerController: {fileID: -4574526707603160507}
|
||||
currentCameraRecoilX: 0
|
||||
currentCameraRecoilY: 0
|
||||
gun: {fileID: 3995507965915027724}
|
||||
gunHolder: {fileID: 8280541971482439080}
|
||||
gunHolder: {fileID: 2173918897660926645}
|
||||
weaponManager: {fileID: 8357986889675898169}
|
||||
positionRecoil: 1
|
||||
rotationRecoil: 1
|
||||
positionMultX: 2
|
||||
@@ -836,7 +817,7 @@ MonoBehaviour:
|
||||
showGizmos: 0
|
||||
showOverlay: 0
|
||||
overlayColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
target: {fileID: 1363144486119695814}
|
||||
target: {fileID: 2848367205963120269}
|
||||
--- !u!95 &8957579265169979397
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
@@ -886,8 +867,12 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
syncMode: 0
|
||||
syncInterval: 0.1
|
||||
currentWeaponIndex: 0
|
||||
activeWeapons: []
|
||||
currentWeaponIndex: 2
|
||||
activeWeapons:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 2173918897660926645}
|
||||
- {fileID: 0}
|
||||
gunHolster: {fileID: 6522444664664986769}
|
||||
cam: {fileID: 6272346181657429395}
|
||||
--- !u!1 &6272346181657429393
|
||||
@@ -1040,7 +1025,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 6035287771982183217}
|
||||
- {fileID: 2848367205963120269}
|
||||
- {fileID: 1363144486119695814}
|
||||
- {fileID: 2173918897660926647}
|
||||
m_Father: {fileID: 6272346181657429396}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1208,32 +1193,13 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Weapon
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: damage
|
||||
value: 15
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: weaponKind
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: magazinSize
|
||||
value: 16
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: totalAmmunition
|
||||
value: 16
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: currentAmmunition
|
||||
value: 16
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
--- !u!4 &2848367205963120269 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
m_PrefabInstance: {fileID: 3292089710699836531}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3649358604728444914 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2236875552107647873, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
@@ -1244,11 +1210,6 @@ GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
m_PrefabInstance: {fileID: 3292089710699836531}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2848367205963120269 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
m_PrefabInstance: {fileID: 3292089710699836531}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6305701708507383038
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1412,11 +1373,6 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3}
|
||||
m_PrefabInstance: {fileID: 6305701708507383038}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8334588817950881727 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
|
||||
m_PrefabInstance: {fileID: 6305701708507383038}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5739201115059209923 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
|
||||
@@ -1442,173 +1398,87 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
|
||||
m_PrefabInstance: {fileID: 6305701708507383038}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7565221866438160433
|
||||
--- !u!4 &8334588817950881727 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
|
||||
m_PrefabInstance: {fileID: 6305701708507383038}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8654899547373519491
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 4074665071222326704}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: USP 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5139256649524637864, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.008
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5139256649524637864, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.055
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5139256649524637864, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.167
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.034
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0177
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.2867
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.039
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0474
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.2881
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: 3.7112896
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0713
|
||||
value: 1.9542754
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.08
|
||||
value: -10.937987
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
- target: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
--- !u!1 &8280541971482439080 stripped
|
||||
- target: {fileID: 7365407325767981110, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Hand
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 7767085553880336978, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
- {fileID: 7572542760695273090, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
--- !u!1 &2173918897660926645 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 7565221866438160433}
|
||||
m_CorrespondingSourceObject: {fileID: 7365407325767981110, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
m_PrefabInstance: {fileID: 8654899547373519491}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1363144486119695814 stripped
|
||||
--- !u!4 &2173918897660926647 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 7565221866438160433}
|
||||
m_CorrespondingSourceObject: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
m_PrefabInstance: {fileID: 8654899547373519491}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3995507965915027724 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6885991082275612989, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 7565221866438160433}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2065766509905691831 stripped
|
||||
--- !u!4 &2667261596731681437 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 7565221866438160433}
|
||||
m_CorrespondingSourceObject: {fileID: 6708222704297240606, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
m_PrefabInstance: {fileID: 8654899547373519491}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &909324728237481282 stripped
|
||||
--- !u!4 &6477822315647626977 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 7565221866438160433}
|
||||
m_CorrespondingSourceObject: {fileID: 2448190575139433570, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
|
||||
m_PrefabInstance: {fileID: 8654899547373519491}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 705507994}
|
||||
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -178,7 +178,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
@@ -289,7 +289,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 203427802}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0.04, z: 0}
|
||||
m_LocalPosition: {x: 0, y: -1.24, z: 0}
|
||||
m_LocalScale: {x: 100, y: 0.1, z: 100}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1362549044}
|
||||
@@ -396,128 +396,6 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -5053925668127403250, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
--- !u!1001 &342194877
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 10.188591
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.51
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 1.174
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: M92
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Weapon
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: weaponKind
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
--- !u!1001 &409053569
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: USP 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 10.12892
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.30300653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9999914
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.0041435333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0.475
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
--- !u!1001 &419161482
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -583,6 +461,27 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3}
|
||||
--- !u!1 &448875238 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 692675524}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &448875239
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 448875238}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &450235891 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -466329591000292508, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
@@ -659,7 +558,7 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -2138796739762357153, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
--- !u!1001 &680590968
|
||||
--- !u!1001 &692675524
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
@@ -667,44 +566,44 @@ PrefabInstance:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1672832146417829139, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: weaponKind
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
propertyPath: weaponAnimator
|
||||
value:
|
||||
objectReference: {fileID: 1170955081}
|
||||
- target: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: GranadeUSP 1 (1)
|
||||
value: USP 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 10.12892
|
||||
value: 14.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.30300653
|
||||
value: 1.31
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: -2.11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9999914
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.0041435333
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -716,31 +615,10 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0.475
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
--- !u!1 &680590969 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 680590968}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &680590970
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 680590969}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &705507993
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -832,7 +710,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1001 &739500445
|
||||
PrefabInstance:
|
||||
@@ -973,6 +851,18 @@ PrefabInstance:
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2489159159464621496, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -18.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2489159159464621496, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -26.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2489159159464621496, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2550463727306718371, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
@@ -991,92 +881,6 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
--- !u!1001 &863637338
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 10.188591
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.51
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 1.174
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: M92 (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Weapon
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: weaponKind
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
--- !u!1 &863637339 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
m_PrefabInstance: {fileID: 863637338}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &863637340
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 863637339}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &1035340512 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -208595431880416365, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
@@ -1115,6 +919,11 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -629719859055844128, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
--- !u!95 &1170955081 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 4797094208700084232, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 692675524}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1246681035
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1179,8 +988,65 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1249968656
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8.152592
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.74
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.25494772
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: M92
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
--- !u!4 &1362549044 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
@@ -1205,27 +1071,6 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -1550514412580984892, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
--- !u!1 &1657029747 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3}
|
||||
m_PrefabInstance: {fileID: 342194877}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &1657029752
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1657029747}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &1683546023 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
@@ -1245,27 +1090,6 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -8678823145569952518, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
--- !u!1 &1721250000 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3}
|
||||
m_PrefabInstance: {fileID: 409053569}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &1721250005
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1721250000}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &1767188876 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 281855664364225751, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
|
||||
@@ -1375,9 +1199,9 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2119583729}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.5941708, y: -0.23374963, z: 0.91566634}
|
||||
m_LocalPosition: {x: 0.5941708, y: -0.23374963, z: -16.31}
|
||||
m_LocalScale: {x: 4.6584, y: 1, z: 14.388176}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
||||
@@ -30,8 +30,8 @@ public class ProcedualAnimationController : NetworkBehaviour
|
||||
[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;
|
||||
[SerializeField] private WeaponManager weaponManager;
|
||||
|
||||
|
||||
[Header("General Settings")]
|
||||
@@ -94,15 +94,14 @@ public class ProcedualAnimationController : NetworkBehaviour
|
||||
public Quaternion[] rotationMod = new Quaternion[3];
|
||||
|
||||
|
||||
public void OnSwitchWeapon(float fireRate)
|
||||
public void OnSwitchWeapon(GameObject currentWeapon)
|
||||
{
|
||||
if (isLocalPlayer)
|
||||
{
|
||||
//gun = newGun;
|
||||
gunAnimator = gun.GetComponent<Animator>();
|
||||
gunAnimator.SetFloat("ShootSpeed", 1f / (60f / fireRate));
|
||||
//startPos = gunPositionObj.transform.localPosition;
|
||||
//startRot = gunRotationObj.transform.localRotation.eulerAngles;
|
||||
if (isLocalPlayer) {
|
||||
if(currentWeapon != null) {
|
||||
gunHolder = currentWeapon;
|
||||
gunAnimator = currentWeapon.GetComponent<Weapon>().WeaponAnimator;
|
||||
gunAnimator.SetFloat("ShootSpeed", 1f / (60f / currentWeapon.GetComponent<Weapon>().Firerate));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,11 +27,9 @@ public class Shoot : NetworkBehaviour
|
||||
private void Start() {
|
||||
if (isServer) {
|
||||
weapon = weaponHolder.GetComponent<Weapon>();
|
||||
shootAnim.OnSwitchWeapon(weapon.Firerate);
|
||||
}
|
||||
if (isLocalPlayer) {
|
||||
weapon = weaponHolder.GetComponent<Weapon>();
|
||||
shootAnim.OnSwitchWeapon(weapon.Firerate);
|
||||
curAmmo = weapon.CurrentAmmunition;
|
||||
totalAmmo = weapon.TotalAmmunition;
|
||||
}
|
||||
|
||||
@@ -19,9 +19,10 @@ public class Weapon : MonoBehaviour
|
||||
[SerializeField] int totalAmmunition = 0;
|
||||
[SerializeField] GameObject bulletExit;
|
||||
[SerializeField] bool allowAction = true;
|
||||
[SerializeField] Animator weaponAnimator;
|
||||
|
||||
public bool Active { get => active; set => active = value; }
|
||||
public weaponKinds WeaponKind { get => weaponKind; set => weaponKind = value; }
|
||||
public weaponKinds WeaponKind { get => weaponKind; }
|
||||
public int Damage { get => damage; set => damage = value; }
|
||||
public float Firerate { get => firerate; set => firerate = value; }
|
||||
public int RoundsPerShot { get => roundsPerShot; set => roundsPerShot = value; }
|
||||
@@ -29,8 +30,9 @@ public class Weapon : MonoBehaviour
|
||||
public int CurrentAmmunition { get => currentAmmunition; set => currentAmmunition = value; }
|
||||
public int MagazinSize { get => magazinSize; set => magazinSize = value; }
|
||||
public int TotalAmmunition { get => totalAmmunition; set => totalAmmunition = value; }
|
||||
public GameObject BulletExit { get => bulletExit; set => bulletExit = value; }
|
||||
public GameObject BulletExit { get => bulletExit; }
|
||||
public bool AllowAction { get => allowAction; set => allowAction = value; }
|
||||
public Animator WeaponAnimator { get => weaponAnimator; }
|
||||
|
||||
private void Start()
|
||||
{
|
||||
|
||||
@@ -10,17 +10,15 @@ public class WeaponManager : NetworkBehaviour
|
||||
private int lastWeaponIndex = 0;
|
||||
private int counter = 0;
|
||||
public List<GameObject> activeWeapons = new List<GameObject>();
|
||||
|
||||
private ProcedualAnimationController procedualAnimationController;
|
||||
|
||||
[SerializeField] GameObject gunHolster;
|
||||
[SerializeField] Camera cam;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
for(int i = 0; i<4; i++)
|
||||
{
|
||||
activeWeapons.Add(null);
|
||||
}
|
||||
|
||||
procedualAnimationController = GetComponent<ProcedualAnimationController>();
|
||||
}
|
||||
|
||||
void Update() {
|
||||
@@ -31,6 +29,7 @@ public class WeaponManager : NetworkBehaviour
|
||||
if (nextActive != -1) { // -1 no next found
|
||||
currentWeaponIndex = nextActive;
|
||||
activeWeapons[currentWeaponIndex].SetActive(true);
|
||||
procedualAnimationController.OnSwitchWeapon(activeWeapons[currentWeaponIndex].gameObject);
|
||||
// play weapon switch animation
|
||||
}
|
||||
}
|
||||
@@ -40,47 +39,38 @@ public class WeaponManager : NetworkBehaviour
|
||||
if (nextActive != -1) { // -1 no next found
|
||||
currentWeaponIndex = nextActive;
|
||||
activeWeapons[currentWeaponIndex].SetActive(true);
|
||||
procedualAnimationController.OnSwitchWeapon(activeWeapons[currentWeaponIndex].gameObject);
|
||||
// play weapon switch animation
|
||||
}
|
||||
}
|
||||
|
||||
if (Input.GetButtonDown("Interact")) // e NACH DEM AUFHEBEN MUSS N<>CSHTE AKTIVE GESUCHT WEREDN
|
||||
if (Input.GetButtonDown("Interact")) // e
|
||||
{
|
||||
CmdPickupWeapon();
|
||||
PickupWeapon();
|
||||
|
||||
}else if (Input.GetButtonDown("Drop")) // q Droping weapon ERSTE WAFFE DIE MAN DROPT WIRD DEAKTIVIERT
|
||||
}else if (Input.GetButtonDown("Drop")) // q Droping weapon
|
||||
{
|
||||
if(activeWeapons[currentWeaponIndex] != null)
|
||||
{
|
||||
activeWeapons[currentWeaponIndex].SetActive(true);
|
||||
GameObject curWeapon = activeWeapons[currentWeaponIndex];
|
||||
Rigidbody rigid = curWeapon.GetComponent<Rigidbody>();
|
||||
|
||||
curWeapon.transform.position = cam.transform.position;
|
||||
rigid.useGravity = true;
|
||||
rigid.isKinematic = false;
|
||||
rigid.velocity = cam.transform.forward * 10 + cam.transform.up * 2;
|
||||
curWeapon.GetComponent<BoxCollider>().enabled = true;
|
||||
curWeapon.gameObject.transform.SetParent(null);
|
||||
activeWeapons[currentWeaponIndex] = null;
|
||||
|
||||
dropWeapon(); // Throws weapon away
|
||||
int nextActive = SearchForNext(activeWeapons, currentWeaponIndex, 1);
|
||||
if (nextActive != -1) { // -1 no next found
|
||||
currentWeaponIndex = nextActive;
|
||||
activeWeapons[currentWeaponIndex].SetActive(true);
|
||||
procedualAnimationController.OnSwitchWeapon(activeWeapons[currentWeaponIndex].gameObject);
|
||||
// play weapon switch animation
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private int SearchForNext(List<GameObject> l, int lastActive = 0, int direction = 1) {
|
||||
int size = l.Count;
|
||||
bool condition = true;
|
||||
int counter = 0;
|
||||
foreach (GameObject obj in l) { if(obj == null) { counter++; } }
|
||||
if(counter < 4) {
|
||||
if (lastActive <= -1) { lastActive = size; }
|
||||
if (lastActive >= l.Count) { lastActive = 0; }
|
||||
for (int i = lastActive + direction; condition; i += direction) {
|
||||
@@ -98,13 +88,20 @@ public class WeaponManager : NetworkBehaviour
|
||||
else { condition = false; }
|
||||
}
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
[Command]
|
||||
private void CmdPickupWeapon() {
|
||||
public GameObject getCurrentWeapon()
|
||||
{
|
||||
return activeWeapons[currentWeaponIndex].gameObject;
|
||||
}
|
||||
|
||||
private void PickupWeapon() {
|
||||
if (Physics.Raycast(cam.transform.position, cam.transform.forward, out RaycastHit hit))
|
||||
{
|
||||
|
||||
Debug.Log(hit.transform.name);
|
||||
if (hit.transform.tag == "Weapon") // If Object is a weapon and the weapon is not in the current active weapons
|
||||
{
|
||||
foreach (GameObject obj in activeWeapons) { // Disable all weapons
|
||||
@@ -114,18 +111,50 @@ public class WeaponManager : NetworkBehaviour
|
||||
hit.rigidbody.isKinematic = true;
|
||||
hit.rigidbody.useGravity = false;
|
||||
hit.transform.GetComponent<BoxCollider>().enabled = false; // Disable Boxcollider
|
||||
hit.transform.position = cam.transform.position;
|
||||
switch (hit.transform.GetComponent<Weapon>().WeaponKind.ToString()) // Adding weapon to inventory slot
|
||||
|
||||
{
|
||||
case "Rifle": activeWeapons[0] = hit.transform.gameObject; break;
|
||||
case "Pistole": activeWeapons[1] = hit.transform.gameObject; break;
|
||||
case "Knife": activeWeapons[2] = hit.transform.gameObject; break;
|
||||
case "Grenade": activeWeapons[3] = hit.transform.gameObject; break;
|
||||
//hit.transform.position = cam.transform.position;
|
||||
switch (hit.transform.GetComponent<Weapon>().WeaponKind.ToString()) { // Adding weapon to inventory slot
|
||||
case "Rifle": putWeaponInArray(0, hit); break;
|
||||
case "Pistole": putWeaponInArray(1, hit); break;
|
||||
case "Knife": putWeaponInArray(2, hit); break;
|
||||
case "Grenade": putWeaponInArray(3, hit); break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool putWeaponInArray(int index, RaycastHit hit) {
|
||||
if (activeWeapons[currentWeaponIndex] != null) {
|
||||
dropWeapon(); // Throws weapon away
|
||||
}
|
||||
activeWeapons[index] = hit.transform.gameObject;
|
||||
activeWeapons[index].SetActive(true);
|
||||
currentWeaponIndex = index;
|
||||
procedualAnimationController.OnSwitchWeapon(activeWeapons[currentWeaponIndex].gameObject);
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool dropWeapon()
|
||||
{
|
||||
if(currentWeaponIndex != 2)
|
||||
{
|
||||
GameObject currentWeapon = activeWeapons[currentWeaponIndex];
|
||||
currentWeapon.SetActive(true);
|
||||
Rigidbody rigid = currentWeapon.GetComponent<Rigidbody>();
|
||||
rigid.useGravity = true;
|
||||
rigid.isKinematic = false;
|
||||
rigid.velocity = cam.transform.forward * 10 + cam.transform.up * 2;
|
||||
currentWeapon.GetComponent<BoxCollider>().enabled = true;
|
||||
currentWeapon.gameObject.transform.SetParent(null);
|
||||
activeWeapons[currentWeaponIndex] = null;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user