일부 버그 수정

Assets/Resources/Prefabs/Popups/AlbumOpenPopup.prefab

@@ -574,10 +574,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8643226523064314600}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8643226524284132493
 CanvasRenderer:
@@ -650,7 +650,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 0
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -672,7 +672,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 0
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 30.803467, y: 0, z: 26.952942, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0

Assets/Scenes/Main.unity

@@ -14143,12 +14143,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 281679010}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 726633383}
+  m_Father: {fileID: 1834861282}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -14175,7 +14175,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\uC568\uBC94 \uC81C\uBAA9"
+  m_text: "\uC81C\uBAA9"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 000e8ba4eacaa2148a0eabd4db3eeab7, type: 2}
@@ -14205,9 +14205,9 @@ MonoBehaviour:
   m_fontSize: 50
   m_fontSizeBase: 50
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
-  m_fontSizeMin: 18
+  m_fontSizeMin: 50
-  m_fontSizeMax: 72
+  m_fontSizeMax: 50
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -14217,7 +14217,7 @@ MonoBehaviour:
   m_lineSpacing: 0
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
+  m_charWidthMaxAdj: 50
   m_TextWrappingMode: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
@@ -14240,7 +14240,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 29.696701, y: 0, z: 27.222046, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -45673,7 +45673,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1834861282}
-  - {fileID: 281679011}
   - {fileID: 264014381}
   m_Father: {fileID: 1535761049}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -136301,7 +136300,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 281679011}
   m_Father: {fileID: 726633383}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Scripts/UI/HuntingPanel.cs

@@ -73,7 +73,7 @@ public class HuntingPanel : uScrollViewMgr
     {
         //GameManager.DB.GetHuntingDataLength()
         var curtargetindex = GameManager.DB.GetUnlockTargetIndex(true);
-        DB_HuntingListData huntingListData = DB_HuntingListData.GetEntity(Mathf.FloorToInt((float)((float)curtargetindex / 2.0f)));
+        DB_HuntingListData huntingListData = DB_HuntingListData.GetEntity(curtargetindex);
         TitleTMP.text = huntingListData.DBF_Title;
         t_type.text = $"Type{CurAlbumType}";
         Set_ScrollView(GameManager.DB.Get_AlbumDatas(CurAlbumType));

Assets/Scripts/UI/Popup/AlbumOpenPopup.cs

@@ -12,7 +12,7 @@ public class AlbumOpenPopup : PopupBase
         GameManager.Sound.PlaySFX(ESFXType.Open_Popup);
 
         var targetindex = GameManager.DB.GetUnlockTargetIndex(true) - 1;
-        DB_HuntingListData huntingListData = DB_HuntingListData.GetEntity(Mathf.FloorToInt((float)((float)targetindex / 2.0f)));
+        DB_HuntingListData huntingListData = DB_HuntingListData.GetEntity(targetindex);
         t_.text = $"축하합니다!!\n{huntingListData.DBF_Title} 앨범이 오픈되었습니다.";
         StartCoroutine(Co_Off());
     }

Assets/Scripts/UI/Popup/ResultPopup.cs

@@ -89,7 +89,6 @@ public class ResultPopup : PopupBase
 
         GoldTMP.enabled = true;
 
-        if (GamePanel.Instance.Player_Milgi > 0) NormalGameObjects[1].SetActive(false);
         ButtonlabelTMP.text = _gameResult ? "밀기 2배\n<size=35>이번 판 무효" : "밀기 4배\n<size=35>이번 판 무효";
         list_xinfo.ForEach(f => f.mul = 0); // 초기화
         go_milgiad.SetActive(false);
@@ -283,6 +282,8 @@ public class ResultPopup : PopupBase
                 t_Cal.text = $"{fixedScore}점\n= 총 {fixedScore}점";
             }
 
+            t_Cal.text += $"x {GamePanel.Instance.Stake}냥";
+
             GoldTMP.text = "-" + CodeJay.CodeJayUtility.Converter.MoneyToString(_resultTotalGold);
             GameManager.DB.SubGold(_resultTotalGold, this.name);
             GameManager.DB.AddGoldToAI(GamePanel.Instance.IsChallengeMode, _resultTotalGold);
@@ -307,6 +308,7 @@ public class ResultPopup : PopupBase
         m_ResultxList.Set(list_xinfo);
         t_enemygold.text = gos_bankrupt[0].activeSelf ? "0냥" : CodeJay.CodeJayUtility.Converter.MoneyToString(GameManager.DB.GetRemainigNormalGameAIGold());
         t_mygold.text = CodeJay.CodeJayUtility.Converter.MoneyToString(GameManager.DB.Gold);
+        if (GamePanel.Instance.Player_Milgi > 0) NormalGameObjects[1].SetActive(false);
 
         GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold);
         GameManager.Event.InvokeEvent(EEventType.OnGameEnd);
@@ -316,7 +318,6 @@ public class ResultPopup : PopupBase
     public void WinWithFirstBbug(long resultGold)
     {
         _gameResult = true;
-        if (GamePanel.Instance.Player_Milgi > 0) NormalGameObjects[1].SetActive(false);
         ButtonlabelTMP.text = _gameResult ? "밀기 4배\n<size=35>이번 판 무효" : "밀기 2배\n<size=35>이번 판 무효";
         GoldTMP.enabled = true;
         GameManager.Sound.PlaySFX(ESFXType.Win);
@@ -395,6 +396,7 @@ public class ResultPopup : PopupBase
         gos_bankrupt[0].GetComponent<Image>().DOFade(1f, 1f).From(0f).SetEase(Ease.InExpo);
         t_enemygold.text = "0냥";
         t_mygold.text = CodeJay.CodeJayUtility.Converter.MoneyToString(GameManager.DB.Gold);
+        if (GamePanel.Instance.Player_Milgi > 0) NormalGameObjects[1].SetActive(false);
 
         GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold);
         GameManager.Event.InvokeEvent(EEventType.OnGameEnd);
@@ -403,6 +405,7 @@ public class ResultPopup : PopupBase
 
     public void ClickShop()
     {
+        GamePanel.Instance.Player_Milgi = 0;
         GameManager.Sound.PlaySFX(ESFXType.Button_Hit);
         CanvasControl.Ins.Go_Shop();
         GameManager.UI.HideTopPopup();