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

sync

This commit is contained in:
kimrdd 2024-04-21 01:19:36 +02:00
parent 585688b1e2
commit 4959ccdc8d
3 changed files with 1050 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

220
Assets/Scenes/GameScene.unity
View File

@ -123,6 +123,110 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1001 &66896262
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 968288136}
m_Modifications:
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalPosition.x
value: -6.25
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalPosition.y
value: 9
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalPosition.z
value: 7.475
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: Gap
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: Gap.x
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: Gap.y
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: gridType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: GridSize.x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: GridSize.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4738812082694162819, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_Name
value: GridSpawnerWall-z
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3}
--- !u!4 &66896263 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
m_PrefabInstance: {fileID: 66896262}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &203396308 --- !u!1001 &203396308
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -976,7 +1080,7 @@ PrefabInstance:
- target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3} type: 3}
propertyPath: sphereRange propertyPath: sphereRange
value: 1.5 value: 2.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3} type: 3}
@ -1011,7 +1115,7 @@ PrefabInstance:
- target: {fileID: 5664717836218291588, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - target: {fileID: 5664717836218291588, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3} type: 3}
propertyPath: m_Orbits.Array.data[2].m_Height propertyPath: m_Orbits.Array.data[2].m_Height
value: -5 value: -10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3} type: 3}
@ -1147,7 +1251,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: acef1d7c80f784543acd3e1571e99495, type: 3} m_Script: {fileID: 11500000, guid: acef1d7c80f784543acd3e1571e99495, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
RebuildGrid: 1 RebuildGrid: 0
DebugTowerPrefab: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554, DebugTowerPrefab: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554,
type: 3} type: 3}
SilhouetteMaterial: {fileID: 2100000, guid: 0610eb89b05f0b546929db3664a351d8, type: 2} SilhouetteMaterial: {fileID: 2100000, guid: 0610eb89b05f0b546929db3664a351d8, type: 2}
@ -1168,6 +1272,8 @@ Transform:
- {fileID: 1554436712} - {fileID: 1554436712}
- {fileID: 2098922851} - {fileID: 2098922851}
- {fileID: 359510069} - {fileID: 359510069}
- {fileID: 1016399494}
- {fileID: 66896263}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1001440767 --- !u!1001 &1001440767
@ -1238,6 +1344,110 @@ PrefabInstance:
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9d875dda41d470948bbe6fd408a7e835, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9d875dda41d470948bbe6fd408a7e835, type: 3}
--- !u!1001 &1016399493
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 968288136}
m_Modifications:
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalPosition.x
value: -6.25
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalPosition.y
value: 9
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalPosition.z
value: -7.475
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: Gap
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: Gap.x
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: Gap.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: gridType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: GridSize.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3798840069121289071, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: GridSize.y
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4738812082694162819, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
propertyPath: m_Name
value: GridSpawnerWall+z
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3}
--- !u!4 &1016399494 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
m_PrefabInstance: {fileID: 1016399493}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1515922344 --- !u!1 &1515922344
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1632,12 +1842,12 @@ PrefabInstance:
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830, - target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 9.7 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830, - target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -7.3 value: -6.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830, - target: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3} type: 3}

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

@ -1,5 +1,4 @@
using System.Collections; using Cinemachine;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class CameraSlotClickDetect : MonoBehaviour public class CameraSlotClickDetect : MonoBehaviour
@ -32,6 +31,8 @@ public class CameraSlotClickDetect : MonoBehaviour
if (tower != null) if (tower != null)
{ {
GameManager.Instance.SelectedTower = tower; GameManager.Instance.SelectedTower = tower;
} }
} }
else if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask)) else if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask))