Commit Graph

61 Commits (b52d767bb02fe9785c5e2ff8aaa1562e4a121dcb)

Author SHA1 Message Date
xiaoyi 2184310813 feat(*): update dll version 2021-04-09 17:39:08 +08:00
zhangwenyan 7a3c830ed8 feat(*):replace all framework 2021-04-09 17:25:03 +08:00
zhangwenyan c34f1ebafb fix(*):merge master conflict 2021-04-09 15:31:49 +08:00
xiaoyi e3662d3276 feat(*): update Android aar , update dll version 2021-04-08 14:14:55 +08:00
xiaoyi e2c21b9464 feat(upm): update dependenices to taptap repo 2021-04-08 11:58:16 +08:00
xiaoyi a7ec3e826b feat(*): update v2.0.0 native package 2021-04-08 11:55:23 +08:00
xiaoyi 0cf311d6ed feat(upm): update packagename 2021-04-08 10:32:01 +08:00
zhangwenyan a70dad49fd mod:replace all framework 2021-04-08 10:11:23 +08:00
xiaoyi 01dd136f70 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 cd6563f2df feat(*): update upm dependencies 2021-04-07 18:56:41 +08:00
xiaoyi 1215f6ce60 feat(*): update namespace to TapTap.ModuleName 2021-04-07 16:20:41 +08:00