Merge branch 'develop/2.x' into feat/tdsuser

# Conflicts:
#	Assets/LCLibs/Common.dll.meta
#	Assets/LCLibs/TapBootstrap_2.1.7.aar
#	Assets/LCLibs/TapBootstrap_2.1.7.aar.meta
#	Assets/TapTap/Bootstrap/Plugins/Android/libs/TapBootstrap_2.1.6.aar.meta
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	Assets/TapTap/Bootstrap/Plugins/iOS/TapBootstrapSDK.framework/Headers/TapBootstrap.h
#	Assets/TapTap/Bootstrap/Plugins/iOS/TapBootstrapSDK.framework/TapBootstrapSDK
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_2.1.7.aar.meta
#	Assets/TapTap/Common/Plugins/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/TapTap.Common.pdb
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.pdb
#	Assets/TapTap/Friends/Plugins/TapTap.Friends.dll
#	Assets/TapTap/Friends/Plugins/TapTap.Friends.pdb
#	Assets/TapTap/License/Plugins/TapTap.License.dll
#	Assets/TapTap/License/Plugins/TapTap.License.pdb
#	Assets/TapTap/Login/Editor/TapLoginIOSProcessor.cs
#	Assets/TapTap/Login/Plugins/TapTap.Login.dll
#	Assets/TapTap/Login/Plugins/TapTap.Login.pdb
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.dll
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.pdb
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.pdb
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.pdb
#	TapSDK2-Unity.sln

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 2.1.7
+
+### None
+
 ## 2.1.6
 
 ### BreakingChanges

Plugins/Android/libs/TapCommon_2.1.7.aar.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: 7dec5c56ea74a4cb5ad72b4bec9685f2
+<<<<<<< HEAD:Assets/LCLibs/Common.dll.meta
+guid: 6c5e054f629d44a83956237f550da969
+=======
+guid: fdfc96aff59854a6dbea47d109e204e1
+>>>>>>> develop/2.x:Assets/TapTap/Common/Plugins/Android/libs/TapCommon_2.1.7.aar.meta
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -11,15 +15,10 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
   - first:
       Any: 
     second:
-      enabled: 0
+      enabled: 1
       settings: {}
   - first:
       Editor: Editor
@@ -27,6 +26,12 @@ PluginImporter:
       enabled: 0
       settings:
         DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Plugins/iOS/TapCommonSDK.framework/Headers/TDSBaseManager.h

@@ -9,8 +9,8 @@
 #import <TapCommonSDK/TDSAccount.h>
 
 #define TapCommonSDK @"TapCommon"
-#define TapCommonSDK_VERSION_NUMBER @"20106001"
+#define TapCommonSDK_VERSION_NUMBER @"20107001"
-#define TapCommonSDK_VERSION        @"2.1.6"
+#define TapCommonSDK_VERSION        @"2.1.7"
 
 NS_ASSUME_NONNULL_BEGIN
 typedef NSString *TDSLanguage NS_STRING_ENUM;

package.json

@@ -2,7 +2,7 @@
   "name": "com.taptap.tds.common",
   "displayName": "TapTap Common",
   "description": "TapTap Develop Service",
-  "version": "2.1.6",
+  "version": "3.0.0",
   "unity": "2018.3",
   "license": "MIT"
 }