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

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

This commit is contained in:
BOT Alex 2024-04-21 05:59:35 +02:00
parent 704c52e460 51146ad553
commit 14fac4f4db
12 changed files with 5720 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
Assets/Materials/BeamParticles.mat Normal file
View File

@ -0,0 +1,133 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BeamParticles
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
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}
- _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: 0.4431373, g: 0.7607844, b: 0.77647066, a: 1}
- _Color: {r: 0.44313726, g: 0.7607843, b: 0.77647066, 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: []
--- !u!114 &7331646501082890843
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

8
Assets/Materials/BeamParticles.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0acc2f04c88b1bd4aab9b132bd1ed149
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

137
Assets/Materials/Cell.mat Normal file
View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Cell
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3005
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
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}
- _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: 10
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 5
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.2134, g: 0.2156, b: 0.22, a: 1}
- _Color: {r: 0.21339998, g: 0.21559995, b: 0.21999997, 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: []
--- !u!114 &8625757837965251938
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

8
Assets/Materials/Cell.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 126265236ba8819e7a7eb658ca04116b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

41
Assets/Prefabs/Particles/TowerLowHPParticles.prefab
View File

@ -5099,7 +5099,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 3
scalar: 2.82
scalar: 0.42
minScalar: 0.36
maxCurve:
serializedVersion: 2
@ -5595,13 +5595,13 @@ ParticleSystem:
serializedVersion: 6
enabled: 1
type: 4
angle: 13.546443
angle: 18.996029
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1
donutRadius: 0.2
m_Position: {x: 0, y: -0.57938933, z: -0.0000000345343}
m_Rotation: {x: 270, y: -0, z: 0}
m_Rotation: {x: 270, y: 269.99994, z: 90.00007}
m_Scale: {x: 1, y: 1, z: 1}
placementMode: 0
m_MeshMaterialIndex: 0
@ -5681,7 +5681,7 @@ ParticleSystem:
sphericalDirectionAmount: 0
randomPositionAmount: 0
radius:
value: 0.08283816
value: 0.07379217
mode: 0
spread: 0
speed:
@ -5925,17 +5925,26 @@ ParticleSystem:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.28778756
value: 0.43589866
inSlope: -0.6626655
outSlope: -0.6626655
time: 0.17214882
value: 0.9794873
inSlope: 5.0530663
outSlope: 5.0530663
tangentMode: 0
weightedMode: 0
inWeight: 0.7260353
outWeight: 1
- serializedVersion: 3
time: 0.18986535
value: 1
inSlope: 1.2077019
outSlope: 1.2077019
tangentMode: 0
weightedMode: 0
inWeight: 1
outWeight: 0.33333334
- serializedVersion: 3
time: 0.4362709
value: 0.94358844
time: 0.39421767
value: 1
inSlope: -8.021934
outSlope: -8.021934
tangentMode: 0
@ -7137,7 +7146,7 @@ ParticleSystem:
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule:
enabled: 0
enabled: 1
x:
serializedVersion: 2
minMaxState: 0
@ -7194,7 +7203,7 @@ ParticleSystem:
y:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: 1.81
minScalar: 0
maxCurve:
serializedVersion: 2
@ -7297,7 +7306,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
inWorldSpace: 0
inWorldSpace: 1
randomizePerFrame: 0
ExternalForcesModule:
serializedVersion: 2
@ -7690,7 +7699,7 @@ ParticleSystem:
strengthY:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.1
minScalar: 1
maxCurve:
serializedVersion: 2
@ -7743,7 +7752,7 @@ ParticleSystem:
strengthZ:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.1
minScalar: 1
maxCurve:
serializedVersion: 2
@ -7793,7 +7802,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
separateAxes: 0
separateAxes: 1
frequency: 0.66
damping: 1
octaves: 1

2
Assets/Prefabs/PlacementSystem/SlotHolder.prefab
View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
- {fileID: 2100000, guid: 126265236ba8819e7a7eb658ca04116b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

2
Assets/Prefabs/Towers/BaseTower.prefab
View File

@ -225,7 +225,7 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingLayerID: -344656299
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &637976866739038905

11
Assets/Prefabs/Towers/BlackHole.prefab
View File

@ -334,22 +334,17 @@ PrefabInstance:
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.00000001785987
value: -0.00000001990998
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -3.2491562e-10
value: -3.6221226e-10
objectReference: {fileID: 0}
- target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5000648575824335922, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 1.238
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}

908
Assets/Scenes/GameScene.unity
View File

File diff suppressed because it is too large Load Diff

4925
Assets/Scenes/TowerTest.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs
View File

@ -59,14 +59,14 @@ public class CameraSlotClickDetect : MonoBehaviour
else
Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector");
}
else
/* else
{
GameManager.Instance.SelectedTower = null;
if (towerCam != null)
towerCam.ChangeToTarget(null);
else
Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector");
}
} */
}
void ShootHoverRay()

10
ProjectSettings/TagManager.asset
View File

@ -9,14 +9,14 @@ TagManager:
- Default
- TransparentFX
- Ignore Raycast
-
- Cell
- Water
- UI
- Projectile
-
- Tower
-
- Cell
-
-
-
-
@ -42,3 +42,9 @@ TagManager:
- name: Default
uniqueID: 0
locked: 0
- name: Overlay
uniqueID: 3527279329
locked: 0
- name: TowerUI
uniqueID: 3950310997
locked: 0