Merge branch 'feat/friend-v3' into release/v3.3.0

Browse Source

# Conflicts:
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp.csproj
#	Assets/TapTap/Achievement/Plugins/TapTap.Achievement.dll
#	Assets/TapTap/Achievement/Plugins/TapTap.Achievement.pdb
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	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/License/Plugins/TapTap.License.dll
#	Assets/TapTap/License/Plugins/TapTap.License.pdb
#	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
#	ProjectSettings/EditorBuildSettings.asset
#	TapSDK/TapSDK.sln
#	TapSDK2-Unity.sln
#	TapTap.Achievement.Editor.csproj
#	TapTap.Common.Editor.csproj
#	TapTap.Login.Editor.csproj
#	TapTap.Moment.Editor.csproj
#	TapTap.TapDB.Editor.csproj
#	compile.sh

xiaoyi 2021-10-15 12:12:47 +08:00

parent ea90e58ac1 1d1fe87608

commit 920fe645d1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available