Skip to content

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

클리어 컨디션 해서 Map에 넣음 

서류가방에 테스트로 적용해봄
parent 18cdb90b
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 25 deletions
Assets/Player3Test.prefab
View file @ b8f25489
......@@ -67,6 +67,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -172,6 +173,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -277,6 +279,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -326,7 +329,7 @@ GameObject:
- component: {fileID: 5186655675642147998}
- component: {fileID: 2496973653136699540}
m_Layer: 0
m_Name: SavedMap_2019-05-14-22-18-37
m_Name: Player3Test
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -361,8 +364,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aa2c12f6bf26415469ec088e3e4c4dc3, type: 3}
m_Name:
m_EditorClassIdentifier:
testInputSizeX: 0
testInputSizeY: 0
maxMapSize: 5
floors: {fileID: 5390496715387352304}
walls: {fileID: 6532917746544365902}
......@@ -371,6 +372,19 @@ MonoBehaviour:
- {fileID: 6317210441967747213}
- {fileID: 8692496119037193698}
- {fileID: 4002211523417806573}
clearConditions:
- type: 0
count: 0
goal: 0
- type: 0
count: 0
goal: 0
- type: 0
count: 0
goal: 0
- type: 0
count: 0
goal: 0
--- !u!1 &2104754727029010325
GameObject:
m_ObjectHideFlags: 0
......@@ -438,6 +452,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -543,6 +558,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -648,6 +664,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -753,6 +770,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -858,6 +876,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -963,6 +982,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1069,6 +1089,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1192,6 +1213,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1297,6 +1319,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1402,6 +1425,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1507,6 +1531,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1612,6 +1637,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1717,6 +1743,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -1878,6 +1905,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2001,6 +2029,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2140,6 +2169,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2245,6 +2275,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2351,6 +2382,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2474,6 +2506,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2580,6 +2613,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2733,6 +2767,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2838,6 +2873,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2943,6 +2979,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -3048,6 +3085,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -3153,6 +3191,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -3258,6 +3297,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......
Assets/Scripts/Interactors/Briefcase.cs
View file @ b8f25489
......@@ -7,6 +7,8 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
[SerializeField]
private Floor floor = null;
public Vector2Int Position { get { return floor != null ? floor.mapPos : throw new UnassignedReferenceException("Floor of Interactor is not assigned"); } }
private int aCase;
private int nCase;
public GameObject GetObject()
{
......@@ -20,7 +22,10 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
public void Init(Floor floor)
{
this.floor = floor;
aCase = GameManager.inst.clearIndex[(int)ClearType.AllCase];
nCase = GameManager.inst.clearIndex[(int)ClearType.NCase];
if (aCase >= 0) MapManager.inst.currentMap.clearConditions[aCase].goal++;
this.floor = floor;
PlayerController.inst.OnPlayerMove += Interact;
}
......@@ -29,7 +34,16 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
Debug.Log(Position + " " + position);
if (Position == position)
{
IngameManager.inst.BriefcaseCount++;
if (aCase >= 0)
{
MapManager.inst.currentMap.clearConditions[aCase].count++;
MapManager.inst.currentMap.clearConditions[aCase].IsDone();
}
if (nCase >= 0)
{
MapManager.inst.currentMap.clearConditions[nCase].count++;
MapManager.inst.currentMap.clearConditions[nCase].IsDone();
}
Destroy(gameObject);
}
}
......
Assets/Scripts/Managers/GameManager.cs
View file @ b8f25489
......@@ -7,26 +7,16 @@ public class GameManager : SingletonBehaviour<GameManager>
{
public Material mirrorMaterial;
/*
private List<IPlayerInteractor> playerInteractors;
public int[] clearIndex = new int[9];
public int clearCounter = 0;
public void UpdateInteractorList()
private void GetClearIndex(Map map)
{
playerInteractors = FindObjectsOfType<MonoBehaviour>().OfType<IPlayerInteractor>().ToList();
for (int i = 0; i < 9; i++) clearIndex[i] = -1;
foreach (var child in map.clearConditions)
{
clearIndex[(int)child.type] = map.clearConditions.IndexOf(child);
clearCounter++;
}
}
public void AddInteractor()
{
}
public void TriggerPlayerInteractors(Vector2Int pos)
{
foreach (var interactor in playerInteractors)
{
interactor.Interact(pos);
}
}
*/
}
Assets/Scripts/Map/ClearCondition.cs 0 → 100644
View file @ b8f25489
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public enum ClearType
{
NFloor,
NTurret,
NCase,
NPlayer,
AllFloor,
AllTurret,
AllCase,
White,
Black
}
[System.Serializable]
public class ClearCondition
{
public ClearType type;
public int count;
public int goal;
public ClearCondition(ClearType _type, int _goal)
{
type = _type;
goal = _goal;
count = 0;
}
public bool IsDone()
{
if (goal <= count)
{
GameManager.inst.clearCounter--;
GameManager.inst.clearIndex[(int)type] = -1;
return true;
}
else return false;
}
}
Assets/Scripts/Map/ClearCondition.cs.meta 0 → 100644
View file @ b8f25489
fileFormatVersion: 2
guid: 4899567b2a08a374da0108b53f6d6683
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Map/Map.cs
View file @ b8f25489
......@@ -5,7 +5,7 @@ using System.IO;
public class Map : MonoBehaviour
{
public int testInputSizeX, testInputSizeY;
[Header("Map Data")]
public int maxMapSize;
public Dictionary<Vector2Int, Floor> floorGrid;
public Dictionary<Vector2, Wall> wallGrid;
......@@ -15,6 +15,8 @@ public class Map : MonoBehaviour
public GameObject objects;
public List<Floor> startFloors;
public List<ClearCondition> clearConditions;
/// <summary>
/// Get floor at position.
/// </summary>
......
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