2026-04-11 에러수정

This commit is contained in:
2026-04-11 09:04:58 +09:00
parent 00b832296b
commit ba93dc6d2f
57 changed files with 378 additions and 23 deletions

View File

@@ -21,9 +21,7 @@ public class Item : UseableEntry
public ItemEffectType ItemEffectType;
public GameObject ItemEffectVisual;
public int SortId;
public string ItemName;
public Sprite Icon; //인벤토리용 2D 아이콘
[TextArea] public string Description;
public bool IsStackable; // 중첩 가능 여부
public int MaxStack = 99; //장비는 1개
public int Rarity = 1; //기본등급 1
@@ -46,4 +44,8 @@ public class Item : UseableEntry
public float IntervalDamage;
public float IntervalDamageTime;
public override void Use()
{
throw new System.NotImplementedException();
}
}

View File

@@ -80,7 +80,7 @@ public void PickUp()
private void PlayPickupEffect()
{
// 이펙트 프리팹을 소환하거나 소리를 재생
Debug.Log($"{ItemInstance.Data.ItemName} 획득 이펙트 재생!");
Debug.Log($"{ItemInstance.Data.EntryName} 획득 이펙트 재생!");
}
private void OnTriggerEnter(Collider other)

View File

@@ -352,14 +352,14 @@ public void SpawnItemToWorld(ItemInstance dropItem)
Vector3 dropPosition = player != null ? player.transform.position + player.transform.forward * 1.5f + Vector3.up * (dropItem.Data.WorldScale.y * 0.5f + 0.25f) : Vector3.zero;
// 빈 게임오브젝트를 생성하고 WorldItem 컴포넌트를 붙임
GameObject dropObj = new GameObject($"{dropItem.Data.ItemName}_Dropped");
GameObject dropObj = new GameObject($"{dropItem.Data.EntryName}_Dropped");
dropObj.transform.SetParent(GameManager.Instance.DynamicObjectsField.transform);
dropObj.transform.position = dropPosition;
WorldItem worldItem = dropObj.AddComponent<WorldItem>();
worldItem.SetItem(dropItem); // SetItem으로 데이터 주입 및 모델 생성
Debug.Log($"{dropItem.Data.ItemName} {dropItem.CurrentStack}개를 필드에 버렸습니다.");
Debug.Log($"{dropItem.Data.EntryName} {dropItem.CurrentStack}개를 필드에 버렸습니다.");
}
public void DropItemFromSlot(int slotIndex)

View File

@@ -38,13 +38,8 @@
*/
[CreateAssetMenu(menuName = "Skill/SkillData")]
public class SkillData : ScriptableObject
public class SkillData : UseableEntry
{
[Header("기본 정보")]
public string SkillName;
[TextArea] public string Description;
public Sprite Icon;
[Header("스킬 분류")]
public SkillType SkillType;
public ActivationType ActivationType;
@@ -75,6 +70,11 @@ public SkillLevelData GetLevelData(int level)
int idx = Mathf.Clamp(level - 1, 0, Levels.Length - 1);
return Levels[idx];
}
public override void Use()
{
throw new System.NotImplementedException();
}
}
[System.Serializable]

View File

@@ -9,7 +9,7 @@ public void Execute(SkillInstance skill, Transform caster, float chargeRatio)
// PlayerStat에 버프 적용
// caster.GetComponent<PlayerStat>()?.ApplyBuff(levelData);
Debug.Log($"버프 적용: {skill.Data.SkillName}, 지속시간 {levelData.Duration}초");
Debug.Log($"버프 적용: {skill.Data.EntryName}, 지속시간 {levelData.Duration}초");
}
public void ExecuteAtPosition(SkillInstance skill, Transform caster, Vector3 targetPos, float chargeRatio)

View File

@@ -26,8 +26,8 @@ private void Update()
public void ShowTooltip(ItemInstance item, RectTransform slotRect)
{
_icon.sprite = item.Data.Icon;
_titleText.text = item.Data.ItemName;
_descriptionText.text = item.Data.Description;
_titleText.text = item.Data.EntryName;
_descriptionText.text = item.Data.EntryDesc;
//무기일 경우
if (item.Data.ItemType == ItemType.EQUIPMENT)

View File

@@ -1,10 +1,12 @@
using UnityEngine;
[System.Serializable]
public abstract class UseableEntry : ScriptableObject
{
[Header("기본 정보")]
public string EntryName;
public string EntryDesc;
public Sprite icon;
[TextArea] public string EntryDesc;
public Sprite Icon;
public abstract void Use();
}

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c948d7d35a597e246a7a75311dea922c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 29126fe7f4af21e42bc207d4b27add74
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: da6dc0018ec3b8c49ac99ddb2036a145
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d76bafdebeb09dd4a837e6a6a5f9e186
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 014787f7b07814d468e930b897f4267c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b1c72538292ac7942af70200b3a7fd65
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f1648a18787dcf84098b4180af1eddc3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: db55388767253c44ab1bea528311ddd4
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d49938838adfef94a938ce4ca86a02a3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 11f09953a241dde4baf566b785d2995f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 84d3f06eea8a0664198bbcb8b801fb66
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6b1658695d8a47b48b389481ff8499a1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 00aa54ef3a5fb1c418703f16e903bca8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9ededd3d9d8db194b8633912e481d868
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8f15546f733c85640a01eb812dfd417b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1367baa8ce6f19e4ea3aa2fe5e3801aa
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e1b984bfe01fb59459aa09fec813e618
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3f2421a22d60bbf46a03e53f7c23d251
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e509f9014d52b1a4c8fb87398dc5bbd6
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1e6306f4f9b6c984298fec234fd55493
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1710599e5767907489f19684c071ab00
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b4bb010d0bc249948b52e1311e0b4033
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 42e92ccfcb036f14aaae0fd01a119586
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f02b78255f574b24ab0c7bbacc10e71f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 84a03c7353df819449bfe6f74d6accae
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a7ed158dd11aad946b3d06911ec2632f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: