Commit ce6000fc authored by 18신대성's avatar 18신대성

클리어 UI 모양 및 위치변경

parent c85321b5
...@@ -405,10 +405,10 @@ RectTransform: ...@@ -405,10 +405,10 @@ RectTransform:
m_Father: {fileID: 158856772} m_Father: {fileID: 158856772}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 75}
m_SizeDelta: {x: 550, y: 300} m_SizeDelta: {x: 1920, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &238561070 --- !u!114 &238561070
MonoBehaviour: MonoBehaviour:
...@@ -483,7 +483,7 @@ RectTransform: ...@@ -483,7 +483,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 180, y: -60} m_AnchoredPosition: {x: 885, y: 0}
m_SizeDelta: {x: 150, y: 150} m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &256306797 --- !u!114 &256306797
...@@ -658,6 +658,41 @@ CanvasRenderer: ...@@ -658,6 +658,41 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 342512061} m_GameObject: {fileID: 342512061}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &447253776
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &448150607 --- !u!1 &448150607
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -895,8 +930,8 @@ MonoBehaviour: ...@@ -895,8 +930,8 @@ MonoBehaviour:
sourceCamera: {fileID: 534669904} sourceCamera: {fileID: 534669904}
outlineCamera: {fileID: 1548020010} outlineCamera: {fileID: 1548020010}
outlineShaderMaterial: {fileID: 0} outlineShaderMaterial: {fileID: 0}
renderTexture: {fileID: 1751407643} renderTexture: {fileID: 855292323}
extraRenderTexture: {fileID: 740540897} extraRenderTexture: {fileID: 447253776}
--- !u!1 &666076611 --- !u!1 &666076611
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -932,7 +967,7 @@ RectTransform: ...@@ -932,7 +967,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -60} m_AnchoredPosition: {x: -885, y: 0}
m_SizeDelta: {x: 150, y: 150} m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &666076613 --- !u!114 &666076613
...@@ -1028,41 +1063,6 @@ CanvasRenderer: ...@@ -1028,41 +1063,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 666076611} m_GameObject: {fileID: 666076611}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &740540897
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &770981479 --- !u!1 &770981479
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1098,7 +1098,7 @@ RectTransform: ...@@ -1098,7 +1098,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -180, y: -60} m_AnchoredPosition: {x: -735, y: 0}
m_SizeDelta: {x: 150, y: 150} m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &770981481 --- !u!114 &770981481
...@@ -1268,6 +1268,41 @@ RectTransform: ...@@ -1268,6 +1268,41 @@ RectTransform:
m_AnchoredPosition: {x: 895, y: -490} m_AnchoredPosition: {x: 895, y: -490}
m_SizeDelta: {x: 100, y: 60} m_SizeDelta: {x: 100, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!84 &855292323
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1015578410 --- !u!1 &1015578410
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1417,7 +1452,7 @@ RectTransform: ...@@ -1417,7 +1452,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 76} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 510, y: 100} m_SizeDelta: {x: 510, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1516940102 --- !u!114 &1516940102
...@@ -1587,7 +1622,7 @@ Camera: ...@@ -1587,7 +1622,7 @@ Camera:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
m_RenderingPath: 1 m_RenderingPath: 1
m_TargetTexture: {fileID: 1751407643} m_TargetTexture: {fileID: 855292323}
m_TargetDisplay: 0 m_TargetDisplay: 0
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 0 m_HDR: 0
...@@ -1779,41 +1814,6 @@ CanvasRenderer: ...@@ -1779,41 +1814,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1745203029} m_GameObject: {fileID: 1745203029}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &1751407643
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1839944655 --- !u!1 &1839944655
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1831,7 +1831,7 @@ GameObject: ...@@ -1831,7 +1831,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1839944656 --- !u!224 &1839944656
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2193,6 +2193,10 @@ PrefabInstance: ...@@ -2193,6 +2193,10 @@ PrefabInstance:
propertyPath: clearUINextText propertyPath: clearUINextText
value: value:
objectReference: {fileID: 1463021450} objectReference: {fileID: 1463021450}
- target: {fileID: 2122327709, guid: 42247a938bb6e554eb00dc08303a72d6, type: 3}
propertyPath: buttonUIs
value:
objectReference: {fileID: 1607829337}
- target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6, - target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
......
...@@ -19,6 +19,7 @@ public class GameManager : SingletonBehaviour<GameManager> ...@@ -19,6 +19,7 @@ public class GameManager : SingletonBehaviour<GameManager>
public CommentUIGenerator commentUIGenerator; public CommentUIGenerator commentUIGenerator;
public Image whiteout; public Image whiteout;
public GameObject clearUI; public GameObject clearUI;
public GameObject buttonUIs;
public Text clearUINextText; public Text clearUINextText;
[Header("Stage Data")] [Header("Stage Data")]
...@@ -93,6 +94,7 @@ public class GameManager : SingletonBehaviour<GameManager> ...@@ -93,6 +94,7 @@ public class GameManager : SingletonBehaviour<GameManager>
yield return null; yield return null;
clearUINextText.text = StageSelector.nextStage.Replace("_", " - "); clearUINextText.text = StageSelector.nextStage.Replace("_", " - ");
clearUI.SetActive(true); clearUI.SetActive(true);
buttonUIs.SetActive(false);
Debug.Log("Stage Clear!"); Debug.Log("Stage Clear!");
Cursor.visible = true; Cursor.visible = true;
......
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