diff --git a/AndroidData/RandomGFGoStop_One.keystore b/AndroidData/RandomGFGoStop_One.keystore new file mode 100644 index 0000000..d057daf Binary files /dev/null and b/AndroidData/RandomGFGoStop_One.keystore differ diff --git a/Assets/Editor/AutoBuild.cs b/Assets/Editor/AutoBuild.cs index 7622952..58fdba3 100644 --- a/Assets/Editor/AutoBuild.cs +++ b/Assets/Editor/AutoBuild.cs @@ -21,9 +21,6 @@ public static class AutoBuild PlayerSettings.Android.splitApplicationBinary = false; File.WriteAllText("Assets/Resources/VersionCode.txt", PlayerSettings.Android.bundleVersionCode.ToString()); PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64; -#if UNITY_ANDROID - Set_AndroidKeyStore(); -#endif } else { @@ -61,10 +58,19 @@ public static class AutoBuild PlayerSettings.Android.keyaliasName = "fgb"; PlayerSettings.Android.keystorePass = PlayerSettings.Android.keyaliasPass = "fgb123!!"; } + [MenuItem("AutoBuild/Set_OneStoreKeyStore")] + static void Set_OneStoreKeyStore() + { + PlayerSettings.Android.useCustomKeystore = true; + PlayerSettings.Android.keystoreName = "AndroidData/RandomGFGoStop_One.keystore"; + PlayerSettings.Android.keyaliasName = "fgb"; + PlayerSettings.Android.keystorePass = PlayerSettings.Android.keyaliasPass = "fgb123!!"; + } [MenuItem("AutoBuild/Build APK with KeyStore")] static void Build_APK_with_KeyStore() { Common(BuildTargetGroup.Android, BuildTarget.Android); + Set_AndroidKeyStore(); //PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel23; var curVer = PlayerSettings.bundleVersion; @@ -73,10 +79,11 @@ public static class AutoBuild BuildStart("AndroidData/GoStop_Test_" + Application.version + "_(" + PlayerSettings.Android.bundleVersionCode + ").apk", BuildTarget.Android); PlayerSettings.bundleVersion = curVer; } - [MenuItem("AutoBuild/Build OneStore APK")] + [MenuItem("AutoBuild/Build APK with KeyStore (OneStore)")] static void Build_APK_OneStore() { Common(BuildTargetGroup.Android, BuildTarget.Android); + Set_OneStoreKeyStore(); //PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel23; PlayerSettings.SetScriptingDefineSymbols(UnityEditor.Build.NamedBuildTarget.Android, "OneStore"); @@ -89,6 +96,7 @@ public static class AutoBuild { ++PlayerSettings.Android.bundleVersionCode; Common(BuildTargetGroup.Android, BuildTarget.Android); + Set_AndroidKeyStore(); PlayerSettings.SetScriptingDefineSymbols(UnityEditor.Build.NamedBuildTarget.Android, ""); EditorUserBuildSettings.buildAppBundle = true; @@ -97,6 +105,20 @@ public static class AutoBuild //if (EditorUtility.DisplayDialog("라이브 빌드", "현재 버전 : " + PlayerSettings.bundleVersion + " " + PlayerSettings.Android.bundleVersionCode.ToString(), "OK", "Not Build")) // AppBundlePublisher.Build(); } + [MenuItem("AutoBuild/Build Live AAB (OneStore)")] + static void Build_AAB_OneStore() + { + ++PlayerSettings.Android.bundleVersionCode; + Common(BuildTargetGroup.Android, BuildTarget.Android); + Set_OneStoreKeyStore(); + + PlayerSettings.SetScriptingDefineSymbols(UnityEditor.Build.NamedBuildTarget.Android, ""); + EditorUserBuildSettings.buildAppBundle = true; + BuildStart("AndroidData/GoStop_Live_OneStore" + Application.version + "_(" + PlayerSettings.Android.bundleVersionCode + ").aab", BuildTarget.Android); + EmptySymbol(); + //if (EditorUtility.DisplayDialog("라이브 빌드", "현재 버전 : " + PlayerSettings.bundleVersion + " " + PlayerSettings.Android.bundleVersionCode.ToString(), "OK", "Not Build")) + // AppBundlePublisher.Build(); + } #endif #if UNITY_IOS [MenuItem("AutoBuild/IOS Xcode")] diff --git a/Assets/GoogleMobileAds/link.xml.meta b/Assets/GoogleMobileAds/link.xml.meta index 1271708..51c4692 100644 --- a/Assets/GoogleMobileAds/link.xml.meta +++ b/Assets/GoogleMobileAds/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ef19cb3736f6b9c49ae7f653cc4bc4be +guid: 5f0f2ecafbde8e542be264e68651ecc3 labels: - gvh - gvh_version-9.5.0 diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 0f0ca2f..9fd26a6 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -28,6 +28,5 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -월 70만원 한도제한 신규 이펙트 적용 구글 및 원스토어 이미지 분기 처리 \ No newline at end of file diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index b9a9056..c98a78e 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -36,7 +36,7 @@ - +