Sveskejuice
/
3DTD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense

This commit is contained in:
OliverS 2024-04-21 12:55:08 +02:00
parent 885d9d8622 77ffbc6473
commit 98b34c45c5
15 changed files with 287 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Materials/Cell.mat
View File

@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3005
m_CustomRenderQueue: 3001
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
@ -88,7 +88,7 @@ Material:
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _Blend: 2
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
@ -97,8 +97,8 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _DstBlendAlpha: 10
- _DstBlend: 1
- _DstBlendAlpha: 1
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
@ -106,7 +106,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 5
- _QueueOffset: 1
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0

40
Assets/Prefabs/Camera/Cinemachine.prefab
View File

@ -60,7 +60,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 5
m_FollowOffset: {x: 0, y: -10, z: -5}
m_FollowOffset: {x: 0, y: 7.5, z: -12}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -144,7 +144,7 @@ MonoBehaviour:
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_FrequencyGain: 1
mNoiseOffsets: {x: 0, y: 0, z: 0}
mNoiseOffsets: {x: 111.28198, y: 834.8169, z: 628.4523}
--- !u!1 &1127111119625446846
GameObject:
m_ObjectHideFlags: 0
@ -217,7 +217,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400473914611959530}
serializedVersion: 2
m_LocalRotation: {x: -0.048121, y: 0.83193743, z: 0.5479291, w: 0.07306359}
m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -296,7 +296,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2383950784329503899}
serializedVersion: 2
m_LocalRotation: {x: -0.05019385, y: 0.8159028, z: 0.5715319, w: 0.071655326}
m_LocalRotation: {x: 0.019247457, y: 0.9717585, z: -0.21916102, w: 0.08534311}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -375,7 +375,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3339643807228368672}
serializedVersion: 2
m_LocalRotation: {x: -0.04599445, y: 0.84738916, z: 0.5237152, w: 0.074420586}
m_LocalRotation: {x: 0.024118531, y: 0.95756304, z: -0.27462542, w: 0.084096424}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -489,7 +489,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 5
m_FollowOffset: {x: 0, y: -10, z: -5}
m_FollowOffset: {x: 0, y: 7.5, z: -12}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -573,7 +573,7 @@ MonoBehaviour:
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_FrequencyGain: 1
mNoiseOffsets: {x: 0, y: 0, z: 0}
mNoiseOffsets: {x: 810.0047, y: -961.7987, z: -792.96875}
--- !u!1 &5419760417237671588
GameObject:
m_ObjectHideFlags: 0
@ -599,7 +599,7 @@ Transform:
m_GameObject: {fileID: 5419760417237671588}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6.051462, y: 0.14279556, z: -1.480094}
m_LocalPosition: {x: 6.051462, y: 2.5, z: -1.480094}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -620,7 +620,7 @@ GameObject:
- component: {fileID: 7847799551035619544}
- component: {fileID: 3837216061230793568}
- component: {fileID: 8510394576666186474}
m_Layer: 0
m_Layer: 7
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
@ -635,8 +635,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6163557566655415017}
serializedVersion: 2
m_LocalRotation: {x: -0.05019385, y: 0.8159028, z: 0.5715319, w: 0.071655326}
m_LocalPosition: {x: 4.584422, y: -19.255428, z: 6.807704}
m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686}
m_LocalPosition: {x: 2.430962, y: 14.8024, z: 18.973312}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -681,7 +681,7 @@ Camera:
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 1407
m_Bits: 1919
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -724,7 +724,7 @@ MonoBehaviour:
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_RenderPostProcessing: 1
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
@ -917,7 +917,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 5
m_FollowOffset: {x: 0, y: -10, z: -5}
m_FollowOffset: {x: 0, y: 7.5, z: -12}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -1001,7 +1001,7 @@ MonoBehaviour:
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_FrequencyGain: 1
mNoiseOffsets: {x: 0, y: 0, z: 0}
mNoiseOffsets: {x: 538.96094, y: -723.33167, z: -275.6394}
--- !u!1 &7435709693246867821
GameObject:
m_ObjectHideFlags: 0
@ -1030,7 +1030,7 @@ Transform:
m_GameObject: {fileID: 7435709693246867821}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.17995, y: -9.857204, z: 3.443367}
m_LocalPosition: {x: 3.9598336, y: 10, z: 10.336213}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -1079,7 +1079,7 @@ MonoBehaviour:
m_Calls: []
m_LegacyBlendHint: 0
m_YAxis:
Value: 0
Value: 0.5
m_SpeedMode: 0
m_MaxSpeed: 0
m_AccelTime: 0.2
@ -1156,14 +1156,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0aa8da13840a5cb43997aca17b09b15d, type: 3}
m_Name:
m_EditorClassIdentifier:
originalTarget: {fileID: 5419760417237671588}
target: {fileID: 5419760417237671588}
origin: {fileID: 7435709693246867821}
towerCamScript: {fileID: 0}
origin: {fileID: 6163557566655415017}
hideFadeSpeed: 7
showFadeSpeed: 2
sphereRadius: 3.5
sphereRange: 2.5
sphereOffset: {x: 0, y: 8, z: 0}
--- !u!114 &7757173428948913319
MonoBehaviour:
m_ObjectHideFlags: 0

