Merge branch 'main' of https://github.com/SYEON10/Chemistry

Author: Danny-IV

Assets/Dialogue/CE2.yarn

@@ -168,7 +168,7 @@ YOU: 뭐? 그런 거면 말을 하지
 <<SetPortrait Portraits Eun_Idle>>
 YOU: 화가 많이 난 것 같은데...
 이후로 다시는 크리스를 볼 수 없었다.
-<<ChangeStat lvChris -100>>
+<<ChangeStat lvChris -20>>
 ===
 
 

Assets/Dialogue/CE4.yarn

@@ -124,7 +124,7 @@ YOU: 네가 그때로 돌아오면 좋겠어...
 은채는 당신의 손을 뿌리치고 떠난다.
 <<SetPortrait Portraits>>
 다시는 당신과 마주치려 하지 않을 것이다.
-<<ChangeStat charm -100>>
+<<ChangeStat charm -50>>
 ===
 title: 일반CE4
 ---

Assets/Dialogue/CM4.yarn

@@ -52,7 +52,7 @@ YOU: ...네가 좋은 것 같아.
 이미 자리에서 일어나 몸을 돌린 뒤였다.
 크리스는 그는 카페 문을 박차고 도망치듯 그 자리를 벗어났다.
 그 뒤로 다시는 그 붉은 머리칼을 볼 수 없었다.
-<<ChangeStat charm -100>>
+<<ChangeStat charm -50>>
 ===
 
 title: 일반CM4

Assets/Dialogue/EM2.yarn

@@ -111,7 +111,7 @@ YOU: 우욱... 더는 못 먹겠어...
 <<SetPortrait Portraits>>
 민트가 당신을 잠깐 쳐다보더니 아무말도 없이 주방으로 돌아갔다.
 당신은 엄청난 경멸을 느낀다...
-<<ChangeStat lvMint -100>>
+<<ChangeStat lvMint -20>>
 ===
 
 

Assets/Scenes/EndingReview.unity

@@ -662,6 +662,8 @@ GameObject:
   - component: {fileID: 268295283}
   - component: {fileID: 268295285}
   - component: {fileID: 268295286}
+  - component: {fileID: 268295288}
+  - component: {fileID: 268295287}
   m_Layer: 5
   m_Name: EndingReviewScreen
   m_TagString: Untagged
@@ -694,7 +696,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 1920, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &268295282
 MonoBehaviour:
@@ -765,7 +767,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 268295287}
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
@@ -805,6 +807,44 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f2e7a057538de74d8fe3ba5e17b5177, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &268295287
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 268295280}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &268295288
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 268295280}
+  m_CullTransparentMesh: 1
 --- !u!1 &313735877
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Main.unity

@@ -1352,7 +1352,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -2186,10 +2186,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1963833246}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 1920, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1407234423
 MonoBehaviour:

Assets/Scripts/Data/CharacterStat.cs

@@ -3,13 +3,13 @@
 public class CharacterStat
 {
     //스탯 초기값 설정
-    public Stat mov = new Stat(50);
-    public Stat charm = new Stat(50);
-    public Stat mental = new Stat(50);
+    public Stat mov = new Stat(65);
+    public Stat charm = new Stat(65);
+    public Stat mental = new Stat(65);
     public Stat lvChris = new Stat(50);
     public Stat lvEun = new Stat(50);
     public Stat lvMint = new Stat(50);
-    public Stat Chris_Eun = new Stat(50);
-    public Stat Eun_Mint = new Stat(50);
-    public Stat Mint_Chris = new Stat(50);
+    public Stat Chris_Eun = new Stat(70);
+    public Stat Eun_Mint = new Stat(70);
+    public Stat Mint_Chris = new Stat(70);
 }