Commit Graph

11 Commits (145e31e0480cae0fb5844e4b3866df5389b49eca)

Author SHA1 Message Date
xiaoyi f46676a0dc 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 cff64178e5 feat: update 2.1.6 binary 2021-07-01 15:52:40 +08:00
xiaoyi efaae54ed1 feat: update doc 2021-06-22 16:51:33 +08:00
xiaoyi 5372a97495 feat: update release native binary 2021-06-10 11:12:59 +08:00
xiaoyi ee6e4a62a6 feat: update scene 2021-06-03 11:13:24 +08:00
xiaoyi 2f1d53297f feat(*): update native binary , doc 2021-05-28 11:28:03 +08:00
xiaoyi ee95e80dd1 feat(*): update binary 2021-05-14 19:16:05 +08:00
xiaoyi 85f7be4fd1 feat(*): update native binary 2021-05-10 17:18:07 +08:00
xiaoyi 24c7d25567 feat(2.1.x): update 2.1.x feature and braking changes 2021-04-25 13:55:07 +08:00
xiaoyi 190f0f2d55 feat(README): update README 2021-04-12 11:24:42 +08:00
xiaoyi 68c3547036 feat(*): update namespace to TapTap.ModuleName 2021-04-07 16:20:41 +08:00