Reapply "【Facebook】更新SDK和相关配置"

This reverts commit 528d061bf5.

Forest/Assets/FacebookSDK/Plugins/Android/libs/facebook-android-wrapper-17.0.0.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: bda855210f1f344978a21514004034a0
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Forest/Assets/FacebookSDK/Plugins/Editor/Dependencies.xml

@@ -2,17 +2,17 @@
 <dependencies>
     <androidPackages>
         <androidPackage spec="com.parse.bolts:bolts-android:1.4.0" />
-        <androidPackage spec="com.facebook.android:facebook-core:[16.0.1,17)" />
+        <androidPackage spec="com.facebook.android:facebook-core:[17.0.0,18)" />
-        <androidPackage spec="com.facebook.android:facebook-applinks:[16.0.1,17)" />
+        <androidPackage spec="com.facebook.android:facebook-applinks:[17.0.0,18)" />
-        <androidPackage spec="com.facebook.android:facebook-login:[16.0.1,17)" />
+        <androidPackage spec="com.facebook.android:facebook-login:[17.0.0,18)" />
-        <androidPackage spec="com.facebook.android:facebook-share:[16.0.1,17)" />
+        <androidPackage spec="com.facebook.android:facebook-share:[17.0.0,18)" />
-        <androidPackage spec="com.facebook.android:facebook-gamingservices:[16.0.1,17)" />
+        <androidPackage spec="com.facebook.android:facebook-gamingservices:[17.0.0,18)" />
     </androidPackages>
     <iosPods>
-        <iosPod name="FBSDKCoreKit_Basics" version="~> 16.0.1" />
+        <iosPod name="FBSDKCoreKit_Basics" version="~> 17.0.0" />
-        <iosPod name="FBSDKCoreKit" version="~> 16.0.1" />
+        <iosPod name="FBSDKCoreKit" version="~> 17.0.0" />
-        <iosPod name="FBSDKLoginKit" version="~> 16.0.1" />
+        <iosPod name="FBSDKLoginKit" version="~> 17.0.0" />
-        <iosPod name="FBSDKShareKit" version="~> 16.0.1" />
+        <iosPod name="FBSDKShareKit" version="~> 17.0.0" />
-        <iosPod name="FBSDKGamingServicesKit" version="~> 16.0.1" />
+        <iosPod name="FBSDKGamingServicesKit" version="~> 17.0.0" />
     </iosPods>
 </dependencies>

Forest/Assets/FacebookSDK/Plugins/Facebook.Unity.dll.meta

@@ -1,14 +1,15 @@
 fileFormatVersion: 2
 guid: 08462833fafe743b8bd59914b9f52696
-timeCreated: 1561663359
-licenseType: Pro
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Any: 

Forest/Assets/FacebookSDK/Plugins/Settings/Facebook.Unity.Settings.dll.meta

@@ -1,14 +1,15 @@
 fileFormatVersion: 2
 guid: c49f2b3ca212b47fc9cd8ce655177c89
-timeCreated: 1561663363
-licenseType: Pro
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Any: 

Forest/Assets/FacebookSDK/Plugins/Windows/Facebook.Unity.Windows.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 401db7925e96046b8a4e1b248577ee01
+guid: 1430182b1e5d64997aeda2070b4531c3
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/LibFBGManaged.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 56b0270c53c474c6a93d5bb82a543d4c
+guid: f474d2eb5ff0c41ea88db94b07e9a971
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/METADATA.bzl.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3b8139c338d6c4e8c81ce053a8d93a29
+guid: 0caa850c290704435b044d096c5c4437
 DefaultImporter:
   externalObjects: {}
   userData: 

Forest/Assets/FacebookSDK/Plugins/Windows/x64/LibFBGPlatform.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 240ff6613196f40b9a6038730ff9ef6f
+guid: 847298e9708154efc911952d510b6dba
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/LibFBGUI.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 25786f464040f451b93415a003df67ea
+guid: 7511989cae530409694b01d0689ab3a0
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/METADATA.bzl.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f8e3f9f49f590403790dc506589f0256
+guid: 8c084ca3602034d93b888266a68addc9
 DefaultImporter:
   externalObjects: {}
   userData: 

Forest/Assets/FacebookSDK/Plugins/Windows/x64/WebView2Loader.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d68c1b66096b44c2aa701165f2ebdae7
+guid: 118a1719df3654445bf95d79c2ee1e15
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/cpprest_2_10.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 569805c32550e47c283ad218ec2ca32d
+guid: a81c4e892c0334b128476132960c4011
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/libcrypto-3-x64.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f37026febb1834867bf083f0086b40d0
+guid: c2467336ababd4880b8864cdfd09525e
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/libcurl.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 71330672282ef414180b64f67f3eb158
+guid: c0074179c412c4538be77b083ada0125
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/libssl-3-x64.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4aff1e5a04c6647e69bef8c8751beb94
+guid: 938b59dc6da1f431888cb2e05d85d3eb
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/tinyxml2.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5e5b8778d73d64f72978f47978c337d7
+guid: 503d1c1d1157d4e1fac07962d4a72953
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x64/zlib1.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eae7c4d2856384b839d5b5d3745bad29
+guid: 0cf6ec435de3c4d82a13e92a46c236d9
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/LibFBGPlatform.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c3f48162e7882419fb866d16763cba89
+guid: 43295463941dc47b68ebc033bc3b97a5
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/LibFBGUI.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ac18dc5f21eed41ea8babc0884a63f8b
+guid: ff7c662d891d4441a8527588d3080f98
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/METADATA.bzl.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2e071419f04b5442f9bf0e90a7f7573d
+guid: 60df6f13bbf1642c2b8114b11a812e70
 DefaultImporter:
   externalObjects: {}
   userData: 

Forest/Assets/FacebookSDK/Plugins/Windows/x86/WebView2Loader.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6f37573bb14b64e5d99975b76a7fa540
+guid: 839a1df6e42814ae4867349515df25d0
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/cpprest_2_10.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 001a5ab3fd80b43e780ba5da0bfef822
+guid: c651c1681c6f348208cb85e894ccdfaa
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/libcrypto-3.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b03568f7572c74e378d468a04d921b3c
+guid: 74b1f53b4dea04c8187b202c9a532704
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/libcurl.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d66b8b4ad59fb40029d898f0670c4ed5
+guid: 7a5cdbf95b73d40c3961ccc4ee0f320a
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/libssl-3.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21e586019094245afb5360db13ab7829
+guid: 2c674e72034d74f6db7fa52e52d25b41
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/tinyxml2.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a90e75fb86ed489a87dc88c2d72a30d
+guid: e6dca454fc2844559bcce201db4cb3cf
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/Plugins/Windows/x86/zlib1.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 06b47556a07ea483786a6f1916c31f84
+guid: 3c5ab29a1134642258705c127eb75e64
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Forest/Assets/FacebookSDK/SDK/Editor/iOS/FBUnityInterface.mm

@@ -652,6 +652,12 @@ extern "C" {
     return [FBSDKSettings.sharedSettings isAdvertiserTrackingEnabled];
   }
 
+  BOOL IOSFBDomainErrorEnabled(BOOL domainErrorEnabled)
+  {
+    [FBSDKSettings.sharedSettings setIsDomainErrorEnabled:domainErrorEnabled];
+    return [FBSDKSettings.sharedSettings isDomainErrorEnabled];
+  }
+
   char* IOSFBSdkVersion()
   {
     const char* string = [[FBSDKSettings.sharedSettings sdkVersion] UTF8String];

Forest/Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset

@@ -14,11 +14,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   selectedAppIndex: 0
   clientTokens:
-  - fe4647fd2ddb9cce0790e7c27480d161
+  - a118f647a27f07f8c395046d39803d7e
   appIds:
-  - 331672559709537
+  - 875922084374527
   appLabels:
-  - Avery
+  - Forest Nuts and Bolts
   cookie: 1
   logging: 1
   status: 1

Forest/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" android:installLocation="preferExternal" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" android:installLocation="preferExternal" android:versionCode="1" android:versionName="1.0">
-  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
+  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <application android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="true">
+  <application android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="true">
-    <activity android:name="com.unity3d.player.UnityPlayerActivity" android:label="@string/app_name">
+    <activity android:name="com.unity3d.player.UnityPlayerActivity" android:label="@string/app_name">
-      <intent-filter>
+      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
+      </intent-filter>
-      <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+      <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
-    </activity>
+    </activity>
-    <activity android:name="com.facebook.unity.FBUnityLoginActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+    <activity android:name="com.facebook.unity.FBUnityLoginActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-    <activity android:name="com.facebook.unity.FBUnityDialogsActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+    <activity android:name="com.facebook.unity.FBUnityDialogsActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-    <activity android:name="com.facebook.unity.FBUnityGamingServicesFriendFinderActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+    <activity android:name="com.facebook.unity.FBUnityGamingServicesFriendFinderActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-    <activity android:name="com.facebook.unity.FBUnityAppLinkActivity" android:exported="true" />
+    <activity android:name="com.facebook.unity.FBUnityAppLinkActivity" android:exported="true" />
-    <activity android:name="com.facebook.unity.FBUnityDeepLinkingActivity" android:exported="true" />
+    <activity android:name="com.facebook.unity.FBUnityDeepLinkingActivity" android:exported="true" />
-    <activity android:name="com.facebook.unity.FBUnityGameRequestActivity" />
+    <activity android:name="com.facebook.unity.FBUnityGameRequestActivity" />
-    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb331672559709537" />
+    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb875922084374527" />
-    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="fe4647fd2ddb9cce0790e7c27480d161" />
+    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="a118f647a27f07f8c395046d39803d7e" />
-    <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="true" />
+    <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="true" />
-    <meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="true" />
+    <meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="true" />
-    <provider android:name="com.facebook.FacebookContentProvider" android:authorities="com.facebook.app.FacebookContentProvider331672559709537" android:exported="true" />
+    <provider android:name="com.facebook.FacebookContentProvider" android:authorities="com.facebook.app.FacebookContentProvider875922084374527" android:exported="true" />
-  </application>
+  </application>
 </manifest>