Merge remote-tracking branch 'origin/NewUIv2' into NewUI
# Conflicts: # My project/Assets/App/Infrastructure/Core/AppRouter.cs # My project/Assets/AppUI/NewAppUI/Login.uxml # My project/Assets/AppUI/NewAppUI/Scene/Boot.unity # My project/ProjectSettings/ProjectVersion.txt
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
1.43 MB
2.64 MB
2.63 MB
1.08 MB