Commit Graph

10 Commits (77557a27ea19b3077a13bad10cd4cfbeb49c1022)

Author SHA1 Message Date
xiaoyi 77557a27ea 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
xiaoyi f1e5940dfd feat: update 2.1.6 binary 2021-07-01 15:52:40 +08:00
xiaoyi 587b694e77 feat: udpate 2.1.5 binary 2021-06-22 16:23:51 +08:00
xiaoyi 7a6cb849fe feat: update release native binary 2021-06-10 11:12:59 +08:00
xiaoyi c3d1e5b565 feat(*): update native binary , doc 2021-05-28 11:28:03 +08:00
xiaoyi 8c9e4675fd feat(*): update binary 2021-05-14 19:16:05 +08:00
xiaoyi 5fee27aff7 feat(package): update package.json version 2021-05-11 13:56:04 +08:00
zhangwenyan 3045a073b6 feat(*):replace all framework 2021-04-09 17:25:03 +08:00
xiaoyi 11ef1a76b7 feat(upm): update packagename 2021-04-08 10:32:01 +08:00
xiaoyi 42991af608 feat(*): update namespace to TapTap.ModuleName 2021-04-07 16:20:41 +08:00