Skip to content

Commit

Permalink
Initial project commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Redtricity committed Apr 11, 2024
1 parent 667d285 commit 6fb4252
Show file tree
Hide file tree
Showing 354 changed files with 59,530 additions and 308 deletions.
Binary file modified .plastic/plastic.changes
Binary file not shown.
Binary file modified .plastic/plastic.wktree
Binary file not shown.
7 changes: 4 additions & 3 deletions Assets/Code/Scripts/C#/Asteroids/Asteroid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ public class Asteroid : MonoBehaviour, IDamageable
{
[SerializeField] private FracturedAsteroid _fracturedAsteroidPrefab;
[SerializeField] private Detonator _explosionPrefab;

private Transform _transform;

private void Awake()
{
_transform = transform;
}

public void TakeDamage(int damage, Vector3 hitPosition)
{
FractureAsteroid(hitPosition);
Expand All @@ -27,7 +28,7 @@ private void FractureAsteroid(Vector3 hitPosition)

if (_explosionPrefab != null)
{
Instantiate(_explosionPrefab, transform.position /*hitPosition*/, Quaternion.identity);
Instantiate(_explosionPrefab, transform.position/*hitPosition*/, Quaternion.identity);
}

Destroy(gameObject);
Expand Down
10 changes: 5 additions & 5 deletions Assets/Code/Scripts/C#/Weapons/Projectile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[RequireComponent(typeof(AudioSource))]
public class Projectile : MonoBehaviour
{
[SerializeField] Detonator _hitEffect;
//[SerializeField] Detonator _hitEffect;
[SerializeField] AudioClip _impactSound;

float _launchForce;
Expand Down Expand Up @@ -69,10 +69,10 @@ void OnCollisionEnter(Collision collision)
damageable.TakeDamage(_damage, hitPosition);
}

if (_hitEffect != null)
{
Instantiate(_hitEffect, transform.position, Quaternion.identity);
}
//if (_hitEffect != null)
// {
// Instantiate(_hitEffect, transform.position, Quaternion.identity);
// }
Destroy(gameObject);
}
}
8 changes: 8 additions & 0 deletions Assets/Data.meta

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

8 changes: 8 additions & 0 deletions Assets/Detonator Explosion Framework.meta

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

3 changes: 0 additions & 3 deletions Assets/Detonator Explosion Framework/System/Detonator.asmdef

This file was deleted.

8 changes: 8 additions & 0 deletions Assets/Editor.meta

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

8 changes: 8 additions & 0 deletions Assets/Layer Lab.meta

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

22 changes: 18 additions & 4 deletions Assets/Level/Prefabs/Asteroids/AsteroidField.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 6108906136019097549}
- component: {fileID: 2682976384237501257}
m_Layer: 0
m_Layer: 12
m_Name: AsteroidField
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -44,8 +44,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ccd97082242f6a14b875128bac505f7f, type: 3}
m_Name:
m_EditorClassIdentifier:
_asteroidCount: 500
_radius: 300
_maxScale: 5
_asteroidCount: 200
_radius: 1000
_maxScale: 10
_asteroidPrefabs:
- {fileID: 4907725008704425395, guid: 8d1c053c856ccd342a247a6999fe21a2, type: 3}
- {fileID: 70327051729923251, guid: 14c054706926a4b4daedb942ff80a0ba, type: 3}
- {fileID: 734536042158316043, guid: 60087dee9a8d401428eb8cac2650d062, type: 3}
- {fileID: 8372853535964171725, guid: 4b2ade0b5be7f9645b882ceea67cfefc, type: 3}
- {fileID: 3154022289418229669, guid: ce589be1b7a7346449a3c52db9a7cc64, type: 3}
- {fileID: 1974751786456796194, guid: d5cf8133e83157648af5404e1e3f8c4e, type: 3}
- {fileID: 8422501420125115633, guid: 5e32cd08d5bbe464e923685ec45e6c89, type: 3}
- {fileID: 3283076551405430352, guid: 34fe897756dc7564788b9def595bd1b8, type: 3}
- {fileID: 8076945003133476520, guid: 404543f54e2e9f94eb6c116ca83503ce, type: 3}
- {fileID: 3456673936579180888, guid: a4c1d36e86b01064c988549ef5932c9c, type: 3}
- {fileID: 8384346206203999032, guid: 4c3866f9bdc47434496144f3586cda84, type: 3}
- {fileID: 7693715545201609306, guid: 20a7c7c4072edf942854ec4490ed1110, type: 3}
- {fileID: 8485936309606149631, guid: 5deec60603f78cf47aa9947ae2e5340f, type: 3}
- {fileID: 9170021297830774034, guid: e75df66f20ac4ca4b82670b91e0919ca, type: 3}
- {fileID: 5368724522633551599, guid: 26546b2e4b7740a40b28d6142c878056, type: 3}
17 changes: 1 addition & 16 deletions Assets/Level/Prefabs/Asteroids/Rock1.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ GameObject:
- component: {fileID: 2658815308585873198}
- component: {fileID: 8475050153916891716}
- component: {fileID: 2283576649562098377}
- component: {fileID: -6024634401271302153}
m_Layer: 12
m_Name: Rock1
m_TagString: Untagged
Expand Down Expand Up @@ -165,18 +164,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
--- !u!114 &-6024634401271302153
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4907725008704425395}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b4b8c7d88eebb9940b3c4196017b84df, type: 3}
m_Name:
m_EditorClassIdentifier:
fractured: {fileID: 9062937608016205562, guid: 6b9b09c37a192284f83e389421fcbe0c,
type: 3}
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock10.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock11.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock12.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock13.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock14.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock15.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock2.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock3.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock4.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock5.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock6.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock7.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock8.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/Asteroids/Rock9.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 058a328f10df29a40a593556ac8b3957, type: 3}
m_Name:
m_EditorClassIdentifier:
_points: 20
_points: 10
Loading

0 comments on commit 6fb4252

Please sign in to comment.