4
Assets/Prefabs/Towers/Gripper.prefab
View File

@ -211,7 +211,7 @@ GameObject:
- component: {fileID: 6807244090726446967}
- component: {fileID: 3260218246680966212}
- component: {fileID: 5534604080396206135}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -699,7 +699,7 @@ GameObject:
- component: {fileID: 5085823209220062842}
- component: {fileID: 2912058578458925804}
- component: {fileID: 5446927876721548141}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}

4
Assets/Prefabs/Towers/MrLazer.prefab
View File

@ -435,7 +435,7 @@ GameObject:
- component: {fileID: 1535854729180182417}
- component: {fileID: 4145198674078390849}
- component: {fileID: 5586582421155135170}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -823,7 +823,7 @@ GameObject:
- component: {fileID: 7520882556874433836}
- component: {fileID: 8307404243822428515}
- component: {fileID: 4181301279646802677}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}

4
Assets/Prefabs/Towers/Tesla.prefab
View File

@ -750,7 +750,7 @@ GameObject:
- component: {fileID: 2101235597875236002}
- component: {fileID: 4565723301201504394}
- component: {fileID: 2530843504051139423}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1235,7 +1235,7 @@ GameObject:
- component: {fileID: 8117385873619926185}
- component: {fileID: 6783875346531452571}
- component: {fileID: 2563076007296177699}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}

4
Assets/Prefabs/Towers/Turret.prefab
View File

@ -252,7 +252,7 @@ GameObject:
- component: {fileID: 432796252682377629}
- component: {fileID: 3370533879401949812}
- component: {fileID: 1398471167256814047}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -402,7 +402,7 @@ GameObject:
- component: {fileID: 271800776993535811}
- component: {fileID: 1616640625290415239}
- component: {fileID: 8756968480882234867}
m_Layer: 8
m_Layer: 9
m_Name: SliderKnob
m_TagString: Untagged
m_Icon: {fileID: 0}

