mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skill cooltime 적용 로직 테스트 코드

Browse Source
This commit is contained in:
aube.lee
2025-02-08 14:49:06 +09:00
parent d4bafd6cec
commit 57eb4abea3
9 changed files with 118 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs
View File

@@ -160,12 +160,12 @@ namespace TON
attackCollider.EnableCollider(false);
}
public void SkillAttack(string skillName)
public void SkillAttack(string skillId)
{
animator.Play("Skill Attack");
// 스킬 생성
GameObject skill = ObjectPoolManager.Instance.GetEffect(skillName);
GameObject skill = ObjectPoolManager.Instance.GetEffect(skillId);
// skill.transform.SetParent(firePoint);
skill.transform.SetPositionAndRotation(firePoint.position, firePoint.rotation);

48
Gameton-06/Assets/Gameton/Scripts/Character/Skill/DarknessBall.cs
View File

@@ -4,54 +4,8 @@ using UnityEngine;
namespace TON
{
public class DarknessBall : PoolAble
public class DarknessBall : SkillBase
{
private float elapsedTime; // 경과 시간 저장 변수
public float destoryTime = 2f;
[SerializeField]
private float damage;
private string id = "K0003";
private DamageCalculator damageCalculator = new DamageCalculator();
private PlayerData playerData;
void OnEnable()
{
elapsedTime = 0f; // 오브젝트가 활성화될 때 초기화
damage = SkillDataManager.Singleton.GetSkillData(id).damage;
playerData = PlayerDataManager.Singleton.player;
}
void Update()
{
elapsedTime += Time.deltaTime; // 경과 시간 누적
// 2초가 지나면 오브젝트 풀에 반환
if (elapsedTime >= destoryTime)
{
ReleaseObject();
}
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Monster")) // 적과 충돌 시 제거
{
// 기본 데미지 계산
// TODO: 장비 공격력 반영 필요
// float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower, playerData.equipmentAttack, playerData.defensivePower);
// 몬스터 방어력
float monsterDefencePower = collision.GetComponent<MonsterBase>().defencePower;
float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower * this.damage, 0, monsterDefencePower);
// 치명타 적용
damage = damageCalculator.ApplyCriticalDamage(damage);
collision.GetComponent<IDamage>().ApplyDamage(damage);
ReleaseObject();
}
}
}
}

48
Gameton-06/Assets/Gameton/Scripts/Character/Skill/FireBall.cs
View File

@@ -5,54 +5,8 @@ using UnityEngine;
namespace TON
{
public class FireBall : PoolAble
public class FireBall : SkillBase
{
private float elapsedTime; // 경과 시간 저장 변수
public float destoryTime = 2f;
[SerializeField]
private float damage;
private string id = "K0001";
private DamageCalculator damageCalculator = new DamageCalculator();
private PlayerData playerData;
void OnEnable()
{
elapsedTime = 0f; // 오브젝트가 활성화될 때 초기화
damage = SkillDataManager.Singleton.GetSkillData(id).damage;
playerData = PlayerDataManager.Singleton.player;
}
void Update()
{
elapsedTime += Time.deltaTime; // 경과 시간 누적
// 2초가 지나면 오브젝트 풀에 반환
if (elapsedTime >= destoryTime)
{
ReleaseObject();
}
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Monster")) // 적과 충돌 시 제거
{
// 기본 데미지 계산
// TODO: 장비 공격력 반영 필요
// float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower, playerData.equipmentAttack, playerData.defensivePower);
// 몬스터 방어력
float monsterDefencePower = collision.GetComponent<MonsterBase>().defencePower;
float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower * this.damage, 0, monsterDefencePower);
// 치명타 적용
damage = damageCalculator.ApplyCriticalDamage(damage);
collision.GetComponent<IDamage>().ApplyDamage(damage);
ReleaseObject();
}
}
}
}

47
Gameton-06/Assets/Gameton/Scripts/Character/Skill/IceBall.cs
View File

@@ -4,53 +4,8 @@ using UnityEngine;
namespace TON
{
public class IceBall : PoolAble
public class IceBall : SkillBase
{
private float elapsedTime; // 경과 시간 저장 변수
public float destoryTime = 2f;
[SerializeField]
private float damage;
private string id = "K0002";
private DamageCalculator damageCalculator = new DamageCalculator();
private PlayerData playerData;
void OnEnable()
{
elapsedTime = 0f; // 오브젝트가 활성화될 때 초기화
damage = SkillDataManager.Singleton.GetSkillData(id).damage;
playerData = PlayerDataManager.Singleton.player;
}
void Update()
{
elapsedTime += Time.deltaTime; // 경과 시간 누적
// 2초가 지나면 오브젝트 풀에 반환
if (elapsedTime >= destoryTime)
{
ReleaseObject();
}
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Monster")) // 적과 충돌 시 제거
{
// 기본 데미지 계산
// TODO: 장비 공격력 반영 필요
// float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower, playerData.equipmentAttack, playerData.defensivePower);
// 몬스터 방어력
float monsterDefencePower = collision.GetComponent<MonsterBase>().defencePower;
float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower * this.damage, 0, monsterDefencePower);
// 치명타 적용
damage = damageCalculator.ApplyCriticalDamage(damage);
collision.GetComponent<IDamage>().ApplyDamage(damage);
ReleaseObject();
}
}
}
}

46
Gameton-06/Assets/Gameton/Scripts/Character/Skill/SkillBase.cs
View File

@@ -5,17 +5,41 @@ using UnityEngine;
namespace TON
{
[System.Serializable]
public abstract class SkillBase
public abstract class SkillBase : PoolAble
{
public float SkillCoolDown => SkillData.coolDown;
public float CurrentCoolDown { get; protected set; }
public SkillData SkillData { get; private set; }
public PlayerData playerData;
private DamageCalculator damageCalculator = new DamageCalculator();
private float elapsedTime; // 경과 시간 저장 변수
public float destoryTime = 2f;
public void Init(SkillData skillData)
{
SkillData = skillData;
playerData = PlayerDataManager.Singleton.player;
}
void OnEnable()
{
elapsedTime = 0f; // 오브젝트가 활성화될 때 초기화
}
void Update()
{
UpdateSkill(Time.deltaTime);
elapsedTime += Time.deltaTime; // 경과 시간 누적
// 2초가 지나면 오브젝트 풀에 반환
if (elapsedTime >= destoryTime)
{
ReleaseObject();
}
}
public void UpdateSkill(float deltaTime)
@@ -25,7 +49,25 @@ namespace TON
}
public abstract void ExecuteSkill(CharacterBase actor);
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Monster")) // 적과 충돌 시 제거
{
// 기본 데미지 계산
// TODO: 장비 공격력 반영 필요
// float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower, playerData.equipmentAttack, playerData.defensivePower);
// 몬스터 방어력
float monsterDefencePower = collision.GetComponent<MonsterBase>().defencePower;
float damage = damageCalculator.CalculateBaseDamage(playerData.attackPower * SkillData.damage, 0, monsterDefencePower);
// 치명타 적용
damage = damageCalculator.ApplyCriticalDamage(damage);
collision.GetComponent<IDamage>().ApplyDamage(damage);
ReleaseObject();
}
}
}
}

3
Gameton-06/Assets/Gameton/Scripts/Character/Skill/SkillDataManager.cs
View File

@@ -22,10 +22,7 @@ namespace TON
{
skillDatas = new List<SkillData>();
}
// skillData를 skillBase로 치환
// 기존 스킬 클래스들을 skillBase를 상속받게 변경
}
public SkillData GetSkillData(string skillId)