Merge branch 'master' into release/v3.4.0

Browse Source

# Conflicts:
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp.csproj
#	Assets/TapTap/Achievement/CHANGELOG.md
#	Assets/TapTap/Achievement/package.json
#	Assets/TapTap/Bootstrap/CHANGELOG.md
#	Assets/TapTap/Bootstrap/package.json
#	Assets/TapTap/Common/CHANGELOG.md
#	Assets/TapTap/Common/package.json
#	Assets/TapTap/Friends/package.json
#	Assets/TapTap/License/CHANGELOG.md
#	Assets/TapTap/License/package.json
#	Assets/TapTap/Login/CHANGELOG.md
#	Assets/TapTap/Login/package.json
#	Assets/TapTap/Moment/CHANGELOG.md
#	Assets/TapTap/Moment/package.json
#	Assets/TapTap/Support/package.json
#	Assets/TapTap/TapDB/CHANGELOG.md
#	Assets/TapTap/TapDB/VERSIONNOTE.md
#	Assets/TapTap/TapDB/package.json
#	IngameDebugConsole.Runtime.csproj
#	TapSDK2-Unity.sln
#	TapTap.Achievement.Editor.csproj
#	TapTap.Common.Editor.csproj
#	TapTap.Login.Editor.csproj
#	TapTap.Moment.Editor.csproj
#	TapTap.TapDB.Editor.csproj
#	pushhub.sh

3.4.0

xiaoyi 2021-11-09 14:44:57 +08:00

parent 5b190108d0 29d2862b32

commit 809838dbc3

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