Skip to content

Commit

Permalink
feat(#6): add menu for buying turrets
Browse files Browse the repository at this point in the history
feat(#9): bassic turret - can look at enemies near it
fix: NameToLayer it is not, what you are looking for
fix: castle and enemt reaaranged prefabs
fix: fixed player raycast weapon layermask
  • Loading branch information
dofranko committed Oct 4, 2021
1 parent 9287354 commit d9b12bd
Show file tree
Hide file tree
Showing 31 changed files with 4,114 additions and 16 deletions.
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"files.exclude":
{
"**/.DS_Store":true,
Expand Down Expand Up @@ -52,5 +52,6 @@
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
},
"discord.enabled": true
}
8 changes: 8 additions & 0 deletions Assets/Prefabs/Allies.meta

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

122 changes: 122 additions & 0 deletions Assets/Prefabs/Allies/BasicAllyTurret.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5608707421201796344
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5608707421201699032}
- component: {fileID: 5608707421203026168}
- component: {fileID: 5608707421203993144}
- component: {fileID: 5608707421192453944}
- component: {fileID: 5608707421201796345}
m_Layer: 0
m_Name: BasicAllyTurret
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5608707421201699032
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608707421201796344}
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5608707421203026168
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608707421201796344}
m_Mesh: {fileID: 4300000, guid: 17ca2b0ac31cb494993a64142da8659a, type: 3}
--- !u!23 &5608707421203993144
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608707421201796344}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: c437e7b5d7c2a7d4dbfcf59338cd77a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!95 &5608707421192453944
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608707421201796344}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: 17ca2b0ac31cb494993a64142da8659a, type: 3}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &5608707421201796345
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608707421201796344}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1062bc610d4ba0b4781393ff87f2ac34, type: 3}
m_Name:
m_EditorClassIdentifier:
fireRate: 0.3
damage: 10
range: 3
enemyLayerMask:
serializedVersion: 2
m_Bits: 256
7 changes: 7 additions & 0 deletions Assets/Prefabs/Allies/BasicAllyTurret.prefab.meta

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

2 changes: 1 addition & 1 deletion Assets/Prefabs/Bullet.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947737207179238372}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.1571, y: 0.2975, z: -0.1598}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
m_Children: []
m_Father: {fileID: 0}
Expand Down
8 changes: 8 additions & 0 deletions Assets/Prefabs/Castle.meta

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

1 change: 1 addition & 0 deletions Assets/Prefabs/Castle.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ MonoBehaviour:
healthBar: {fileID: 7256826481947575667}
shieldBar: {fileID: 6488496470374117360}
upgradesPanel: {fileID: 8245986056085704512}
defense: 5
--- !u!65 &1278402896461765707
BoxCollider:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit d9b12bd

Please sign in to comment.