513
Assets/Scenes/GameScene.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -233,6 +233,47 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 66896262}
m_PrefabAsset: {fileID: 0}
--- !u!21 &96894727
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
m_BuildTextureStacks: []
--- !u!21 &110256343
Material:
serializedVersion: 8
@ -315,7 +356,7 @@ Material:
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!21 &146287405
--- !u!21 &143624822
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -352,9 +393,9 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1001 &203396308
PrefabInstance:
@ -1229,47 +1270,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &594043085
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!1 &739155301
GameObject:
m_ObjectHideFlags: 0
@ -1718,115 +1718,50 @@ PrefabInstance:
propertyPath: m_Name
value: Cinemachine
objectReference: {fileID: 0}
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.0716554
objectReference: {fileID: 0}
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.050193895
objectReference: {fileID: 0}
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.5715319
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.x
value: 4.5844216
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: -16.898224
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.z
value: 6.807705
value: 2.4309628
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.0716554
value: 0.08475683
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.050193895
value: 0.021683881
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.5715319
propertyPath: m_LocalRotation.w
value: 0.08475683
objectReference: {fileID: 0}
- target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: origin
value:
objectReference: {fileID: 949771675}
- target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: originalTarget
value:
objectReference: {fileID: 1043201808}
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: -7.5
propertyPath: m_LocalRotation.x
value: 0.021683881
objectReference: {fileID: 0}
- target: {fileID: 5609352768173468343, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_RenderPostProcessing
propertyPath: m_LocalRotation.w
value: 0.0840964
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.024118524
objectReference: {fileID: 0}
- target: {fileID: 7847799551035619544, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_DefaultBlend.m_Time
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
- target: {fileID: 7847799551035619544, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.07306354
objectReference: {fileID: 0}
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.04812096
objectReference: {fileID: 0}
- target: {fileID: 6115888582170302332, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.5
objectReference: {fileID: 0}
- target: {fileID: 6163557566655415017, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_Layer
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.074420586
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.04599445
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.84738916
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.5237152
propertyPath: m_DefaultBlend.m_Style
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8510394576666186474, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
@ -1935,6 +1870,47 @@ Material:
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!21 &966649735
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!1 &968288134
GameObject:
m_ObjectHideFlags: 0
@ -2160,12 +2136,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1016399493}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1043201808 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5419760417237671588, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
m_PrefabInstance: {fileID: 929277189}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1117810916
GameObject:
m_ObjectHideFlags: 0
@ -2195,7 +2165,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0001757741}
m_LocalPosition: {x: 5.425, y: 0, z: -0.32499993}
m_LocalScale: {x: -2.879942, y: 1, z: 0.41743508}
m_LocalScale: {x: 2.879942, y: 1, z: 0.41743508}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2004418199}
@ -2271,7 +2241,7 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117810916}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1196654378
--- !u!21 &1129750886
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -2308,9 +2278,9 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!1 &1211328792
GameObject:
@ -2417,7 +2387,19 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1211328792}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1316029833
--- !u!114 &1335003908 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4274405463174037481, guid: 04b33788ffcc15e4e8f74ae3b8d95dc3,
type: 3}
m_PrefabInstance: {fileID: 2302953136146228920}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1337340550
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -2454,22 +2436,10 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 360, g: 550, b: 0, a: 0}
- _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
- _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
m_BuildTextureStacks: []
--- !u!114 &1335003908 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4274405463174037481, guid: 04b33788ffcc15e4e8f74ae3b8d95dc3,
type: 3}
m_PrefabInstance: {fileID: 2302953136146228920}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1346132657 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954,
@ -2531,7 +2501,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1422832817
--- !u!21 &1410484379
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -2568,9 +2538,9 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
- _halfSize: {r: 360, g: 550, b: 0, a: 0}
- _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
- _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
m_BuildTextureStacks: []
--- !u!21 &1454190399
Material:
@ -2965,7 +2935,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0001757741}
m_LocalPosition: {x: 0.3743, y: 0, z: -3.6272}
m_LocalScale: {x: -3.8886604, y: 1, z: 0.6895194}
m_LocalScale: {x: 3.88866, y: 1, z: 0.6895194}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2004418199}
@ -3041,88 +3011,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644633573}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1702065252
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
m_BuildTextureStacks: []
--- !u!21 &1756777727
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!1 &1785574039
GameObject:
m_ObjectHideFlags: 0
@ -3163,7 +3051,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
m_Center: {x: 0, y: -5, z: 0}
--- !u!23 &1785574041
MeshRenderer:
m_ObjectHideFlags: 0
@ -3259,6 +3147,47 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8e7a492524fd6434aae9b71446cfe174, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1857690523
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1 &1875223176
GameObject:
m_ObjectHideFlags: 0
@ -3288,7 +3217,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0001757741}
m_LocalPosition: {x: 3.1357, y: -0, z: 1.9062}
m_LocalScale: {x: -2.879942, y: 1, z: 0.41743508}
m_LocalScale: {x: 2.879942, y: 1, z: 0.41743508}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2004418199}
@ -3482,6 +3411,47 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1903073779
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!1 &2004418198
GameObject:
m_ObjectHideFlags: 0
@ -3536,47 +3506,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
TargetCarveGrid: {fileID: 1812668202}
--- !u!21 &2043222203
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1001 &2074753046
PrefabInstance:
m_ObjectHideFlags: 0

2
Assets/Scripts/Camera/CameraController.cs
View File

@ -49,7 +49,7 @@ public class CameraController : MonoBehaviour
cam.GetComponent<CinemachineCameraOffset>().m_Offset.z += scroll * scrollSpeed;
cam.GetComponent<CinemachineCameraOffset>().m_Offset.z = Mathf.Clamp(cam.GetComponent<CinemachineCameraOffset>().m_Offset.z, -20, 10);
cam.GetComponent<CinemachineCameraOffset>().m_Offset.z = Mathf.Clamp(cam.GetComponent<CinemachineCameraOffset>().m_Offset.z, -15f, 10f);
timer += Time.deltaTime;
float evalTime = timer / stopAfterTime;

12
Assets/Scripts/Camera/TowerCam.cs
View File

@ -13,6 +13,9 @@ public class TowerCam : MonoBehaviour
{
if (m_gameObject == null)
m_gameObject = this.gameObject;
if (instance == null)
instance = this;
}
public void ChangeToTarget(GameObject target)
@ -38,4 +41,13 @@ public class TowerCam : MonoBehaviour
HideWall.instance.target = null;
}
}
public void ChangeToMainCamera()
{
m_gameObject.GetComponent<CinemachineFreeLook>().m_Priority = 9;
m_gameObject.GetComponent<CinemachineCameraOffset>().m_Offset.z = originalOffset;
HideWall.instance.target = null;
}
}

7
Assets/Scripts/Manager/AudioManager.cs
View File

@ -26,13 +26,6 @@ public class AudioManager : MonoBehaviour
public static AudioClip FindAudioClip(string nameOfClip)
{
Debug.Log(nameOfClip);
Debug.Log(Instance);
Debug.Log(Instance.audioLibrary);
foreach (var clip in Instance.audioLibrary.Clips)
{
Debug.LogWarning(clip.name);
}
return Instance.audioLibrary.Clips.First(x => x.name.ToLower().Replace(" ", "")== nameOfClip.ToLower().Replace(" ", ""));
}

6
Assets/Scripts/PlacementSystem/PlacementManager.cs
View File

@ -105,7 +105,7 @@ public class TowerPlacementManager : MonoBehaviour
OnDeselectSlot(CurrentSelectedSlot, slot);
CurrentSelectedSlot = slot;
slot.gameObject.GetComponentInChildren<Renderer>().material.color = Color.blue;
slot.gameObject.GetComponentInChildren<Renderer>().material.color = default;
}
// Called when another slot is getting selected
@ -142,10 +142,13 @@ public class TowerPlacementManager : MonoBehaviour
//SilhouettedObject.SetActive(true);
SilhouettedObject.transform.parent = slot.TowerSpawnPoint.transform;
SilhouettedObject.transform.localPosition = offset;
slot.gameObject.GetComponentInChildren<Renderer>().material.color = Color.white;
}
public void OnSlotUnHovered(SlotManager slot, GridManager grid, int x, int y)
{
slot.gameObject.GetComponentInChildren<Renderer>().material.color = default;
Destroy(SilhouettedObject);
}
@ -153,7 +156,6 @@ public class TowerPlacementManager : MonoBehaviour
{
Destroy(SilhouettedObject);
OnTowerPlaced?.Invoke(SelectedTowerInfo);
}

6
Assets/Scripts/Tower/BeamTower.cs
View File

@ -31,6 +31,12 @@ public class BeamTower : AimTower
private IEnumerator AttackLoop()
{
do {
if (GameManager.Instance.CurrentNumEnemies == 0)
{
yield return new WaitForEndOfFrame();
continue;
}
Vector3 origin = barrel.Tip.position;
Vector3 rayDir = barrel.transform.forward;

2
Assets/Scripts/Tower/GravityTower.cs
View File

@ -35,6 +35,8 @@ public class GravityTower : Tower
protected override void FixedUpdate()
{
if (GameManager.Instance.CurrentNumEnemies == 0) return;
Collider[] projectilesInRadius = Physics.OverlapSphere(orb.position, radius, affectedBodies);
foreach (var projectile in projectilesInRadius)
{

6
Assets/Scripts/Tower/ProjectileTower.cs
View File

@ -31,6 +31,12 @@ public class ProjectileTower : AimTower
private IEnumerator AttackLoop()
{
do {
if (GameManager.Instance.CurrentNumEnemies == 0)
{
yield return new WaitForEndOfFrame();
continue;
}
yield return new WaitForSeconds(attackSecondsDelay);
Debug.DrawRay(transform.position, horizontalArc.ToKnobVector, Color.red, attackSecondsDelay);
Debug.DrawRay(transform.position, verticalArc.ToKnobVector, Color.green, attackSecondsDelay);

2
Assets/Scripts/Utilities/HealthComponent.cs
View File

@ -43,6 +43,8 @@ public class HealthComponent : MonoBehaviour
{
CameraShake.instance.ShakeCamera(0.5f, 0.2f);
TowerCam.instance.ChangeToMainCamera();
Destroy(gameObject);
}
}