Commit e4de4bcb authored by 18류지석's avatar 18류지석

누락된 에너미 스폰 다시 추가, 버그 수정

parent dd04ff2a
......@@ -209,9 +209,9 @@ MonoBehaviour:
weight: 3
patrolRange: 2
noticeRange: 2
attackRange: 2
patrolSpeed: 5
trackSpeed: 7
attackRange: 1
patrolSpeed: 2.5
trackSpeed: 3.5
playerDistance: 0
--- !u!114 &114468655689627186
MonoBehaviour:
......
......@@ -51,3 +51,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fc7c7899a8a94c24cb9eb34d432133ce, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
dropTableData: {fileID: 4900000, guid: 6216895c658a2af40890a4446cc10a8c, type: 3}
dropItemList: []
enemyPrefab:
- {fileID: 1636491341446076, guid: a164c147037e89448820f7387c724c42, type: 2}
......@@ -171,6 +171,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4519224550781046}
- component: {fileID: 114498254109604890}
m_Layer: 0
m_Name: goblin
m_TagString: Untagged
......@@ -1154,6 +1155,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b5ed2c384310eb6408bb42c91b195e15, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114498254109604890
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1793875229757898}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d27745292051704a87740def5391766, type: 3}
m_Name:
m_EditorClassIdentifier:
enemyPrefab: {fileID: 1636491341446076, guid: a164c147037e89448820f7387c724c42,
type: 2}
--- !u!212 &212423219453141376
SpriteRenderer:
m_ObjectHideFlags: 1
......
This diff is collapsed.
......@@ -1041,30 +1041,6 @@ Prefab:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114685218848006942, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: UpgradeStage
objectReference: {fileID: 0}
- target: {fileID: 224008356030171754, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1083421967201116, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224718253185442684, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 224363839195006936, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
m_IsPrefabAsset: 0
......
......@@ -67,6 +67,7 @@ public class EnemyManager : Singleton<EnemyManager>
private GameObject PickFromPool(GameObject enemy)
{
Debug.Log(enemy.name);
GameObject[] pool = enemyPool[enemy];
foreach(GameObject obj in pool)
{
......
......@@ -37,7 +37,7 @@ public class InventoryManager : MonoBehaviour {
IEnumerator TestCoroutine()
{
yield return null;
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
/*PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
yield return new WaitForSeconds(1.5f);
ItemInstantiate(itemPool[0], player.transform.position);
......@@ -51,7 +51,7 @@ public class InventoryManager : MonoBehaviour {
AddonInstantiate(addonPool[0], player.transform.position);
yield return new WaitForSeconds(1.5f);
AddonInstantiate(addonPool[1], player.transform.position);
/*ItemSelect(0);
ItemSelect(0);
yield return new WaitForSeconds(1f);
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1])));
yield return new WaitForSeconds(1f);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment