Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DevChallenge #14

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

DevChallenge #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e4014b
Upgraded project to version 2018.2.14f1
gtoni Nov 2, 2018
df55c24
Reorganized scripts
gtoni Nov 2, 2018
7940f1b
Added Actor framework
gtoni Nov 3, 2018
5cdaa5a
Refactoring of Player and Enemy classes
gtoni Nov 4, 2018
b3c0fa1
Added Hover ability to Character
gtoni Nov 5, 2018
4e75448
The flying saucers now fly and shoot the player
gtoni Nov 5, 2018
8195cce
Fixed the background parallax
gtoni Nov 6, 2018
c616c9b
Made enemies rotate along the ground normal
gtoni Nov 6, 2018
486dafa
Fixed some bugs and rearanged the spawners
gtoni Nov 7, 2018
76f3511
Added two new features to RangedWeapon
gtoni Nov 7, 2018
7ca3b74
Fixed a bug where pickups were sometimes picked twice
gtoni Nov 7, 2018
5bc7ce6
Changed the way enemies deal contact damage
gtoni Nov 8, 2018
060166b
Refactored LayBombs. Made some reorganization.
gtoni Nov 9, 2018
8536600
Added crosshair, refactored some of the UI
gtoni Nov 9, 2018
e3889d2
Added WorldBoundary
gtoni Nov 10, 2018
816f730
Changed private variable naming
gtoni Nov 10, 2018
871b17e
Added joystick support for the aiming mechanic
gtoni Nov 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .vs/unitydemo-2DPlatformer/DesignTimeBuild/.dtbcache
View file
Open in desktop
Binary file not shown.
Binary file added .vs/unitydemo-2DPlatformer/v15/.suo
View file
Open in desktop
Binary file not shown.
Empty file added .vs/unitydemo-2DPlatformer/v15/Server/sqlite3/db.lock
View file
Open in desktop
Empty file.
Binary file added .vs/unitydemo-2DPlatformer/v15/Server/sqlite3/storage.ide
View file
Open in desktop
Binary file not shown.
Binary file added .vs/unitydemo-2DPlatformer/v15/Server/sqlite3/storage.ide-shm
View file
Open in desktop
Binary file not shown.
Binary file added .vs/unitydemo-2DPlatformer/v15/Server/sqlite3/storage.ide-wal
View file
Open in desktop
Binary file not shown.
340 changes: 340 additions & 0 deletions Assembly-CSharp.csproj
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 36 additions & 20 deletions Assets/Animation/Controllers/Clouds.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,67 @@
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Clouds
serializedVersion: 2
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 3
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 110700000}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_StateMachineMotionSetIndex: 0
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &110200000
State:
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Clouds
m_Speed: 1
m_CycleOffset: 0
m_Motions:
- {fileID: 7400000, guid: 3ae97e047e2e24a52ad27b209e246997, type: 2}
m_ParentStateMachine: {fileID: 110700000}
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: 3ae97e047e2e24a52ad27b209e246997, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &110700000
StateMachine:
serializedVersion: 2
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_DefaultState: {fileID: 110200000}
m_States:
- {fileID: 110200000}
m_ChildStateMachine: []
m_ChildStateMachinePosition: []
m_OrderedTransitions: {}
m_MotionSetCount: 1
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110200000}
m_Position: {x: 50, y: 50, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 60, y: 0, 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: 110200000}
71 changes: 42 additions & 29 deletions Assets/Animation/Controllers/Enemy1.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,73 @@
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Enemy1
serializedVersion: 2
m_AnimatorParameters: []
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 3
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 110700000}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_StateMachineMotionSetIndex: 0
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &110200000
State:
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: enemyWalk
m_Speed: 1
m_CycleOffset: 0
m_Motions:
- {fileID: 7400000, guid: 1c1a0c404c30d41359300f3a64ef0803, type: 2}
m_ParentStateMachine: {fileID: 110700000}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 540, y: 24, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 1c1a0c404c30d41359300f3a64ef0803, type: 2}
m_Tag:
m_SpeedParameter: Speed
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &110700000
StateMachine:
serializedVersion: 2
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_DefaultState: {fileID: 110200000}
m_States:
- {fileID: 110200000}
m_ChildStateMachine: []
m_ChildStateMachinePosition: []
m_OrderedTransitions:
data:
first: {fileID: 0}
second: []
data:
first: {fileID: 110200000}
second: []
data:
first: {fileID: 0}
second: []
m_MotionSetCount: 1
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110200000}
m_Position: {x: 540, y: 24, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 60, y: 0, 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: 110200000}
68 changes: 42 additions & 26 deletions Assets/Animation/Controllers/Enemy2.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,73 @@
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Enemy2
serializedVersion: 2
m_AnimatorParameters: []
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 3
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 110700000}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_StateMachineMotionSetIndex: 0
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &110200000
State:
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: enemy2wobble
m_Speed: 1
m_CycleOffset: 0
m_Motions:
- {fileID: 7400000, guid: 27c2d3dfaa8c1467d9f11cad99393e62, type: 2}
m_ParentStateMachine: {fileID: 110700000}
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: 27c2d3dfaa8c1467d9f11cad99393e62, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &110700000
StateMachine:
serializedVersion: 2
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_DefaultState: {fileID: 110200000}
m_States:
- {fileID: 110200000}
m_ChildStateMachine: []
m_ChildStateMachinePosition: []
m_OrderedTransitions:
data:
first: {fileID: 0}
second: []
data:
first: {fileID: 110200000}
second: []
m_MotionSetCount: 1
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110200000}
m_Position: {x: 50, y: 50, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -228, y: 48, 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: 110200000}
84 changes: 84 additions & 0 deletions Assets/Materials/CrosshairMaterial.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: CrosshairMaterial
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
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: 0}
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}
m_Floats:
- PixelSnap: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnableExternalAlpha: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 0.7058824}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
8 changes: 8 additions & 0 deletions Assets/Materials/CrosshairMaterial.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading