-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added tutorial screen at the beginning of the game. Fixed bug that caused set resources not to be synced properly. Fixed bug that caused wave to start early if enemy count dropped to zero before respawning (zombie enemy). Lowered health for a few enemies. Current known bugs: none (but there probably are some) Assuming I don't find any obvious bugs, this is going to be the last update to this project for a while so I can move onto other projects.
- Loading branch information
1 parent
289706e
commit 3100e86
Showing
21 changed files
with
648 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!91 &9100000 | ||
| AnimatorController: | ||
| m_ObjectHideFlags: 0 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: Image | ||
| serializedVersion: 5 | ||
| m_AnimatorParameters: [] | ||
| m_AnimatorLayers: | ||
| - serializedVersion: 5 | ||
| m_Name: Base Layer | ||
| m_StateMachine: {fileID: 1107158666809279090} | ||
| 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 &1102118052845993830 | ||
| AnimatorState: | ||
| serializedVersion: 5 | ||
| m_ObjectHideFlags: 1 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: TutorialFade | ||
| 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: 8bb8d6d1c50b62b458d8acf4312deec1, type: 2} | ||
| m_Tag: | ||
| m_SpeedParameter: | ||
| m_MirrorParameter: | ||
| m_CycleOffsetParameter: | ||
| m_TimeParameter: | ||
| --- !u!1107 &1107158666809279090 | ||
| AnimatorStateMachine: | ||
| serializedVersion: 5 | ||
| m_ObjectHideFlags: 1 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: Base Layer | ||
| m_ChildStates: | ||
| - serializedVersion: 1 | ||
| m_State: {fileID: 1102118052845993830} | ||
| 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: 1102118052845993830} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!74 &7400000 | ||
| AnimationClip: | ||
| m_ObjectHideFlags: 0 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: TutorialFade | ||
| serializedVersion: 6 | ||
| m_Legacy: 0 | ||
| m_Compressed: 0 | ||
| m_UseHighQualityCurve: 1 | ||
| m_RotationCurves: [] | ||
| m_CompressedRotationCurves: [] | ||
| m_EulerCurves: [] | ||
| m_PositionCurves: [] | ||
| m_ScaleCurves: [] | ||
| m_FloatCurves: | ||
| - curve: | ||
| serializedVersion: 2 | ||
| m_Curve: | ||
| - serializedVersion: 2 | ||
| time: 0 | ||
| value: 1 | ||
| inSlope: 0 | ||
| outSlope: 0 | ||
| tangentMode: 136 | ||
| - serializedVersion: 2 | ||
| time: 1 | ||
| value: 0 | ||
| inSlope: 0 | ||
| outSlope: 0 | ||
| tangentMode: 136 | ||
| m_PreInfinity: 2 | ||
| m_PostInfinity: 2 | ||
| m_RotationOrder: 4 | ||
| attribute: m_Alpha | ||
| path: | ||
| classID: 225 | ||
| script: {fileID: 0} | ||
| 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: 1574349066 | ||
| script: {fileID: 0} | ||
| typeID: 225 | ||
| 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: 0 | ||
| 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: 2 | ||
| time: 0 | ||
| value: 1 | ||
| inSlope: 0 | ||
| outSlope: 0 | ||
| tangentMode: 136 | ||
| - serializedVersion: 2 | ||
| time: 1 | ||
| value: 0 | ||
| inSlope: 0 | ||
| outSlope: 0 | ||
| tangentMode: 136 | ||
| m_PreInfinity: 2 | ||
| m_PostInfinity: 2 | ||
| m_RotationOrder: 4 | ||
| attribute: m_Alpha | ||
| path: | ||
| classID: 225 | ||
| script: {fileID: 0} | ||
| m_EulerEditorCurves: [] | ||
| m_HasGenericRootTransform: 0 | ||
| m_HasMotionFloatCurves: 0 | ||
| m_GenerateMotionCurves: 0 | ||
| m_Events: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.