diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index cf081d7..7653301 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/Editor/AutoBuild.cs b/Assets/Editor/AutoBuild.cs index 33f17d5..5aa7709 100644 --- a/Assets/Editor/AutoBuild.cs +++ b/Assets/Editor/AutoBuild.cs @@ -18,7 +18,6 @@ public static class AutoBuild if (_bt == BuildTarget.Android) { - PlayerSettings.Android.splitApplicationBinary = false; File.WriteAllText("Assets/Resources/VersionCode.txt", PlayerSettings.Android.bundleVersionCode.ToString()); PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64; } @@ -76,6 +75,7 @@ public static class AutoBuild var curVer = PlayerSettings.bundleVersion; PlayerSettings.bundleVersion = "9.9.9"; EditorUserBuildSettings.buildAppBundle = false; + PlayerSettings.Android.splitApplicationBinary = false; BuildStart("AndroidData/GoStop_Test_" + Application.version + "_(" + PlayerSettings.Android.bundleVersionCode + ").apk", BuildTarget.Android); PlayerSettings.bundleVersion = curVer; } @@ -87,6 +87,7 @@ public static class AutoBuild //PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel23; EditorUserBuildSettings.buildAppBundle = false; + PlayerSettings.Android.splitApplicationBinary = false; BuildStart("AndroidData/GoStop_Test_" + Application.version + "_(" + PlayerSettings.Android.bundleVersionCode + ").apk", BuildTarget.Android); } [MenuItem("AutoBuild/Build Live AAB")] @@ -97,6 +98,7 @@ public static class AutoBuild Set_AndroidKeyStore(); EditorUserBuildSettings.buildAppBundle = true; + PlayerSettings.Android.splitApplicationBinary = true; BuildStart("AndroidData/GoStop_Live_" + Application.version + "_(" + PlayerSettings.Android.bundleVersionCode + ").aab", BuildTarget.Android); //if (EditorUtility.DisplayDialog("라이브 빌드", "현재 버전 : " + PlayerSettings.bundleVersion + " " + PlayerSettings.Android.bundleVersionCode.ToString(), "OK", "Not Build")) // AppBundlePublisher.Build(); @@ -109,6 +111,7 @@ public static class AutoBuild Set_OneStoreKeyStore(); EditorUserBuildSettings.buildAppBundle = true; + PlayerSettings.Android.splitApplicationBinary = true; BuildStart("AndroidData/GoStop_Live_OneStore" + Application.version + "_(" + PlayerSettings.Android.bundleVersionCode + ").aab", BuildTarget.Android); //if (EditorUtility.DisplayDialog("라이브 빌드", "현재 버전 : " + PlayerSettings.bundleVersion + " " + PlayerSettings.Android.bundleVersionCode.ToString(), "OK", "Not Build")) // AppBundlePublisher.Build(); diff --git a/Assets/GoogleMobileAds/link.xml.meta b/Assets/GoogleMobileAds/link.xml.meta index 2ea6277..e03de8b 100644 --- a/Assets/GoogleMobileAds/link.xml.meta +++ b/Assets/GoogleMobileAds/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fb678a2e7f18f914a87ecb076dd436b2 +guid: 9371a8d163a58dd4792c935d0cbfd834 labels: - gvh - gvh_version-9.5.0 diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset index 687a3f5..2a51a57 100644 --- a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -40,7 +40,6 @@ MonoBehaviour: - GoogleMobileAds.Mediation.UnityAds.Common - GoogleMobileAds.Mediation.UnityAds.iOS - KinoBloom.Runtime - - Purchasing.Common showAdvancedSettings: 1 addMgrToSceneAutomatically: 0 autoUpdateReferences: 1 diff --git a/Assets/Resources/VersionCode.txt b/Assets/Resources/VersionCode.txt index 8e2afd3..dec2bf5 100644 --- a/Assets/Resources/VersionCode.txt +++ b/Assets/Resources/VersionCode.txt @@ -1 +1 @@ -17 \ No newline at end of file +19 \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index db8566f..c88e7c4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,19 +3,19 @@ "com.google.ads.mobile": "9.5.0", "com.google.ads.mobile.mediation.metaaudiencenetwork": "3.14.0", "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "2.7.2", + "com.unity.addressables": "2.7.3", "com.unity.ai.navigation": "2.0.9", "com.unity.collab-proxy": "2.9.3", "com.unity.device-simulator.devices": "1.0.0", - "com.unity.ide.rider": "3.0.37", + "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.23", "com.unity.ide.vscode": "1.2.5", "com.unity.mobile.android-logcat": "1.4.5", "com.unity.multiplayer.center": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.purchasing": "4.12.2", + "com.unity.purchasing": "5.0.2", "com.unity.recorder": "5.1.2", - "com.unity.test-framework": "1.5.1", + "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", "com.unity.modules.accessibility": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2ca6872..12123a8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -33,7 +33,7 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "2.7.2", + "version": "2.7.3", "depth": 0, "source": "registry", "dependencies": { @@ -43,7 +43,7 @@ "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.4.1", + "com.unity.scriptablebuildpipeline": "2.4.2", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -67,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.24", + "version": "1.8.25", "depth": 2, "source": "registry", "dependencies": { @@ -109,7 +109,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.37", + "version": "3.0.38", "depth": 0, "source": "registry", "dependencies": { @@ -177,12 +177,12 @@ "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "4.12.2", + "version": "5.0.2", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.12.5", + "com.unity.services.core": "1.14.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" @@ -201,7 +201,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "2.4.1", + "version": "2.4.2", "depth": 1, "source": "registry", "dependencies": { @@ -222,7 +222,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.5.1", + "version": "1.6.0", "depth": 0, "source": "builtin", "dependencies": { @@ -232,7 +232,7 @@ } }, "com.unity.test-framework.performance": { - "version": "3.1.0", + "version": "3.2.0", "depth": 2, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3a8f004..3b8772e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.0 + bundleVersion: 9.9.9 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -175,7 +175,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 17 + AndroidBundleVersionCode: 19 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 35 AndroidPreferredInstallLocation: 1 @@ -269,7 +269,7 @@ PlayerSettings: AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: AndroidData/RandomGFGoStop_One.keystore' + AndroidKeystoreName: '{inproject}: AndroidData/RandomGFGoStop.keystore' AndroidKeyaliasName: fgb AndroidEnableArmv9SecurityFeatures: 0 AndroidEnableArm64MTE: 0 @@ -909,7 +909,7 @@ PlayerSettings: XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: - Purchasing: 0 + Purchasing: 1 Unity Ads: 1 luminIcon: m_Name: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 0faef8d..0c7ca7b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.58f2 -m_EditorVersionWithRevision: 6000.0.58f2 (92dee566b325) +m_EditorVersion: 6000.0.59f2 +m_EditorVersionWithRevision: 6000.0.59f2 (ef281c76c3c1) diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 8a78299..cb1a18f 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -17,7 +17,7 @@ UnityConnectSettings: m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 1