diff --git a/Client/Assets/1_Script/System/GameManager.cs b/Client/Assets/1_Script/System/GameManager.cs index 2880c102..00c278df 100644 --- a/Client/Assets/1_Script/System/GameManager.cs +++ b/Client/Assets/1_Script/System/GameManager.cs @@ -17,10 +17,14 @@ public class GameManager : DontDestroy /// /// 현재 엑셀 처리가 끝났는지 확인하는 부분. /// - public bool isExcel { get { return corExcel != null && corExcel.IsRunning; } } + public bool isExcel { get { return _isExcel; } } + //멀티 쓰레드가 너무 빠르게 동작해 데이터 세팅이 끝나지 않았는데 씬이 먼져 넘어가버림 + //그래서 이미지 데이터가 불러와 지지 않는 상태에서 로딩이 끝나버리는 버그가 발생해서 방식을 수정. + public bool _isExcel; protected override void OnStart() { + _isExcel = true; Statics.version = PlayerPrefs.GetString("version"); DownlodeResp request = new DownlodeResp(); request.Request((data) => @@ -64,6 +68,7 @@ public class GameManager : DontDestroy Statics.stringIcons.Add(data.Value.name, Sprite.Create(obj, new Rect(0, 0, obj.width, obj.height), new Vector2(0.5f, 0.5f))); } } + _isExcel = false; } //public float x = 2160f; diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset index 133b1a96..3196410f 100644 --- a/Client/ProjectSettings/ProjectSettings.asset +++ b/Client/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.1 + bundleVersion: 0.2.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -154,7 +154,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.DefaultCompany.Client + Android: com.MrPan.Fairytales buildNumber: Standalone: 0 VisionOS: 0 @@ -162,8 +162,8 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 33 - AndroidTargetSdkVersion: 33 + AndroidMinSdkVersion: 34 + AndroidTargetSdkVersion: 34 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -251,7 +251,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 15 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -832,7 +832,7 @@ PlayerSettings: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: - Android: 0 + Android: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} managedStrippingLevel: