Skip to content

M
man-in-the-mirror
Commit c60bf36c authored by 18손재민's avatar 18손재민
Browse files
Options

흑마네킹 안생기는 버그 없애고 나머지 검증된 맵 다 찍음

parent fc55989b
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 4 deletions
Assets/Resources/Stages/stage15.json
View file @ c60bf36c
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":3,"xPos":-0.5,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":6,"xPos":0.0,"yPos":0.0},{"tag":5,"xPos":1.0,"yPos":0.0},{"tag":7,"xPos":0.0,"yPos":1.0}],"clears":[{"type":7,"goal":2}],"cases":[0],"bullets":[0,1]} {"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":3,"xPos":-0.5,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":8,"xPos":0.0,"yPos":1.0},{"tag":6,"xPos":0.0,"yPos":0.0},{"tag":5,"xPos":1.0,"yPos":0.0}],"clears":[{"type":7,"goal":2}],"cases":[0],"bullets":[0,1]}
\ No newline at end of file \ No newline at end of file
Assets/Resources/Stages/stage16.json 0 → 100644
View file @ c60bf36c
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":3,"xPos":-0.5,"yPos":-1.0},{"tag":3,"xPos":1.0,"yPos":-0.5},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":7,"xPos":1.0,"yPos":-1.0},{"tag":8,"xPos":-2.0,"yPos":-2.0}],"clears":[{"type":7,"goal":3},{"type":8,"goal":2}],"cases":[],"bullets":[1,1,1]}
\ No newline at end of file
Assets/Resources/Stages/stage16.json.meta 0 → 100644
View file @ c60bf36c
fileFormatVersion: 2
guid: a4a6035949e1a314f897191c69c03977
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Stages/stage17.json 0 → 100644
View file @ c60bf36c
{"objects":[{"tag":0,"xPos":25.0,"yPos":0.0},{"tag":2,"xPos":0.5,"yPos":2.0},{"tag":2,"xPos":0.5,"yPos":1.0},{"tag":2,"xPos":0.0,"yPos":-0.5},{"tag":2,"xPos":0.5,"yPos":-1.0},{"tag":2,"xPos":0.5,"yPos":-2.0},{"tag":2,"xPos":-2.0,"yPos":-0.5},{"tag":3,"xPos":-1.0,"yPos":-0.5},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":2.0},{"tag":1,"xPos":-1.0,"yPos":2.0},{"tag":1,"xPos":0.0,"yPos":2.0},{"tag":1,"xPos":1.0,"yPos":2.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":2.0,"yPos":0.0},{"tag":1,"xPos":2.0,"yPos":1.0},{"tag":1,"xPos":2.0,"yPos":2.0},{"tag":1,"xPos":2.0,"yPos":-1.0},{"tag":1,"xPos":2.0,"yPos":-2.0},{"tag":9,"xPos":2.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-2.0},{"tag":6,"xPos":2.0,"yPos":-1.0},{"tag":5,"xPos":-1.0,"yPos":2.0}],"clears":[{"type":0,"goal":1}],"cases":[1],"bullets":[0,2]}
\ No newline at end of file
Assets/Resources/Stages/stage17.json.meta 0 → 100644
View file @ c60bf36c
fileFormatVersion: 2
guid: 418dca1804d136d47b73049fffbac98c
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Stages/stage6.json
View file @ c60bf36c
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":-1.0},{"tag":2,"xPos":0.5,"yPos":-2.0},{"tag":3,"xPos":-2.0,"yPos":0.5},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-1.0},{"tag":6,"xPos":0.0,"yPos":-1.0},{"tag":6,"xPos":-1.0,"yPos":-2.0},{"tag":6,"xPos":-2.0,"yPos":1.0},{"tag":5,"xPos":-1.0,"yPos":1.0},{"tag":7,"xPos":1.0,"yPos":1.0},{"tag":7,"xPos":1.0,"yPos":-2.0}],"clears":[{"type":7,"goal":1},{"type":8,"goal":1}],"cases":[0],"bullets":[]} {"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":-1.0},{"tag":2,"xPos":0.5,"yPos":-2.0},{"tag":3,"xPos":-2.0,"yPos":0.5},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-1.0},{"tag":6,"xPos":-2.0,"yPos":1.0},{"tag":6,"xPos":0.0,"yPos":-1.0},{"tag":6,"xPos":-1.0,"yPos":-2.0},{"tag":5,"xPos":-1.0,"yPos":1.0},{"tag":8,"xPos":1.0,"yPos":1.0},{"tag":8,"xPos":1.0,"yPos":-2.0}],"clears":[{"type":7,"goal":1},{"type":8,"goal":1}],"cases":[0],"bullets":[0,0]}
\ No newline at end of file \ No newline at end of file
Assets/Resources/Stages/stage7.json
View file @ c60bf36c
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":-0.5,"yPos":1.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":0.5,"yPos":1.0},{"tag":2,"xPos":-2.0,"yPos":0.5},{"tag":3,"xPos":-1.5,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":7,"xPos":-2.0,"yPos":1.0},{"tag":7,"xPos":0.0,"yPos":1.0},{"tag":5,"xPos":-2.0,"yPos":0.0},{"tag":5,"xPos":0.0,"yPos":-1.0},{"tag":6,"xPos":-1.0,"yPos":0.0}],"clears":[{"type":7,"goal":1},{"type":8,"goal":1}],"cases":[0,0],"bullets":[0]} {"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":-2.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":1.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":0.5,"yPos":1.0},{"tag":3,"xPos":-1.5,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":5,"xPos":0.0,"yPos":-1.0},{"tag":5,"xPos":-2.0,"yPos":0.0},{"tag":6,"xPos":-1.0,"yPos":0.0},{"tag":8,"xPos":-2.0,"yPos":1.0},{"tag":8,"xPos":0.0,"yPos":1.0}],"clears":[{"type":7,"goal":1},{"type":8,"goal":1}],"cases":[0,0],"bullets":[0]}
\ No newline at end of file \ No newline at end of file
Assets/Scripts/Map/Map.cs
View file @ c60bf36c
...@@ -223,16 +223,18 @@ public class Map : MonoBehaviour ...@@ -223,16 +223,18 @@ public class Map : MonoBehaviour
{ {
case ObjType.Briefcase: case ObjType.Briefcase:
objectGrid.Add(pos, Instantiate(MapManager.inst.briefCase, new Vector3(pos.x, 0.5f, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>()); objectGrid.Add(pos, Instantiate(MapManager.inst.briefCase, new Vector3(pos.x, 0.5f, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>());
objectGrid[pos].Init(GetFloorAtPos(pos));
break; break;
case ObjType.Camera: case ObjType.Camera:
objectGrid.Add(pos, Instantiate(MapManager.inst.cameraTurret, new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>()); objectGrid.Add(pos, Instantiate(MapManager.inst.cameraTurret, new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>());
objectGrid[pos].Init(GetFloorAtPos(pos));
break; break;
case ObjType.Mannequin: case ObjType.Mannequin:
objectGrid.Add(pos, Instantiate(MapManager.inst.mannequins[Random.Range(0, 5)], new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>()); objectGrid.Add(pos, Instantiate(MapManager.inst.mannequins[Random.Range(0, 5)], new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>());
objectGrid[pos].Init(GetFloorAtPos(pos));
objectGrid[pos].GetObject().GetComponent<Mannequin>().SetColor(isWhite); objectGrid[pos].GetObject().GetComponent<Mannequin>().SetColor(isWhite);
break; break;
} }
objectGrid[pos].Init(GetFloorAtPos(pos));
StartCoroutine(MapManager.inst.Rebaker()); StartCoroutine(MapManager.inst.Rebaker());
} }
else else
......
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