-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
…mo to pick up, CHAR. for code, added NPC enemy health script, modified weapon scripts. still need to work on ammo pickup, weapon pickup, npc shooting at CHAR, and fix errors
- Loading branch information
There are no files selected for viewing
Large diffs are not rendered by default.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!1107 &-6805046237438391141 | ||
AnimatorStateMachine: | ||
serializedVersion: 6 | ||
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: 3447847733044138179} | ||
m_Position: {x: 90, y: 110, z: 0} | ||
- serializedVersion: 1 | ||
m_State: {fileID: -2863198520474622824} | ||
m_Position: {x: -220, y: -30, z: 0} | ||
m_ChildStateMachines: [] | ||
m_AnyStateTransitions: [] | ||
m_EntryTransitions: [] | ||
m_StateMachineTransitions: {} | ||
m_StateMachineBehaviours: [] | ||
m_AnyStatePosition: {x: -190, y: 20, z: 0} | ||
m_EntryPosition: {x: 110, y: 10, z: 0} | ||
m_ExitPosition: {x: -200, y: 70, z: 0} | ||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} | ||
m_DefaultState: {fileID: 3447847733044138179} | ||
--- !u!1102 &-2863198520474622824 | ||
AnimatorState: | ||
serializedVersion: 6 | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Falling To Roll | ||
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: -203655887218126122, guid: 4f52f003eca24b843924f016ea500470, | ||
type: 3} | ||
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: Animator_Mutant | ||
serializedVersion: 5 | ||
m_AnimatorParameters: [] | ||
m_AnimatorLayers: | ||
- serializedVersion: 5 | ||
m_Name: Base Layer | ||
m_StateMachine: {fileID: -6805046237438391141} | ||
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!1102 &3447847733044138179 | ||
AnimatorState: | ||
serializedVersion: 6 | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Breathing Idle | ||
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: 7a339da250b798d41a54414ce864a1a7, type: 2} | ||
m_Tag: | ||
m_SpeedParameter: | ||
m_MirrorParameter: | ||
m_CycleOffsetParameter: | ||
m_TimeParameter: | ||
--- !u!1101 &5388810996332279481 | ||
AnimatorStateTransition: | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: | ||
m_Conditions: [] | ||
m_DstStateMachine: {fileID: 0} | ||
m_DstState: {fileID: -3398653591857322796, guid: 30914248533bfd94caae7d85f239a2bc, | ||
type: 2} | ||
m_Solo: 0 | ||
m_Mute: 0 | ||
m_IsExit: 0 | ||
serializedVersion: 3 | ||
m_TransitionDuration: 0.25 | ||
m_TransitionOffset: 0 | ||
m_ExitTime: 0.8828125 | ||
m_HasExitTime: 1 | ||
m_HasFixedDuration: 1 | ||
m_InterruptionSource: 0 | ||
m_OrderedInterruption: 1 | ||
m_CanTransitionToSelf: 1 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!114 &-7795833870516908601 | ||
MonoBehaviour: | ||
m_ObjectHideFlags: 11 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_GameObject: {fileID: 0} | ||
m_Enabled: 1 | ||
m_EditorHideFlags: 0 | ||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | ||
m_Name: | ||
m_EditorClassIdentifier: | ||
version: 7 | ||
--- !u!21 &2100000 | ||
Material: | ||
serializedVersion: 8 | ||
m_ObjectHideFlags: 0 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Mutant_diffuse | ||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} | ||
m_Parent: {fileID: 0} | ||
m_ModifiedSerializedProperties: 0 | ||
m_ValidKeywords: | ||
- _NORMALMAP | ||
m_InvalidKeywords: [] | ||
m_LightmapFlags: 4 | ||
m_EnableInstancingVariants: 0 | ||
m_DoubleSidedGI: 0 | ||
m_CustomRenderQueue: -1 | ||
stringTagMap: | ||
RenderType: Opaque | ||
disabledShaderPasses: [] | ||
m_LockedProperties: | ||
m_SavedProperties: | ||
serializedVersion: 3 | ||
m_TexEnvs: | ||
- _BaseMap: | ||
m_Texture: {fileID: 2800000, guid: 376b3607335c1194d8f2c9dde044bd56, type: 3} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _BumpMap: | ||
m_Texture: {fileID: 2800000, guid: 00be55c27c345ac40918de0a631a1714, type: 3} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _DetailAlbedoMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _DetailMask: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _DetailNormalMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _EmissionMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _MainTex: | ||
m_Texture: {fileID: 2800000, guid: 376b3607335c1194d8f2c9dde044bd56, type: 3} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _MetallicGlossMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _OcclusionMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _ParallaxMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _SpecGlossMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- unity_Lightmaps: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- unity_LightmapsInd: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- unity_ShadowMasks: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
m_Ints: [] | ||
m_Floats: | ||
- _AlphaClip: 0 | ||
- _AlphaToMask: 0 | ||
- _Blend: 0 | ||
- _BlendModePreserveSpecular: 1 | ||
- _BumpScale: 1 | ||
- _ClearCoatMask: 0 | ||
- _ClearCoatSmoothness: 0 | ||
- _Cull: 2 | ||
- _Cutoff: 0.5 | ||
- _DetailAlbedoMapScale: 1 | ||
- _DetailNormalMapScale: 1 | ||
- _DstBlend: 0 | ||
- _DstBlendAlpha: 0 | ||
- _EnvironmentReflections: 1 | ||
- _GlossMapScale: 0 | ||
- _Glossiness: 0 | ||
- _GlossyReflections: 0 | ||
- _Metallic: 0 | ||
- _OcclusionStrength: 1 | ||
- _Parallax: 0.005 | ||
- _QueueOffset: 0 | ||
- _ReceiveShadows: 1 | ||
- _Smoothness: 0.5 | ||
- _SmoothnessTextureChannel: 0 | ||
- _SpecularHighlights: 1 | ||
- _SrcBlend: 1 | ||
- _SrcBlendAlpha: 1 | ||
- _Surface: 0 | ||
- _WorkflowMode: 1 | ||
- _ZWrite: 1 | ||
m_Colors: | ||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} | ||
- _Color: {r: 1, g: 1, b: 1, a: 1} | ||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | ||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | ||
m_BuildTextureStacks: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.