mirror of
https://github.com/DerTyp7/defrain-shooter-unity.git
synced 2025-11-01 14:02:31 +01:00
Weapon Switch/Standard Hand
ja alles irgendwie klappt jetzt
This commit is contained in:
Noah4ever
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user