Merge remote-tracking branch 'origin/sound' into 1.0.1

Assets/_2_0Script/SubMgr/EventMgr.cs

@@ -1741,6 +1741,9 @@ public class EventMgr : MonoBehaviour
     //성장 열기
     private void OpenRaise()
     {
+        var sysEventRaise = DataHandler.GetSysEventRaise();
+        var playEventRaise = DataHandler.GetPlayEventRaise();
+
         OpenEventWindow();
         goCanvasRaiseUI.SetActive(true);
         MiddleEventTap();
@@ -1757,14 +1760,14 @@ public class EventMgr : MonoBehaviour
             btnRaise10 = trfui.Find("groupLeft").GetChild(3).GetComponent<ButtonIV>();
             btnRaise1.transform.Find("txt").GetComponent<TextMeshProUGUI>().text = FormatString.StringFormat(LocalizationText.GetText("event_give"), 1);
             txtRaisePrice1 = btnRaise1.transform.Find("txtPrice").GetComponent<TextMeshProUGUI>();
-            txtRaisePrice1.text = DataHandler.GetSysEventRaise().price.ToString();
+            txtRaisePrice1.text = sysEventRaise.price.ToString();
             txtRaisePrice30 = btnRaise10.transform.Find("txtPrice").GetComponent<TextMeshProUGUI>();
             txtRaiseHave = trfui.Find("txtHave").GetComponent<TextMeshProUGUI>();
             trfui.Find("txtExplain").GetComponent<TextMeshProUGUI>().text = LocalizationText.GetText("event_exchange_warning");
             raisingEvent = imgRaiseFront.transform.Find("RaisingEvent").GetComponent<ParticleSystem>();
             marimoGrow = trfui.Find("groupLeft").GetChild(1).GetComponent<DOTweenAnimation>();
 
-            int len = DataHandler.GetSysEventRaise().rewards.Length;//보상 목록 수
+            int len = sysEventRaise.rewards.Length;//보상 목록 수
             const int rowcnt = 2;
             raiseIdList = new List<int>();
             for (int i = 0; i < len; i++)
@@ -1777,7 +1780,7 @@ public class EventMgr : MonoBehaviour
             escrRaise.LoadDatas(raiseIdRows);
         }
 
-        txtRaiseHave.text = DataHandler.GetPlayEventRaise().item.ToString();
+        txtRaiseHave.text = playEventRaise.item.ToString();
 
         RefreshGachaButton();
 
@@ -1787,6 +1790,7 @@ public class EventMgr : MonoBehaviour
         //@ 나중에 마리모 단계에 따라 raise0, raise1, raise2 중에서 맞는 이미지 불러오기.
 
         //일정횟수 이상 자라면 성장항목에 표기하는 이미지를 다르게 한다. 일정횟수의 기준은 DB 의 Scale 3.
+#if false
         int grow = (DataHandler.GetPlayEventRaise().itemUsed / DataHandler.GetSysEventRaise().price) / DataHandler.GetEvents()[(int)eEventMoveType.Raise].scale3;
 
         switch (grow)
@@ -1802,6 +1806,16 @@ public class EventMgr : MonoBehaviour
                 Addressables.LoadAssetAsync<Sprite>("event/raise2").Completed += ALoadRaiseFrontComp;
                 break;
         }
+#else
+        int tryCount = playEventRaise.itemUsed / sysEventRaise.price;
+
+        if(tryCount >= 2000)
+            Addressables.LoadAssetAsync<Sprite>("event/raise2").Completed += ALoadRaiseFrontComp;
+        else if(tryCount >= 500)
+            Addressables.LoadAssetAsync<Sprite>("event/raise1").Completed += ALoadRaiseFrontComp;
+        else
+            Addressables.LoadAssetAsync<Sprite>("event/raise0").Completed += ALoadRaiseFrontComp;
+#endif
     }
 
     //성장 닫기. 이 역시 어드레서블 필요
@@ -2062,7 +2076,7 @@ public class EventMgr : MonoBehaviour
 
         CoverCamera.Hold();
     }
-    #endregion Raise
+#endregion Raise
 
     //오픈 보상
     #region Reward