Skip to content

Commit 22a8741

Browse files
committed
[FIX] canvas scaler 적용 및 관련 에러 해결
1 parent 406635b commit 22a8741

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

Assets/Scenes/EndingReview.unity

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,9 +1004,9 @@ RectTransform:
10041004
m_Children: []
10051005
m_Father: {fileID: 1681531295}
10061006
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1007-
m_AnchorMin: {x: 0.5, y: 0}
1008-
m_AnchorMax: {x: 0.5, y: 0}
1009-
m_AnchoredPosition: {x: 0, y: 84}
1007+
m_AnchorMin: {x: 0.5, y: 0.5}
1008+
m_AnchorMax: {x: 0.5, y: 0.5}
1009+
m_AnchoredPosition: {x: 0, y: -456}
10101010
m_SizeDelta: {x: 514.2, y: 50}
10111011
m_Pivot: {x: 0.5, y: 0.5}
10121012
--- !u!114 &716805101
@@ -1630,10 +1630,10 @@ MonoBehaviour:
16301630
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
16311631
m_Name:
16321632
m_EditorClassIdentifier:
1633-
m_UiScaleMode: 0
1633+
m_UiScaleMode: 1
16341634
m_ReferencePixelsPerUnit: 100
16351635
m_ScaleFactor: 1
1636-
m_ReferenceResolution: {x: 800, y: 600}
1636+
m_ReferenceResolution: {x: 1920, y: 1080}
16371637
m_ScreenMatchMode: 0
16381638
m_MatchWidthOrHeight: 0
16391639
m_PhysicalUnit: 3

Assets/Scenes/Lobby.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ MonoBehaviour:
170170
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
171171
m_Name:
172172
m_EditorClassIdentifier:
173-
m_UiScaleMode: 0
173+
m_UiScaleMode: 1
174174
m_ReferencePixelsPerUnit: 100
175175
m_ScaleFactor: 1
176-
m_ReferenceResolution: {x: 800, y: 600}
176+
m_ReferenceResolution: {x: 1920, y: 1080}
177177
m_ScreenMatchMode: 0
178178
m_MatchWidthOrHeight: 0
179179
m_PhysicalUnit: 3

Assets/Scenes/Main.unity

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ RectTransform:
161161
- {fileID: 1352160962}
162162
m_Father: {fileID: 798779350}
163163
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
164-
m_AnchorMin: {x: 0.5, y: 0}
165-
m_AnchorMax: {x: 0.5, y: 0}
166-
m_AnchoredPosition: {x: 0, y: 50}
164+
m_AnchorMin: {x: 0.5, y: 0.5}
165+
m_AnchorMax: {x: 0.5, y: 0.5}
166+
m_AnchoredPosition: {x: 0, y: -490}
167167
m_SizeDelta: {x: 1500, y: 300}
168168
m_Pivot: {x: 0.5, y: 0}
169169
--- !u!225 &149772869
@@ -969,9 +969,9 @@ RectTransform:
969969
- {fileID: 441531331}
970970
m_Father: {fileID: 798779350}
971971
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
972-
m_AnchorMin: {x: 0.5, y: 1}
973-
m_AnchorMax: {x: 0.5, y: 1}
974-
m_AnchoredPosition: {x: 0, y: -365}
972+
m_AnchorMin: {x: 0.5, y: 0.5}
973+
m_AnchorMax: {x: 0.5, y: 0.5}
974+
m_AnchoredPosition: {x: 0, y: 175}
975975
m_SizeDelta: {x: 1299.504, y: 730}
976976
m_Pivot: {x: 0.5, y: 0.5}
977977
--- !u!225 &681266428
@@ -1161,10 +1161,10 @@ MonoBehaviour:
11611161
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
11621162
m_Name:
11631163
m_EditorClassIdentifier:
1164-
m_UiScaleMode: 0
1164+
m_UiScaleMode: 1
11651165
m_ReferencePixelsPerUnit: 100
11661166
m_ScaleFactor: 1
1167-
m_ReferenceResolution: {x: 800, y: 600}
1167+
m_ReferenceResolution: {x: 1920, y: 1080}
11681168
m_ScreenMatchMode: 0
11691169
m_MatchWidthOrHeight: 0
11701170
m_PhysicalUnit: 3
@@ -2354,10 +2354,10 @@ RectTransform:
23542354
m_Children: []
23552355
m_Father: {fileID: 798779350}
23562356
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2357-
m_AnchorMin: {x: 0, y: 0}
2358-
m_AnchorMax: {x: 1, y: 1}
2357+
m_AnchorMin: {x: 0.5, y: 0.5}
2358+
m_AnchorMax: {x: 0.5, y: 0.5}
23592359
m_AnchoredPosition: {x: 0, y: 0}
2360-
m_SizeDelta: {x: 0, y: 0}
2360+
m_SizeDelta: {x: 1920, y: 1080}
23612361
m_Pivot: {x: 0.5, y: 0.5}
23622362
--- !u!222 &1739688810
23632363
CanvasRenderer:

Assets/Scripts/UI/PortraitDisplay.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,15 @@ IEnumerator ChangePortrait(List<string> spriteNames)
9393
}
9494
images[i].sprite = sprite;
9595
images[i].rectTransform.sizeDelta = new Vector2(sprite.texture.width, sprite.texture.height);
96+
images[i].rectTransform.localScale = new Vector3(1, 1, 1);
9697
}
9798
// 왼쪽사람은 오른쪽 보게
9899

99100
if (images != null & images.Count != 0)
100101
{
101102
if (images[0] != null) images[0].rectTransform.localScale = new Vector3(-1, 1, 1);
102103
}
104+
103105
if (doFade) yield return Fade(0, 1);
104106

105107
previousSpriteNames = spriteNames;

0 commit comments

Comments
 (0)