From 61910cbfc1293aac1a0839d7a5c7e056b374ad05 Mon Sep 17 00:00:00 2001 From: huyfei Date: Wed, 10 Jan 2024 13:34:21 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=20=E6=9B=B4=E6=96=B0fb=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=82=E6=95=B0=EF=BC=8C=20=E6=9A=B4=E9=9C=B2=20fbA?= =?UTF-8?q?ppId=20=E8=AF=BB=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/GuruManager/Manager/GuruSDKManager.cs | 23 +++++++++++++++----- Runtime/Code/Config/GuruServicesConfig.cs | 4 ++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Editor/GuruManager/Manager/GuruSDKManager.cs b/Editor/GuruManager/Manager/GuruSDKManager.cs index 3fffd13..d4f1c80 100644 --- a/Editor/GuruManager/Manager/GuruSDKManager.cs +++ b/Editor/GuruManager/Manager/GuruSDKManager.cs @@ -254,13 +254,13 @@ namespace Guru.Editor } else { - if (_servicesConfig.fb_settings.app_id.IsNullOrEmpty()) + if (_servicesConfig.fb_settings.fb_app_id.IsNullOrEmpty()) { passed = false; AddResultLine($"{MARK_INDENT}{mk_warn} Facebook AppID is missing!", CheckStatus.Warning); _serviceNormalFail++; } - if (_servicesConfig.fb_settings.client_token.IsNullOrEmpty()) + if (_servicesConfig.fb_settings.fb_client_token.IsNullOrEmpty()) { passed = false; AddResultLine($"{MARK_INDENT}{mk_warn} Facebook Client Token is missing!", CheckStatus.Warning); @@ -519,14 +519,27 @@ namespace Guru.Editor n = so.FindProperty("IPMSetting"); if (null != n) { + // AppID p = n.serializedObject.FindProperty("IPMSetting.appID"); p.stringValue = _servicesConfig.app_settings.app_id; - + // BundleID + p = n.serializedObject.FindProperty("IPMSetting.bundleId"); + p.stringValue = _servicesConfig.app_settings.bundle_id; + // tokenValidTime if (_servicesConfig.app_settings.token_vaild_time > 0) { p = n.serializedObject.FindProperty("IPMSetting.tokenValidTime"); p.intValue = _servicesConfig.app_settings.token_vaild_time; } + if (_servicesConfig.fb_settings != null) + { + // FB App ID + p = n.serializedObject.FindProperty("IPMSetting.fbAppId"); + p.stringValue = _servicesConfig.fb_settings.fb_app_id; + // FB Client Token + p = n.serializedObject.FindProperty("IPMSetting.fbClientToken"); + p.stringValue = _servicesConfig.fb_settings.fb_client_token; + } } //---------- AMAZON ----------------------- @@ -788,7 +801,7 @@ namespace Guru.Editor { n.ClearArray(); n.InsertArrayElementAtIndex(0); - n.GetArrayElementAtIndex(0).stringValue = _servicesConfig.fb_settings.app_id; + n.GetArrayElementAtIndex(0).stringValue = _servicesConfig.fb_settings.fb_app_id; } n = so.FindProperty("clientTokens"); @@ -796,7 +809,7 @@ namespace Guru.Editor { n.ClearArray(); n.InsertArrayElementAtIndex(0); - n.GetArrayElementAtIndex(0).stringValue = _servicesConfig.fb_settings.client_token; + n.GetArrayElementAtIndex(0).stringValue = _servicesConfig.fb_settings.fb_client_token; } n = so.FindProperty("androidKeystorePath"); diff --git a/Runtime/Code/Config/GuruServicesConfig.cs b/Runtime/Code/Config/GuruServicesConfig.cs index bb46893..bfbf020 100644 --- a/Runtime/Code/Config/GuruServicesConfig.cs +++ b/Runtime/Code/Config/GuruServicesConfig.cs @@ -74,8 +74,8 @@ namespace Guru [Serializable] public class GuruFbSettings { - public string app_id; - public string client_token; + public string fb_app_id; + public string fb_client_token; } [Serializable]