diff --git a/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs b/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs
index bcffe5cab..e19edddd2 100644
--- a/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs
+++ b/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs
@@ -131,7 +131,7 @@ namespace BFEditor.Build
// 应用名
if (buildInfo.IsPublish())
{
- PlayerSettings.productName = "b6";
+ PlayerSettings.productName = "Knight Connect";
}
else
{
diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
index c7debd978..6f9ebdb20 100644
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -25,11 +25,11 @@
-
-
+
+
-
+
diff --git a/Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs b/Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs
index b56661529..a7c1cbd27 100644
--- a/Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs
+++ b/Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs
@@ -20,7 +20,7 @@ namespace BF
#if UNITY_ANDROID
// string appKey = "85460dcd";
- string appKey = "193cca4fd";
+ string appKey = "19b1b4f1d";
BFLog.Log("unity-script: IronSource.Agent.validateIntegration");
IronSource.Agent.validateIntegration();
@@ -32,9 +32,9 @@ namespace BF
IronSource.Agent.init(appKey);
IronSource.Agent.setManualLoadRewardedVideo(true);
#elif UNITY_IPHONE
- string appKey = "8545d445";
+ // string appKey = "8545d445";
#else
- string appKey = "unexpected_platform";
+ // string appKey = "unexpected_platform";
#endif
// BFLog.Log("unity-script: IronSource.Agent.validateIntegration");
// IronSource.Agent.validateIntegration();
diff --git a/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs b/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs
index 652c8cce2..6f916408d 100644
--- a/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs
+++ b/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs
@@ -19,114 +19,114 @@ namespace BF
public void Init()
{
BFLog.Log("TASdk.Init");
- // TASdk.Init();
- // AFSdk.Init();
+ TASdk.Init();
+ AFSdk.Init();
}
// 设置账户id
public void SetThinkingAnalyticsAccountId(string id)
{
- // TASdk.SetAccountId(id);
+ TASdk.SetAccountId(id);
}
// 清除账户id
public void ClearThinkingAnalyticsAccountId()
{
- // TASdk.ClearAccountId();
+ TASdk.ClearAccountId();
}
// 数数科技上报
// lua端使用
public void PostThinkingAnalyticsEvent(string eventName, string data = "")
{
- // if (string.IsNullOrEmpty(data))
- // {
- // TASdk.Track(eventName, null);
- // }
- // else
- // {
- // var properties = JsonConvert.DeserializeObject>(data);
- // TASdk.Track(eventName, properties);
- // }
+ if (string.IsNullOrEmpty(data))
+ {
+ TASdk.Track(eventName, null);
+ }
+ else
+ {
+ var properties = JsonConvert.DeserializeObject>(data);
+ TASdk.Track(eventName, properties);
+ }
}
// 数数科技上报
// c#端使用，只上报事件名
public void PostThinkingAnalyticsEventName(string eventName)
{
- // TASdk.Track(eventName, null);
+ TASdk.Track(eventName, null);
}
// 数数科技上报
// c#端使用，上报事件名和参数
public void PostThinkingAnalyticsEventProperties(string eventName, Dictionary properties)
{
- // TASdk.Track(eventName, properties);
+ TASdk.Track(eventName, properties);
}
public void PostAppsflyerEvent(string eventName, string data = "")
{
- // if (string.IsNullOrEmpty(data))
- // {
- // AFSdk.SendEvent(eventName, null);
- // }
- // else
- // {
- // var properties = JsonConvert.DeserializeObject>(data);
- // AFSdk.SendEvent(eventName, properties);
- // }
+ if (string.IsNullOrEmpty(data))
+ {
+ AFSdk.SendEvent(eventName, null);
+ }
+ else
+ {
+ var properties = JsonConvert.DeserializeObject>(data);
+ AFSdk.SendEvent(eventName, properties);
+ }
}
public void PostFireBaseEvent(string eventName, string data = "")
{
- // if (string.IsNullOrEmpty(data))
- // {
- // return;
- // }
- // else
- // {
- // BFMain.Instance.SDKMgr.BFNativeSDKMgr.LogEvent(eventName, data);
- // }
+ if (string.IsNullOrEmpty(data))
+ {
+ return;
+ }
+ else
+ {
+ BFMain.Instance.SDKMgr.BFNativeSDKMgr.LogEvent(eventName, data);
+ }
}
// 设置账户id
public void PostAdjustSimpleTrackEvent(string key)
{
- // AdjustEvent adjustEvent = new AdjustEvent(key);
- // // BFLog.Log("PostAdjustSimpleTrackEvent");
- // Adjust.trackEvent(adjustEvent);
+ AdjustEvent adjustEvent = new AdjustEvent(key);
+ // BFLog.Log("PostAdjustSimpleTrackEvent");
+ Adjust.trackEvent(adjustEvent);
}
public void PostAdjustRevenueTrackEvent(string key, double currency, string currencyCode)
{
- // AdjustEvent adjustEvent = new AdjustEvent(key);
- // adjustEvent.setRevenue(currency, currencyCode);
- // // BFLog.Log("PostAdjustRevenueTrackEvent");
- // Adjust.trackEvent(adjustEvent);
+ AdjustEvent adjustEvent = new AdjustEvent(key);
+ adjustEvent.setRevenue(currency, currencyCode);
+ // BFLog.Log("PostAdjustRevenueTrackEvent");
+ Adjust.trackEvent(adjustEvent);
}
public void PostAdjustCallbackTrackEvent(string key, string data = "")
{
- // var properties = JsonConvert.DeserializeObject>(data);
- // AdjustEvent adjustEvent = new AdjustEvent(key);
- // foreach (var item in properties)
- // {
- // adjustEvent.addCallbackParameter(item.Key, item.Value);
- // }
- // // BFLog.Log("PostAdjustCallbackTrackEvent");
- // Adjust.trackEvent(adjustEvent);
+ var properties = JsonConvert.DeserializeObject>(data);
+ AdjustEvent adjustEvent = new AdjustEvent(key);
+ foreach (var item in properties)
+ {
+ adjustEvent.addCallbackParameter(item.Key, item.Value);
+ }
+ // BFLog.Log("PostAdjustCallbackTrackEvent");
+ Adjust.trackEvent(adjustEvent);
}
public void PostAdjustPartnerTrackEvent(string key, string data = "")
{
- // var properties = JsonConvert.DeserializeObject>(data);
- // AdjustEvent adjustEvent = new AdjustEvent(key);
- // foreach (var item in properties)
- // {
- // adjustEvent.addPartnerParameter(item.Key, item.Value);
- // }
- // // BFLog.Log("PostAdjustPartnerTrackEvent");
- // Adjust.trackEvent(adjustEvent);
+ var properties = JsonConvert.DeserializeObject>(data);
+ AdjustEvent adjustEvent = new AdjustEvent(key);
+ foreach (var item in properties)
+ {
+ adjustEvent.addPartnerParameter(item.Key, item.Value);
+ }
+ // BFLog.Log("PostAdjustPartnerTrackEvent");
+ Adjust.trackEvent(adjustEvent);
}
}
}
diff --git a/Assets/Scripts/Common/SDK/SDKManager.cs b/Assets/Scripts/Common/SDK/SDKManager.cs
index 425702e55..9befe8411 100644
--- a/Assets/Scripts/Common/SDK/SDKManager.cs
+++ b/Assets/Scripts/Common/SDK/SDKManager.cs
@@ -96,7 +96,7 @@ namespace BF
BFPaySDKMgr = sdkGo.AddComponent();
// 广告
// BFAdmobSDKMgr = sdkGo.AddComponent();
- // BFIronSourceSDKMgr = sdkGo.AddComponent();
+ BFIronSourceSDKMgr = sdkGo.AddComponent();
// 三方上报
BFThirdReportSDKMgr = sdkGo.AddComponent();
// native交互管理
diff --git a/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset b/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset
index 181f5133d..5b815c3f2 100644
--- a/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset
+++ b/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset
@@ -14,11 +14,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
selectedAppIndex: 0
clientTokens:
- -
+ - 7ec364275c7766833d2ebace0c5a806e
appIds:
- -
+ - 222326627097275
appLabels:
- -
+ - Knight Connect
cookie: 1
logging: 1
status: 1
diff --git a/Assets/scenes/enter_scene.unity b/Assets/scenes/enter_scene.unity
index c786ed381..8397548fd 100644
--- a/Assets/scenes/enter_scene.unity
+++ b/Assets/scenes/enter_scene.unity
@@ -212,8 +212,8 @@ MonoBehaviour:
enableLog: 0
networkType: 1
tokens:
- - appid:
- serverUrl:
+ - appid: 4bd4464b39394188a6708fee41f352f7
+ serverUrl: https://ta.perfeggsgame.com
mode: 0
timeZone: 1
timeZoneId:
@@ -392,7 +392,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2a2ec6ba1ee8b48749524f015ed572a6, type: 3}
m_Name:
m_EditorClassIdentifier:
- devKey:
+ devKey: XHsvoUhhNvMamKMSEvrew3
iosDevKey:
appID:
UWPAppID:
diff --git a/BFVersions/android/dz_dev/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_dev/unityLibrary/src/main/AndroidManifest.xml
index e025d9ab8..a40f5e667 100644
--- a/BFVersions/android/dz_dev/unityLibrary/src/main/AndroidManifest.xml
+++ b/BFVersions/android/dz_dev/unityLibrary/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
+ android:value="ca-app-pub-8252390069143459~1326835946"/>
diff --git a/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml
index c8adad7bf..5611f28e0 100644
--- a/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml
+++ b/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
+ android:value="ca-app-pub-8252390069143459~1326835946"/>
diff --git a/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml
index 5367fc285..83bcbd6e8 100644
--- a/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml
+++ b/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
+ android:value="ca-app-pub-8252390069143459~1326835946"/>
diff --git a/BFVersions/android/dz_release/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_release/unityLibrary/src/main/AndroidManifest.xml
index 7772dc46d..9457b468c 100644
--- a/BFVersions/android/dz_release/unityLibrary/src/main/AndroidManifest.xml
+++ b/BFVersions/android/dz_release/unityLibrary/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
+ android:value="ca-app-pub-8252390069143459~1326835946"/>