Commit 385cf2f8 authored by LasseKau's avatar LasseKau
Browse files

shotgunfix 2

-
parent 18251186
This diff is collapsed.
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-4408330332364441758
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: idleLantern
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 9c542122f6b6fb3419cea57e38b5f09a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Lantern (4)
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 3746454701502280671}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &3746454701502280671
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -4408330332364441758}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -4408330332364441758}
fileFormatVersion: 2
guid: bfa3feec7864730479b45c14c6148208
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: idleLantern
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.359, y: -1.056, z: 1.288}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.41666666
value: {x: 0.359, y: -1.08, z: 1.288}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0.359, y: -1.056, z: 1.288}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.359
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.359
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1.056
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.41666666
value: -1.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -1.056
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.288
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1.288
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 9c542122f6b6fb3419cea57e38b5f09a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -2120,8 +2120,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129050000}
m_LocalRotation: {x: 0.087172285, y: 0.89959055, z: 0.21045254, w: -0.37262255}
m_LocalPosition: {x: 546.07666, y: 49.411003, z: 701.66235}
m_LocalRotation: {x: -0.15078206, y: 0.74571776, z: 0.18036474, w: 0.62340873}
m_LocalPosition: {x: 551.7359, y: 49.77305, z: 681.88544}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -2456,32 +2456,32 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.16
value: -0.86
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.69
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0.05394794
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7166064
value: 0.68750614
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0.055767864
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.6974778
value: 0.7220214
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
......@@ -2491,23 +2491,33 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
value: -0.07
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 91.55
value: 87.2
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
value: -8.9
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_Name
value: Player_Lantern (4)
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2502203975881118265, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5cef5c8cc19bbb64b94eb3cd16103234, type: 3}
--- !u!1 &155757584
......@@ -14001,6 +14011,11 @@ PrefabInstance:
propertyPath: m_Name
value: Player_Rifle (4)
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: e041ca53b92f54d49b3d3ed6581623fe,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e041ca53b92f54d49b3d3ed6581623fe, type: 3}
--- !u!4 &653692981 stripped
......@@ -43941,6 +43956,31 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dfc229e3b5e4ae141a6e32a5cee30964, type: 3}
--- !u!1 &2065119831 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 5cef5c8cc19bbb64b94eb3cd16103234,
type: 3}
m_PrefabInstance: {fileID: 150405580}
m_PrefabAsset: {fileID: 0}
--- !u!95 &2065119832
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2065119831}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: bfa3feec7864730479b45c14c6148208, 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!1001 &2068198019
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -44776,7 +44816,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2106049755}
m_LocalRotation: {x: 0, y: 0, z: -0, w: 1}
m_LocalPosition: {x: 554.12, y: 86.248, z: 680.358}
m_LocalPosition: {x: 554.12, y: 86.584, z: 680.358}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 963194228}
......@@ -15,16 +15,24 @@ public class shotgunAnim : MonoBehaviour
}
public void reloadAnim()
{
/*
anim.SetTrigger("ReloadBack");
anim.SetTrigger("ReloadFront");
anim.SetTrigger("ReloadLeftShell");
anim.SetTrigger("ReloadRightShell");
anim.SetTrigger("ReloadRightArm");
anim.SetTrigger("ReloadLeftArm");
*/
anim.SetBool("Reload", true);
}
public void resetReload()
{
/*
anim.ResetTrigger("ReloadBack");
anim.ResetTrigger("ReloadFront");
anim.ResetTrigger("ReloadLeftShell");
anim.ResetTrigger("ReloadRightShell");
*/
anim.SetBool("Reload", false);
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment