Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix misc. bugs + code improvements #61

Merged
merged 23 commits into from
Nov 24, 2021
Merged

Fix misc. bugs + code improvements #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
62b6122
Moved more setup code from Start() to Awake()
ddabble Nov 22, 2021
a81277e
Fixed EnemyManager exception when restarting game
ddabble Nov 22, 2021
dbdd4e4
Replaced copy of prefab with reference to prefab
ddabble Nov 22, 2021
d197cbe
Moved SkeletonRagdollController to proper folder
ddabble Nov 23, 2021
7a52920
Moved loot models and materials to proper folder
ddabble Nov 23, 2021
1c278de
Renamed old `enemy` model folder -> PlaceholderEnemy
ddabble Nov 23, 2021
b75b7c8
Misc. code improvements
ddabble Nov 22, 2021
ad4b9fd
Set player state to FREE after canceling UI wheel
ddabble Nov 23, 2021
30dfae7
Removed setting player state in InstantiateConstructionTower
ddabble Nov 23, 2021
b7155f6
UIControllerWheel uses index for selected segment
ddabble Nov 23, 2021
f40b00f
Fixed wheel segment scaling animation not finishing
ddabble Nov 23, 2021
f4b74b9
Fixed not initially setting construction tower position
ddabble Nov 23, 2021
6c57a2d
Fixed not always focusing on held interactable
ddabble Nov 23, 2021
2cedbb5
Renamed Decor folder -> Scenery
ddabble Nov 23, 2021
c2fdc2a
Moved terrain scenery materials to proper folder
ddabble Nov 23, 2021
e747040
Moved lightning tower VFX to proper folder
ddabble Nov 23, 2021
353d942
Moved scripts to top of components in prefabs
ddabble Nov 23, 2021
762fa8e
Moved player-related prefabs to Player folder
ddabble Nov 23, 2021
7325717
Moved prefabs from top-level to proper folders
ddabble Nov 23, 2021
2f1115a
Moved ScriptableObject scripts to Scripts folder
ddabble Nov 23, 2021
3edb005
Renamed TowerScript -> TowerScriptableObject
ddabble Nov 23, 2021
80b15cb
Removed the unused TowerConstructor script
ddabble Nov 23, 2021
930e6e3
Fixed placing more than one tower on a single cell
ddabble Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Assets/Materials/Loot.meta
View file
Open in desktop

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

0 ...CrystalLoot/Loot material components.meta → ...erials/Loot/Loot material components.meta
View file
Open in desktop
File renamed without changes.
0 ...rial components/Crystalv2_Material_AO.png → ...rial components/Crystalv2_Material_AO.png
View file
Open in desktop
File renamed without changes
0 ...components/Crystalv2_Material_AO.png.meta → ...components/Crystalv2_Material_AO.png.meta
View file
Open in desktop
File renamed without changes.
0 ... components/Crystalv2_Material_Albedo.png → ... components/Crystalv2_Material_Albedo.png
View file
Open in desktop
File renamed without changes
0 ...onents/Crystalv2_Material_Albedo.png.meta → ...onents/Crystalv2_Material_Albedo.png.meta
View file
Open in desktop
File renamed without changes.
0 ... components/Crystalv2_Material_Height.png → ... components/Crystalv2_Material_Height.png
View file
Open in desktop
File renamed without changes
0 ...onents/Crystalv2_Material_Height.png.meta → ...onents/Crystalv2_Material_Height.png.meta
View file
Open in desktop
File renamed without changes.
0 ...omponents/Crystalv2_Material_Metallic.png → ...omponents/Crystalv2_Material_Metallic.png
View file
Open in desktop
File renamed without changes
0 ...ents/Crystalv2_Material_Metallic.png.meta → ...ents/Crystalv2_Material_Metallic.png.meta
View file
Open in desktop
File renamed without changes.
0 ... components/Crystalv2_Material_Normal.png → ... components/Crystalv2_Material_Normal.png
View file
Open in desktop
File renamed without changes
0 ...onents/Crystalv2_Material_Normal.png.meta → ...onents/Crystalv2_Material_Normal.png.meta
View file
Open in desktop
File renamed without changes.
0 ...refabs/Loot/CrystalLoot/Loot material.mat → Assets/Materials/Loot/Loot material.mat
View file
Open in desktop
File renamed without changes.
0 ...s/Loot/CrystalLoot/Loot material.mat.meta → Assets/Materials/Loot/Loot material.mat.meta
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions Assets/Materials/Terrain/Scenery.meta
View file
Open in desktop

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

0 ...s/Prefabs/Terrain/Decor/color palette.png → ...terials/Terrain/Scenery/color palette.png
View file
Open in desktop
File renamed without changes
0 ...fabs/Terrain/Decor/color palette.png.meta → ...ls/Terrain/Scenery/color palette.png.meta
View file
Open in desktop
File renamed without changes.
0 .../Prefabs/Terrain/Decor/fauna material.mat → ...erials/Terrain/Scenery/fauna material.mat
View file
Open in desktop
File renamed without changes.
0 ...abs/Terrain/Decor/fauna material.mat.meta → ...s/Terrain/Scenery/fauna material.mat.meta
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions Assets/Models/Enemies/Animations/Skeleton.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,31 +224,31 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: DeathMode
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Dead
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: WalkMode
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Chasing
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -363,7 +363,7 @@ BlendTree:
m_BlendParameterY: Blend
m_MinThreshold: 0
m_MaxThreshold: 7
m_UseAutomaticThresholds: 0
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!1101 &483655395840417495
Expand Down
0 Assets/Models/enemy.meta → Assets/Models/Enemies/PlaceholderEnemy.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Models/enemy/enemy.blend → ...dels/Enemies/PlaceholderEnemy/enemy.blend
View file
Open in desktop
File renamed without changes.
0 Assets/Models/enemy/enemy.blend.meta → ...Enemies/PlaceholderEnemy/enemy.blend.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Models/enemy/enemy.fbx → ...Models/Enemies/PlaceholderEnemy/enemy.fbx
View file
Open in desktop
File renamed without changes.
0 Assets/Models/enemy/enemy.fbx.meta → ...s/Enemies/PlaceholderEnemy/enemy.fbx.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Models/enemy/enemy_texture.png → ...nemies/PlaceholderEnemy/enemy_texture.png
View file
Open in desktop
File renamed without changes
0 Assets/Models/enemy/enemy_texture.png.meta → ...s/PlaceholderEnemy/enemy_texture.png.meta
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions Assets/Models/Loot.meta
View file
Open in desktop

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

