diff --git a/Editor/GuruManager/Manager/GuruSDKManager.cs b/Editor/GuruManager/Manager/GuruSDKManager.cs index d4f1c80..52cbcb9 100644 --- a/Editor/GuruManager/Manager/GuruSDKManager.cs +++ b/Editor/GuruManager/Manager/GuruSDKManager.cs @@ -14,7 +14,7 @@ namespace Guru.Editor private const string GURU_SETTINGS_PATH = "Assets/Guru/Resources/GuruSettings.asset"; private const string APPLOVIN_SETTINGS_PATH = "Assets/Guru/Resources/AppLovinSettings.asset"; private const string FACEBOOK_SETTINGS_PATH = "Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset"; - private const string ANDROID_KEYSTORE_PATH = "Packages/com.guru.unity.sdk.core/Keystore/guru.jks"; + private const string ANDROID_KEYSTORE_PATH = "Assets/Plugins/Android/guru_key.jks"; private const string KeyMaxAutoUpdateEnabled = "com.applovin.auto_update_enabled"; @@ -584,29 +584,29 @@ namespace Guru.Editor p.boolValue = true; arr = _servicesConfig.ad_settings.pubmatic_ids_android; - if (IsArrayHasLength(arr, 4)) + if (IsArrayHasLength(arr, 3)) { p = n.serializedObject.FindProperty("PubmaticSetting.Android.storeUrl"); - p.stringValue = arr[0]; + p.stringValue = _servicesConfig.app_settings.android_store; p = n.serializedObject.FindProperty("PubmaticSetting.Android.bannerUnitID"); - p.stringValue = arr[1]; + p.stringValue = arr[0]; p = n.serializedObject.FindProperty("PubmaticSetting.Android.interUnitID"); - p.stringValue = arr[2]; + p.stringValue = arr[1]; p = n.serializedObject.FindProperty("PubmaticSetting.Android.rewardUnitID"); - p.stringValue = arr[3]; + p.stringValue = arr[2]; } arr = _servicesConfig.ad_settings.pubmatic_ids_ios; - if (IsArrayHasLength(arr, 4)) + if (IsArrayHasLength(arr, 3)) { p = n.serializedObject.FindProperty("PubmaticSetting.iOS.storeUrl"); - p.stringValue = arr[0]; + p.stringValue = _servicesConfig.app_settings.ios_store; p = n.serializedObject.FindProperty("PubmaticSetting.iOS.bannerUnitID"); - p.stringValue = arr[1]; + p.stringValue = arr[0]; p = n.serializedObject.FindProperty("PubmaticSetting.iOS.interUnitID"); - p.stringValue = arr[2]; + p.stringValue = arr[1]; p = n.serializedObject.FindProperty("PubmaticSetting.iOS.rewardUnitID"); - p.stringValue = arr[3]; + p.stringValue = arr[2]; } } @@ -814,12 +814,25 @@ namespace Guru.Editor n = so.FindProperty("androidKeystorePath"); n.stringValue = ANDROID_KEYSTORE_PATH; + DeployKeystore(); so.ApplyModifiedProperties(); EditorUtility.SetDirty(settings); AssetDatabase.SaveAssetIfDirty(settings); } + + private void DeployKeystore() + { + var from = "Packages/com.guru.unity.sdk.core/Editor/BuildTool/guru_key.jks"; + var to = ANDROID_KEYSTORE_PATH.Replace("Assets", Application.dataPath); + if (File.Exists(from) && !File.Exists(to)) + { + File.Copy(from, to); + } + } + + private void ApplyMods() { PlayerSettings.applicationIdentifier = _servicesConfig.app_settings.bundle_id; // 设置包名 diff --git a/Runtime/Code/SDK/GuruSDK.cs b/Runtime/Code/SDK/GuruSDK.cs index 321b061..610c8a2 100644 --- a/Runtime/Code/SDK/GuruSDK.cs +++ b/Runtime/Code/SDK/GuruSDK.cs @@ -276,7 +276,7 @@ namespace Guru { string url = ""; #if UNITY_EDITOR - url = "test@com.guru.ai"; + url = "https://test@com.guru.ai"; #elif UNITY_ANDROID url = GuruSettings?.AndroidStoreUrl ?? ""; #elif UNITY_IOS diff --git a/package.json b/package.json index cf7b371..683d29d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.guru.unity.sdk", "displayName": "Guru SDK", - "version": "1.0.0", + "version": "1.0.3", "description": "Guru SDK for unity project", "unity": "2020.3", "author":{