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 02:25:24 +02:00
parent 51d699a7d6 61fd4ae374
commit 1a04482283
6 changed files with 2131 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Models/Tesla.fbx
View File

Binary file not shown.

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

@ -150,7 +150,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2706937706720644184
Transform:
m_ObjectHideFlags: 0
@ -285,7 +285,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4483150376441744029
Transform:
m_ObjectHideFlags: 0
@ -558,7 +558,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4458500525501258603
Transform:
m_ObjectHideFlags: 0
@ -1070,6 +1070,41 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.8355417
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.3897073
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.8721452
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.28036886
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.3817056
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.12270706
objectReference: {fileID: 0}
- target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.x
@ -1125,6 +1160,81 @@ PrefabInstance:
propertyPath: m_Name
value: MrLazer
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.8355417
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.3897073
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.86138517
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.31186444
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.37699637
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.13649149
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.8355417
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.3897073
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.86691535
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.29614466
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.3794167
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.12961154
objectReference: {fileID: 0}
- target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_Size.x
@ -1212,6 +1322,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eee68a5f6c2f68de58dce57219fb9068, type: 3}
m_Name:
m_EditorClassIdentifier:
selectedUI: {fileID: 4921653813610390360}
barrel: {fileID: 2855975055267202294}
horizontalArc: {fileID: 7877969574926732052}
verticalArc: {fileID: 5988398579311035611}
@ -1231,3 +1342,9 @@ MonoBehaviour:
m_Bits: 1281
beam: {fileID: 4784832335096719658}
attackSecondsDelay: 1
--- !u!1 &4921653813610390360 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 354863385000927614}
m_PrefabAsset: {fileID: 0}

1679
Assets/Prefabs/Towers/Tesla.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Towers/Tesla.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 148ea27cfb89dc0398835d59bed11cca
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

327
Assets/Scenes/TowerTest.unity
View File

@ -414,6 +414,149 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1001 &762567055
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1328109535653931045, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_Name
value: Tesla
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.x
value: 1.745
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.166
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.745
objectReference: {fileID: 0}
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.334
objectReference: {fileID: 0}
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.z
value: -3
objectReference: {fileID: 0}
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000023165901
objectReference: {fileID: 0}
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000000074471513
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.745
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.334
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.z
value: -3
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000016282542
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000000055622356
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.745
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.334
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalPosition.z
value: -3
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.0000000228801
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.000000008283737
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3}
--- !u!1 &769011490
GameObject:
m_ObjectHideFlags: 0
@ -817,6 +960,184 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1001 &1090335998
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.6317062
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.206
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.35424447
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 269373318190900745, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.6317062
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.z
value: -3.3542445
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.952017
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.30604526
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.00000002314971
objectReference: {fileID: 0}
- target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000000074419453
objectReference: {fileID: 0}
- target: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_Name
value: MrLazer
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.6317062
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.z
value: -3.3542445
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9402716
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.34042525
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.00000002309675
objectReference: {fileID: 0}
- target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.000000008362176
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.6317062
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalPosition.z
value: -3.3542445
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9463082
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.32326588
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.00000001627116
objectReference: {fileID: 0}
- target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000000055583484
objectReference: {fileID: 0}
- target: {fileID: 7605001933718563855, guid: 4e5e3131ea2a78cfd93219be3806da6d,
type: 3}
propertyPath: OnHealthZero.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3}
--- !u!1 &1197417724
GameObject:
m_ObjectHideFlags: 0
@ -953,10 +1274,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
Balance: 0
IsBuildMode: 0
ShopSelectedTower:
name:
price: 0
prefab: {fileID: 0}
--- !u!4 &1395991987
Transform:
m_ObjectHideFlags: 0
@ -1594,3 +1911,5 @@ SceneRoots:
- {fileID: 504816165}
- {fileID: 1395991987}
- {fileID: 1519212185}
- {fileID: 762567055}
- {fileID: 1090335998}

4
Assets/Scripts/Utilities/EditableArc.cs
View File

@ -77,8 +77,8 @@ public class EditableArc : MonoBehaviour
Vector2 arcTangent = orientation == ArcOrientation.HORIZONTAL ? new Vector2(arcTangent3D.x, arcTangent3D.z) : new Vector2(arcTangent3D.x, arcTangent3D.y);
// i have no idea why but somehow this needs to be here idk
if (orientation == ArcOrientation.VERTICAL)
arcTangent.x *= -1f;
// if (orientation == ArcOrientation.VERTICAL)
// arcTangent.x *= -1f;
Debug.DrawRay(knob.transform.position, arcTangent3D, Color.yellow, 5f);
Vector3 screenRay = Camera.main.ScreenPointToRay(Input.mousePosition).direction;