Commit 63274e54 authored by 18손재민's avatar 18손재민

승리조건 표시하는 UI만듬

승리조건을 exact할때만으로 바꿈
parent af34d9ac
This diff is collapsed.
fileFormatVersion: 2
guid: 874af447cef689e478ca96b4d1d197c2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c9d4d43dcf536a247a53db738b48f679
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 66bb74902851e6f45b1dd366762222ac
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: 1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 05626d4bcfb37c74c927e1ee78806026
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -6,6 +6,7 @@ using System.Linq;
public class GameManager : SingletonBehaviour<GameManager>
{
public Material mirrorMaterial;
public ClearUIGenerator uiGenerator;
public int[] clearIndex = new int[9];
public int clearCounter = 0;
......
......@@ -31,6 +31,7 @@ public class MapManager : SingletonBehaviour<MapManager>
currentMap.transform.position = new Vector3(0, 0, 0);
surface.BuildNavMesh();
GameManager.inst.SetClearIndex(currentMap);
GameManager.inst.uiGenerator.GenerateAllClearUI();
for (int i = 0; i < currentMap.startFloors.Count; i++)
PlayerController.inst.CreatePlayer(currentMap.startFloors[i]);
}
......
......@@ -21,7 +21,8 @@ public class ClearCondition
public ClearType type;
public int count;
public int goal;
bool isDone = false;
public bool isDone = false;
public ClearStatusUI assignedClearUI;
/*public ClearCondition(ClearType _type, int _goal)
{
......@@ -34,18 +35,20 @@ public class ClearCondition
{
count += _count;
goal += _goal;
if (goal <= count)
if (goal == count)
{
GameManager.inst.clearCounter--;
isDone = true;
Debug.Log(GameManager.inst.clearCounter);
assignedClearUI.RefreshClearCondition();
if (GameManager.inst.clearCounter == 0)
GameManager.inst.ClearStage();
}
else if (goal > count && isDone)
else if (goal != count && isDone)
{
GameManager.inst.clearCounter++;
isDone = false;
assignedClearUI.RefreshClearCondition();
}
}
}
......@@ -70,6 +70,7 @@ public class PlayerController : SingletonBehaviour<PlayerController>
void Start()
{
prePos = MapPos;
bulletList.Add(BulletCode.True);
bulletList.Add(BulletCode.Mirror);
bulletList.Add(BulletCode.False);
bulletList.Add(BulletCode.Mirror);
......
fileFormatVersion: 2
guid: 7d9d5ca6bbd96d4489ae2b168a5257de
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class ClearStatusUI : MonoBehaviour
{
[Header("gameobjects")]
public ClearCondition assignedCondition;
public Sprite emptyBox;
public Sprite fullBox;
[Header("inside")]
public Text tooltipText;
public Text goalText;
public Text statusText;
public Image doneImage;
public void Init(ClearCondition condition, string tooltip)
{
assignedCondition = condition;
tooltipText.text = tooltip;
goalText.text = assignedCondition.goal.ToString();
statusText.text = assignedCondition.count.ToString();
if (assignedCondition.isDone) doneImage.sprite = fullBox;
else doneImage.sprite = emptyBox;
}
public void RefreshClearCondition()
{
goalText.text = assignedCondition.goal.ToString();
statusText.text = assignedCondition.count.ToString();
if (assignedCondition.isDone) doneImage.sprite = fullBox;
else doneImage.sprite = emptyBox;
}
}
fileFormatVersion: 2
guid: 811442d8833cec34eaa6bf9db4aae339
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ClearUIGenerator : MonoBehaviour
{
public GameObject clearUI;
private int nextx = -175;
private int nexty = -100;
// Start is called before the first frame update
public void GenerateAllClearUI()
{
foreach (ClearCondition cond in MapManager.inst.currentMap.clearConditions)
{
ClearStatusUI ui = Instantiate(clearUI, transform).GetComponent<ClearStatusUI>();
ui.GetComponent<RectTransform>().anchoredPosition = new Vector2(nextx, nexty);
nexty -= 200;
string str;
switch(cond.type)
{
case ClearType.NFloor:
str = "강조된 바닥에 올라서세요.";
break;
case ClearType.NTurret:
str = "카메라터렛을 파괴하세요.";
break;
case ClearType.NCase:
str = "서류가방을 획득하세요.";
break;
case ClearType.NPlayer:
str = "캐릭터를 일정 수로 만드세요.";
break;
case ClearType.AllFloor:
str = "모든 강조된 바닥에 올라서세요.";
break;
case ClearType.AllTurret:
str = "모든 카메라터렛을 파괴하세요.";
break;
case ClearType.AllCase:
str = "모든 서류가방을 획득하세요";
break;
case ClearType.White:
str = "흰 마네킹을 만드세요.";
break;
case ClearType.Black:
str = "검은 마네킹을 만드세요.";
break;
default:
str = "오류입니다.";
break;
}
ui.Init(cond, str);
cond.assignedClearUI = ui;
}
}
}
fileFormatVersion: 2
guid: d988d68782719aa48821116eae3f5a6d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
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