Commit Graph

13 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 1d6f90b34e feat: udpate 2.1.5 binary 2021-06-22 16:23:51 +08:00
xiaoyi 5372a97495 feat: update release native binary 2021-06-10 11:12:59 +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 1de35c042d feat(package): update package.json version 2021-05-11 13:56:04 +08:00
xiaoyi cda13900eb feat(*): update dll version 2021-04-09 17:39:08 +08:00
zhangwenyan 23a2282984 feat(*):replace all framework 2021-04-09 17:25:03 +08:00
xiaoyi 8f7355f0b5 feat(upm): update dependenices to taptap repo 2021-04-08 11:58:16 +08:00
xiaoyi e93eaf6048 feat(upm): update packagename 2021-04-08 10:32:01 +08:00
xiaoyi 56c8e893e0 feat(*): update upm dependencies 2021-04-07 18:56:41 +08:00
xiaoyi 68c3547036 feat(*): update namespace to TapTap.ModuleName 2021-04-07 16:20:41 +08:00