0 ...Prefabs/Loot/CrystalLoot/Loot crystal.fbx → Assets/Models/Loot/Loot crystal.fbx
View file
Open in desktop
File renamed without changes.
0 ...bs/Loot/CrystalLoot/Loot crystal.fbx.meta → Assets/Models/Loot/Loot crystal.fbx.meta
View file
Open in desktop
File renamed without changes.
28 changes: 14 additions & 14 deletions Assets/Prefabs/Base/Base.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5829545455071137389}
- component: {fileID: 5829545455071137386}
- component: {fileID: 5829545455071137385}
- component: {fileID: 990519977}
- component: {fileID: 5829545455071137386}
- component: {fileID: 990519971}
m_Layer: 8
m_Name: Base
Expand All @@ -244,19 +244,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &5829545455071137386
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5829545455071137399}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.4, y: 1.4, z: 1.4}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5829545455071137385
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -293,6 +280,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
health: 10
maxHealth: 100
--- !u!65 &5829545455071137386
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5829545455071137399}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.4, y: 1.4, z: 1.4}
m_Center: {x: 0, y: 0, z: 0}
--- !u!95 &990519971
Animator:
serializedVersion: 3
Expand Down
92 changes: 46 additions & 46 deletions Assets/Prefabs/Base/Explosion.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8540785681650497267}
- component: {fileID: 8540785681650497266}
- component: {fileID: 8540785681650497264}
- component: {fileID: 8540785681650497265}
- component: {fileID: 8540785681650497266}
m_Layer: 0
m_Name: Explosion
m_TagString: Untagged
Expand All @@ -33,6 +33,51 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!114 &8540785681650497266
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8540785681650497039}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23da7d395c7d2402b9dea90134beb67f, type: 3}
m_Name:
m_EditorClassIdentifier:
explosionCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 2
outSlope: 2
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.4168595
value: 2.079442
inSlope: 1.6487453
outSlope: 1.6487453
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.19291438
- serializedVersion: 3
time: 0.9791565
value: 2.2972221
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!33 &8540785681650497264
MeshFilter:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -82,48 +127,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &8540785681650497266
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8540785681650497039}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23da7d395c7d2402b9dea90134beb67f, type: 3}
m_Name:
m_EditorClassIdentifier:
explosionCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 2
outSlope: 2
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.4168595
value: 2.079442
inSlope: 1.6487453
outSlope: 1.6487453
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.19291438
- serializedVersion: 3
time: 0.9791565
value: 2.2972221
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
78 changes: 39 additions & 39 deletions Assets/Prefabs/Enemy/Enemies/PlaceholderEnemy.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ GameObject:
m_Component:
- component: {fileID: 5818494558055746955}
- component: {fileID: 1339947353988727182}
- component: {fileID: 490591066213595821}
- component: {fileID: 6258525490855855638}
- component: {fileID: 1387437967117219409}
- component: {fileID: 1234598521595535095}
- component: {fileID: 5307998303341428611}
- component: {fileID: 1387437967117219409}
- component: {fileID: 490591066213595821}
- component: {fileID: 6258525490855855638}
m_Layer: 11
m_Name: PlaceholderEnemy
m_TagString: Untagged
Expand Down Expand Up @@ -232,36 +232,34 @@ MonoBehaviour:
playerAttackDistance: 1
playerChaseStopDistance: 4
attackDamage: 1
--- !u!136 &490591066213595821
CapsuleCollider:
--- !u!114 &1234598521595535095
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6626098340742600497}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.4
m_Height: 1.4
m_Direction: 1
m_Center: {x: 0, y: 0.8, z: 0}
--- !u!54 &6258525490855855638
Rigidbody:
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dde39a3ed8a181143bd4f0d992b95909, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 1
maxHealth: 1
--- !u!114 &5307998303341428611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6626098340742600497}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 80
m_CollisionDetection: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36286781665dc37498a44f6eb6d18e9b, type: 3}
m_Name:
m_EditorClassIdentifier:
lootPrefab: {fileID: 8630265067307965030, guid: 7a8fb2fa4df12b44b9b6261450ac0d42, type: 3}
spawnHeight: 1.5
--- !u!195 &1387437967117219409
NavMeshAgent:
m_ObjectHideFlags: 0
Expand All @@ -284,34 +282,36 @@ NavMeshAgent:
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!114 &1234598521595535095
MonoBehaviour:
--- !u!136 &490591066213595821
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6626098340742600497}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dde39a3ed8a181143bd4f0d992b95909, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 1
maxHealth: 1
--- !u!114 &5307998303341428611
MonoBehaviour:
m_Radius: 0.4
m_Height: 1.4
m_Direction: 1
m_Center: {x: 0, y: 0.8, z: 0}
--- !u!54 &6258525490855855638
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6626098340742600497}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36286781665dc37498a44f6eb6d18e9b, type: 3}
m_Name:
m_EditorClassIdentifier:
lootPrefab: {fileID: 8630265067307965030, guid: 7a8fb2fa4df12b44b9b6261450ac0d42, type: 3}
spawnHeight: 1.5
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 80
m_CollisionDetection: 0
--- !u!1 &6681559575030372356
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading