xiaoyi
|
c87e88b91d
|
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
|
2021-07-15 11:49:07 +08:00 |