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

스킬 세팅 UI 기본 레이아웃 작업

Browse Source
This commit is contained in:
aube.lee
2025-02-10 15:15:17 +09:00
parent 6641a9e0ff
commit 4d15b23dfd
25 changed files with 3922 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gameton-06/Assets/Gameton/Scripts/Character/Skill.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: dab915d74078caf41bf985d45e8dbb81
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -1,97 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace TON
{
[System.Serializable]
public 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 = 0f; // 경과 시간 저장 변수
public float destoryTime = 2f;
public void Init(SkillData skillData)
{
SkillData = skillData;
playerData = PlayerDataManager.Singleton.player;
}
void OnEnable()
{
elapsedTime = 0f;
}
public void InvokeExcuteSkill()
{
InvokeRepeating(nameof(ExecuteSkill), 0f, 1f); // 즉시 실행 후 1초 간격 반복
}
void ExecuteSkill()
{
if (elapsedTime >= destoryTime)
{
CancelInvoke(nameof(ExecuteSkill)); // 반복 중지
ReleaseObject();
return;
}
Debug.Log("SkillBase:: " + SkillData.name);
UpdateSkill(Time.deltaTime);
elapsedTime += 1.0f;
}
void OnDisable()
{
CancelInvoke(nameof(ExecuteSkill)); // 오브젝트 비활성화 시 중지
}
void Update()
{
}
public void SetCurrentCoolDown()
{
CurrentCoolDown = SkillData.coolDown; // 쿨타임 시작
}
public void UpdateSkill(float deltaTime)
{
CurrentCoolDown -= deltaTime;
CurrentCoolDown = Mathf.Max(0, CurrentCoolDown);
}
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();
}
}
}
}

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

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 9407c2d7c54dec74eac0fe37da48ef1d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -1,142 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace TON
{
public class SkillDataManager : SingletonBase<SkillDataManager>
{
public List<SkillData> skillDatas { get; private set; }
public SerializableDictionary<string, SkillBase> skillInstances { get; private set; }
protected override void Awake()
{
base.Awake();
LoadSkillData();
}
private void LoadSkillData()
{
skillDatas = JSONLoader.LoadFromResources<List<SkillData>>("Skill");
if (skillDatas == null)
{
skillDatas = new List<SkillData>();
}
}
public void SetSkillInstances()
{
skillInstances = new SerializableDictionary<string, SkillBase>();
// skillData를 skillBase로 치환
foreach (var skillData in skillDatas)
{
skillInstances.Add(skillData.id, InitSkillData(skillData));
}
}
// 스킬 슬롯에 배치할 수 있는 스킬 수 리턴하는 메소드
public int GetActiveSkillCount()
{
int characterLevel = PlayerDataManager.Singleton.player.level;
int availableSkillCount = 0;
foreach (SkillData skill in skillDatas)
{
if (skill.requiredLevel <= characterLevel)
{
availableSkillCount++;
}
}
return availableSkillCount > 3 ? 3 : availableSkillCount;
}
// 스킬 슬롯에 적용해야하는 스킬 리스트 리턴
public List<SkillBase> GetActiveSkillInstance()
{
List<SkillBase> filteredSkills = new List<SkillBase>();
foreach (SkillData skill in skillDatas)
{
if (skill.slotNumber == 1 || skill.slotNumber == 2 || skill.slotNumber == 3)
{
filteredSkills.Add(skillInstances.GetValueOrDefault(skill.id));
}
}
return filteredSkills;
}
// 스킬 쿨타임 설정하는 메소드
public void SetCoolTime(string skillId)
{
if (skillInstances.TryGetValue(skillId, out SkillBase skillBase))
{
skillBase.SetCurrentCoolDown();
}
}
// 스킬 쿨타임 업데이트 메소드
public void UpdateSkillCoolDown(string skillId)
{
if (skillInstances.TryGetValue(skillId, out SkillBase skillBase))
{
skillBase.UpdateSkill(Time.deltaTime);
}
}
// 스킬을 실행할 수 있는지 확인
public bool CanExecuteSkill(string skillId)
{
if (skillInstances.TryGetValue(skillId, out SkillBase skill))
{
return skill.CurrentCoolDown <= 0;
}
else
{
return false;
}
}
// 스킬의 쿨타임 및 파괴 로직 실행 메소드
public void InvokeExcuteSkill(string skillId)
{
if (skillInstances.TryGetValue(skillId, out SkillBase skill))
{
skill.InvokeExcuteSkill();
}
}
// 스킬 발사(생성) 메소드 추가
public void ExecuteSkill(string skillId, Transform firePoint, float lastDirection)
{
// 스킬 생성
GameObject skill = ObjectPoolManager.Instance.GetEffect(skillId);
skill.transform.SetPositionAndRotation(firePoint.position, firePoint.rotation);
// 🔥 스킬 방향 반전
var bulletScale = skill.transform.localScale;
bulletScale.x = Mathf.Abs(bulletScale.x) * lastDirection;
skill.transform.localScale = bulletScale;
// 스킬 이동 방향 설정
Rigidbody2D skillRb = skill.GetComponent<Rigidbody2D>();
skillRb.velocity = new Vector2(lastDirection * 5f, 0f);
InvokeExcuteSkill(skillId);
}
private SkillBase InitSkillData(SkillData skillData)
{
SkillBase skill = gameObject.AddComponent<SkillBase>();
skill.Init(skillData);
return skill;
}
public SkillBase GetSkillData(string skillId)
{
return skillInstances.GetValueOrDefault(skillId);
}
}
}

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

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 6eedee4d78efcd0409acbbe2ca1da519
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: