From b2de1d473e6e091175a4e639c7da08a23ca173e9 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 2 Jan 2025 10:07:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=96=B4=EB=93=9C=EB=A0=88=EC=84=9C=EB=B8=94?= =?UTF-8?q?=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20%=20=EC=A0=95?= =?UTF-8?q?=EC=83=81=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Android/addressables_content_state.bin | Bin 9799 -> 10246 bytes Assets/Script/Main/MainToTitle.cs | 24 ++++++++---------- .../Script/Table/Mission/table_missionbase.cs | 4 +-- .../com.unity.services.core/Settings.json | 4 +++ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index c366965e75ddcc54d60be955951e1ec9440eb3c4..30565340f1e0ab692ce65a9441d472d42b0ad0a8 100644 GIT binary patch literal 10246 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 aQGx)FvIQkB=jw|!^lM)K695(); @@ -51,7 +49,7 @@ public class MainToTitle : MonoBehaviour bool calcSuccess = false; for (int retry = 0; retry < retryLimit; retry++) { - downloadSize = 0; + totalDownloadSize = 0; calcSuccess = true; foreach (var label in labels) { @@ -60,7 +58,7 @@ public class MainToTitle : MonoBehaviour if (handle.Status == AsyncOperationStatus.Succeeded) { - downloadSize += handle.Result; + totalDownloadSize += handle.Result; } else { @@ -86,9 +84,9 @@ public class MainToTitle : MonoBehaviour } // 다운로드 크기 출력 - if (downloadSize > 0) + if (totalDownloadSize > 0) { - label_popup.text = $"다운로드 안내\n\n최신 패치 파일을 받아야 합니다.\n총 {FormatSize(downloadSize)}를 다운로드 합니다.\n\nWifi로 다운로드 하는 것을 권장합니다."; + label_popup.text = $"다운로드 안내\n\n최신 패치 파일을 받아야 합니다.\n총 {FormatSize(totalDownloadSize)}를 다운로드 합니다.\n\nWifi로 다운로드 하는 것을 권장합니다."; go_popup.SetActive(true); while (!startDownload) yield return null; // 팝업에서 OK 누를 때까지 대기 @@ -98,7 +96,6 @@ public class MainToTitle : MonoBehaviour // 다운로드 시작 foreach (var label in labels) { - // 다운로드 크기 계산 var handle = Addressables.GetDownloadSizeAsync(label); yield return handle; @@ -110,15 +107,16 @@ public class MainToTitle : MonoBehaviour while (!downHandle.IsDone) { - slider_download.value = (float)(completedDownloads + downHandle.PercentComplete) / totalLabels; - label_slider.text = $"{(slider_download.value * 100f).ToString("N2")}%"; + float progress = (float)currentDownloadedSize / totalDownloadSize; + slider_download.value = progress; + label_slider.text = $"{progress * 100f:N2}%"; yield return null; } if (downHandle.Status == AsyncOperationStatus.Succeeded) { - ++completedDownloads; - slider_download.value = (float)completedDownloads / totalLabels; + // 다운로드 완료 후 currentDownloadedSize에 추가 + currentDownloadedSize += handle.Result; } else { diff --git a/Assets/Script/Table/Mission/table_missionbase.cs b/Assets/Script/Table/Mission/table_missionbase.cs index 1adde5856..2e41be39b 100644 --- a/Assets/Script/Table/Mission/table_missionbase.cs +++ b/Assets/Script/Table/Mission/table_missionbase.cs @@ -93,15 +93,15 @@ public class table_missionbase : MonoBehaviour //json = $"{{\"table_abilityconfig\":{json}}}"; } } -#if UNITY_EDITOR protected void Set_lastjson2() { +#if UNITY_EDITOR // TODO 정인호 : 임의로 만든 json 파일 오류 처리 (정식에선 지워야함) int startIndex = json_last.IndexOf(","); // 첫 번째 객체 시작 int endIndex = json_last.IndexOf(",") + 1; // 첫 번째 객체 끝 json_last = json_last.Remove(startIndex, endIndex - startIndex); - } #endif + } protected virtual void Start() { LoadComplete = true; } public bool Get_LoadComplete() { return LoadComplete; } } \ No newline at end of file diff --git a/ProjectSettings/Packages/com.unity.services.core/Settings.json b/ProjectSettings/Packages/com.unity.services.core/Settings.json index e69de29bb..dc6a06b89 100644 --- a/ProjectSettings/Packages/com.unity.services.core/Settings.json +++ b/ProjectSettings/Packages/com.unity.services.core/Settings.json @@ -0,0 +1,4 @@ +{ + "EnvironmentName": "production", + "EnvironmentId": "aed3f247-7248-4a9e-a859-b52f7aaae216" +} \ No newline at end of file