Skip to content

Commit 6fa1148

Browse files
committed
Radiant Field, Range Weapon are changed. Gameplay Scene Light Map and Navmesh are re-baked
1 parent d8a9f71 commit 6fa1148

20 files changed

+730
-776
lines changed
12.8 KB
Binary file not shown.
Loading
Binary file not shown.
Binary file not shown.

Assets/Scenes/Gameplay Scene/Lightmap-0_comp_shadowmask.png.meta

-135
This file was deleted.
19.2 KB
Binary file not shown.

Assets/_Scripts/Editor/AudioEnumGenerator.cs

+20-15
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,55 @@
11
using System.IO;
22
using System.Reflection;
3+
using Scriptable_Objects;
34
using UnityEditor;
45
using UnityEngine;
56

6-
namespace _Scripts.Editor
7+
namespace Editor
78
{
8-
[CustomEditor(typeof(AudioLibrary))]
9+
[CustomEditor(typeof(AudioLibrarySO))]
910
public class AudioEnumGenerator : UnityEditor.Editor
1011
{
12+
private const string directory_path = "Assets/_Scripts/Enums";
13+
1114
public override void OnInspectorGUI()
1215
{
1316
base.OnInspectorGUI();
14-
15-
AudioLibrary sfxLibrary = (AudioLibrary)target;
17+
AudioLibrarySO sfxLibrarySO = (AudioLibrarySO) target;
1618

1719
if (GUILayout.Button("Generate Enums"))
18-
GenerateEnums(sfxLibrary);
20+
{
21+
GenerateEnums(sfxLibrarySO);
22+
}
1923
}
2024

21-
private void GenerateEnums(AudioLibrary sfxLibrary)
25+
private void GenerateEnums(AudioLibrarySO sfxLibrarySO)
2226
{
23-
foreach (FieldInfo fieldInfo in sfxLibrary.GetType().GetFields())
27+
foreach (FieldInfo fieldInfo in sfxLibrarySO.GetType().GetFields())
2428
{
2529
if (fieldInfo.FieldType != typeof(AudioClip[])) continue;
2630
string arrayName = fieldInfo.Name;
2731
string enumCode = $"public enum {arrayName}\n{{\n";
32+
AudioClip[] audioClips = (AudioClip[]) fieldInfo.GetValue(sfxLibrarySO);
2833

29-
AudioClip[] audioClips = (AudioClip[])fieldInfo.GetValue(sfxLibrary);
30-
31-
for (int i = 0; i < audioClips.Length; i++) enumCode += $"\t{audioClips[i].name} = {i},\n";
34+
for (int i = 0; i < audioClips.Length; i++)
35+
{
36+
enumCode += $"\t{audioClips[i].name} = {i},\n";
37+
}
3238

3339
enumCode += "}";
34-
3540
Debug.Log($"Generated Enum for {arrayName}:\n{enumCode}");
36-
3741
SaveEnumToFile(arrayName, enumCode);
3842
}
3943
}
4044

4145
private void SaveEnumToFile(string arrayName, string enumCode)
4246
{
43-
string directoryPath = "Assets/_Scripts/Enums";
44-
string filePath = $"{directoryPath}/{arrayName}.cs";
47+
string filePath = $"{directory_path}/{arrayName}.cs";
4548

46-
if (!AssetDatabase.IsValidFolder(directoryPath))
49+
if (!AssetDatabase.IsValidFolder(directory_path))
50+
{
4751
AssetDatabase.CreateFolder("Assets/_Scripts/", "Enums");
52+
}
4853

4954
File.WriteAllText(filePath, enumCode);
5055
AssetDatabase.Refresh();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
using DG.Tweening;
2+
using Event_System;
3+
using UnityEngine;
4+
5+
namespace Camera
6+
{
7+
[ExecuteAlways]
8+
public class PlayerCameraController : MonoBehaviour
9+
{
10+
private const float start_rotation = 40;
11+
[SerializeField]
12+
private Vector3 offset = new Vector3(0, 16, -16);
13+
[SerializeField]
14+
private float cameraShakeDuration = 0.5f;
15+
private Transform player;
16+
17+
private void Awake()
18+
{
19+
player = GameObject.FindGameObjectWithTag("Player").transform;
20+
transform.rotation = Quaternion.Euler(start_rotation, 0, 0);
21+
}
22+
23+
private void LateUpdate()
24+
{
25+
Vector3 desiredPosition = player.position + offset;
26+
transform.position = desiredPosition;
27+
}
28+
29+
private void OnEnable()
30+
{
31+
EventManager.Subscribe<PlayerDamagedEventArgs>(ImpactShake);
32+
}
33+
34+
private void OnDisable()
35+
{
36+
EventManager.UnSubscribe<PlayerDamagedEventArgs>(ImpactShake);
37+
}
38+
39+
private void ImpactShake(PlayerDamagedEventArgs args)
40+
{
41+
transform.DOComplete();
42+
transform.DOShakePosition(cameraShakeDuration);
43+
transform.DOShakeRotation(cameraShakeDuration, 1);
44+
}
45+
}
46+
}

Assets/_Scripts/Player/Weapons/RadiantField.cs

+17-10
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,41 @@ namespace Player.Weapons
77
{
88
public class RadiantField : MonoBehaviour, IWeapon
99
{
10-
public float Range => range;
10+
private float cooldown;
1111
private int damage;
12+
private EnemyDetector enemyDetector;
1213
private float range;
13-
private float cooldown;
1414
private float timer;
15-
private EnemyDetector enemyDetector;
15+
public float Range => range;
1616

17-
public void InitializeWeapon(WeaponDataSO weaponData,EnemyDetector enemyDetector, PlayerAnimationManager playerAnimationManager)
17+
public void InitializeWeapon(WeaponDataSO weaponData, EnemyDetector enemyDetector, PlayerAnimationManager playerAnimationManager)
1818
{
19-
damage = (int)weaponData._itemAttributes[ItemAttributeTypes.DAMAGE].baseValue;
19+
damage = (int) weaponData._itemAttributes[ItemAttributeTypes.DAMAGE].baseValue;
2020
range = weaponData._itemAttributes[ItemAttributeTypes.RANGE].baseValue;
2121
cooldown = weaponData._itemAttributes[ItemAttributeTypes.COOLDOWN].baseValue;
22-
transform.localScale = new Vector3(range*2, 0.01f, range*2);
23-
this.enemyDetector=enemyDetector;
22+
transform.localScale = new Vector3(range * 2, 0.01f, range * 2);
23+
this.enemyDetector = enemyDetector;
2424
}
2525

2626
public void TryGiveDamage()
2727
{
2828
timer -= Time.fixedDeltaTime;
29-
if(timer > 0)
29+
30+
if (timer > 0)
31+
{
3032
return;
33+
}
3134

32-
for(int i=0;i<enemyDetector.Size;i++)
35+
for (int i = 0; i < enemyDetector.Size; i++)
3336
{
34-
if(Vector3.Distance(enemyDetector.damageAbles[i].Position,transform.position)>range)
37+
if (Vector3.Distance(enemyDetector.damageAbles[i].Position, transform.position) > range)
38+
{
3539
break;
40+
}
41+
3642
enemyDetector.damageAbles[i]?.TakeDamage(damage);
3743
}
44+
3845
timer = cooldown;
3946
}
4047
}

0 commit comments

Comments
 (0)