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
..
Android	Merge branch 'master' into feat/friends	2021-04-07 19:37:47 +08:00
iOS	Merge branch 'master' into feat/friends	2021-04-07 19:37:47 +08:00
Android.meta	feat(*): update namespace to TapTap.ModuleName	2021-04-07 16:20:41 +08:00
TapTap.Bootstrap.dll	feat(*): update namespace to TapTap.ModuleName	2021-04-07 16:20:41 +08:00
TapTap.Bootstrap.dll.meta	feat(*): update namespace to TapTap.ModuleName	2021-04-07 16:20:41 +08:00
TapTap.Bootstrap.pdb	feat(*): update namespace to TapTap.ModuleName	2021-04-07 16:20:41 +08:00
TapTap.Bootstrap.pdb.meta	feat(*): update namespace to TapTap.ModuleName	2021-04-07 16:20:41 +08:00
iOS.meta	feat(*): update namespace to TapTap.ModuleName	2021-04-07 16:20:41 +08:00