Commit Graph

110 Commits (7ab29b1cbb009fb2b7a6d64bae229c4be6d4576e)

Author SHA1 Message Date
zhangwenyan 3045a073b6 feat(*):replace all framework 2021-04-09 17:25:03 +08:00
zhangwenyan da90067b4c fix(*):merge master conflict 2021-04-09 15:31:49 +08:00
xiaoyi ba8a97082a feat(*): update Android aar , update dll version 2021-04-08 14:14:55 +08:00
xiaoyi f03b640698 feat(*): update v2.0.0 native package 2021-04-08 11:55:23 +08:00
xiaoyi 292a2135dc build(package): update unitypackage name 2021-04-08 11:43:43 +08:00
xiaoyi 37f8674dd4 feat(README): update upm package Doc path 2021-04-08 11:23:34 +08:00
xiaoyi 11ef1a76b7 feat(upm): update packagename 2021-04-08 10:32:01 +08:00
zhangwenyan 40845d539a mod:replace all framework 2021-04-08 10:11:23 +08:00
xiaoyi c1b6be4312 Merge branch 'master' into feat/friends
# Conflicts:
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp.csproj
#	Assets/TapBootstrapSDK/Plugins/TapBootstrapSDK.dll
#	Assets/TapCommonSDK/Plugins/Android/libs/TapCommon_1.1.11.aar.meta
#	Assets/TapDBSDK/Plugins/TapDBSDK.dll
#	Assets/TapMomentSDK/Plugins/TapMomentSDK.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11(1).aar
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11(1).aar.meta
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11.aar
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11.aar.meta
#	Assets/TapTap/Common/Plugins/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/TapTap.Common.pdb
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.pdb
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.pdb
#	ProjectSettings/ProjectSettings.asset
#	TapSDK2-Unity.sln.DotSettings.user
#	TapTap.Bootstrap.Editor.csproj
#	TapTap.Common.Editor.csproj
#	TapTap.Login.Editor.csproj
#	TapTap.Moment.Editor.csproj
#	TapTap.TapDB.Editor.csproj
#	compile.sh
2021-04-07 19:37:47 +08:00
xiaoyi 42991af608 feat(*): update namespace to TapTap.ModuleName 2021-04-07 16:20:41 +08:00